improved versioning of plugins and features

diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index aee489870cc666bfd420e676f0165a8e38f62c75..638cd293394817cc3e6abd1b3896032e1e7de559 100644 (file)
--- a/taxeditor-application/META-INF/MANIFEST.MF
+++ b/taxeditor-application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2\r
 Bundle-Name: EDIT Taxonomic Editor\r
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true\r
-Bundle-Version: 2.0.0.v20090805-1724\r
+Bundle-Version: 2.0.1.qualifier\r
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin\r
 Bundle-Vendor: EDIT\r
 Export-Package: eu.etaxonomy.taxeditor\r

diff --git a/taxeditor-application/TaxEditor.product b/taxeditor-application/TaxEditor.product
index 66da9621783d62e1a9e55ed56f74381383763999..e54f375f8ac8c3d5351eb4842922ed9410aeeeee 100644 (file)
--- a/taxeditor-application/TaxEditor.product
+++ b/taxeditor-application/TaxEditor.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.4"?>
 
-<product name="%productName" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="2.0.0.v20090805-1653" useFeatures="true">
+<product name="%productName" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="2.0.1.qualifier" useFeatures="true">
 
    <aboutInfo>
       <text>
@@ -83,7 +83,7 @@
    </plugins>
 
    <features>
-      <feature id="eu.etaxonomy.taxeditor" version="2.0.0.v20090630-1147"/>
+      <feature id="eu.etaxonomy.taxeditor" version="2.0.1.qualifier"/>
    </features>
 
 </product>

diff --git a/taxeditor-bulkeditor/META-INF/MANIFEST.MF b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
index 6975cbed96e1309fd542c75e221ec51ddf4dacf4..e28e5edc18e8a6e5bfdd7e6712dbbbe79f62c8ac 100644 (file)
--- a/taxeditor-bulkeditor/META-INF/MANIFEST.MF
+++ b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Bulk Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 2.0.0.v20090805-1724
+Bundle-Version: 2.0.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Localization: plugin

diff --git a/taxeditor-editor/META-INF/MANIFEST.MF b/taxeditor-editor/META-INF/MANIFEST.MF
index c6c949f64c2ba7a9cc7f1fa52a1509206cb7d1fc..5fd39e239c94f5451bb2dccc627b5c850baad146 100644 (file)
--- a/taxeditor-editor/META-INF/MANIFEST.MF
+++ b/taxeditor-editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 2.0.0.v20090805-1724
+Bundle-Version: 2.0.1.qualifier
 Bundle-ClassPath: .,icons/
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0

diff --git a/taxeditor-feature-dependencies/build.properties b/taxeditor-feature-dependencies/build.properties
index 64f93a9f0b7328eb563aa5ad6cec7f828020e124..d89fe74ed78d23aa121988cca07d521091d3e278 100644 (file)
--- a/taxeditor-feature-dependencies/build.properties
+++ b/taxeditor-feature-dependencies/build.properties
@@ -1 +1,2 @@
 bin.includes = feature.xml
+generateFeatureVersionSuffix=true
\ No newline at end of file

diff --git a/taxeditor-feature-dependencies/feature.xml b/taxeditor-feature-dependencies/feature.xml
index 8c2d065b171fb578a316d00a86b6e8211cd055b9..69f1b3855ef65c6b709f6cf2f900c50f4e87f9cc 100644 (file)
--- a/taxeditor-feature-dependencies/feature.xml
+++ b/taxeditor-feature-dependencies/feature.xml
@@ -2,8 +2,10 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.dependencies"
       label="Taxeditor Dependencies"
-      version="2.0.0.v20090805-1724"
-      os="macosx,win32">
+      version="2.0.1.qualifier"
+      os="macosx,win32"
+      ws="carbon,win32"
+      arch="x86">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -384,68 +386,77 @@
    <plugin
          id="org.eclipse.update.core.win32"
          os="win32"
+         ws="win32"
+         arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.2.100.v20080107"
          fragment="true"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.filesystem.win32.x86"
          os="win32"
+         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.1.0.v20080604-1400"
          fragment="true"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.net.win32.x86"
          os="win32"
+         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0.I20080521"
          fragment="true"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.resources.win32.x86"
          os="win32"
+         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.4.0.v20071204"
          fragment="true"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.security.win32.x86"
          os="win32"
+         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0.v20080529-1600"
          fragment="true"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.swt.win32.win32.x86"
          os="win32"
+         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.4.1.v3452b"
          fragment="true"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.win32"
          os="win32"
+         ws="win32"
+         arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.2.100.v20080408-0800"
          fragment="true"
          unpack="false"/>
 

