merge-update from trunk

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index 550fbaba60de3c7fd419698c0836844e5616513d..5b1f9e061d55719dab90754db87e383746a466bb 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@ -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.4.qualifier
+Bundle-Version: 3.3.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin

diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index 83e3b219adfe6018a2ff54f6367a2b4cf18ec0e3..b53e2804011320d34e848e0d5e6622baf74df9e2 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.4-SNAPSHOT</version>
+               <version>3.3.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index b1c2cf9615db35b9076dfb117a667a5a29857ab8..61c72751cc72b36ce68409254b0675f6cd9f04e1 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@ -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.4.qualifier
+Bundle-Version: 3.3.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index 6a0aab48482d6ca57a823e577689164bc8a5593f..f499633e8da78d3827d7dccc7126e584abe40bb6 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.4-SNAPSHOT</version>
+               <version>3.3.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
index bc9116b1effd63741e4a27e19f5af75ab9e0632d..d9bbfb0bdd8ed3de61bcfc20f96bacfe43284b4a 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
@@ -26,6 +26,7 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.CompoundContributionItem;
 import org.eclipse.ui.handlers.IHandlerService;
 
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants;
@@ -86,6 +87,11 @@ public class DynamicNewObjectMenu extends CompoundContributionItem {
                                }
                        }
                });
+               
+               //FIXME:3.3MC Need corresponding Details Viewer section for FieldUnit
+               if(key == SpecimenOrObservationType.FieldUnit){
+                       menuItem.setEnabled(false);
+               }
        }
 
        /**

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 7f38d77afd8a92335c3e0dd59018d90361bbaf05..77de70d42f78785424bb8799859ec4702d181fe0 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -25,6 +25,22 @@
        <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
@@ -188,21 +204,5 @@
        <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.4-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.2.4-SNAPSHOT.jar" sourcepath="lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.2.4-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.2.4-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.2.4-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.2.4-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.2.4-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index d9160a29750c262d85483e94d81d7c1b82ae5912..e61452d5e3c04ef09e1b94121fd5dad58ebc74cb 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -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.4.qualifier
+Bundle-Version: 3.3.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -87,6 +87,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.model.description,
  eu.etaxonomy.cdm.model.location,
  eu.etaxonomy.cdm.model.media,
+ eu.etaxonomy.cdm.model.metadata,
  eu.etaxonomy.cdm.model.molecular,
  eu.etaxonomy.cdm.model.name,
  eu.etaxonomy.cdm.model.occurrence,
@@ -418,22 +419,22 @@ Bundle-ClassPath: .,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
  lib/c3p0-0.9.2.jar,
- lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,
- lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,
- lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.2.4-SNAPSHOT.jar,
- lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.2.4-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,
- lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.2.4-SNAPSHOT.jar,
- lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,
- lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.2.4-SNAPSHOT.jar,
+ lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,
+ lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.3.0-SNAPSHOT.jar,
  lib/cglib-nodep-2.2.2.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index c3e7cc475e3edc2b4605ea7f2c1a7f557a16fd20..50c772a2bbd09addd37618579e2653442141fcf5 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -22,22 +22,22 @@ bin.includes = META-INF/,\
                lib/batik-util-1.7.jar,\\r
                lib/batik-xml-1.7.jar,\\r
                lib/c3p0-0.9.2.jar,\\r
-               lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.2.4-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.2.4-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.2.4-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-services-3.2.4-SNAPSHOT.jar,\\r
+               lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-io-3.3.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-model-3.3.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-print-3.3.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-services-3.3.0-SNAPSHOT.jar,\\r
                lib/cglib-nodep-2.2.2.jar,\\r
                lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 909a3f8680205605def564fc84b36f8f158aca1a..39566db2359a8e2a619a64fd0461d85458db98dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.2.4-SNAPSHOT</version>\r
+    <version>3.3.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r

diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 1e7a409aef9523de634ccfa1f7fc7e26332e2ffa..104450a57fc0fc41dbe08ebcac62094b40c8cc5e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -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.4.qualifier
+Bundle-Version: 3.3.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin

diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml
index 91d2d3d2f413ad244a91fe8afdd73e6bd6989e31..4d7c2c07fa768e697667bed11e681ac20c0a5b85 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.2.4-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index ee7edd77679bd147ad9fb30cb3bb2138d72d5b7c..bce79a08fc0011b794e846f793e0de0eccdb4da1 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.2.4.qualifier"
+      version="3.3.0.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">

diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
index 2d7ba6e57b6d5f90683cd0077ed3de4fc11036da..98330db8d220aa843d0cbee4a3400883c2e65775 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.4-SNAPSHOT</version>
+               <version>3.3.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index 0ac58923ca88ea8d27c91c4e26a5a0ff67782987..ed554efb8f28e7b756ea8ab3572953edb1195100 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.2.4.qualifier"
+      version="3.3.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"

diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index 6f567c28a43e19eccecc6c23a4a0ec05fc43b1ac..4ea5c9ef9b7121526064205e2c14b7ee337febdb 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.4-SNAPSHOT</version>
+               <version>3.3.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>

diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index d0b1e0e35d9cb115e03240f41aa6036352763fd0..b145f9726b1c4b0e170dc167a59ad90b1e9096f9 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -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.4.qualifier
+Bundle-Version: 3.3.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml
index df6189956f86d63f69928a030bf4e23027dc0709..dc625f5b98afae9000d3991c5d7b4660a2302ebe 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/pom.xml
+++ b/eu.etaxonomy.taxeditor.help/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.4-SNAPSHOT</version>
+               <version>3.3.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index a11ce39a1ff3932a8ab6c120a98bfd0b42ad1c19..fbc2a192b7801d7132414d8c716df464f41d9ec0 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
@@ -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.4.qualifier
+Bundle-Version: 3.3.0.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,

diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml
index f578296e94192f43fd7b8aa4270174aac29b6149..f6295f28d89e23af6c4798749218defa8bd7d6a9 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.4-SNAPSHOT</version>
+               <version>3.3.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 40b2a391c3dc7484bdb3b46aa4eae1e0d0210566..9391b836390319a798eddaf5a70d8b591883268b 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -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.4.qualifier
+Bundle-Version: 3.3.0.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,

diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
index a6140a38c31169f3f57b5e4a9fcf2232bafc5e69..69ede3f58390fdadd21c4bf5dcfed103de192d99 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.2.4-SNAPSHOT</version>
+               <version>3.3.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index ccd13fb2c5b2f2d0875779f0cbbb74ebac106288..49f04868463b0c80ac8359e7fc0cfa99142caedc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -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.4.qualifier
+Bundle-Version: 3.3.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,

diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml
index df38c9d03725fee7b66aeca248e4991c52458687..c2a3af24f9a42750e6a958e2cc28b3adbd83c265 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.2.4-SNAPSHOT</version>
+       <version>3.3.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
index 4971cb3e625badaf0bb8170f5cb7c8bfba2467a7..dfaa62d7a718e7fad050b60b24900a8e8cdb0c5b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
@@ -19,8 +19,8 @@ import eu.etaxonomy.cdm.model.common.DefinedTerm;
  * @created Jun 25, 2010
  * @version 1.0
  */
