Fix Build issue for product bundle

Activate new Sirius 4.x properties for product Add sample to examples Remove doc TOC
ejuliot · Aug 9, 2016 · 046ba33 · 046ba33
1 parent ca16750
commit 046ba33
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 91 deletions.
diff --git a/packaging/org.obeonetwork.dsl.organizationchart.runtime.feature/feature.xml b/packaging/org.obeonetwork.dsl.organizationchart.runtime.feature/feature.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.obeonetwork.dsl.organizationchart.runtime.feature"
-      label="OrganizationChart"
-      version="1.0.0.qualifier"
-      provider-name="Obeo"
-      plugin="org.obeonetwork.dsl.organizationchart.branding">
-
-   <description url="http://docs.obeonetwork.com/organizationchart">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.obeonetwork.dsl.organizationchart.runtime.feature"
+      label="OrganizationChart"
+      version="1.0.0.qualifier"
+      provider-name="Obeo"
+      plugin="org.obeonetwork.dsl.organizationchart.branding">
+
+   <description url="http://docs.obeonetwork.com/organizationchart">
       This modeler provides a set of common diagrams to work with
 Organization Chart models.
 Provides same features as org.obeonetwork.dsl.organizationchart.runtime.sdk.feature 
-without the dependencies to Obeo Designer.
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2009, 2014 Obeo.
+without the dependencies to Sirius.
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2009, 2016 Obeo.
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License
 v1.0 which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
       Eclipse Public License - v 1.0
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
 ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
@@ -217,64 +217,58 @@ and the intellectual property laws of the United States of America.
 No party to this Agreement will bring a legal action under this
 Agreement more than one year after the cause of action arose.
 Each party waives its rights to a jury trial in any resulting
-litigation.
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.gmf.runtime.notation" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sirius.runtime" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sirius.runtime.acceleo" version="0.0.0" match="greaterOrEqual"/>
-      <!--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"/>
-   </requires>
-
-   <!--plugin
-         id="org.obeonetwork.gmf.runtime.diagram.ui.extension"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/-->
-
-   <plugin
-         id="org.obeonetwork.dsl.organizationchart"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.obeonetwork.dsl.organizationchart.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.obeonetwork.dsl.organizationchart.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.obeonetwork.dsl.organizationchart.design"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.obeonetwork.dsl.organizationchart.branding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <!--plugin
-         id="org.obeonetwork.dsl.organizationchart.design.doc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/-->
-
-</feature>
+litigation.
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.gmf.runtime.notation" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sirius.runtime" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sirius.runtime.acceleo" version="0.0.0" match="greaterOrEqual"/>
+      <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.eclipse.sirius.properties.feature" version="0.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.obeonetwork.dsl.organizationchart"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.obeonetwork.dsl.organizationchart.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.obeonetwork.dsl.organizationchart.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.obeonetwork.dsl.organizationchart.design"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.obeonetwork.dsl.organizationchart.branding"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.obeonetwork.dsl.organizationchart.design.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/packaging/org.obeonetwork.dsl.organizationchart.runtime.sdk.feature/feature.xml b/packaging/org.obeonetwork.dsl.organizationchart.runtime.sdk.feature/feature.xml
@@ -21,7 +21,7 @@ OrganizationChart models.
    </description>
 
    <copyright url="http://www.obeo.fr/legal.php?lang=en">
-      Copyright (c) 2009, 2014 Obeo.
+      Copyright (c) 2009, 2016 Obeo.
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License
 v1.0 which accompanies this distribution, and is available at

diff --git a/...etwork.dsl.organizationchart.design.doc/doc/OrganizationChart Designer User Guide-toc.xml b/...etwork.dsl.organizationchart.design.doc/doc/OrganizationChart Designer User Guide-toc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<toc topic="doc/UML Designer User Guide.html" label="UML Designer User Guide">
-	<topic href="doc/UML Designer User Guide.html" label="Providing Feedback"></topic>
+<toc topic="doc/OrganizationChart User Guide.html" label="OrganizationChart Designer User Guide">
+	<topic href="doc/OrganizationChart User Guide.html" label="Providing Feedback"></topic>
 	<topic href="doc/UML Designer User Guide.html#GettingStarted" label="Getting Started">
 		<topic href="doc/UML Designer User Guide.html#StartingfromtheTravelAgencyexample" label="Starting from the Travel Agency example"></topic>
 		<topic href="doc/UML Designer User Guide.html#CreateanewUMLmodelUMLproject" label="Create a new UML model &amp; UML project"></topic>

diff --git a/plugins/org.obeonetwork.dsl.organizationchart.design.doc/plugin.xml b/plugins/org.obeonetwork.dsl.organizationchart.design.doc/plugin.xml
@@ -11,13 +11,6 @@ Contributors:
     Etienne Juliot - initial API and implementation
 -->
 <plugin>
-    <extension
-        point="org.eclipse.help.toc">
-        <toc
-            file="doc/OrganizationChart Designer User Guide-toc.xml"
-            primary="true">
-        </toc>
-    </extension>
 
     <extension point="org.eclipse.emf.common.ui.examples">
         <example wizardID="org.obeonetwork.dsl.organizationchart.design.doc.TravelAgencyWizard">

diff --git a/plugins/org.obeonetwork.dsl.organizationchart.design/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.organizationchart.design/META-INF/MANIFEST.MF
@@ -7,9 +7,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.emf.transaction,
- org.eclipse.sirius,
+ org.eclipse.sirius;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.sirius.common,
  org.eclipse.sirius.common.acceleo.mtl.ide,
+ org.eclipse.sirius.common.acceleo.aql,
  org.eclipse.sirius.ext.base,
  org.eclipse.sirius.ui,
  org.eclipse.ui.ide,

diff --git a/releng/org.obeonetwork.dsl.organizationchart.parent/pom.xml b/releng/org.obeonetwork.dsl.organizationchart.parent/pom.xml
@@ -33,7 +33,7 @@ Contributors:
     <module>${root-path}/plugins/org.obeonetwork.dsl.organizationchart.editor</module>
     <module>${root-path}/plugins/org.obeonetwork.dsl.organizationchart.design</module>
     <module>${root-path}/plugins/org.obeonetwork.dsl.organizationchart.branding</module>
-    <!--module>${root-path}/plugins/org.obeonetwork.dsl.organizationchart.design.doc</module-->
+    <module>${root-path}/plugins/org.obeonetwork.dsl.organizationchart.design.doc</module>
 
 
     <!-- Build test plugins -->