Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorAnsgar Radermacher2016-01-16 18:21:13 -0500
committerAnsgar Radermacher2016-01-17 08:03:01 -0500
commit36b670f0a9f5dd59422a9f368dfe035d0b5f719c (patch)
tree7bb419a329ba5c568f5b3062b7661ed0b3e78d46 /releng
parent47dd8f8ebd64192956b097cb70f783d7446138ab (diff)
downloadorg.eclipse.papyrus-36b670f0a9f5dd59422a9f368dfe035d0b5f719c.tar.gz
org.eclipse.papyrus-36b670f0a9f5dd59422a9f368dfe035d0b5f719c.tar.xz
org.eclipse.papyrus-36b670f0a9f5dd59422a9f368dfe035d0b5f719c.zip
Bug 484701 - [QDesigner] Refactoring - code generators, architecture exploration and component based design should be organised in common directory
Bug 478797 - [model library] Decide which model library to use for C++ primitive types Change-Id: Idade4edfcf803da3528c0873aa04b754915866fd
Diffstat (limited to 'releng')
-rw-r--r--releng/extra/pom.xml102
-rw-r--r--releng/extra/site/category.xml10
2 files changed, 67 insertions, 45 deletions
diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index 7d547132d8b..09691ca5398 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -14,7 +14,6 @@
<modules>
<!-- features -->
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module>
- <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module>
@@ -23,14 +22,9 @@
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module>
- <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module>
- <module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature</module>
- <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>../../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module>
@@ -41,9 +35,6 @@
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.effbd.feature</module>
<!-- plug-ins-->
- <module>../../extraplugins/codegen/org.eclipse.papyrus.acceleo</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module>
<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.core</module>
<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.ui</module>
<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties</module>
@@ -53,13 +44,6 @@
<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module>
<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module>
<module>../../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.codegen.base</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module>
<module>../../plugins/customization/org.eclipse.papyrus.customization</module>
<module>../../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module>
<module>../../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit</module>
@@ -76,19 +60,6 @@
<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config</module>
<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu</module>
<module>../../extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types</module>
- <module>../../extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile</module>
- <module>../../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.generator.ui</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.profile</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.profile.edit</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.profile.editor</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.reverse</module>
- <module>../../extraplugins/java/org.eclipse.papyrus.java.reverse.ui</module>
<module>../../extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit</module>
<module>../../extraplugins/layers/org.eclipse.papyrus.layers.runtime</module>
<module>../../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel</module>
@@ -105,15 +76,65 @@
<module>../../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module>
<module>../../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module>
<module>../../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</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>
+
+ <!-- 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>
<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common</module>
@@ -125,9 +146,6 @@
<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.perspective</module>
<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository</module>
<module>../../extraplugins/robotml/org.eclipse.papyrus.robotml.validation</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.texteditor.model</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module>
<module>../../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module>
<module>../../extraplugins/uml/org.eclipse.papyrus.uml.export</module>
<module>../../extraplugins/uml/org.eclipse.papyrus.uml.diagram.dnd.smart</module>
@@ -153,8 +171,6 @@
<module>../../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module>
<module>../../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module>
- <module>../../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module>
- <module>../../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module>
<!-- Papyrus Uml Diagram Ecore -->
<module>../../extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.ecore.feature</module>
diff --git a/releng/extra/site/category.xml b/releng/extra/site/category.xml
index b53462dceec..06db34d62bf 100644
--- a/releng/extra/site/category.xml
+++ b/releng/extra/site/category.xml
@@ -66,7 +66,10 @@
<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.cpp.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.cpp.feature" version="1.2.0.qualifier">
+ <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">
@@ -99,7 +102,10 @@
<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.cpp.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.extra.cpp.feature.source" version="1.2.0.qualifier">
+ <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">

Back to the top