diff --git a/taxeditor-feature/build.properties b/taxeditor-feature/build.properties
index 64f93a9f0b7328eb563aa5ad6cec7f828020e124..433029e304eb58c4577a2e1a30011bccaa311c6b 100644 (file)
--- a/taxeditor-feature/build.properties
+++ b/taxeditor-feature/build.properties
@@ -1 +1,2 @@
 bin.includes = feature.xml
+generateFeatureVersionSuffix=true

diff --git a/taxeditor-feature/feature.xml b/taxeditor-feature/feature.xml
index a5b5909800e41752487023298865714eb60a8e9b..e586d245e4dedbec1ef031abe288f00fdaad9b36 100644 (file)
--- a/taxeditor-feature/feature.xml
+++ b/taxeditor-feature/feature.xml
@@ -2,19 +2,27 @@
 <feature
       id="eu.etaxonomy.taxeditor"
       label="Taxeditor Feature"
-      version="2.0.0.v20090805-1724"
-      provider-name="EDIT">
+      version="2.0.1.qualifier"
+      provider-name="EDIT"
+      os="macosx,win32"
+      ws="carbon,win32"
+      arch="x86">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description url="http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditor">
+      EDIT Taxonomic Editor
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright url="http://www.e-taxonomy.eu">
+      CopyrightCopyright (C) 2007 EDIT
+European Distributed Institute of Taxonomy
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="http://www.mozilla.org/MPL">
+      The contents of this file are subject to the Mozilla Public License Version 1.1 (the &quot;License&quot;); you may not use this file except
+in compliance with the License. 
+
+You may obtain a copy of the License at http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations
+under the License.
    </license>
 
    <url>
@@ -22,46 +30,46 @@
    </url>
 
    <includes
-         id="eu.etaxonomy.taxeditor.feature.dependencies"
+         id="eu.etaxonomy.cdmLibrary"
          version="0.0.0"/>
 
    <includes
-         id="eu.etaxonomy.cdmLibrary"
+         id="eu.etaxonomy.taxeditor.feature.dependencies"
          version="0.0.0"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.application"
          download-size="0"
          install-size="0"
-         version="2.0.0.v20090805-1724"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.editor"
          download-size="0"
          install-size="0"
-         version="2.0.0.v20090805-1724"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.navigation"
          download-size="0"
          install-size="0"
-         version="2.0.0.v20090805-1724"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.store"
          download-size="0"
          install-size="0"
-         version="2.0.0.v20090805-1724"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.bulkeditor"
          download-size="0"
          install-size="0"
-         version="2.0.0.v20090805-1724"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>

diff --git a/taxeditor-navigation/META-INF/MANIFEST.MF b/taxeditor-navigation/META-INF/MANIFEST.MF
index 6e591f24a77dbe7050ed732fd9597562e1d7d11f..2c561318883e766af9f5188e8c3fdb0fa4eb3a3b 100644 (file)
--- a/taxeditor-navigation/META-INF/MANIFEST.MF
+++ b/taxeditor-navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 2.0.0.v20090805-1724
+Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.navigation,

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index df91822b028bf66581712f298e050b8a91b51ae1..50d6655be6e54e7bf3ff2abfd67b0688d8012992 100644 (file)
--- a/taxeditor-store/META-INF/MANIFEST.MF
+++ b/taxeditor-store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 2.0.0.v20090805-1724
+Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.datasource,

diff --git a/taxeditor-updateSite/site.xml b/taxeditor-updateSite/site.xml
index c079168f062e06c5f8fd1e7c16a70c9c40757f58..a1324eb80a7f743c79dc2c1dc6a59c4c339be3d0 100644 (file)
--- a/taxeditor-updateSite/site.xml
+++ b/taxeditor-updateSite/site.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/eu.etaxonomy.cdmLibrary_2.1.0.v20090708-1900.jar" id="eu.etaxonomy.cdmLibrary" version="2.1.0.v20090708-1900">
+   <feature url="features/eu.etaxonomy.cdmLibrary_2.1.0.v20090810-1245.jar" id="eu.etaxonomy.cdmLibrary" version="2.1.0.v20090810-1245">
       <category name="Cdm Library"/>
    </feature>
-   <feature url="features/eu.etaxonomy.taxeditor_2.0.0.v20090805-1724.jar" id="eu.etaxonomy.taxeditor" version="2.0.0.v20090805-1724">
+   <feature url="features/eu.etaxonomy.taxeditor_2.0.1.200908121154.jar" id="eu.etaxonomy.taxeditor" version="2.0.1.200908121154" os="macosx,win32" ws="carbon,win32" arch="x86">
       <category name="Taxonomic Editor"/>
    </feature>
    <category-def name="Taxonomic Editor" label="Taxonomic Editor"/>