Merge pull request #10 from cfsnook/master

tshoang · web-flow · commit 75b425a30b8f · 2018-12-06T17:28:24.000Z
prepare for release
diff --git a/ac.soton.eventb.emf.components.branding/META-INF/MANIFEST.MF b/ac.soton.eventb.emf.components.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ac.soton.eventb.emf.components.branding
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.0.release
 Bundle-Vendor: %pluginVendor
 Bundle-Localization: plugin
diff --git a/ac.soton.eventb.emf.components.diagram/META-INF/MANIFEST.MF b/ac.soton.eventb.emf.components.diagram/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ac.soton.eventb.emf.components.diagram; singleton:=true
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.0.0.release
 Bundle-ClassPath: .
 Bundle-Activator: ac.soton.eventb.emf.components.diagram.part.ComponentsDiagramEditorPlugin
 Bundle-Vendor: %providerName
diff --git a/ac.soton.eventb.emf.components.doc/META-INF/MANIFEST.MF b/ac.soton.eventb.emf.components.doc/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ac.soton.eventb.emf.components.doc;singleton:=true
-Bundle-Version: 0.0.1.qualifier
+Bundle-Version: 0.0.1.release
 Bundle-Vendor: %pluginVendor
diff --git a/ac.soton.eventb.emf.components.edit/META-INF/MANIFEST.MF b/ac.soton.eventb.emf.components.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ac.soton.eventb.emf.components.edit;singleton:=true
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.0.0.release
 Bundle-ClassPath: .
 Bundle-Activator: ac.soton.eventb.emf.components.provider.ComponentsEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/ac.soton.eventb.emf.components.feature/feature.properties b/ac.soton.eventb.emf.components.feature/feature.properties
@@ -19,14 +19,14 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Component Diagrams (for Rodin 3.2.x)
+featureName=CODA Component Diagrams (for Rodin 3.x.x)
 
 # "providerName" property - name of the company that provides the feature
 featureProvider=University of Southampton
 
 # "description" property - description of the feature
 featureDescription=\
-An extension to Event-B to provide modelling with Component Diagrams.\n\
+CODA Component Diagrams extends UML-B and Event-B to provide modelling of components that are connected by timed channels.\n\
 \n\
 Release history:\n\
 -------------------------------------------------------------------\n\
diff --git a/ac.soton.eventb.emf.components.feature/feature.xml b/ac.soton.eventb.emf.components.feature/feature.xml
@@ -11,9 +11,9 @@
          University of Southampton - Initial API and implementation
  -->
 <feature
-      id="ac.soton.eventb.components.feature"
+      id="ac.soton.eventb.emf.components.feature"
       label="%featureName"
-      version="6.0.0.qualifier"
+      version="6.0.0.release"
       provider-name="%featureProvider"
       plugin="ac.soton.eventb.emf.components.branding"
       license-feature="ac.soton.coda.licence"
@@ -36,7 +36,7 @@
       <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>
       <import plugin="ac.soton.eventb.emf.diagrams" version="4.0.0" match="compatible"/>
       <import plugin="org.eventb.emf.core" version="5.0.0" match="compatible"/>
-      <import plugin="ac.soton.eventb.emf.core.extension" version="4.0.0" match="compatible"/>
+      <import plugin="ac.soton.eventb.emf.core.extension" version="5.0.0" match="compatible"/>
       <import plugin="ac.soton.eventb.statemachines" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.emf.edit" version="2.10.1" match="compatible"/>
       <import plugin="ac.soton.eventb.emf.decomposition" version="0.0.1" match="compatible"/>
@@ -67,15 +67,15 @@
       <import plugin="ac.soton.eventb.emf.components.edit" version="6.0.0" match="compatible"/>
       <import plugin="ac.soton.eventb.emf.diagrams.edit" version="2.2.0" match="compatible"/>
       <import plugin="org.eclipse.emf.ecore.edit" version="2.7.0" match="compatible"/>
-      <import plugin="org.eventb.emf.core.edit" version="1.1.0" match="compatible"/>
-      <import plugin="ac.soton.eventb.emf.core.extension.edit" version="1.0.0" match="compatible"/>
+      <import plugin="org.eventb.emf.core.edit" version="2.0.0" match="compatible"/>
+      <import plugin="ac.soton.eventb.emf.core.extension.edit" version="2.0.0" match="compatible"/>
       <import plugin="ac.soton.eventb.statemachines.edit" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.emf.validation" version="1.4.0" match="compatible"/>
       <import plugin="org.eclipse.gef" version="3.7.0" match="compatible"/>
       <import plugin="org.rodinp.keyboard.ui" version="2.0.0" match="compatible"/>
       <import plugin="org.eventb.emf.persistence" version="3.0.0" match="compatible"/>
       <import plugin="ac.soton.eventb.statemachines.diagram" version="3.0.0" match="compatible"/>
-      <import plugin="ac.soton.eventb.emf.diagrams.refactor" version="0.0.0" match="compatible"/>
+      <import plugin="ac.soton.eventb.emf.diagrams.refactor" version="1.0.0" match="compatible"/>
       <import plugin="org.eclipse.draw2d" version="3.10.100" match="compatible"/>
       <import plugin="org.eclipse.emf.edit" version="2.7.0" match="compatible"/>
       <import plugin="ac.soton.eventb.emf.decomposition.edit" version="0.0.2" match="compatible"/>
@@ -85,7 +85,7 @@
       <import plugin="org.eventb.core" version="3.1.0" match="compatible"/>
       <import plugin="org.eventb.ui" version="3.0.0" match="compatible"/>
       <import plugin="ac.soton.eventb.emf.core.extension.persistence" version="2.0.0" match="compatible"/>
