diff options
author | Ansgar Radermacher | 2016-04-06 09:12:29 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2016-04-15 08:24:46 +0000 |
commit | 8825c18b6e8926b45269c40d9af43c3c064b0048 (patch) | |
tree | 1218fa2b2e70e0cc4cd1ea63872802bb2c9137df /releng | |
parent | 24e858e4c3c68be3c250863c22601198297e3d61 (diff) | |
download | org.eclipse.papyrus-8825c18b6e8926b45269c40d9af43c3c064b0048.tar.gz org.eclipse.papyrus-8825c18b6e8926b45269c40d9af43c3c064b0048.tar.xz org.eclipse.papyrus-8825c18b6e8926b45269c40d9af43c3c064b0048.zip |
Bug 486820 - [designer] delete old qompass code from papyrus git
Change-Id: I7635b8289340d55418af74887ea99e85a8fadb40
Diffstat (limited to 'releng')
-rwxr-xr-x | releng/extra-tests/pom.xml | 1 | ||||
-rw-r--r-- | releng/extra/pom.xml | 57 | ||||
-rw-r--r-- | releng/extra/site/category.xml | 52 | ||||
-rw-r--r-- | releng/org.eclipse.papyrus.oomph/setups/papyrus.setup | 122 |
4 files changed, 2 insertions, 230 deletions
diff --git a/releng/extra-tests/pom.xml b/releng/extra-tests/pom.xml index 090ad68e1db..56191377068 100755 --- a/releng/extra-tests/pom.xml +++ b/releng/extra-tests/pom.xml @@ -23,7 +23,6 @@ <module>../../tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests</module> <module>../../tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests</module> <module>../../tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests</module> - <module>../../tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests</module> <module>../../tests/junit/extraplugins/org.eclipse.papyrus.tests.extra</module> <module>../../tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests</module> <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.sysml.diagram.feature</module> diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml index a8a02ac95fa..03a5773fd2b 100644 --- a/releng/extra/pom.xml +++ b/releng/extra/pom.xml @@ -76,63 +76,6 @@ <module>../../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module> <module>../../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module> - <!-- Papyrus qompass --> - <module>../../extraplugins/qompass/org.eclipse.papyrus.qompass.ui</module> - - <!-- Papyrus qompass/codegen --> - <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.feature</module> - <module>../../extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.base</module> - <module>../../extraplugins/qompass/codegen/org.eclipse.papyrus.codegen.extensionpoints</module> - <module>../../extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.model</module> - <module>../../extraplugins/qompass/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module> - - <!-- Papyrus qompass/codegen/cpp --> - <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.codegen.cpp.feature</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.cdtproject</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.codegen.ui</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.examples</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.profile.ui</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.cpp.library.ui</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.texteditor.cdt</module> - <module>../../extraplugins/qompass/codegen/cpp/org.eclipse.papyrus.views.cpp</module> - - <!-- Papyrus qompass/codegen/java --> - <module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module> - <module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module> - <module>../../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.generator.ui</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.edit</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.profile.editor</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse</module> - <module>../../extraplugins/qompass/codegen/java/org.eclipse.papyrus.java.reverse.ui</module> - - <!-- Papyrus qompass/designer --> - <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module> - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.fcm.profile</module> - - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.core</module> - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.cpp</module> - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.java</module> - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.doc</module> - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.ui</module> - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.validation</module> - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.designer.vsl</module> - <module>../../extraplugins/qompass/designer/org.eclipse.papyrus.qompass.modellibs.core</module> - <module>../../extraplugins/qompass/designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module> - - <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module> - <module>../../extraplugins/qompass/designer/tracing/org.eclipse.papyrus.views.tracepoints</module> - <module>../../extraplugins/qompass/designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module> - <!-- Papyrus RobotML --> <module>../../extraplugins/robotml/org.eclipse.papyrus.robotml</module> <module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.deployment</module> diff --git a/releng/extra/site/category.xml b/releng/extra/site/category.xml index 6f3a674c93d..8ce16340da5 100644 --- a/releng/extra/site/category.xml +++ b/releng/extra/site/category.xml @@ -33,15 +33,6 @@ <feature url="features/org.eclipse.papyrus.extra.dsml.validation.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.dsml.validation.feature.source" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.extra.others.category"/> </feature> - <feature url="features/org.eclipse.papyrus.java.generator.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.java.generator.feature" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.java.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.java.profile.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.java.profile.feature" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.java.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.java.reverse.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.java.reverse.feature" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.java.category"/> - </feature> <feature url="features/org.eclipse.papyrus.extra.robotml.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.robotml.feature" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.extra.robotml"/> </feature> @@ -60,48 +51,15 @@ <feature url="features/org.eclipse.papyrus.extra.eastadl.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.eastadl.feature" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.extra.others.category"/> </feature> - <feature url="features/org.eclipse.papyrus.extra.codegen.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.codegen.feature" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.others.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.extra.codegen.cpp.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.codegen.cpp.feature" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.others.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.extra.qompass.designer.basic.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.qompass.designer.basic.feature" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.qompass.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.qompass.designer.tracing.feature" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.qompass.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.java.generator.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.java.generator.feature.source" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.java.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.java.profile.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.java.profile.feature.source" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.java.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.java.reverse.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.java.reverse.feature.source" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.java.category"/> - </feature> <feature url="features/org.eclipse.papyrus.extra.robotml.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.robotml.feature.source" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.extra.robotml"/> </feature> <feature url="features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature.source" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.extra.robotml"/> </feature> - <feature url="features/org.eclipse.papyrus.extra.qompass.designer.basic.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.qompass.designer.basic.feature.source" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.qompass.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.qompass.designer.tracing.feature.source" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.qompass.category"/> - </feature> <feature url="features/org.eclipse.papyrus.migration.rsa.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.migration.rsa.feature.source" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.extra.others.category"/> </feature> - <feature url="features/org.eclipse.papyrus.extra.codegen.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.codegen.feature.source" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.others.category"/> - </feature> - <feature url="features/org.eclipse.papyrus.extra.codegen.cpp.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.codegen.cpp.feature.source" version="1.2.0.qualifier"> - <category name="org.eclipse.papyrus.extra.others.category"/> - </feature> <feature url="features/org.eclipse.papyrus.uml.alf.extra.feature.source_0.7.0.qualifier.jar" id="org.eclipse.papyrus.uml.alf.extra.feature.source" version="0.7.0.qualifier"> <category name="org.eclipse.papyrus.extra.others.category"/> </feature> @@ -224,21 +182,11 @@ </description> </category-def> <category-def name="org.eclipse.papyrus.extra.others.category" label="Papyrus Extra (Others)"/> - <category-def name="org.eclipse.papyrus.extra.java.category" label="Papyrus Java"> - <description> - Papyrus Java Category - </description> - </category-def> <category-def name="org.eclipse.papyrus.extra.robotml" label="Papyrus RobotML"> <description> Papyrus RobotML Category </description> </category-def> - <category-def name="org.eclipse.papyrus.extra.qompass.category" label="Papyrus Qompass Designer"> - <description> - Papyrus Qompass Designer Category - </description> - </category-def> <category-def name="org.eclipse.papyrus.extra.dd.category" label="Papyrus Diagram Definition"> <description> Diagram Definition Category diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup index 6140b9cd01e..0e911a20a2b 100644 --- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup +++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup @@ -1316,84 +1316,6 @@ <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.luna}"/>
</stream>
</project>
- <project label="C/C++ Codegen" name="cpp">
- <setupTask xsi:type="setup.targlets:TargletTask">
- <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus CPP Dependencies">
- <requirement name="org.eclipse.cdt.feature.group"/>
- <requirement name="org.eclipse.acceleo.feature.group"/>
- <repositoryList name="Neon">
- <repository url="http://download.eclipse.org/tools/cdt/builds/neon/milestones/m6">
- <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
- <detail key="updateFrom">
- <value>CDT</value>
- </detail>
- </annotation>
- </repository>
- <repository url="http://download.eclipse.org/tools/cdt/launchbar/neon.m5">
- <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
- <detail key="updateFrom">
- <value>CDT:1</value>
- </detail>
- </annotation>
- </repository>
- <repository url="http://download.eclipse.org/facet/updates/integration/1.1.0/I201603181016/">
- <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
- <detail key="updateFrom">
- <value>EMF Facet</value>
- </detail>
- </annotation>
- </repository>
- </repositoryList>
- <repositoryList name="Mars">
- <repository url="http://download.eclipse.org/tools/cdt/builds/mars/milestones/ur2-rc1">
- <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
- <detail key="updateFrom">
- <value>CDT</value>
- </detail>
- </annotation>
- </repository>
- <repository url="http://download.eclipse.org/facet/updates/release/1.0.2/">
- <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools">
- <detail key="updateFrom">
- <value>EMF Facet</value>
- </detail>
- </annotation>
- </repository>
- </repositoryList>
- <repositoryList name="Luna">
- <repository url="${base.downloads.url}/tools/cdt/builds/luna/milestones"/>
- <repository url="${base.downloads.url}/facet/updates/release/0.4.0"/>
- </repositoryList>
- </targlet>
- </setupTask>
- <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="codegen"/>
- <setupTask xsi:type="setup:VariableTask" name="papyrus.extratests.folder" value="codegen"/>
- <setupTask xsi:type="setup:VariableTask" name="papyrus.extrafeature" value="extra.cpp"/>
- <setupTask xsi:type="setup:VariableTask" name="papyrus.extratestsfeature" value="tests.extra.codegen.cpp"/>
- <setupTask xsi:type="p2_1.0:P2Task">
- <requirement name="org.eclipse.xtend.sdk.feature.group"/>
- <requirement name="org.eclipse.acceleo.feature.group"/>
- </setupTask>
- <setupTask xsi:type="projects:ProjectsImportTask">
- <sourceLocator locateNestedProjects="true" rootFolder="${papyrus.git.clone.location/extraplugins/qompass-designer}">
- <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.fcm\.profile"/>
- </sourceLocator>
- </setupTask>
- <stream label="master (Neon/2.0)" name="master">
- <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/>
- </stream>
- <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance">
- <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.mars}"/>
- </stream>
- <stream label="streams/1.0-maintenance (Luna/1.0.x)" name="streams/1.0-maintenance">
- <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.luna}"/>
- <setupTask xsi:type="setup.targlets:TargletTask">
- <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus CPP Dependencies">
- <requirement name="org.eclipse.emf.facet.sdk.feature.feature.group"/>
- </targlet>
- </setupTask>
- </stream>
- </project>
<project label="Diagram Template" name="diagramtemplate">
<setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="diagramtemplate"/>
<stream label="master (Neon/2.0)" name="master">
@@ -1410,8 +1332,8 @@ <project label="DSML Validation" name="dsml.validation">
<setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="dsml.validation"/>
<setupTask xsi:type="projects:ProjectsImportTask">
- <sourceLocator rootFolder="${papyrus.git.clone.location/extraplugins}/codegen">
- <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.codegen\.base"/>
+ <sourceLocator rootFolder="${papyrus.git.clone.location/plugins}/infra/core">
+ <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\.tools"/>
</sourceLocator>
</setupTask>
<setupTask xsi:type="p2_1.0:P2Task">
@@ -1441,46 +1363,6 @@ </stream>
<description/>
</project>
- <project label="Java" name="java">
- <setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="java"/>
- <setupTask xsi:type="setup:VariableTask" name="papyrus.extrafeature" value="java\.(?:profile|generator|reverse)"/>
- <setupTask xsi:type="setup.targlets:TargletTask">
- <targlet activeRepositoryList="${eclipse.target.platform}" name="Java Plug-ins">
- <requirement name="org.eclipse.papyrus.java.profile.feature.feature.group"/>
- <requirement name="org.eclipse.papyrus.java.generator.feature.feature.group"/>
- <requirement name="org.eclipse.papyrus.java.reverse.feature.feature.group"/>
- <repositoryList name="Neon">
- <repository url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/neon/extra"/>
- </repositoryList>
- <repositoryList name="Mars">
- <repository url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/mars/extra"/>
- </repositoryList>
- <repositoryList name="Luna">
- <repository url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/luna"/>
- </repositoryList>
- </targlet>
- </setupTask>
- <setupTask xsi:type="setup.workingsets:WorkingSetTask">
- <description>Projects related to Java code generation/reverse.</description>
- <workingSet name="Papyrus Java">
- <predicate xsi:type="predicates:AndPredicate">
- <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.layers.stackmodel"/>
- <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/>
- <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.java\..*"/>
- </predicate>
- </workingSet>
- </setupTask>
- <stream label="master (Neon/2.0)" name="master">
- <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/>
- </stream>
- <stream label="streams/1.1-maintenance (Mars/1.1.x)" name="streams/1.1-maintenance">
- <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.mars}"/>
- </stream>
- <stream label="streams/1.0-maintenance (Luna/1.0.x)" name="streams/1.0-maintenance">
- <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.luna}"/>
- </stream>
- <description/>
- </project>
<project label="Layers" name="layers">
<setupTask xsi:type="setup:VariableTask" name="papyrus.extraplugins.folder" value="layers"/>
<setupTask xsi:type="setup:VariableTask" name="papyrus.extrafeature" value="layers"/>
|