Bug 538423: Papyrus must provide a Papyrus CDO server product
- clean the product dependencies
- clean the target platform
- remove h2 dependency
- add the EPL2 licence
- add the copy of the file cdo-server.xml into each built product
Change-Id: I2ada91c9beb9d5d3971ff8ddf0bc8caba75ed026
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
diff --git a/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target b/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target
index 041e727..4094ca8 100755
--- a/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target
+++ b/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.target
@@ -1,72 +1,14 @@
<?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="1535534505">
+<target name="Papyrus CDO H2 Server" sequenceNumber="1536134538">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.h2.source" version="0.0.0"/>
- <repository id="Orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe.core.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.all.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xtend.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.mwe.ui.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.core.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xpand.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xtext.xbase.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.validation.ocl.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.compare.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.mwe.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.m2m.qvt.oml.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.acceleo.engine" version="0.0.0"/>
- <unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.core.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.remoteservice.sdk.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.dawn.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.cdo.epp.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/"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.0.201806010809"/>
- <repository id="gmfRuntime" location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/>
- <repository id="gmfNotation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301"/>
- </location>
</locations>
</target>
diff --git a/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd b/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd
index efd1eac..715c0c8 100755
--- a/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd
+++ b/plugins/cdo-server/cdo-server-releng/main/org.eclipse.papyrus.cdo.server.h2.target.photon/org.eclipse.papyrus.cdo.server.h2.target.photon.tpd
@@ -1,117 +1,8 @@
target "Papyrus CDO H2 Server" with source requirements
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/" Orbit {
- org.h2.source lazy
-}
-
location "http://download.eclipse.org/releases/photon/" eclipse-photon {
-org.eclipse.emf.mwe.core.feature.feature.group lazy
-org.eclipse.jdt.feature.group lazy
-//org.eclipse.gmf.tooling.runtime.feature.group lazy
-org.eclipse.emf.compare.uml2.feature.group lazy
-org.eclipse.xtext.xbase.lib.feature.group lazy
-org.eclipse.uml2.feature.group lazy
-org.eclipse.emf.mwe2.runtime.sdk.feature.group lazy
-//org.eclipse.emf.compare.diagram.papyrus.feature.group lazy
-org.eclipse.ocl.all.feature.group lazy
-org.eclipse.draw2d.feature.group lazy
-org.eclipse.xwt.feature.feature.group lazy
-org.eclipse.xtend.feature.group lazy
-org.eclipse.emf.mwe.ui.feature.feature.group lazy
-org.eclipse.ocl.examples.feature.group lazy
-org.eclipse.xtext.runtime.feature.group lazy
-org.eclipse.pde.feature.group lazy
-org.eclipse.ocl.core.sdk.feature.group lazy
-org.eclipse.xtext.sdk.feature.group lazy
-org.eclipse.egit.feature.group lazy
-org.eclipse.emf.compare.feature.group lazy
-org.eclipse.rcp.feature.group lazy
-org.eclipse.xpand.feature.group lazy
-org.eclipse.platform.feature.group lazy
-org.eclipse.emf.compare.ide.ui.feature.group lazy
-org.eclipse.xtext.xbase.feature.group lazy
-org.eclipse.wst.common_core.feature.feature.group lazy
-org.eclipse.xtend.sdk.feature.group lazy
-org.eclipse.emf.validation.ocl.feature.group lazy
-org.eclipse.xtext.ui.feature.group lazy
-org.eclipse.emf.cdo.compare.feature.group lazy
-org.eclipse.gmf.feature.group lazy
-org.eclipse.emf.compare.diagram.gmf.feature.group lazy
-org.eclipse.ocl.uml.feature.group lazy
-org.eclipse.equinox.executable.feature.group lazy
-org.eclipse.emf.mwe2.language.sdk.feature.group lazy
-org.eclipse.wst.xml_core.feature.feature.group lazy
-org.eclipse.papyrus.sdk.feature.feature.group lazy
-org.eclipse.emf.compare.egit.feature.group lazy
-org.eclipse.emf.mwe.sdk.feature.group lazy
-org.eclipse.equinox.p2.discovery.feature.feature.group lazy
-org.eclipse.m2m.qvt.oml.feature.group lazy
-org.eclipse.emf.cdo.feature.group lazy
-org.eclipse.jgit.feature.group lazy
-org.eclipse.emf.feature.group lazy
-org.eclipse.xsd.feature.group lazy
-org.eclipse.acceleo.engine lazy
-org.eclipse.emf.eef.sdk-feature.feature.group lazy
-org.eclipse.ecf.core.feature.group lazy
-org.eclipse.ecf.remoteservice.sdk.feature.feature.group lazy
-org.eclipse.emf.cdo.dawn.feature.group lazy
-org.eclipse.emf.cdo.epp.feature.group lazy
-org.eclipse.emf.cdo.sdk.feature.group lazy
+ 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
}
-
-//updateFrom("GMF Runtime",0)
-
-location gmfRuntime "http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809" {
- org.eclipse.gmf.runtime.sdk.feature.group
-}
-
-//updateFrom("GMF Runtime",1)
-
-location gmfNotation "http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201805221301" {
- org.eclipse.gmf.runtime.notation.sdk.feature.group
-}
-
-// Only for testing!
-//location "http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/" e4-tools {
-// org.eclipse.e4.tools.spies.feature.feature.group lazy
-//}
-
-//location "http://download.eclipse.org/modeling/emf/cdo/drops/R20160607-1209" cdo {
-//org.eclipse.emf.cdo.server.feature.group lazy
-//org.eclipse.emf.cdo.server.db.feature.group lazy
-//org.eclipse.emf.cdo.server.lissome.feature.group lazy
-//org.eclipse.emf.cdo.server.objectivity.feature.group lazy
-//org.eclipse.net4j.db.postgresql.feature.group lazy
-//org.eclipse.net4j.db.derby.feature.group lazy
-//org.eclipse.emf.cdo.server.db4o.feature.group lazy
-//org.eclipse.net4j.db.feature.group lazy
-//org.eclipse.net4j.db.mysql.feature.group lazy
-//org.eclipse.emf.cdo.server.mongodb.feature.group lazy
-//org.eclipse.net4j.db.hsqldb.feature.group lazy
-//org.eclipse.net4j.db.oracle.feature.group lazy
-//org.eclipse.net4j.db.h2.feature.group lazy
-//org.eclipse.net4j.db.doc.feature.group lazy
-//}
-
-//location "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/" sysml14 {
-//org.eclipse.papyrus.sysml14.feature.feature.group lazy
-//}
-
-//location "http://www.elver.org/eclipse/2.1.0/update" DBDriver {
-//org.postgresql.feature.group lazy
-//}
-
-//location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon" papyrus-photon {
-// org.eclipse.papyrus.extra.cdo.feature.feature.group
-//}
-
-//location "https://hudson.eclipse.org/papyrus/view/Requirements/job/Requirements-Neon/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.requirements.p2/target/repository/" papyrus-req {
-//org.eclipse.papyrus.requirements.sysml14.assistant.feature.feature.group lazy
-//org.eclipse.papyrus.requirements.sysml14.metrics.feature.feature.group lazy
-//org.eclipse.papyrus.bmm.feature.feature.group lazy
-//org.eclipse.papyrus.requirements.sysml14.matrix.feature.feature.group lazy
-//org.eclipse.papyrus.requirements.cheatsheets.feature.feature.group lazy
-//org.eclipse.papyrus.requirements.sysml14.verification.feature.feature.group lazy
-//org.eclipse.papyrus.requirements.sysml14.traceability.feature.feature.group lazy
-//org.eclipse.papyrus.requirements.sysml14.core.feature.feature.group lazy
-//}
\ No newline at end of file
diff --git a/plugins/cdo-server/cdo-server-releng/pom.xml b/plugins/cdo-server/cdo-server-releng/pom.xml
index 7b110a1..a3a46e1 100755
--- a/plugins/cdo-server/cdo-server-releng/pom.xml
+++ b/plugins/cdo-server/cdo-server-releng/pom.xml
@@ -184,6 +184,102 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven.resources.version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <!-- Copy cdo-server.xml file into the final built products -->
+ <executions>
+ <execution>
+ <id>copy-resources-linux-gtk-x86</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.h2.product/linux/gtk/x86/configuration</outputDirectory>
+ <resources>
+ <resource>
+ <directory>config/</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources-linux-gtk-x86_64</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.h2.product/linux/gtk/x86_64/configuration</outputDirectory>
+ <resources>
+ <resource>
+ <directory>config/</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources-macosx-cocoa-x86_64</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/products/org.eclipse.papyrus.cdo.server.h2.product/macosx/cocoa/x86_64/configuration</outputDirectory>
+ <resources>
+ <resource>
+ <directory>config/</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources-win32-win32-x86_64</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_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>
+ <resources>
+ <resource>
+ <directory>config/</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+
+
</build>
<modules>
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
index 5432ce4..89d97e9 100755
--- a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
+++ b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/META-INF/MANIFEST.MF
@@ -8,8 +8,7 @@
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)",
- org.h2;bundle-version="1.3.168"
+ org.eclipse.emf.cdo.server;bundle-version="[4.5.0,5.0.0)"
Bundle-Activator: org.eclipse.papyrus.cdo.server.h2.product.Activator
Bundle-ActivationPolicy: lazy
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
index b592263..d98df96 100755
--- a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
+++ b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/PapyrusCDOServerH2.product
@@ -32,65 +32,9 @@
<windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
</vm>
+
<plugins>
- <plugin id="com.google.guava"/>
- <plugin id="com.ibm.icu"/>
- <plugin id="javax.annotation"/>
- <plugin id="javax.inject"/>
- <plugin id="javax.xml"/>
- <plugin id="org.apache.ant"/>
- <plugin id="org.apache.batik.css"/>
- <plugin id="org.apache.batik.util"/>
- <plugin id="org.apache.commons.jxpath"/>
- <plugin id="org.apache.commons.lang"/>
- <plugin id="org.apache.felix.gogo.runtime"/>
- <plugin id="org.apache.felix.gogo.shell"/>
- <plugin id="org.apache.felix.scr"/>
- <plugin id="org.eclipse.ant.core"/>
- <plugin id="org.eclipse.ant.launching"/>
- <plugin id="org.eclipse.ant.ui"/>
- <plugin id="org.eclipse.compare"/>
- <plugin id="org.eclipse.compare.core"/>
- <plugin id="org.eclipse.core.commands"/>
- <plugin id="org.eclipse.core.contenttype"/>
- <plugin id="org.eclipse.core.databinding"/>
- <plugin id="org.eclipse.core.databinding.beans"/>
- <plugin id="org.eclipse.core.databinding.observable"/>
- <plugin id="org.eclipse.core.databinding.property"/>
- <plugin id="org.eclipse.core.expressions"/>
- <plugin id="org.eclipse.core.externaltools"/>
- <plugin id="org.eclipse.core.filebuffers"/>
- <plugin id="org.eclipse.core.filesystem"/>
- <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
- <plugin id="org.eclipse.core.jobs"/>
- <plugin id="org.eclipse.core.resources"/>
- <plugin id="org.eclipse.core.resources.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.runtime"/>
- <plugin id="org.eclipse.core.variables"/>
- <plugin id="org.eclipse.debug.core"/>
- <plugin id="org.eclipse.debug.ui"/>
- <plugin id="org.eclipse.draw2d"/>
- <plugin id="org.eclipse.e4.core.commands"/>
- <plugin id="org.eclipse.e4.core.contexts"/>
- <plugin id="org.eclipse.e4.core.di"/>
- <plugin id="org.eclipse.e4.core.di.annotations"/>
- <plugin id="org.eclipse.e4.core.di.extensions"/>
- <plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
- <plugin id="org.eclipse.e4.core.services"/>
- <plugin id="org.eclipse.e4.emf.xpath"/>
- <plugin id="org.eclipse.e4.ui.bindings"/>
- <plugin id="org.eclipse.e4.ui.css.core"/>
- <plugin id="org.eclipse.e4.ui.css.swt"/>
- <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
- <plugin id="org.eclipse.e4.ui.di"/>
- <plugin id="org.eclipse.e4.ui.model.workbench"/>
- <plugin id="org.eclipse.e4.ui.services"/>
- <plugin id="org.eclipse.e4.ui.widgets"/>
- <plugin id="org.eclipse.e4.ui.workbench"/>
- <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
- <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
- <plugin id="org.eclipse.e4.ui.workbench.swt"/>
- <plugin id="org.eclipse.e4.ui.workbench3"/>
<plugin id="org.eclipse.emf.cdo"/>
<plugin id="org.eclipse.emf.cdo.common"/>
<plugin id="org.eclipse.emf.cdo.expressions"/>
@@ -101,90 +45,11 @@
<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.emf.common"/>
- <plugin id="org.eclipse.emf.common.ui"/>
- <plugin id="org.eclipse.emf.databinding"/>
- <plugin id="org.eclipse.emf.ecore"/>
- <plugin id="org.eclipse.emf.ecore.change"/>
- <plugin id="org.eclipse.emf.ecore.edit"/>
- <plugin id="org.eclipse.emf.ecore.xmi"/>
- <plugin id="org.eclipse.emf.edit"/>
- <plugin id="org.eclipse.emf.edit.ui"/>
- <plugin id="org.eclipse.emf.mapping.ecore2xml"/>
- <plugin id="org.eclipse.emf.transaction"/>
- <plugin id="org.eclipse.emf.transaction.ui"/>
- <plugin id="org.eclipse.emf.validation"/>
- <plugin id="org.eclipse.emf.workspace"/>
- <plugin id="org.eclipse.equinox.app"/>
- <plugin id="org.eclipse.equinox.bidi"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.console"/>
<plugin id="org.eclipse.equinox.ds"/>
- <plugin id="org.eclipse.equinox.frameworkadmin"/>
- <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
- <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
- <plugin id="org.eclipse.equinox.p2.core"/>
- <plugin id="org.eclipse.equinox.p2.director"/>
- <plugin id="org.eclipse.equinox.p2.director.app"/>
- <plugin id="org.eclipse.equinox.p2.engine"/>
- <plugin id="org.eclipse.equinox.p2.garbagecollector"/>
- <plugin id="org.eclipse.equinox.p2.jarprocessor"/>
- <plugin id="org.eclipse.equinox.p2.metadata"/>
- <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
- <plugin id="org.eclipse.equinox.p2.operations"/>
- <plugin id="org.eclipse.equinox.p2.publisher"/>
- <plugin id="org.eclipse.equinox.p2.publisher.eclipse"/>
- <plugin id="org.eclipse.equinox.p2.repository"/>
- <plugin id="org.eclipse.equinox.p2.repository.tools"/>
- <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
- <plugin id="org.eclipse.equinox.p2.ui"/>
- <plugin id="org.eclipse.equinox.preferences"/>
- <plugin id="org.eclipse.equinox.registry"/>
- <plugin id="org.eclipse.equinox.security"/>
- <plugin id="org.eclipse.equinox.security.ui"/>
- <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.equinox.event"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
- <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
- <plugin id="org.eclipse.gef"/>
- <plugin id="org.eclipse.gmf.runtime.common.core"/>
- <plugin id="org.eclipse.gmf.runtime.common.ui"/>
- <plugin id="org.eclipse.gmf.runtime.common.ui.action"/>
- <plugin id="org.eclipse.gmf.runtime.common.ui.services"/>
- <plugin id="org.eclipse.gmf.runtime.common.ui.services.action"/>
- <plugin id="org.eclipse.gmf.runtime.common.ui.services.properties"/>
- <plugin id="org.eclipse.gmf.runtime.diagram.core"/>
- <plugin id="org.eclipse.gmf.runtime.diagram.ui"/>
- <plugin id="org.eclipse.gmf.runtime.diagram.ui.properties"/>
- <plugin id="org.eclipse.gmf.runtime.diagram.ui.resources.editor"/>
- <plugin id="org.eclipse.gmf.runtime.draw2d.ui"/>
- <plugin id="org.eclipse.gmf.runtime.draw2d.ui.render"/>
- <plugin id="org.eclipse.gmf.runtime.emf.clipboard.core"/>
- <plugin id="org.eclipse.gmf.runtime.emf.commands.core"/>
- <plugin id="org.eclipse.gmf.runtime.emf.core"/>
- <plugin id="org.eclipse.gmf.runtime.emf.type.core"/>
- <plugin id="org.eclipse.gmf.runtime.emf.ui"/>
- <plugin id="org.eclipse.gmf.runtime.emf.ui.properties"/>
- <plugin id="org.eclipse.gmf.runtime.gef.ui"/>
- <plugin id="org.eclipse.gmf.runtime.notation"/>
- <plugin id="org.eclipse.gmf.runtime.notation.edit"/>
- <plugin id="org.eclipse.help"/>
- <plugin id="org.eclipse.jdt.compiler.apt" fragment="true"/>
- <plugin id="org.eclipse.jdt.compiler.tool" fragment="true"/>
- <plugin id="org.eclipse.jdt.core"/>
- <plugin id="org.eclipse.jdt.core.manipulation"/>
- <plugin id="org.eclipse.jdt.debug"/>
- <plugin id="org.eclipse.jdt.debug.ui"/>
- <plugin id="org.eclipse.jdt.junit"/>
- <plugin id="org.eclipse.jdt.junit.core"/>
- <plugin id="org.eclipse.jdt.junit.runtime"/>
- <plugin id="org.eclipse.jdt.launching"/>
- <plugin id="org.eclipse.jdt.ui"/>
- <plugin id="org.eclipse.jface"/>
- <plugin id="org.eclipse.jface.databinding"/>
- <plugin id="org.eclipse.jface.text"/>
- <plugin id="org.eclipse.ltk.core.refactoring"/>
- <plugin id="org.eclipse.ltk.ui.refactoring"/>
- <plugin id="org.eclipse.nebula.widgets.richtext"/>
<plugin id="org.eclipse.net4j"/>
<plugin id="org.eclipse.net4j.db"/>
<plugin id="org.eclipse.net4j.db.h2"/>
@@ -192,123 +57,6 @@
<plugin id="org.eclipse.net4j.jvm"/>
<plugin id="org.eclipse.net4j.tcp"/>
<plugin id="org.eclipse.net4j.util"/>
- <plugin id="org.eclipse.osgi"/>
- <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
- <plugin id="org.eclipse.osgi.services"/>
- <plugin id="org.eclipse.osgi.util"/>
- <plugin id="org.eclipse.papyrus.emf.facet.common.core"/>
- <plugin id="org.eclipse.papyrus.emf.facet.common.ui"/>
- <plugin id="org.eclipse.papyrus.emf.facet.custom.core"/>
- <plugin id="org.eclipse.papyrus.emf.facet.custom.metamodel"/>
- <plugin id="org.eclipse.papyrus.emf.facet.custom.ui"/>
- <plugin id="org.eclipse.papyrus.emf.facet.efacet"/>
- <plugin id="org.eclipse.papyrus.emf.facet.efacet.catalog"/>
- <plugin id="org.eclipse.papyrus.emf.facet.efacet.core"/>
- <plugin id="org.eclipse.papyrus.emf.facet.efacet.metamodel"/>
- <plugin id="org.eclipse.papyrus.emf.facet.query.java"/>
- <plugin id="org.eclipse.papyrus.emf.facet.query.java.core"/>
- <plugin id="org.eclipse.papyrus.emf.facet.query.java.metamodel"/>
- <plugin id="org.eclipse.papyrus.emf.facet.util.core"/>
- <plugin id="org.eclipse.papyrus.emf.facet.util.emf.catalog"/>
- <plugin id="org.eclipse.papyrus.emf.facet.util.emf.core"/>
- <plugin id="org.eclipse.papyrus.emf.facet.util.emf.ui"/>
- <plugin id="org.eclipse.papyrus.emf.facet.util.jface.ui"/>
- <plugin id="org.eclipse.papyrus.emf.facet.util.pde.core"/>
- <plugin id="org.eclipse.papyrus.emf.facet.util.swt"/>
- <plugin id="org.eclipse.papyrus.emf.facet.util.ui"/>
- <plugin id="org.eclipse.papyrus.infra.architecture"/>
- <plugin id="org.eclipse.papyrus.infra.architecture.representation"/>
- <plugin id="org.eclipse.papyrus.infra.constraints"/>
- <plugin id="org.eclipse.papyrus.infra.core"/>
- <plugin id="org.eclipse.papyrus.infra.core.architecture"/>
- <plugin id="org.eclipse.papyrus.infra.core.log"/>
- <plugin id="org.eclipse.papyrus.infra.core.sasheditor"/>
- <plugin id="org.eclipse.papyrus.infra.core.sasheditor.di"/>
- <plugin id="org.eclipse.papyrus.infra.core.sashwindows.di"/>
- <plugin id="org.eclipse.papyrus.infra.emf"/>
- <plugin id="org.eclipse.papyrus.infra.emf.expressions"/>
- <plugin id="org.eclipse.papyrus.infra.emf.gmf"/>
- <plugin id="org.eclipse.papyrus.infra.emf.readonly"/>
- <plugin id="org.eclipse.papyrus.infra.filters"/>
- <plugin id="org.eclipse.papyrus.infra.gmfdiag.commands"/>
- <plugin id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration"/>
- <plugin id="org.eclipse.papyrus.infra.gmfdiag.representation"/>
- <plugin id="org.eclipse.papyrus.infra.internationalization"/>
- <plugin id="org.eclipse.papyrus.infra.internationalization.common"/>
- <plugin id="org.eclipse.papyrus.infra.internationalization.utils"/>
- <plugin id="org.eclipse.papyrus.infra.nattable.model"/>
- <plugin id="org.eclipse.papyrus.infra.nattable.representation"/>
- <plugin id="org.eclipse.papyrus.infra.onefile"/>
- <plugin id="org.eclipse.papyrus.infra.properties"/>
- <plugin id="org.eclipse.papyrus.infra.properties.ui"/>
- <plugin id="org.eclipse.papyrus.infra.services.decoration"/>
- <plugin id="org.eclipse.papyrus.infra.services.edit"/>
- <plugin id="org.eclipse.papyrus.infra.services.edit.ui"/>
- <plugin id="org.eclipse.papyrus.infra.services.labelprovider"/>
- <plugin id="org.eclipse.papyrus.infra.services.markerlistener"/>
- <plugin id="org.eclipse.papyrus.infra.services.validation"/>
- <plugin id="org.eclipse.papyrus.infra.tools"/>
- <plugin id="org.eclipse.papyrus.infra.types"/>
- <plugin id="org.eclipse.papyrus.infra.types.core"/>
- <plugin id="org.eclipse.papyrus.infra.ui"/>
- <plugin id="org.eclipse.papyrus.infra.ui.emf"/>
- <plugin id="org.eclipse.papyrus.infra.viewpoints.policy"/>
- <plugin id="org.eclipse.papyrus.infra.widgets"/>
- <plugin id="org.eclipse.papyrus.infra.widgets.toolbox"/>
- <plugin id="org.eclipse.papyrus.uml.extensionpoints"/>
- <plugin id="org.eclipse.papyrus.uml.internationalization.edit"/>
- <plugin id="org.eclipse.papyrus.uml.internationalization.utils"/>
- <plugin id="org.eclipse.papyrus.uml.modelrepair"/>
- <plugin id="org.eclipse.papyrus.uml.profile"/>
- <plugin id="org.eclipse.papyrus.uml.tools"/>
- <plugin id="org.eclipse.papyrus.uml.tools.utils"/>
- <plugin id="org.eclipse.papyrus.views.properties"/>
- <plugin id="org.eclipse.pde"/>
- <plugin id="org.eclipse.pde.build"/>
- <plugin id="org.eclipse.pde.core"/>
- <plugin id="org.eclipse.pde.launching"/>
- <plugin id="org.eclipse.pde.ui"/>
- <plugin id="org.eclipse.search"/>
- <plugin id="org.eclipse.swt"/>
- <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
- <plugin id="org.eclipse.team.core"/>
- <plugin id="org.eclipse.team.ui"/>
- <plugin id="org.eclipse.text"/>
- <plugin id="org.eclipse.ui"/>
- <plugin id="org.eclipse.ui.cheatsheets"/>
- <plugin id="org.eclipse.ui.console"/>
- <plugin id="org.eclipse.ui.editors"/>
- <plugin id="org.eclipse.ui.externaltools"/>
- <plugin id="org.eclipse.ui.forms"/>
- <plugin id="org.eclipse.ui.ide"/>
- <plugin id="org.eclipse.ui.intro"/>
- <plugin id="org.eclipse.ui.navigator"/>
- <plugin id="org.eclipse.ui.navigator.resources"/>
- <plugin id="org.eclipse.ui.trace"/>
- <plugin id="org.eclipse.ui.views"/>
- <plugin id="org.eclipse.ui.views.log"/>
- <plugin id="org.eclipse.ui.views.properties.tabbed"/>
- <plugin id="org.eclipse.ui.win32" fragment="true"/>
- <plugin id="org.eclipse.ui.workbench"/>
- <plugin id="org.eclipse.ui.workbench.texteditor"/>
- <plugin id="org.eclipse.uml2.common"/>
- <plugin id="org.eclipse.uml2.common.edit"/>
- <plugin id="org.eclipse.uml2.types"/>
- <plugin id="org.eclipse.uml2.uml"/>
- <plugin id="org.eclipse.uml2.uml.edit"/>
- <plugin id="org.eclipse.uml2.uml.editor"/>
- <plugin id="org.eclipse.uml2.uml.profile.standard"/>
- <plugin id="org.eclipse.uml2.uml.resources"/>
- <plugin id="org.eclipse.uml2.uml.validation"/>
- <plugin id="org.eclipse.update.configurator"/>
- <plugin id="org.eclipse.xwt"/>
- <plugin id="org.h2"/>
- <plugin id="org.hamcrest.core"/>
- <plugin id="org.junit"/>
- <plugin id="org.sat4j.core"/>
- <plugin id="org.sat4j.pb"/>
- <plugin id="org.tukaani.xz"/>
- <plugin id="org.w3c.css.sac"/>
</plugins>
<configurations>
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/about.html b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/about.html
new file mode 100755
index 0000000..3e183aa
--- /dev/null
+++ b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>November 30, 2017</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
index d69127d..049cfa5 100755
--- a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
+++ b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/build.properties
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- config/
+ config/,\
+ about.html
diff --git a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
index eac2a62..85f8d43 100755
--- a/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
+++ b/plugins/cdo-server/products/org.eclipse.papyrus.cdo.server.h2.product/src/org/eclipse/papyrus/cdo/server/h2/product/Activator.java
@@ -1,3 +1,17 @@
+/*****************************************************************************
+ * Copyright (c) 2018 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Vincent LORENZO (CEA LIST) - Initial API and implementation
+ *****************************************************************************/
+
package org.eclipse.papyrus.cdo.server.h2.product;
import org.eclipse.ui.plugin.AbstractUIPlugin;