-      <import plugin="ac.soton.eventb.emf.core.extension.navigator" version="4.1.0" match="compatible"/>
+      <import plugin="ac.soton.eventb.emf.core.extension.navigator" version="5.0.0" match="compatible"/>
       <import plugin="ac.soton.eventb.emf.diagrams.navigator" version="3.0.0" match="compatible"/>
       <import plugin="ac.soton.eventb.emf.components.diagram" version="6.0.0" match="compatible"/>
       <import plugin="ac.soton.eventb.statemachines.navigator" version="2.0.0" match="compatible"/>
@@ -95,7 +95,8 @@
       <import plugin="ac.soton.eventb.emf.diagrams.generator" version="4.0.0" match="compatible"/>
       <import plugin="ac.soton.emf.translator" version="3.0.0" match="compatible"/>
       <import plugin="ac.soton.emf.translator.eventb" version="0.0.1" match="compatible"/>
-      <import feature="ac.soton.eventb.statemachines.feature" version="3.2.0"/>
+      <import feature="ac.soton.eventb.statemachines.feature" version="4.0.0" match="greaterOrEqual"/>
+      <import feature="ac.soton.eventb.emf.decomposition.feature" version="0.1.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -146,4 +147,10 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="ac.soton.eventb.emf.components.doc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/ac.soton.eventb.emf.components.generator/META-INF/MANIFEST.MF b/ac.soton.eventb.emf.components.generator/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ac.soton.eventb.emf.components.generator;singleton:=true
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 5.0.0.release
 Bundle-Activator: ac.soton.eventb.emf.components.generator.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
diff --git a/ac.soton.eventb.emf.components.navigator/META-INF/MANIFEST.MF b/ac.soton.eventb.emf.components.navigator/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ac.soton.eventb.emf.components.navigator;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.0.release
 Bundle-Activator: ac.soton.eventb.emf.components.navigator.ComponentsNavigatorPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.5.0,2.0.0)",
diff --git a/ac.soton.eventb.emf.components.persistence/META-INF/MANIFEST.MF b/ac.soton.eventb.emf.components.persistence/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ac.soton.eventb.emf.components.persistence;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.0.release
 Bundle-Activator: ac.soton.eventb.emf.components.persistence.ComponentsPersistencePlugin
 Bundle-Vendor: %providerName
 Require-Bundle: ac.soton.eventb.emf.components;bundle-version="[6.0.0,7.0.0)",
diff --git a/ac.soton.eventb.emf.components.sdk/.project b/ac.soton.eventb.emf.components.sdk/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ac.soton.eventb.emf.components.sdk</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/ac.soton.eventb.emf.components.sdk/build.properties b/ac.soton.eventb.emf.components.sdk/build.properties
@@ -0,0 +1,8 @@
+individualSourceBundles=true
+generate.feature@ac.soton.eventb.emf.components.source.feature=ac.soton.eventb.emf.components.feature
+bin.includes = feature.xml,\
+               feature.properties
+src.includes = feature.xml,\
+               feature.properties,\
+               build.properties,\
+               .project\n\
diff --git a/ac.soton.eventb.emf.components.sdk/feature.properties b/ac.soton.eventb.emf.components.sdk/feature.properties
@@ -0,0 +1,37 @@
+###############################################################################
+# Copyright (c) 2018 University of Southampton.
+# 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
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=CODA Component Diagrams (for Rodin 3.x.x) SDK
+
+# "featureVendor" property - name of the company that provides the feature
+featureVendor=University of Southampton
+
+# "description" property - description of the feature
+featureDescription=\
+This SDK feature provides CODA Component Diagrams with its source code and unit tests. \n\
+It is intended for developers to use in a target platform while developing code that uses the \n\
+CODA Component Diagrams.\n\
+CODA Component Diagrams extends UML-B and Event-B to provide modelling of components that are connected by timed channels.\n\
+\n\
+Release history:\n\
+---------------\n\
+### 2.0.1 ###\n\
+- CODA Component Diagrams feature (6.0.0)\n\
+- CODA Component Diagrams source feature (6.0.0):Generated\n\
+  
+# "copyright" property - copyright of the feature
+copyright=Copyright (c) 2018 University of Southampton. All rights reserved.
+
+# "updateSiteName" property - name of the update site
+updateSiteName = Main Rodin update site
diff --git a/ac.soton.eventb.emf.components.sdk/feature.xml b/ac.soton.eventb.emf.components.sdk/feature.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="ac.soton.eventb.emf.components.sdk"
+      label="%featureName"
+      version="6.0.0.release"
+      provider-name="%featureVendor"
+      plugin="ac.soton.eventb.emf.components.branding"
+      license-feature="org.rodinp.license"
+      license-feature-version="1.0.0.release">
+
+   <description>
+      %featureDescription
+   </description>
+
+   <copyright>
+      %featureCopyright
+   </copyright>
+
+   <url>
+      <update label="%updateSiteName" url="http://rodin-b-sharp.sourceforge.net/updates"/>
+   </url>
+
+   <includes
+         id="ac.soton.eventb.emf.components.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="ac.soton.eventb.emf.components.source.feature"
+         version="0.0.0"/>
+
+</feature>
diff --git a/ac.soton.eventb.emf.components/META-INF/MANIFEST.MF b/ac.soton.eventb.emf.components/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ac.soton.eventb.emf.components;singleton:=true
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.0.0.release
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
