From f784e7492359bcddc1937c98546266cf66875008 Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Mon, 2 Nov 2009 18:03:40 +0000
Subject: [PATCH] updating poms to new cdmlib version

---
 taxeditor-annotatedlineeditor/pom.xml                       | 4 ++--
 taxeditor-application/META-INF/MANIFEST.MF                  | 2 +-
 taxeditor-application/pom.xml                               | 4 ++--
 taxeditor-bulkeditor/META-INF/MANIFEST.MF                   | 2 +-
 taxeditor-bulkeditor/pom.xml                                | 4 ++--
 taxeditor-editor/META-INF/MANIFEST.MF                       | 6 ++++--
 taxeditor-editor/pom.xml                                    | 4 ++--
 taxeditor-feature-dependencies/feature.xml                  | 4 ++++
 .../filteredSelection/FilteredReferenceSelectionDialog.java | 1 -
 9 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/taxeditor-annotatedlineeditor/pom.xml b/taxeditor-annotatedlineeditor/pom.xml
index 6e2db28ee..bbc7ae931 100644
--- a/taxeditor-annotatedlineeditor/pom.xml
+++ b/taxeditor-annotatedlineeditor/pom.xml
@@ -4,14 +4,14 @@
     <parent>
   	<groupId>eu.etaxonomy</groupId>
   	<artifactId>taxeditor-parent</artifactId>
-  	<version>1.0</version>
+  	<version>2.1</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-annotatedlineeditor</artifactId>
   <packaging>jar</packaging>
-  <version>1.0</version>
+  <version>2.1</version>
   <name>AnnotatedLineEditor Bundle</name>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorAnnotatedLineEditorBundle</url>
   <dependencies>
diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index 98d919607..caa8140cd 100644
--- a/taxeditor-application/META-INF/MANIFEST.MF
+++ b/taxeditor-application/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Export-Package: eu.etaxonomy.taxeditor
-Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.1",org.eclipse.core.runtime;bundle-version="3.4.0",org.eclipse.core.resources;bundle-version="3.4.1",eu.etaxonomy.cdmlib;bundle-version="2.1.0",eu.etaxonomy.taxeditor.store;bundle-version="1.0.0",eu.etaxonomy.taxeditor.editor;bundle-version="1.0.0",eu.etaxonomy.taxeditor.navigation;bundle-version="1.0.0",eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.0.1"
+Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.1",org.eclipse.core.runtime;bundle-version="3.4.0",org.eclipse.core.resources;bundle-version="3.4.1",eu.etaxonomy.cdmlib;bundle-version="2.3.0",eu.etaxonomy.taxeditor.store;bundle-version="2.1.0",eu.etaxonomy.taxeditor.editor;bundle-version="2.1.0",eu.etaxonomy.taxeditor.navigation;bundle-version="2.1.0",eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.1.0"
 Bundle-ActivationPolicy: lazy
diff --git a/taxeditor-application/pom.xml b/taxeditor-application/pom.xml
index 66e6b0f1c..a71c9ae23 100644
--- a/taxeditor-application/pom.xml
+++ b/taxeditor-application/pom.xml
@@ -4,14 +4,14 @@
   <parent>
 	<groupId>eu.etaxonomy</groupId>
 	<artifactId>taxeditor-parent</artifactId>
-	<version>1.0</version>
+	<version>2.1</version>
   </parent>
  
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-application</artifactId>
   <packaging>jar</packaging>
-  <version>1.0</version>
+  <version>2.1</version>
   <name>Application</name>
   <description>All plugins are combined into this application.</description>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditor</url>
diff --git a/taxeditor-bulkeditor/META-INF/MANIFEST.MF b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
index c9c52fddf..10279906f 100644
--- a/taxeditor-bulkeditor/META-INF/MANIFEST.MF
+++ b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Bundle-ClassPath: .
 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
-Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.jface.text;bundle-version="3.4.2",org.eclipse.ui.editors,org.eclipse.ui.ide,org.eclipse.core.resources;bundle-version="3.4.2",eu.etaxonomy.cdmlib;bundle-version="2.1.0",eu.etaxonomy.taxeditor.editor;bundle-version="2.0.0",eu.etaxonomy.taxeditor.store;bundle-version="2.0.0",org.eclipse.core.expressions
+Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.jface.text;bundle-version="3.4.2",org.eclipse.ui.editors,org.eclipse.ui.ide,org.eclipse.core.resources;bundle-version="3.4.2",eu.etaxonomy.cdmlib;bundle-version="2.3.0",eu.etaxonomy.taxeditor.editor;bundle-version="2.1.0",eu.etaxonomy.taxeditor.store;bundle-version="2.1.0",org.eclipse.core.expressions
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/taxeditor-bulkeditor/pom.xml b/taxeditor-bulkeditor/pom.xml
index 5559867cf..90f8226bf 100644
--- a/taxeditor-bulkeditor/pom.xml
+++ b/taxeditor-bulkeditor/pom.xml
@@ -4,14 +4,14 @@
     <parent>
   	<groupId>eu.etaxonomy</groupId>
   	<artifactId>taxeditor-parent</artifactId>
