Fix UML Designer product

ObeoNetwork · Jul 2, 2018 · 4c8105e · 4c8105e
1 parent 1a00210
commit 4c8105e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/packaging/org.obeonetwork.dsl.uml2.product/category.xml b/packaging/org.obeonetwork.dsl.uml2.product/category.xml
@@ -3,9 +3,6 @@
    <description url="http://www.obeo.fr">
       Viewpoint
    </description>
-   <feature id="org.obeonetwork.dsl.uml2.runtime.feature" version="0.0.0">
-      <category name="Obeo Network"/>
-   </feature>
    <feature id="org.obeonetwork.dsl.uml2.runtime.feature" version="8.1.0.qualifier">
       <category name="Obeo Network"/>
    </feature>
@@ -15,7 +12,10 @@
    <feature id="org.obeonetwork.dsl.uml2.runtime.product.feature" version="8.1.0.qualifier">
       <category name="Obeo Network"/>
    </feature>
-   <feature id="org.obeonetwork.dsl.uml2.runtime.sdk.feature" version="8.1.0.qualifier">
+   <feature url="features/org.obeonetwork.dsl.uml2.core.runtime.feature_8.1.0.qualifier.jar" id="org.obeonetwork.dsl.uml2.core.runtime.feature" version="8.1.0.qualifier">
+      <category name="Obeo Network"/>
+   </feature>
+   <feature url="features/org.obeonetwork.dsl.uml2.umlgen.feature_8.1.0.qualifier.jar" id="org.obeonetwork.dsl.uml2.umlgen.feature" version="8.1.0.qualifier">
       <category name="Obeo Network"/>
    </feature>
    <category-def name="Obeo Network" label="Obeo Network">

diff --git a/packaging/org.obeonetwork.dsl.uml2.runtime.product.feature/feature.xml b/packaging/org.obeonetwork.dsl.uml2.runtime.product.feature/feature.xml
@@ -227,6 +227,7 @@ litigation.
       <import feature="org.eclipse.sirius.runtime.ide.eef" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.sirius.runtime.ide.ui" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.sirius.runtime.ide.ui.acceleo" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.obeonetwork.dsl.uml2.core.runtime.feature" version="0.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -368,13 +369,6 @@ litigation.
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.obeonetwork.dsl.uml2.discovery"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.obeonetwork.dsl.uml2.dashboard"
          download-size="0"

diff --git a/prepare-deploy-local-dir.sh b/prepare-deploy-local-dir.sh
@@ -3,6 +3,7 @@ CORE_UPDATE_SITE_DIR=packaging/org.obeonetwork.dsl.uml2.core.update/target/
 UPDATE_SITE_DIR=packaging/org.obeonetwork.dsl.uml2.update/target/
 DISCOVERY_UPDATE_SITE_DIR=packaging/org.obeonetwork.dsl.uml2.discovery.update/target/
 DISCOVERY=plugins/org.obeonetwork.dsl.uml2.discovery/discovery.xmi
+DISCOVERY_IMAGES=plugins/org.obeonetwork.dsl.uml2.discovery/images/
 TP=releng/org.obeonetwork.dsl.uml2.target/*.tpd
 CORE_TP=releng/org.obeonetwork.dsl.uml2.core.target/*.tpd
 BUNDLE_DIR=packaging/org.obeonetwork.dsl.uml2.product/target/products/*.zip
@@ -17,6 +18,7 @@ cp -r $CORE_UPDATE_SITE_DIR/*.zip $DEPLOY_LOCAL_DIR
 cp -r $DISCOVERY_UPDATE_SITE_DIR/repository $DEPLOY_LOCAL_DIR/discovery
 cp -r $DISCOVERY_UPDATE_SITE_DIR/*.zip $DEPLOY_LOCAL_DIR
 cp -r $DISCOVERY $DEPLOY_LOCAL_DIR
+cp -r $DISCOVERY_IMAGES $DEPLOY_LOCAL_DIR/images
 cp -r $UPDATE_SITE_DIR/repository $DEPLOY_LOCAL_DIR
 cp -r $UPDATE_SITE_DIR/*.zip $DEPLOY_LOCAL_DIR
 cp -r $CORE_TP $DEPLOY_LOCAL_DIR