catch up with development
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..414d5e4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+**/target
+*.log
+**git.properties
+**/target/
+**/.metadata/
+
+**/emf-gen/**/.gitignore
+**/src-gen/**/.gitignore
+**/git.properties
+**/*.java._trace
+**/*.log
+**/*.log.properties
+
+**/bin/
+**/build/
+*.class
+*.ctrl
+**/Debug/
+.DS_Store
+*.ear
+*.war
+
+**/*.actionbin
+**/*.blipbin
+**/*.chartbin
+**/*.cubebin
+**/*.datatypebin
+**/*.dtobin
+**/*.entitybin
+**/*.servicebin
+**/*.tablebin
+**/*.uibin
+**/*.uisemanticbin
+**/*.xtendbin
+**/*.xtextbin
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml
index 1e61410..cd4aeca 100644
--- a/jenkins.build.config.xml
+++ b/jenkins.build.config.xml
@@ -17,8 +17,7 @@
<!-- DO NOT EDIT BELOW THIS LINE -->
<jenkins.build.dependencies>
<jenkins.build.dependency>org.eclipse.osbp.dependencies</jenkins.build.dependency>
- <jenkins.build.dependency>org.eclipse.osbp.fork.gemini.naming</jenkins.build.dependency>
- <jenkins.build.dependency>org.eclipse.osbp.fork.jboss.smooks</jenkins.build.dependency>
+ <jenkins.build.dependency>org.eclipse.osbp.dependencies.p2</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.fork.jpos</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.fork.tapiji</jenkins.build.dependency>
<jenkins.build.dependency>org.eclipse.osbp.fork.uomo</jenkins.build.dependency>
diff --git a/org.eclipse.osbp.technologystack.feature/.gitignore b/org.eclipse.osbp.technologystack.feature/.gitignore
new file mode 100644
index 0000000..10529f3
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.feature/.gitignore
@@ -0,0 +1,3 @@
+/target/
+!**/README.txt
+/apidocs/
diff --git a/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.technologystack.feature/feature.xml b/org.eclipse.osbp.technologystack.feature/feature.xml
index 10c651d..24d83ef 100644
--- a/org.eclipse.osbp.technologystack.feature/feature.xml
+++ b/org.eclipse.osbp.technologystack.feature/feature.xml
@@ -1,15 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--#======================================================================= -->
-<!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
-<!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
-<!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
-<!--# -->
-<!--# Contributors: -->
-<!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
-<!--#======================================================================= -->
-
<feature
id="org.eclipse.osbp.technologystack.feature"
label="%featureName"
@@ -53,22 +43,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.equinox.compendium.sdk"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.equinox.core.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.equinox.server.p2"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.equinox.weaving.sdk"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.osbp.dependencies.feature.activemq"
version="0.0.0"/>
@@ -81,11 +55,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.assert-utilities"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.osbp.dependencies.feature.atmosphere"
+ id="org.eclipse.osbp.dependencies.feature.assert_utilities"
version="0.0.0"/>
<includes
@@ -117,14 +87,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.felix.gogo"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.osbp.dependencies.feature.javax.annotation"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.osbp.dependencies.feature.javax.transaction"
version="0.0.0"/>
@@ -133,10 +95,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.jetty.websockets"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.osbp.dependencies.feature.joda"
version="0.0.0"/>
@@ -157,10 +115,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.quartz"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.osbp.dependencies.feature.sirius"
version="0.0.0"/>
@@ -169,14 +123,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.vaadin.addons"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.osbp.dependencies.feature.vaadin"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.osbp.dependencies.feature.xtend"
version="0.0.0"/>
@@ -187,16 +133,21 @@
<includes
id="org.eclipse.osbp.fork.jpos.feature"
version="0.0.0"/>
-
- <includes
- id="org.eclipse.osbp.fork.tapiji.feature"
- version="0.0.0"/>
<includes
id="org.eclipse.osbp.gitinfo.feature"
version="0.0.0"/>
<includes
+ id="org.eclipse.pde"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.uomo.feature"
version="0.0.0"/>
+
+ <requires>
+ <import feature="org.eclipse.xtext.sdk" version="2.11.0" match="equivalent"/>
+ </requires>
+
</feature>
diff --git a/org.eclipse.osbp.technologystack.feature/pom.xml b/org.eclipse.osbp.technologystack.feature/pom.xml
index a908295..b3efffc 100644
--- a/org.eclipse.osbp.technologystack.feature/pom.xml
+++ b/org.eclipse.osbp.technologystack.feature/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.activemq</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.14.5-SNAPSHOT</version>
<type>eclipse-feature</type>
</dependency>
<dependency>
@@ -44,19 +44,13 @@
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.apache.pdfbox</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.6-SNAPSHOT</version>
<type>eclipse-feature</type>
</dependency>
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.assert-utilities</artifactId>
- <version>${osgi.testing.assertions.version}</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.atmosphere</artifactId>
- <version>2.2.7.vaadin1</version>
+ <artifactId>org.eclipse.osbp.dependencies.feature.assert_utilities</artifactId>
+ <version>${osgi.testing.assertions.version}-SNAPSHOT</version>
<type>eclipse-feature</type>
</dependency>
<dependency>
@@ -68,7 +62,7 @@
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.birt</artifactId>
- <version>4.4.2-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<type>eclipse-feature</type>
</dependency>
<dependency>
@@ -103,18 +97,6 @@
</dependency>
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.felix.gogo</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.javax.annotation</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.javax.transaction</artifactId>
<version>1.1.1</version>
<type>eclipse-feature</type>
@@ -122,13 +104,7 @@
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.jetty</artifactId>
- <version>8.1.16</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.jetty.websockets</artifactId>
- <version>8.1.16</version>
+ <version>9.4.1-SNAPSHOT</version>
<type>eclipse-feature</type>
</dependency>
<dependency>
@@ -163,14 +139,8 @@
</dependency>
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.quartz</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.sirius</artifactId>
- <version>3.0.2</version>
+ <version>4.1.1</version>
<type>eclipse-feature</type>
</dependency>
<dependency>
@@ -181,35 +151,22 @@
</dependency>
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.vaadin.addons</artifactId>
- <version>${project.version}</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.vaadin</artifactId>
- <version>7.5.7</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.xtend</artifactId>
- <version>2.7.3</version>
+ <version>2.11.0-SNAPSHOT</version>
<type>eclipse-feature</type>
</dependency>
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.xtext</artifactId>
- <version>2.7.3</version>
+ <version>2.11.0-SNAPSHOT</version>
<type>eclipse-feature</type>
</dependency>
- <dependency>
- <groupId>org.eclipse.osbp.fork.tapiji</groupId>
- <artifactId>org.eclipse.osbp.fork.tapiji.feature</artifactId>
- <version>${project.version}</version>
- <type>eclipse-feature</type>
- <scope>provided</scope>
- </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>org.eclipse.babel.plugins</groupId> -->
+ <!-- <artifactId>org.eclipse.babel.tapiji.tools.java.feature</artifactId> -->
+ <!-- <version>0.9.1-SNAPSHOT</version> -->
+ <!-- <type>eclipse-feature</type> -->
+ <!-- </dependency> -->
<dependency>
<groupId>org.eclipse.osbp.fork.jpos</groupId>
<artifactId>org.eclipse.osbp.fork.jpos.feature</artifactId>
@@ -246,33 +203,38 @@
<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature" />
<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" />
<feature id="org.eclipse.ecf.filetransfer.ssl.feature" />
- <feature id="org.eclipse.equinox.compendium.sdk" />
- <feature id="org.eclipse.equinox.core.feature" />
- <feature id="org.eclipse.equinox.server.p2" />
- <feature id="org.eclipse.equinox.weaving.sdk" />
+ <feature id="org.eclipse.babel.tapiji.tools.java.feature" />
<feature id="org.eclipse.osbp.dependencies.feature.activemq" />
<feature id="org.eclipse.osbp.dependencies.feature.apache.commons" />
+ <feature id="org.eclipse.osbp.dependencies.feature.apache.pdfbox" />
+ <feature id="org.eclipse.osbp.dependencies.feature.assert_utilities" />
<feature id="org.eclipse.osbp.dependencies.feature.atmosphere" />
<feature id="org.eclipse.osbp.dependencies.feature.beanvalidation" />
<feature id="org.eclipse.osbp.dependencies.feature.birt" />
<feature id="org.eclipse.osbp.dependencies.feature.drools" />
<feature id="org.eclipse.osbp.dependencies.feature.e4tools" />
- <feature id="org.eclipse.osbp.dependencies.feature.eclipse.core.databinding" />
+ <feature
+ id="org.eclipse.osbp.dependencies.feature.eclipse.core.databinding" />
<feature id="org.eclipse.osbp.dependencies.feature.eef" />
<feature id="org.eclipse.osbp.dependencies.feature.equinox" />
- <feature id="org.eclipse.osbp.dependencies.feature.felix.gogo" />
<feature id="org.eclipse.osbp.dependencies.feature.javax.annotation" />
<feature id="org.eclipse.osbp.dependencies.feature.javax.transaction" />
<feature id="org.eclipse.osbp.dependencies.feature.jetty" />
- <feature id="org.eclipse.osbp.dependencies.feature.jetty.websockets" />
<feature id="org.eclipse.osbp.dependencies.feature.joda" />
<feature id="org.eclipse.osbp.dependencies.feature.misc.mbp" />
+ <feature id="org.eclipse.osbp.dependencies.feature.misc.ui" />
<feature id="org.eclipse.osbp.dependencies.feature.mondrian" />
+ <feature id="org.eclipse.osbp.dependencies.feature.osgi.enroute" />
+ <feature id="org.eclipse.osbp.dependencies.feature.persistence" />
<feature id="org.eclipse.osbp.dependencies.feature.quartz" />
<feature id="org.eclipse.osbp.dependencies.feature.smooks" />
<feature id="org.eclipse.osbp.dependencies.feature.uomo" />
<feature id="org.eclipse.osbp.dependencies.feature.vaadin.addons" />
+ <feature id="org.eclipse.osbp.dependencies.feature.vaadin.external" />
<feature id="org.eclipse.osbp.dependencies.feature.vaadin" />
+ <feature id="org.eclipse.osbp.dependencies.feature.xtend" />
+ <feature id="org.eclipse.osbp.dependencies.feature.xtext" />
+ <feature id="org.eclipse.osbp.fork.jpos.feature" />
<feature id="org.eclipse.uomo.feature" />
</excludes>
</configuration>
diff --git a/org.eclipse.osbp.technologystack.p2/.gitignore b/org.eclipse.osbp.technologystack.p2/.gitignore
new file mode 100644
index 0000000..890cbe5
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.p2/.gitignore
@@ -0,0 +1,3 @@
+/lib
+*.log.properties
+/target/
\ No newline at end of file
diff --git a/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.p2/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.technologystack.p2/build.xml b/org.eclipse.osbp.technologystack.p2/build.xml
new file mode 100644
index 0000000..75f5032
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.p2/build.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+#======================================================================
+# Copyright (c) 2012, 2013 Lunifera GmbH (Gross Enzersdorf), C4biz Softwares ME, Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Cristiano Gavião - initial API and implementation
+#======================================================================
+-->
+<project default="basic.build" name="OSBP Dependencies P2 with aggregate repositories">
+
+ <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+ <target name="init">
+ <property name="update.site.source.dir" value="${osbp.deployment.p2.origin.dir}" />
+
+ <echo>Loaded associate sites: ${associate.sites}</echo>
+ <echo>Source dir: ${update.site.source.dir}</echo>
+
+ </target>
+
+ <target name="basic.build" description="OSBP aggregate P2 repository" depends="init, unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,pack.content.jar" />
+
+ <target name="add.associate.sites" if="associate.sites">
+ <if>
+ <and>
+ <!-- Defined in associate.sites -->
+ <isset property="associate.sites" />
+ <not>
+ <equals arg1="${associate.sites}" arg2="" />
+ </not>
+ </and>
+ <then>
+ <!-- counter variable -->
+ <echo>p2.repos=${associate.sites}</echo>
+ <var name="associate.sites.0" value="" />
+ <for param="associate.site" list="${associate.sites}" delimiter=",">
+ <sequential>
+ <var name="associate.sites.0" value="${associate.sites.0}00" />
+ <echo>length=${associate.sites.0}</echo>
+ </sequential>
+ </for>
+ <length property="associate.sites.length" string="${associate.sites.0}" />
+
+ <echo>length=${associate.sites.length}</echo>
+
+ <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml">
+ <filterchain>
+ <tailfilter lines="-1" skip="1" />
+ </filterchain>
+ </loadfile>
+ <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" />
+ <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'>
+</echo>
+ <for param="associate.site" list="${associate.sites}" delimiter=",">
+ <sequential>
+ <!-- insert into content.xml -->
+
+ <echo>Adding associate p2: @{associate.site}</echo>
+
+ <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/>
+ <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/>
+</echo>
+ </sequential>
+ </for>
+ <echo file="${update.site.source.dir}/content.xml" append="true"> </references>
+</repository>
+</echo>
+ </then>
+ </if>
+ </target>
+
+ <target name="remove.references">
+ <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" />
+ <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" />
+ </target>
+
+ <target name="remove.uncategorized.category">
+ <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" />
+ <xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" />
+ </target>
+
+ <target name="unpack.content.jar">
+ <if>
+ <available file="${update.site.source.dir}/content.jar" type="file" />
+ <then>
+ <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" />
+ <delete file="${update.site.source.dir}/content.jar" />
+ </then>
+ </if>
+ </target>
+
+ <target name="pack.content.jar">
+ <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" />
+ <delete file="${update.site.source.dir}/content.xml" />
+ <delete file="${update.site.source.dir}/content.old.xml" />
+ </target>
+
+</project>
diff --git a/org.eclipse.osbp.technologystack.p2/pom.xml b/org.eclipse.osbp.technologystack.p2/pom.xml
index 01eb60d..12ff78a 100644
--- a/org.eclipse.osbp.technologystack.p2/pom.xml
+++ b/org.eclipse.osbp.technologystack.p2/pom.xml
@@ -7,122 +7,130 @@
<!--# http://www.eclipse.org/legal/epl-v10.html -->
<!--# -->
<!--# Contributors: -->
-<!--# Christophe Loetz (Loetz GmbH&Co.KG) - Initial implementation API and implementation -->
+<!--# Christophe Loetz (Loetz GmbH&Co.KG) - Initial implementation API and
+ implementation -->
<!--#======================================================================= -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.osbp.technologystack</groupId>
- <artifactId>org.eclipse.osbp.technologystack</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.osbp.technologystack</groupId>
+ <artifactId>org.eclipse.osbp.technologystack</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
- <artifactId>org.eclipse.osbp.technologystack.p2</artifactId>
- <packaging>eclipse-repository</packaging>
+ <artifactId>org.eclipse.osbp.technologystack.p2</artifactId>
+ <packaging>eclipse-repository</packaging>
- <properties>
-
- </properties>
+ <properties>
- <profiles>
- <profile>
- <id>build.p2</id>
- <activation>
- <property>
- <name>!osbp.skip.build.p2</name>
- </property>
- </activation>
- <properties>
- <osbp.deployment.p2.origin.dir>${project.build.directory}${file.separator}repository</osbp.deployment.p2.origin.dir>
- <associate.p2>
- </associate.p2>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create.p2.inf</id>
- <phase>package</phase>
- <configuration>
- <quiet>true</quiet>
- <target>
- <ant antfile="build.xml" target="basic.build" dir=".">
- <property name="osbp.deployment.p2.origin.dir" value="${osbp.deployment.p2.origin.dir}"/>
- <property name="associate.sites" value="${associate.p2}"/>
- </ant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant-version}</version>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>Saxon-HE</artifactId>
- <version>9.4</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>JBoss Tools Neon</id>
+ <name>JBoss Tools Neon</name>
+ <url>http://download.jboss.org/jbosstools/neon/stable/updates/</url>
+ <layout>p2</layout>
+ </repository>
+ </repositories>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.osbp.technologystack</groupId>
- <artifactId>org.eclipse.osbp.technologystack.feature</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <type>eclipse-feature</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.technologystack</groupId>
- <artifactId>org.eclipse.osbp.technologystack.feature</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <classifier>sources-feature</classifier>
- <type>eclipse-feature</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.technologystack</groupId>
- <artifactId>org.eclipse.osbp.technologystack.target.feature</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <type>eclipse-feature</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.technologystack</groupId>
- <artifactId>org.eclipse.osbp.technologystack.target.feature</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <classifier>sources-feature</classifier>
- <type>eclipse-feature</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>org.eclipse.xtend.lib</artifactId>
- <version>2.7.3</version>
- </dependency>
- </dependencies>
+ <profiles>
+ <profile>
+ <id>build.p2</id>
+ <activation>
+ <property>
+ <name>!osbp.skip.build.p2</name>
+ </property>
+ </activation>
+ <properties>
+ <osbp.deployment.p2.origin.dir>${project.build.directory}${file.separator}repository</osbp.deployment.p2.origin.dir>
+ <associate.p2>
+ </associate.p2>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create.p2.inf</id>
+ <phase>package</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <target>
+ <ant antfile="build.xml" target="basic.build" dir=".">
+ <property name="osbp.deployment.p2.origin.dir"
+ value="${osbp.deployment.p2.origin.dir}" />
+ <property name="associate.sites" value="${associate.p2}" />
+ </ant>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>Saxon-HE</artifactId>
+ <version>9.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.osbp.technologystack</groupId>
+ <artifactId>org.eclipse.osbp.technologystack.feature</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.technologystack</groupId>
+ <artifactId>org.eclipse.osbp.technologystack.feature</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <classifier>sources-feature</classifier>
+ <type>eclipse-feature</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.technologystack</groupId>
+ <artifactId>org.eclipse.osbp.technologystack.target.feature</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.technologystack</groupId>
+ <artifactId>org.eclipse.osbp.technologystack.target.feature</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <classifier>sources-feature</classifier>
+ <type>eclipse-feature</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/org.eclipse.osbp.technologystack.target.feature/.gitignore b/org.eclipse.osbp.technologystack.target.feature/.gitignore
new file mode 100644
index 0000000..10529f3
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.feature/.gitignore
@@ -0,0 +1,3 @@
+/target/
+!**/README.txt
+/apidocs/
diff --git a/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.technologystack.target.feature/feature.xml b/org.eclipse.osbp.technologystack.target.feature/feature.xml
index 044aad9..1ce5c7d 100644
--- a/org.eclipse.osbp.technologystack.target.feature/feature.xml
+++ b/org.eclipse.osbp.technologystack.target.feature/feature.xml
@@ -19,11 +19,39 @@
</license>
<includes
+ id="org.eclipse.osbp.dependencies.feature.apache.batik.1.7.0"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.birt.runtime"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.osbp.dependencies.feature.derby"
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.fork.gemini.naming.feature"
+ id="org.eclipse.osbp.dependencies.feature.e4tools.runtime"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.eclipse.core"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.eclipse.emf"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.eclipse.jdt"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.equinox"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.gemini.naming"
version="0.0.0"/>
<includes
@@ -31,390 +59,35 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.apache.batik.1.7.0"
+ id="org.eclipse.osbp.dependencies.feature.misc.external"
version="0.0.0"/>
-
+
<includes
id="org.eclipse.osbp.dependencies.feature.misc.runtime"
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.security.shiro"
+ id="org.eclipse.osbp.dependencies.feature.vaadin"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.vaadin.addons"
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.dependencies.feature.transaction.geronimo"
+ id="org.eclipse.osbp.dependencies.feature.vaadin.external"
version="0.0.0"/>
<includes
- id="org.eclipse.osbp.fork.gemini.naming.feature"
+ id="org.eclipse.osbp.dependencies.feature.xtend.runtime"
version="0.0.0"/>
- <plugin
- id="org.eclipse.compare.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ <includes
+ id="org.eclipse.osbp.dependencies.feature.xtext.runtime"
+ version="0.0.0"/>
- <plugin
- id="org.eclipse.datatools.connectivity"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.debug.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.help"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jdt.compiler.apt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jdt.compiler.tool"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jdt.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jdt.launching"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osgi.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.objectweb.asm"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.events"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.smil"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="osgi.enterprise"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.commands"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.contenttype"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.expressions"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.filesystem"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.resources"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.commands"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.contexts"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.di"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.di.extensions"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.core.services"
- download-size="0"
- install-size="0"
- version="1.2.1"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.css.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.di"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.model.workbench"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.services"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.e4.ui.workbench"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.databinding"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.change"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.xmi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.edit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.text"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.xsd"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.launcher"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.supplement"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.transforms.xslt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.transforms.hook"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.concurrent"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.security.win32.x86"
- os="win32"
- arch="x86"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.security.win32.x86_64"
- os="win32"
- arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.security.macosx"
- os="macosx"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.console.ssh"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.console.jaas.fragment"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.apache.mina.core"
- download-size="0"
- install-size="0"
- version="2.0.7.v201401071602"
- unpack="false"/>
-
- <plugin
- id="org.apache.sshd.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.http.servletbridge"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ <includes
+ id="org.eclipse.datatools.connectivity.oda.feature"
+ version="0.0.0"/>
</feature>
diff --git a/org.eclipse.osbp.technologystack.target.feature/pom.xml b/org.eclipse.osbp.technologystack.target.feature/pom.xml
index 8c093ea..e611ad0 100644
--- a/org.eclipse.osbp.technologystack.target.feature/pom.xml
+++ b/org.eclipse.osbp.technologystack.target.feature/pom.xml
@@ -42,13 +42,19 @@
<excludes>
<plugin id="org.eclipse.equinox.security.win32.x86" />
<plugin id="org.eclipse.equinox.console.jaas.fragment" />
- <plugin id="osgi.enterprise" />
+ <plugin id="org.eclipse.jdt.core" />
<feature id="org.eclipse.osbp.dependencies.feature.derby" />
+ <feature id="org.eclipse.osbp.dependencies.feature.gemini.naming" />
<feature id="org.eclipse.osbp.dependencies.feature.h2" />
<feature id="org.eclipse.osbp.dependencies.feature.misc.runtime" />
+ <feature id="org.eclipse.osbp.dependencies.feature.mysql" />
<feature id="org.eclipse.osbp.dependencies.feature.security.shiro" />
<feature id="org.eclipse.osbp.dependencies.feature.transaction.geronimo" />
- <feature id="org.eclipse.osbp.fork.gemini.naming.feature" />
+ <feature id="org.eclipse.osbp.dependencies.feature.vaadin.addons" />
+ <feature id="org.eclipse.osbp.dependencies.feature.vaadin.external" />
+ <feature id="org.eclipse.osbp.dependencies.feature.xtext.runtime" />
+ <feature id="org.eclipse.osbp.dependencies.feature.xtend.runtime" />
+<!-- <feature id="org.eclipse.osbp.fork.gemini.naming.feature" /> -->
</excludes>
</configuration>
</plugin>
@@ -115,7 +121,13 @@
<dependency>
<groupId>org.eclipse.osbp.dependencies</groupId>
<artifactId>org.eclipse.osbp.dependencies.feature.derby</artifactId>
- <version>10.12.1-SNAPSHOT</version>
+ <version>10.11.1-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>org.eclipse.osbp.dependencies.feature.gemini.naming</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
<type>eclipse-feature</type>
</dependency>
<dependency>
@@ -137,27 +149,68 @@
<type>eclipse-feature</type>
</dependency>
<dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.security.shiro</artifactId>
- <version>1.2.3-SNAPSHOT</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.dependencies</groupId>
- <artifactId>org.eclipse.osbp.dependencies.feature.transaction.geronimo</artifactId>
- <version>2.2.1</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osbp.fork.gemini.naming</groupId>
- <artifactId>org.eclipse.osbp.fork.gemini.naming.feature</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>eclipse-feature</type>
- </dependency>
- <dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
<version>2.7.3</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>
+ org.eclipse.osbp.dependencies.feature.birt.runtime
+ </artifactId>
+ <version>4.6.0-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>
+ org.eclipse.osbp.dependencies.feature.xtend.runtime
+ </artifactId>
+ <version>2.11.0-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>
+ org.eclipse.osbp.dependencies.feature.xtext.runtime
+ </artifactId>
+ <version>2.11.0-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>
+ org.eclipse.osbp.dependencies.feature.eclipse.emf
+ </artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>org.eclipse.osbp.dependencies.feature.vaadin.addons</artifactId>
+ <version>${project.version}</version>
+ <type>eclipse-feature</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>org.eclipse.osbp.dependencies.feature.vaadin</artifactId>
+ <version>7.7.6</version>
+ <type>eclipse-feature</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>org.eclipse.osbp.dependencies.feature.vaadin.external</artifactId>
+ <version>${project.version}</version>
+ <type>eclipse-feature</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osbp.dependencies</groupId>
+ <artifactId>
+ org.eclipse.osbp.dependencies.feature.e4tools.runtime
+ </artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <type>eclipse-feature</type>
+ </dependency>
</dependencies>
</project>
diff --git a/org.eclipse.osbp.technologystack.target.p2/.gitignore b/org.eclipse.osbp.technologystack.target.p2/.gitignore
new file mode 100644
index 0000000..890cbe5
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.p2/.gitignore
@@ -0,0 +1,3 @@
+/lib
+*.log.properties
+/target/
\ No newline at end of file
diff --git a/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..0933f8c
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.p2/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,10 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.technologystack.target.p2/build.xml b/org.eclipse.osbp.technologystack.target.p2/build.xml
new file mode 100644
index 0000000..75f5032
--- /dev/null
+++ b/org.eclipse.osbp.technologystack.target.p2/build.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+#======================================================================
+# Copyright (c) 2012, 2013 Lunifera GmbH (Gross Enzersdorf), C4biz Softwares ME, Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Cristiano Gavião - initial API and implementation
+#======================================================================
+-->
+<project default="basic.build" name="OSBP Dependencies P2 with aggregate repositories">
+
+ <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+ <target name="init">
+ <property name="update.site.source.dir" value="${osbp.deployment.p2.origin.dir}" />
+
+ <echo>Loaded associate sites: ${associate.sites}</echo>
+ <echo>Source dir: ${update.site.source.dir}</echo>
+
+ </target>
+
+ <target name="basic.build" description="OSBP aggregate P2 repository" depends="init, unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,pack.content.jar" />
+
+ <target name="add.associate.sites" if="associate.sites">
+ <if>
+ <and>
+ <!-- Defined in associate.sites -->
+ <isset property="associate.sites" />
+ <not>
+ <equals arg1="${associate.sites}" arg2="" />
+ </not>
+ </and>
+ <then>
+ <!-- counter variable -->
+ <echo>p2.repos=${associate.sites}</echo>
+ <var name="associate.sites.0" value="" />
+ <for param="associate.site" list="${associate.sites}" delimiter=",">
+ <sequential>
+ <var name="associate.sites.0" value="${associate.sites.0}00" />
+ <echo>length=${associate.sites.0}</echo>
+ </sequential>
+ </for>
+ <length property="associate.sites.length" string="${associate.sites.0}" />
+
+ <echo>length=${associate.sites.length}</echo>
+
+ <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml">
+ <filterchain>
+ <tailfilter lines="-1" skip="1" />
+ </filterchain>
+ </loadfile>
+ <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" />
+ <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'>
+</echo>
+ <for param="associate.site" list="${associate.sites}" delimiter=",">
+ <sequential>
+ <!-- insert into content.xml -->
+
+ <echo>Adding associate p2: @{associate.site}</echo>
+
+ <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/>
+ <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/>
+</echo>
+ </sequential>
+ </for>
+ <echo file="${update.site.source.dir}/content.xml" append="true"> </references>
+</repository>
+</echo>
+ </then>
+ </if>
+ </target>
+
+ <target name="remove.references">
+ <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" />
+ <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" />
+ </target>
+
+ <target name="remove.uncategorized.category">
+ <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" />
+ <xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" />
+ </target>
+
+ <target name="unpack.content.jar">
+ <if>
+ <available file="${update.site.source.dir}/content.jar" type="file" />
+ <then>
+ <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" />
+ <delete file="${update.site.source.dir}/content.jar" />
+ </then>
+ </if>
+ </target>
+
+ <target name="pack.content.jar">
+ <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" />
+ <delete file="${update.site.source.dir}/content.xml" />
+ <delete file="${update.site.source.dir}/content.old.xml" />
+ </target>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 7ca5f03..42908cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,19 @@
</site>
</distributionManagement>
+ <repositories>
+<!-- <repository> -->
+<!-- <id>Eclipse-OSBP-SNAPSHOTS</id> -->
+<!-- <url>https://repo.eclipse.org/content/repositories/osbp-snapshots</url> -->
+<!-- <releases> -->
+<!-- <enabled>false</enabled> -->
+<!-- </releases> -->
+<!-- <snapshots> -->
+<!-- <enabled>true</enabled> -->
+<!-- </snapshots> -->
+<!-- </repository> -->
+ </repositories>
+
<properties>
<license.copyrightOwners>Lunifera GmbH, Loetz GmbH&Co.KG</license.copyrightOwners>
<osbp.gitrepo.name>${project.groupId}</osbp.gitrepo.name>
