Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian NOYRIT2019-10-15 10:07:16 -0400
committerFlorian NOYRIT2019-10-15 10:07:16 -0400
commitf49c1d99fae0cf315ff183197a3004481dc9aafe (patch)
tree25853eddb3e37660afd30f46216e43466191d886
parent142f81650ef403efc9a506b1a63a24e888ee5645 (diff)
downloadorg.eclipse.papyrus-collaborativemodeling-master.tar.gz
org.eclipse.papyrus-collaborativemodeling-master.tar.xz
org.eclipse.papyrus-collaborativemodeling-master.zip
Bug 552115 - Papyrus CDO server product should build on 2019-09HEADmaster
updated the product organisation updated the target platform Change-Id: I4619b2370f224ce3f2ccf6a1e2bc20162202338d Signed-off-by: Florian NOYRIT <florian.noyrit@cea.fr>
-rw-r--r--cdo-server/.project17
-rw-r--r--cdo-server/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--cdo-server/bundles/.project17
-rw-r--r--cdo-server/bundles/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.classpath6
-rw-r--r--[-rwxr-xr-x]cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.project (renamed from cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2.product/.project)8
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/META-INF/MANIFEST.MF16
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/build.properties4
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/plugin.properties6
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/plugin.xml17
-rw-r--r--cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/pom.xml13
-rw-r--r--cdo-server/bundles/pom.xml19
-rwxr-xr-xcdo-server/cdo-server-releng/.project11
-rwxr-xr-xcdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/pom.xml24
-rwxr-xr-xcdo-server/cdo-server-releng/main/pom.xml20
-rw-r--r--cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.classpath14
-rw-r--r--cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.gitignore1
-rw-r--r--cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.project29
-rw-r--r--cdo-server/features/org.eclipse.papyrus.cdo.server.feature/build.properties4
-rwxr-xr-xcdo-server/features/org.eclipse.papyrus.cdo.server.feature/configuration/cdo-server.xml (renamed from cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/config/cdo-server.xml)0
-rw-r--r--cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.xml301
-rw-r--r--cdo-server/features/org.eclipse.papyrus.cdo.server.feature/pom.xml13
-rw-r--r--cdo-server/features/pom.xml19
-rw-r--r--[-rwxr-xr-x]cdo-server/pom.xml (renamed from cdo-server/cdo-server-releng/pom.xml)71
-rw-r--r--cdo-server/products/.project17
-rwxr-xr-xcdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project6
-rw-r--r--cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.m2e.core.prefs4
-rwxr-xr-xcdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF6
-rwxr-xr-xcdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product35
-rwxr-xr-xcdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties1
-rwxr-xr-xcdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml8
-rwxr-xr-xcdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java80
-rwxr-xr-xcdo-server/products/pom.xml34
-rw-r--r--cdo-server/releng/.project17
-rwxr-xr-xcdo-server/releng/org.eclipse.papyrus.cdo.server.h2.target.photon/.project11
-rw-r--r--cdo-server/releng/org.eclipse.papyrus.cdo.server.target/.project17
-rw-r--r--cdo-server/releng/org.eclipse.papyrus.cdo.server.target/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--[-rwxr-xr-x]cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target (renamed from cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target)7
-rw-r--r--[-rwxr-xr-x]cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd (renamed from cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd)5
-rw-r--r--cdo-server/releng/org.eclipse.papyrus.cdo.server.target/pom.xml14
-rw-r--r--cdo-server/releng/pom.xml17
45 files changed, 720 insertions, 210 deletions
diff --git a/cdo-server/.project b/cdo-server/.project
new file mode 100644
index 0000000..6bf388f
--- /dev/null
+++ b/cdo-server/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>cdo-server</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/cdo-server/.settings/org.eclipse.core.resources.prefs b/cdo-server/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/cdo-server/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cdo-server/bundles/.project b/cdo-server/bundles/.project
new file mode 100644
index 0000000..fd2d9df
--- /dev/null
+++ b/cdo-server/bundles/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>bundles</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/cdo-server/bundles/.settings/org.eclipse.core.resources.prefs b/cdo-server/bundles/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/cdo-server/bundles/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.classpath b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.classpath
new file mode 100644
index 0000000..075009d
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2.product/.project b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.project
index df8efaf..4b461b0 100755..100644
--- a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2.product/.project
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.cdo.server.h2.product</name>
+ <name>org.eclipse.papyrus.cdo.server.h2</name>
<comment></comment>
<projects>
</projects>
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.core.resources.prefs b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.jdt.core.prefs b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.m2e.core.prefs b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/META-INF/MANIFEST.MF b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b39821d
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.cdo.server.h2;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
+ org.h2;bundle-version="1.3.168"
+Automatic-Module-Name: org.eclipse.papyrus.cdo.server
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/build.properties b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/build.properties
new file mode 100644
index 0000000..f688266
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/build.properties
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\
+ plugin.properties,\
+ plugin.xml
+generateSourceReferences = true
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/plugin.properties b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/plugin.properties
new file mode 100644
index 0000000..3049ed7
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/plugin.properties
@@ -0,0 +1,6 @@
+
+pluginName = Papyrus CDO Model Repository Server H2
+providerName = Eclipse Modeling Project
+
+product.description = Papyrus CDO server H2
+product.name = Papyrus CDO server H2
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/plugin.xml b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/plugin.xml
new file mode 100644
index 0000000..ac65255
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/plugin.xml
@@ -0,0 +1,17 @@
+
+<plugin>
+ <extension
+ id="product"
+ point="org.eclipse.core.runtime.products">
+ <product
+ application="org.eclipse.emf.cdo.server.app"
+ name="Papyrus CDO Server H2">
+ <property
+ name="appName"
+ value="Papyrus CDO Server H2">
+ </property>
+ </product>
+ </extension>
+
+
+</plugin>
diff --git a/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/pom.xml b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/pom.xml
new file mode 100644
index 0000000..80f4a3c
--- /dev/null
+++ b/cdo-server/bundles/org.eclipse.papyrus.cdo.server.h2/pom.xml
@@ -0,0 +1,13 @@
+<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.papyrus.cdo.server.bundles</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.bundles</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.eclipse.papyrus.cdo.server.h2</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.h2</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
+</project> \ No newline at end of file
diff --git a/cdo-server/bundles/pom.xml b/cdo-server/bundles/pom.xml
new file mode 100644
index 0000000..7888abd
--- /dev/null
+++ b/cdo-server/bundles/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.papyrus.cdo</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.root</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.eclipse.papyrus.cdo.server.bundles</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.bundles</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.papyrus.cdo.server.h2</module>
+ </modules>
+</project>
diff --git a/cdo-server/cdo-server-releng/.project b/cdo-server/cdo-server-releng/.project
deleted file mode 100755
index b159932..0000000
--- a/cdo-server/cdo-server-releng/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>cdo-server-releng</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/pom.xml b/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/pom.xml
deleted file mode 100755
index 74a84bf..0000000
--- a/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.papyrus.cdo.server-releng</groupId>
- <artifactId>org.eclipse.papyrus.cdo.server.main.releng</artifactId>
- <version>1.0.0</version>
- </parent>
- <groupId>org.eclipse.papyrus.cdo.server-releng</groupId>
- <artifactId>org.eclipse.papyrus.cdo.server.h2.target.photon</artifactId>
- <packaging>eclipse-target-definition</packaging>
- <description>This plugin contains the photon target</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
-</build>
-</project>
diff --git a/cdo-server/cdo-server-releng/main/pom.xml b/cdo-server/cdo-server-releng/main/pom.xml
deleted file mode 100755
index f2f3b17..0000000
--- a/cdo-server/cdo-server-releng/main/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <groupId>org.eclipse.papyrus.cdo.server-releng</groupId>
- <artifactId>org.eclipse.papyrus.cdo.server.main.releng</artifactId>
- <packaging>pom</packaging>
- <parent>
- <groupId>org.eclipse.papyrus.cdo.server-releng</groupId>
- <artifactId>org.eclipse.papyrus.cdo.server.releng</artifactId>
- <version>1.0.0</version>
- </parent>
- <version>1.0.0</version>
- <modules>
- <module>../../products</module>
- <module>org.eclipse.papyrus.cdo.server.h2.target.photon</module>
- </modules>
-
-</project>
diff --git a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.classpath b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.classpath
new file mode 100644
index 0000000..248406b
--- /dev/null
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.classpath
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.gitignore b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.project b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.project
new file mode 100644
index 0000000..f4f76ca
--- /dev/null
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.cdo.server.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/build.properties b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/build.properties
new file mode 100644
index 0000000..dedf154
--- /dev/null
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ configuration/
+root = configuration
+src.includes = configuration/
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/config/cdo-server.xml b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/configuration/cdo-server.xml
index 15164cf..15164cf 100755
--- a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/config/cdo-server.xml
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/configuration/cdo-server.xml
diff --git a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.xml b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.xml
new file mode 100644
index 0000000..50196ff
--- /dev/null
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/feature.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.papyrus.cdo.server.feature"
+ label="Papyrus CDO Server"
+ version="1.0.0.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <plugin
+ id="javax.xml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.felix.gogo.runtime"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.felix.gogo.shell"
+ 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.jobs"
+ 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.emf.cdo"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.expressions"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.net4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.security"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server.admin"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server.db"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server.net4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server.security"
+ 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.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.xmi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.app"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.console"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.event"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.preferences"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.registry"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.simpleconfigurator"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.db"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.db.h2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.db.jdbc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.jvm"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.tcp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi.compatibility.state"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osgi.services"
+ 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.eclipse.papyrus.cdo.server.h2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.h2"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/pom.xml b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/pom.xml
new file mode 100644
index 0000000..07e75d7
--- /dev/null
+++ b/cdo-server/features/org.eclipse.papyrus.cdo.server.feature/pom.xml
@@ -0,0 +1,13 @@
+<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.papyrus.cdo.server.features</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.cdo.server.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+
+</project> \ No newline at end of file
diff --git a/cdo-server/features/pom.xml b/cdo-server/features/pom.xml
new file mode 100644
index 0000000..3704732
--- /dev/null
+++ b/cdo-server/features/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.papyrus.cdo</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.root</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.eclipse.papyrus.cdo.server.features</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.papyrus.cdo.server.feature</module>
+ </modules>
+</project>
diff --git a/cdo-server/cdo-server-releng/pom.xml b/cdo-server/pom.xml
index a3a46e1..9ff3de4 100755..100644
--- a/cdo-server/cdo-server-releng/pom.xml
+++ b/cdo-server/pom.xml
@@ -3,19 +3,19 @@
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>
- <groupId>org.eclipse.papyrus.cdo.server-releng</groupId>
- <artifactId>org.eclipse.papyrus.cdo.server.releng</artifactId>
- <version>1.0.0</version>
+ <groupId>org.eclipse.papyrus.cdo</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.root</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <tycho-version>1.2.0</tycho-version>
+ <tycho-version>1.3.0</tycho-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tychoExtrasVersion>1.2.0</tychoExtrasVersion>
+ <tychoExtrasVersion>1.3.0</tychoExtrasVersion>
<jarSignerVersion>1.1.5</jarSignerVersion>
<findbugs.version>3.0.1</findbugs.version>
- <xtext.version>2.14.0</xtext.version>
+ <xtext.version>2.16.0</xtext.version>
<maven.resources.version>3.0.2</maven.resources.version>
<maven.clean.version>3.0.0</maven.clean.version>
<mojo.execmaven.version>1.6.0</mojo.execmaven.version>
@@ -153,31 +153,21 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
+ <!-- <environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
- </environment>
+ </environment> -->
</environments>
<target>
<artifact>
- <groupId>org.eclipse.papyrus.cdo.server-releng</groupId>
- <artifactId>org.eclipse.papyrus.cdo.server.h2.target.photon</artifactId>
- <version>1.0.0</version>
+ <groupId>org.eclipse.papyrus.cdo.server.releng</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.target</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</artifact>
</target>
</configuration>
@@ -185,6 +175,14 @@
</plugins>
</pluginManagement>
<plugins>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -201,7 +199,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.h2.product/linux/gtk/x86/configuration</outputDirectory>
+ <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.product/linux/gtk/x86/configuration</outputDirectory>
<resources>
<resource>
<directory>config/</directory>
@@ -217,7 +215,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.h2.product/linux/gtk/x86_64/configuration</outputDirectory>
+ <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.product/linux/gtk/x86_64/configuration</outputDirectory>
<resources>
<resource>
<directory>config/</directory>
@@ -233,7 +231,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.h2.product/macosx/cocoa/x86_64/configuration</outputDirectory>
+ <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.product/macosx/cocoa/x86_64/configuration</outputDirectory>
<resources>
<resource>
<directory>config/</directory>
@@ -249,23 +247,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.h2.product/win32/win32/x86_64/configuration</outputDirectory>
- <resources>
- <resource>
- <directory>config/</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-resources-win32-win32-x86</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.h2.product/win32/win32/x86/configuration</outputDirectory>
+ <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.product/win32/win32/x86_64/configuration</outputDirectory>
<resources>
<resource>
<directory>config/</directory>
@@ -278,11 +260,12 @@
</plugin>
</plugins>
-
-
</build>
<modules>
- <module>main</module>
+ <module>bundles</module>
+ <module>features</module>
+ <module>products</module>
+ <module>releng</module>
</modules>
</project>
diff --git a/cdo-server/products/.project b/cdo-server/products/.project
new file mode 100644
index 0000000..45203f9
--- /dev/null
+++ b/cdo-server/products/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>products</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project
index df8efaf..4787f71 100755
--- a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project
+++ b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.core.resources.prefs b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.m2e.core.prefs b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
index 89d97e9..3a8db97 100755
--- a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
+++ b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Automatic-Module-Name: org.eclipse.papyrus.cdo.h2.server.product
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.ui;bundle-version="[3.108.1,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emf.cdo.server;bundle-version="[4.5.0,5.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.cdo.server;bundle-version="[4.5.0,5.0.0)",
+ org.eclipse.papyrus.cdo.server.h2;bundle-version="1.0.0"
Bundle-Activator: org.eclipse.papyrus.cdo.server.h2.product.Activator
Bundle-ActivationPolicy: lazy
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
index 4044b00..acd60ef 100755
--- a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
+++ b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Papyrus CDO Server H2" uid="org.eclipse.papyrus.cdo.server.h2.product" application="org.eclipse.emf.cdo.server.app" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
-
+<product name="Papyrus CDO Server H2" uid="org.eclipse.papyrus.cdo.server.h2.product" id="org.eclipse.papyrus.cdo.server.h2.product" application="org.eclipse.emf.cdo.server.app" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -13,7 +12,7 @@
<vmArgs>-Xms40m
-Xmx1000m
-Ddebug=true
--Dnet4j.config=configuration/
+-Dnet4j.config=.
-Dosgi.console.enable.builtin=false
-Dorg.eclipse.emf.cdo.server.browser.port=7777
</vmArgs>
@@ -23,14 +22,12 @@
<windowImages/>
-
<launcher name="papyruscdoserver">
<win useIco="false">
<bmp/>
</win>
</launcher>
-
<vm>
<windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
</vm>
@@ -319,35 +316,15 @@ version(s), and exceptions or additional permissions here}.&quot;
</license>
<plugins>
- <plugin id="org.eclipse.core.runtime"/>
- <plugin id="org.eclipse.emf.cdo"/>
- <plugin id="org.eclipse.emf.cdo.common"/>
- <plugin id="org.eclipse.emf.cdo.expressions"/>
- <plugin id="org.eclipse.emf.cdo.net4j"/>
- <plugin id="org.eclipse.emf.cdo.security"/>
- <plugin id="org.eclipse.emf.cdo.server"/>
- <plugin id="org.eclipse.emf.cdo.server.admin"/>
- <plugin id="org.eclipse.emf.cdo.server.db"/>
- <plugin id="org.eclipse.emf.cdo.server.net4j"/>
- <plugin id="org.eclipse.emf.cdo.server.security"/>
- <plugin id="org.eclipse.equinox.common"/>
- <plugin id="org.eclipse.equinox.console"/>
- <plugin id="org.eclipse.equinox.ds"/>
- <plugin id="org.eclipse.equinox.event"/>
- <plugin id="org.eclipse.equinox.simpleconfigurator"/>
- <plugin id="org.eclipse.net4j"/>
- <plugin id="org.eclipse.net4j.db"/>
- <plugin id="org.eclipse.net4j.db.h2"/>
- <plugin id="org.eclipse.net4j.db.jdbc"/>
- <plugin id="org.eclipse.net4j.jvm"/>
- <plugin id="org.eclipse.net4j.tcp"/>
- <plugin id="org.eclipse.net4j.util"/>
</plugins>
+ <features>
+ <feature id="org.eclipse.papyrus.cdo.server.feature" installMode="root"/>
+ </features>
+
<configurations>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
</configurations>
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
index 049cfa5..17daa5b 100755
--- a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
+++ b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
@@ -2,5 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- config/,\
about.html
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml
index 982a806..892d1da 100755
--- a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml
+++ b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/pom.xml
@@ -4,15 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.cdo.server-products</groupId>
+ <groupId>org.eclipse.papyrus.cdo.server.products</groupId>
<artifactId>org.eclipse.papyrus.cdo.server.products</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.cdo.server.h2.product</artifactId>
<packaging>eclipse-repository</packaging>
<description>This plugins defines the product used in Papyrus CDO Server using H2 DataBase.</description>
<groupId>org.eclipse.papyrus.cdo.server-product</groupId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>org.eclipse.papyrus.cdo.server.h2.product</name>
<build>
@@ -42,8 +42,6 @@
</goals>
</execution>
</executions>
-
-
</plugin>
</plugins>
</build>
diff --git a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
index 85f8d43..c0193d4 100755
--- a/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
+++ b/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
@@ -14,49 +14,49 @@
package org.eclipse.papyrus.cdo.server.h2.product;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.cdo.server.h2.product"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return Activator.plugin;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- Activator.plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(final BundleContext context) throws Exception {
- Activator.plugin = null;
- super.stop(context);
- }
-
+public class Activator extends Plugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.cdo.server.h2.product"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return Activator.plugin;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void start(final BundleContext context) throws Exception {
+ super.start(context);
+ Activator.plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop(final BundleContext context) throws Exception {
+ Activator.plugin = null;
+ super.stop(context);
+ }
+
}
diff --git a/cdo-server/products/pom.xml b/cdo-server/products/pom.xml
index 1c520da..fd6e09c 100755
--- a/cdo-server/products/pom.xml
+++ b/cdo-server/products/pom.xml
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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.papyrus.cdo.server-releng</groupId>
- <artifactId>org.eclipse.papyrus.cdo.server.main.releng</artifactId>
- <version>1.0.0</version>
- <relativePath>../cdo-server-releng/main</relativePath>
- </parent>
- <groupId>org.eclipse.papyrus.cdo.server-products</groupId>
- <artifactId>org.eclipse.papyrus.cdo.server.products</artifactId>
- <version>1.0.0</version>
- <packaging>pom</packaging>
- <description>This folder contains the Papyrus CDO server product</description>
- <modules>
- <module>org.eclipse.papyrus.cdo.server.h2.product</module>
- </modules>
+<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.papyrus.cdo</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.root</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.eclipse.papyrus.cdo.server.products</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.products</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.papyrus.cdo.server.h2.product</module>
+ </modules>
</project>
diff --git a/cdo-server/releng/.project b/cdo-server/releng/.project
new file mode 100644
index 0000000..43a73bf
--- /dev/null
+++ b/cdo-server/releng/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>releng</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/cdo-server/releng/org.eclipse.papyrus.cdo.server.h2.target.photon/.project b/cdo-server/releng/org.eclipse.papyrus.cdo.server.h2.target.photon/.project
deleted file mode 100755
index 4a4d234..0000000
--- a/cdo-server/releng/org.eclipse.papyrus.cdo.server.h2.target.photon/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.cdo.server.h2.target.photon</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/.project b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/.project
new file mode 100644
index 0000000..835ecea
--- /dev/null
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.cdo.server.target</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/.settings/org.eclipse.core.resources.prefs b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target
index 4094ca8..5867050 100755..100644
--- a/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.target
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus CDO H2 Server" sequenceNumber="1536134538">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Papyrus CDO Server" sequenceNumber="1571148184">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
- <repository id="eclipse-photon" location="http://download.eclipse.org/releases/photon/"/>
+ <unit id="javax.xml" version="1.3.4.v201005080400"/>
+ <repository id="eclipse-2019-09" location="http://download.eclipse.org/releases/2019-09/"/>
</location>
</locations>
</target>
diff --git a/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd
index 715c0c8..87355fc 100755..100644
--- a/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/org.eclipse.papyrus.cdo.server.target.tpd
@@ -1,8 +1,9 @@
-target "Papyrus CDO H2 Server" with source requirements
+target "Papyrus CDO Server" with source requirements
-location "http://download.eclipse.org/releases/photon/" eclipse-photon {
+location "http://download.eclipse.org/releases/2019-09/" eclipse-2019-09 {
org.eclipse.rcp.feature.group lazy
org.eclipse.equinox.executable.feature.group lazy
org.eclipse.equinox.p2.discovery.feature.feature.group lazy
org.eclipse.emf.cdo.sdk.feature.group lazy
+ javax.xml
}
diff --git a/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/pom.xml b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/pom.xml
new file mode 100644
index 0000000..39d7d28
--- /dev/null
+++ b/cdo-server/releng/org.eclipse.papyrus.cdo.server.target/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.papyrus.cdo.server.releng</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.releng</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.eclipse.papyrus.cdo.server.releng</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.target</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+ <description>This plugin contains the target</description>
+
+</project>
diff --git a/cdo-server/releng/pom.xml b/cdo-server/releng/pom.xml
new file mode 100644
index 0000000..9aadc61
--- /dev/null
+++ b/cdo-server/releng/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.papyrus.cdo</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.root</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.eclipse.papyrus.cdo.server.releng</groupId>
+ <artifactId>org.eclipse.papyrus.cdo.server.releng</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.papyrus.cdo.server.target</module>
+ </modules>
+</project>

Back to the top