-  	<version>1.0</version>
+  	<version>2.1</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-bulkeditor</artifactId>
   <packaging>jar</packaging>
-  <version>1.0</version>
+  <version>2.1</version>
   <name>Bulkeditor Bundle</name>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorBulkeditorBundle</url>
   <dependencies>
diff --git a/taxeditor-editor/META-INF/MANIFEST.MF b/taxeditor-editor/META-INF/MANIFEST.MF
index 16086fb37..1c8351e0d 100644
--- a/taxeditor-editor/META-INF/MANIFEST.MF
+++ b/taxeditor-editor/META-INF/MANIFEST.MF
@@ -9,12 +9,14 @@ Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: eu.etaxonomy.taxeditor.editor,
  eu.etaxonomy.taxeditor.editor.descriptiontree,
+ eu.etaxonomy.taxeditor.editor.descriptiontree.detailpage,
  eu.etaxonomy.taxeditor.editor.descriptiontree.handler,
  eu.etaxonomy.taxeditor.editor.handler,
  eu.etaxonomy.taxeditor.editor.internal,
  eu.etaxonomy.taxeditor.editor.name,
  eu.etaxonomy.taxeditor.editor.name.handler,
  eu.etaxonomy.taxeditor.editor.reference,
+ eu.etaxonomy.taxeditor.forms,
  eu.etaxonomy.taxeditor.propertysheet,
  eu.etaxonomy.taxeditor.propertysheet.authors,
  eu.etaxonomy.taxeditor.propertysheet.name,
@@ -37,8 +39,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",
  org.eclipse.ui.forms;bundle-version="3.3.101",
  org.eclipse.jface.text;bundle-version="3.4.1",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.4.2",
- eu.etaxonomy.taxeditor.store;bundle-version="1.0.0",
+ eu.etaxonomy.taxeditor.store;bundle-version="2.1.0",
  org.eclipse.ui.navigator;bundle-version="3.3.102",
- eu.etaxonomy.cdmlib;bundle-version="2.1.0"
+ eu.etaxonomy.cdmlib;bundle-version="2.3.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/taxeditor-editor/pom.xml b/taxeditor-editor/pom.xml
index 715674e93..ad6e84c0b 100644
--- a/taxeditor-editor/pom.xml
+++ b/taxeditor-editor/pom.xml
@@ -4,14 +4,14 @@
   <parent>
 	<groupId>eu.etaxonomy</groupId>
 	<artifactId>taxeditor-parent</artifactId>
-	<version>1.0</version>
+	<version>2.1</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-editor</artifactId>
   <packaging>jar</packaging>
-  <version>1.0</version>
+  <version>2.1</version>
   <name>Editor Bundle</name>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
   
diff --git a/taxeditor-feature-dependencies/feature.xml b/taxeditor-feature-dependencies/feature.xml
index 72b2967bd..9d4a3471f 100644
--- a/taxeditor-feature-dependencies/feature.xml
+++ b/taxeditor-feature-dependencies/feature.xml
@@ -79,6 +79,7 @@
    <plugin
          id="org.eclipse.core.filesystem.macosx"
          os="macosx"
+         arch="x86,x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -180,6 +181,7 @@
    <plugin
          id="org.eclipse.equinox.security.macosx"
          os="macosx"
+         arch="x86,x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -459,6 +461,7 @@
          id="org.eclipse.equinox.launcher.cocoa.macosx"
          os="macosx"
          ws="cocoa"
+         arch="x86,x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -478,6 +481,7 @@
          id="org.eclipse.swt.cocoa.macosx"
          os="macosx"
          ws="cocoa"
+         arch="x86,x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredReferenceSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredReferenceSelectionDialog.java
index 7c47220da..409b50fba 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredReferenceSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredReferenceSelectionDialog.java
@@ -32,7 +32,6 @@ import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 
-import eu.etaxonomy.cdm.model.reference.IReferenceBase;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.taxeditor.dialogs.NewReferenceInputDialog;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-- 
2.34.1