-public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<DefinedTerm> {
-  //FIXME:3.3MC----
+public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<DefinedTerm>  {
+//FIXME:3.3MC---- see Ticket #3732
 //extends AbstractMenuPreferences<PreservationMethod> {
   //FIXME:3.3MC----
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
index 4827b632ec01564285dc36d040482809ca322519..6eabada4751c750a5f1441ae08a80c1829ed9291 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
@@ -24,8 +24,8 @@ import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.model.common.CdmMetaData;
-import eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName;
+import eu.etaxonomy.cdm.model.metadata.CdmMetaData;
+import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName;
 import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
 import eu.etaxonomy.taxeditor.ui.dialog.LoginDialog;
 import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
index ee12d72c4f3208bd0ab4a114ec065095da5c4975..ba10851c2478acf8289c0d8fe68453e1642b7c2d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName;
+import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java
index 89e1f8476e39d4522894821f2e6de8fd088cf0e4..211acb36f0ecac033fa95b294e8848151cf7370a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java
@@ -13,7 +13,7 @@ package eu.etaxonomy.taxeditor.view.datasource;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 
-import eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName;
+import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
index f64a6b59b6166b19eaad75e2dfaa3784d0979017..cdf06cf13ac5bb6568dd96ec013227043c72e498 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
@@ -15,8 +15,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.model.common.CdmMetaData;
-import eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName;
+import eu.etaxonomy.cdm.model.metadata.CdmMetaData;
+import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 660d16f4251f0f496a2c91852ebfb3c978686ef0..404e65ebe994b484abffa59d757563ba7f87fc85 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -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.4.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.3.0.SNAPSHOT">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index c007ecd502ce5c782b670f140ad880eeb2c3c6a1..d5e48ecc33f75653aadf65886689a8a4b5aaa0f3 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.4-SNAPSHOT</version>
+               <version>3.3.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
index 8aa2e181935281f0002fab4dc9e7138d0613bc1d..016cdf3966f03708525a5d5a3dfd2396ce818189 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.2.4-SNAPSHOT</version>
+  <version>3.3.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://wp5.e-taxonomy.eu</url>
@@ -15,10 +15,10 @@
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.2.4-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.3.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.2.4-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.3.0-SNAPSHOT</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>