merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 6 Jun 2013 07:38:35 +0000 (07:38 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 6 Jun 2013 07:38:35 +0000 (07:38 +0000)
24 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml

index 7f1b05a6bca9aa26e5628d95985a59bd35fe67c7..7c20eb9cea0e32fb09a31b6ec015d1c8641f73fd 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.2.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
index 7bfb878869fa420aad548dd657d00b1c44bb53b3..35568f1dbc8c989c1ed61706508c18fdd0470baa 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.2.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index ea5de6e2854e3d943fe78275598e4fe245f75388..6810506d4afefe7a6b40f15b55cce75db8fccf45 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.2.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
index ca454484855b2b55f2d3f70c4ab96a99873f26ee..3766197cc7466941541dabf573d7d720e9491cff 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.2.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 64465758793bb826f034c073e90b16cd3b2fb91d..4a519895fc64fd0d87b34d51169b06857ac6cabf 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.2.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -425,22 +425,22 @@ Bundle-ClassPath: .,
  lib/batik-xml-1.7.jar,
  lib/c3p0-0.9.1.jar,
  lib/c3p0-0.9.2.jar,
- lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.2.0-SNAPSHOT.jar,
+ lib/cdmlib-commons-3.2.2-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.2.2-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.2.2-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.2.2-SNAPSHOT.jar,
+ lib/cdmlib-io-3.2.2-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.2.2-SNAPSHOT.jar,
+ lib/cdmlib-model-3.2.2-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.2.2-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.2.2-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.2.2-SNAPSHOT.jar,
+ lib/cdmlib-print-3.2.2-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.2.2-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.2.2-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.2.2-SNAPSHOT.jar,
+ lib/cdmlib-services-3.2.2-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.2.2-SNAPSHOT.jar,
  lib/cglib-2.1.3.jar,
  lib/cglib-nodep-2.2.2.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
index b32b01070bd94d0c963b4991f8e253a1e8177b76..f8a869d2721ffc2d440de5ad533971451bbda375 100644 (file)
@@ -31,22 +31,22 @@ bin.includes = META-INF/,\
                lib/batik-xml-1.7.jar,\\r
                lib/c3p0-0.9.1.jar,\\r
                lib/c3p0-0.9.2.jar,\\r
-               lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.2.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.2.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.2.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.2.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.2.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.2.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.2.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.2.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.2.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.2.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.2.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.2.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.2.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-services-3.2.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-commons-3.2.2-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-commons-3.2.2-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.2.2-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-ext-3.2.2-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.2.2-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-io-3.2.2-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.2.2-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-model-3.2.2-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.2.2-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-persistence-3.2.2-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.2.2-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-print-3.2.2-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.2.2-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-remote-3.2.2-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.2.2-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-services-3.2.2-SNAPSHOT.jar,\\r
                lib/cglib-2.1.3.jar,\\r
                lib/cglib-nodep-2.2.2.jar,\\r
                lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
index 4cf488ee33f1a17bac6e7badc2adfac6cf54f75d..9fb167cc8644ced846238dee40784f7341832719 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar differ
index d013a4337b1dd56bf0ce099b5cfb943ed5347bad..58e39760d400879d8bdab187bfdeeaf30938421e 100644 (file)
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.2.0-SNAPSHOT</version>\r
+    <version>3.2.2-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index 5837a26c75cdb54fa7d99220ca6bb2d0f8b94ce6..26e0e061de5c31ec6cc933693e9cc3326032f657 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.2.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
index ec0ee0a8a4f9ddd47acd92f6656c6d52dd0333a9..821815dd718992644c5c7ecef6c69ba33d6d53d1 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.2.2-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 5c88312037c8264fe25b6b9d968d24f1105ac84b..65ece9fbc29f5314b1ae1f9a1e614537b5c705cc 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.2.0.qualifier"
+      version="3.2.2.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index b2dd3d9414a2ed2b8a544044d9ae8b5dffd31ca6..33c8f9eab94d5d3a4fd19200c26e2d24ba27efd8 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.2.2-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index aef8a77082fc801f022fc039c4ef0448e4e9686a..fc46cd07fc675f34e1306de43826e9931e7e18c6 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.2.0.qualifier"
+      version="3.2.2.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index c9b754b8bb6418a8dbb09974a02b57fbe03af889..5c12ce930ac968f6372df2a6cf35713e0a8b1b48 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.2.2-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 381a326d2a59db529585717ac7f49fb084d07a51..acf68edf5f7f5ea30c9d162f5c089c60ebc55520 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.2.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 1833f444da9ba93b068342cee1fefd6782a9d530..714aa18ca62e75ea4ad23f1a19e99fbac675501f 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.2.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index c258196fd3647aa67d6fd15e4871ad079ebc80da..9e025bdd05e19b325788788cb5fdfa61a22f034c 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.2.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index 78b3bd9617b8fde2acb1dd4dd10626f1d5ade462..0c057ef6379cb27b9cfb6c7e851973a92b8e295b 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.2.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 494cb05feefbca091173118b6cbcd8b1962c5afa..64070eeb87151a607da851d0b8f87019f850d904 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.2.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 6d1807773436b42178fe0b031c96c86b40c999bf..006cc5bc3ff6c6dafa90ecf28b2f57e12c61609a 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.2.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 5f4ddb41f7e705879adae48589a87ecdfb1bb397..97074bc69fbbf9e287ec338b96b5ece0340b693c 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.2.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 53c0bcc12f331b0b564e64151c802061595993a3..494efce1a6df8f177f4004467190e11a5e8cbbe4 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.2.0-SNAPSHOT</version>
+       <version>3.2.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 2b1954a5fb93f55fdcdf613c4c3779f53d82eb31..6b20a3320842c3bf02c5bbb338ce1b47ca93f918 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.2.0.SNAPSHOT">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.2.2.SNAPSHOT">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index ec23b9b83a24678d351729bb139655141929b386..ef81f03629ddfc79b69e6a4a2b267d6647250af3 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.2.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>