editor version 2.0.0.v20090805-1724

diff --git a/.gitattributes b/.gitattributes
index 238cb10eb7fba27f1986285f546a5f37de511ff9..f5c20cba44b8cc3e5f8f85b3d98bf0bc264600e3 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1161,7 +1161,6 @@ taxeditor-store/src/test/resources/log4j.properties -text
 taxeditor-store/src/test/resources/unitils.properties -text
 taxeditor-updateSite/.project -text
 taxeditor-updateSite/index.html -text
-taxeditor-updateSite/logs.zip -text
 taxeditor-updateSite/site.xml -text
 taxeditor-updateSite/web/site.css -text
 taxeditor-updateSite/web/site.xsl -text

diff --git a/.gitignore b/.gitignore
index 3f72f20ed4507cac692bfab76fcf5037719aacca..1bbeb4147758c48473beea591287a99c188fae50 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,7 @@ taxeditor-navigation/target
 taxeditor-store/.classpath
 taxeditor-store/.project
 taxeditor-store/target
+taxeditor-updateSite/artifacts.xml
+taxeditor-updateSite/content.xml
 taxeditor-updateSite/features/*.jar
 taxeditor-updateSite/plugins/*.jar

diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index d24ad0c2ea6f5502c5faa47436317033a44050aa..aee489870cc666bfd420e676f0165a8e38f62c75 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.v20090708-1713\r
+Bundle-Version: 2.0.0.v20090805-1724\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 62b8a32dc296218a5536040ce3910253127a049e..66da9621783d62e1a9e55ed56f74381383763999 100644 (file)
--- a/taxeditor-application/TaxEditor.product
+++ b/taxeditor-application/TaxEditor.product
@@ -1,88 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?pde version="3.4"?>\r
-\r
-<product name="%productName" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="2.0.0.v20090701-1323" useFeatures="true">\r
-\r
-   <aboutInfo>\r
-      <text>\r
-         %productBlurb\r
-      </text>\r
-   </aboutInfo>\r
-\r
-   <configIni use="default">\r
-   </configIni>\r
-\r
-   <launcherArgs>\r
-      <vmArgs>-Xmx256M</vmArgs>\r
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
-   </launcherArgs>\r
-\r
-   <windowImages i16="/taxeditor-application/icons/256color_16x16.gif" i32="/taxeditor-application/icons/256color_32x32.gif" i48="/taxeditor-application/icons/256color_48x48.gif"/>\r
-\r
-   <splash\r
-      startupProgressRect="5,447,366,15"\r
-      startupMessageRect="7,432,360,20"\r
-      startupForegroundColor="000000" />\r
-   <launcher name="TaxonomicEditor">\r
-      <solaris/>\r
-      <win useIco="false">\r
-         <bmp/>\r
-      </win>\r
-   </launcher>\r
-\r
-   <vm>\r
-   </vm>\r
-\r
-   <plugins>\r
-      <plugin id="com.ibm.icu"/>\r
-      <plugin id="eu.etaxonomy.cdmLibrary"/>\r
-      <plugin id="eu.etaxonomy.taxeditor.application"/>\r
-      <plugin id="eu.etaxonomy.taxeditor.editor"/>\r
-      <plugin id="eu.etaxonomy.taxeditor.navigation"/>\r
-      <plugin id="eu.etaxonomy.taxeditor.store"/>\r
-      <plugin id="org.eclipse.core.commands"/>\r
-      <plugin id="org.eclipse.core.contenttype"/>\r
-      <plugin id="org.eclipse.core.databinding"/>\r
-      <plugin id="org.eclipse.core.databinding.beans"/>\r
-      <plugin id="org.eclipse.core.expressions"/>\r
-      <plugin id="org.eclipse.core.filebuffers"/>\r
-      <plugin id="org.eclipse.core.filesystem"/>\r
-      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.core.jobs"/>\r
-      <plugin id="org.eclipse.core.resources"/>\r
-      <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>\r
-      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.core.runtime"/>\r
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>\r
-      <plugin id="org.eclipse.equinox.app"/>\r
-      <plugin id="org.eclipse.equinox.common"/>\r
-      <plugin id="org.eclipse.equinox.preferences"/>\r
-      <plugin id="org.eclipse.equinox.registry"/>\r
-      <plugin id="org.eclipse.help"/>\r
-      <plugin id="org.eclipse.jface"/>\r
-      <plugin id="org.eclipse.jface.databinding"/>\r
-      <plugin id="org.eclipse.jface.text"/>\r
-      <plugin id="org.eclipse.osgi"/>\r
-      <plugin id="org.eclipse.pde.source"/>\r
-      <plugin id="org.eclipse.swt"/>\r
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.text"/>\r
-      <plugin id="org.eclipse.ui"/>\r
-      <plugin id="org.eclipse.ui.editors"/>\r
-      <plugin id="org.eclipse.ui.forms"/>\r
-      <plugin id="org.eclipse.ui.ide"/>\r
-      <plugin id="org.eclipse.ui.navigator"/>\r
-      <plugin id="org.eclipse.ui.navigator.resources"/>\r
-      <plugin id="org.eclipse.ui.views"/>\r
-      <plugin id="org.eclipse.ui.views.properties.tabbed"/>\r
-      <plugin id="org.eclipse.ui.win32" fragment="true"/>\r
-      <plugin id="org.eclipse.ui.workbench"/>\r
-      <plugin id="org.eclipse.ui.workbench.texteditor"/>\r
-      <plugin id="org.junit4"/>\r
-   </plugins>\r
-\r
-   <features>\r
-      <feature id="eu.etaxonomy.taxeditor" version="2.0.0.v20090701-1323"/>\r
-   </features>\r
-\r
-</product>\r
+<?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">
+
+   <aboutInfo>
+      <text>
+         %productBlurb
+      </text>
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <vmArgs>-Xmx256M</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="/taxeditor-application/icons/256color_16x16.gif" i32="/taxeditor-application/icons/256color_32x32.gif" i48="/taxeditor-application/icons/256color_48x48.gif"/>
+
+   <splash
+      startupProgressRect="5,447,366,15"
+      startupMessageRect="7,432,360,20"
+      startupForegroundColor="000000" />
+   <launcher name="TaxonomicEditor">
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+
+   <vm>
+   </vm>
+
+   <plugins>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="eu.etaxonomy.cdmLibrary"/>
+      <plugin id="eu.etaxonomy.taxeditor.application"/>
+      <plugin id="eu.etaxonomy.taxeditor.editor"/>
+      <plugin id="eu.etaxonomy.taxeditor.navigation"/>
+      <plugin id="eu.etaxonomy.taxeditor.store"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.beans"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.filebuffers"/>
+      <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.resources"/>
+      <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>
+      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.jface"/>
+      <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.jface.text"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.pde.source"/>
+      <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.text"/>
+      <plugin id="org.eclipse.ui"/>
+      <plugin id="org.eclipse.ui.editors"/>
+      <plugin id="org.eclipse.ui.forms"/>
+      <plugin id="org.eclipse.ui.ide"/>
+      <plugin id="org.eclipse.ui.navigator"/>
+      <plugin id="org.eclipse.ui.navigator.resources"/>
+      <plugin id="org.eclipse.ui.views"/>
+      <plugin id="org.eclipse.ui.views.properties.tabbed"/>
+      <plugin id="org.eclipse.ui.win32" fragment="true"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.eclipse.ui.workbench.texteditor"/>
+      <plugin id="org.junit4"/>
+   </plugins>
+
+   <features>
+      <feature id="eu.etaxonomy.taxeditor" version="2.0.0.v20090630-1147"/>
+   </features>
+
+</product>

diff --git a/taxeditor-bulkeditor/META-INF/MANIFEST.MF b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
index 69172d627169789de27017490a67d43ec32f6602..6975cbed96e1309fd542c75e221ec51ddf4dacf4 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.v20090630-1147
+Bundle-Version: 2.0.0.v20090805-1724
 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 47595dfd4e5ef48d46cfadaf0ec66eba3d8da8e0..c6c949f64c2ba7a9cc7f1fa52a1509206cb7d1fc 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.v20090708-1713
+Bundle-Version: 2.0.0.v20090805-1724
 Bundle-ClassPath: .,icons/
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CopyOfDistributionComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CopyOfDistributionComposite.java
index 704bf31756fa35044a30fcf0507d0e0fb461fbc4..e5eb3bba741c50bab90f6b8ee4e1ab591f26fc1e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CopyOfDistributionComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CopyOfDistributionComposite.java
@@ -49,16 +49,16 @@ public class CopyOfDistributionComposite extends DescriptionElementComposite {
        @Override\r
        protected void initTextViewer() {\r
                \r
-               Distribution distribution = (Distribution) getElement();\r
-               \r
-               NamedArea area = distribution.getArea();\r
-               PresenceAbsenceTermBase<?> status = distribution.getStatus();\r
-               \r
-               if (status != null) {\r
-                       String text = area.getLabel() + ", " + status.getLabel();\r
-                       setText(text);\r
-               }\r
-               \r
-               setEditable(false);\r
+//             Distribution distribution = (Distribution) getElement();\r
+//             \r
+//             NamedArea area = distribution.getArea();\r
+//             PresenceAbsenceTermBase<?> status = distribution.getStatus();\r
+//             \r
+//             if (status != null) {\r
+//                     String text = area.getLabel() + ", " + status.getLabel();\r
+//                     setText(text);\r
+//             }\r
+//             \r
+//             setEditable(false);\r
        }\r
 }
\ No newline at end of file

diff --git a/taxeditor-feature-dependencies/feature.xml b/taxeditor-feature-dependencies/feature.xml
index 87bf9427910b77f2d3d5428d8c13f2221c7aa30e..8c2d065b171fb578a316d00a86b6e8211cd055b9 100644 (file)
--- a/taxeditor-feature-dependencies/feature.xml
+++ b/taxeditor-feature-dependencies/feature.xml
@@ -1,452 +1,452 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<feature\r
-      id="eu.etaxonomy.taxeditor.feature.dependencies"\r
-      label="Taxeditor Dependencies"\r
-      version="2.0.0.v20090708-1713"\r
-      os="macosx,win32">\r
-\r
-   <description url="http://www.example.com/description">\r
-      [Enter Feature Description here.]\r
-   </description>\r
-\r
-   <copyright url="http://www.example.com/copyright">\r
-      [Enter Copyright Description here.]\r
-   </copyright>\r
-\r
-   <license url="http://www.example.com/license">\r
-      [Enter License Description here.]\r
-   </license>\r
-\r
-   <url>\r
-      <update label="EDIT Taxonomic Editor" url="http://wp5.e-taxonomy.eu/taxeditor/update"/>\r
-   </url>\r
-\r
-   <plugin\r
-         id="com.ibm.icu"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.8.1.v20080530"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="javax.servlet"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="2.5.0.v200806031605"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ant.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.0.v20080529"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.commands"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.I20080509-2000"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.contenttype"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.3.0.v20080604-1400"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.databinding"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.1.1.M20080827-0800b"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.databinding.beans"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.1.1.M20080827-0800a"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.expressions"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.1.r342_v20081203-0800"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filebuffers"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20080603-2000"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.2.0.v20080604-1400"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem.macosx"\r
-         os="macosx"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.0.0.v20080604-1400"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.jobs"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.1.R34x_v20081128"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.net"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.1.0.I20080604"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.resources"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.2.R34x_v20090126"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.resources.compatibility"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20080604-1400"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.runtime"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20080512"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.runtime.compatibility.auth"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.100.v20070502"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.runtime.compatibility.registry"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.200.v20080610"\r
-         fragment="true"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.variables"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.100.v20080529-1300"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.app"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.1.0.v20080421-2006"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.common"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20080421-2006"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.preferences"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.201.R34x_v20080709"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.registry"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20080516-0950"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.security"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.0.1.R34x_v20080721"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.security.macosx"\r
-         os="macosx"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.0.0.v20080602-2000"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.help"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.3.102.v20081014_34x"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jface"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.2.M20090107-0800"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jface.databinding"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.2.1.M20080827-0800a"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.jface.text"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.2.r342_v20081119-0800"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.osgi"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.3.R34x_v20081215-1030"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.osgi.services"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.1.200.v20071203"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.pde.source"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20080603"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.2.v3452b"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt.carbon.macosx"\r
-         os="macosx"\r
-         ws="carbon"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.1.v3452b"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.text"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20080605-1800"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.2.M20090204-0800"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.carbon"\r
-         os="macosx"\r
-         ws="carbon"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="4.0.0.I20080610-1200"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.editors"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20080603-2000"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.forms"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.3.103.v20081027_34x"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.ide"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.2.M20090127-1700"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.navigator"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.3.102.M20090127-1700"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.navigator.resources"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.3.101.M20080910-0800"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.views"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.3.1.M20081112-0800"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.views.properties.tabbed"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.2.M20090127-1700"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.workbench"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.2.M20090127-1700"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.workbench.texteditor"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.1.r341_v20080827-1100"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.update.configurator"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.201.R34x_v20080819"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.update.core"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.202.R34x_v20081128"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.update.ui"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.101.R34x_v20081128"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.junit4"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="4.3.1"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.update.core.win32"\r
-         os="win32"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.100.v20080107"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.filesystem.win32.x86"\r
-         os="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.1.0.v20080604-1400"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.net.win32.x86"\r
-         os="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.0.0.I20080521"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.core.resources.win32.x86"\r
-         os="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.0.v20071204"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.equinox.security.win32.x86"\r
-         os="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="1.0.0.v20080529-1600"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.swt.win32.win32.x86"\r
-         os="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.4.1.v3452b"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.eclipse.ui.win32"\r
-         os="win32"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="3.2.100.v20080408-0800"\r
-         fragment="true"\r
-         unpack="false"/>\r
-\r
-</feature>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="eu.etaxonomy.taxeditor.feature.dependencies"
+      label="Taxeditor Dependencies"
+      version="2.0.0.v20090805-1724"
+      os="macosx,win32">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <url>
+      <update label="EDIT Taxonomic Editor" url="http://wp5.e-taxonomy.eu/taxeditor/update"/>
+   </url>
+
+   <plugin
+         id="com.ibm.icu"
+         download-size="0"
+         install-size="0"
+         version="3.8.1.v20080530"
+         unpack="false"/>
+
+   <plugin
+         id="javax.servlet"
+         download-size="0"
+         install-size="0"
+         version="2.4.0.v200806031604"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ant.core"
+         download-size="0"
+         install-size="0"
+         version="3.2.0.v20080529"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.commands"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.I20080509-2000"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.contenttype"
+         download-size="0"
+         install-size="0"
+         version="3.3.0.v20080604-1400"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.databinding"
+         download-size="0"
+         install-size="0"
+         version="1.1.1.M20080827-0800b"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.databinding.beans"
+         download-size="0"
+         install-size="0"
+         version="1.1.1.M20080827-0800a"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.expressions"
+         download-size="0"
+         install-size="0"
+         version="3.4.1.r342_v20081203-0800"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filebuffers"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.v20080603-2000"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem"
+         download-size="0"
+         install-size="0"
+         version="1.2.0.v20080604-1400"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="1.0.0.v20080604-1400"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.jobs"
+         download-size="0"
+         install-size="0"
+         version="3.4.1.R34x_v20081128"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net"
+         download-size="0"
+         install-size="0"
+         version="1.1.0.I20080604"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.resources"
+         download-size="0"
+         install-size="0"
+         version="3.4.2.R34x_v20090126"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.resources.compatibility"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.v20080604-1400"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.v20080512"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime.compatibility.auth"
+         download-size="0"
+         install-size="0"
+         version="3.2.100.v20070502"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime.compatibility.registry"
+         download-size="0"
+         install-size="0"
+         version="3.2.200.v20080610"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.core.variables"
+         download-size="0"
+         install-size="0"
+         version="3.2.100.v20080529-1300"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.app"
+         download-size="0"
+         install-size="0"
+         version="1.1.0.v20080421-2006"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.common"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.v20080421-2006"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.preferences"
+         download-size="0"
+         install-size="0"
+         version="3.2.201.R34x_v20080709"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.registry"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.v20080516-0950"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security"
+         download-size="0"
+         install-size="0"
+         version="1.0.1.R34x_v20080721"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="1.0.0.v20080602-2000"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.help"
+         download-size="0"
+         install-size="0"
+         version="3.3.102.v20081014_34x"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jface"
+         download-size="0"
+         install-size="0"
+         version="3.4.2.M20090107-0800"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jface.databinding"
+         download-size="0"
+         install-size="0"
+         version="1.2.1.M20080827-0800a"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jface.text"
+         download-size="0"
+         install-size="0"
+         version="3.4.2.r342_v20081119-0800"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi"
+         download-size="0"
+         install-size="0"
+         version="3.4.3.R34x_v20081215-1030"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.services"
+         download-size="0"
+         install-size="0"
+         version="3.1.200.v20071203"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.pde.source"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.v20080603"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt"
+         download-size="0"
+         install-size="0"
+         version="3.4.2.v3452b"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.carbon.macosx"
+         os="macosx"
+         ws="carbon"
+         download-size="0"
+         install-size="0"
+         version="3.4.1.v3452b"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.text"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.v20080605-1800"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui"
+         download-size="0"
+         install-size="0"
+         version="3.4.2.M20090204-0800"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.carbon"
+         os="macosx"
+         ws="carbon"
+         download-size="0"
+         install-size="0"
+         version="4.0.0.I20080610-1200"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.editors"
+         download-size="0"
+         install-size="0"
+         version="3.4.0.v20080603-2000"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.forms"
+         download-size="0"
+         install-size="0"
+         version="3.3.103.v20081027_34x"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.ide"
+         download-size="0"
+         install-size="0"
+         version="3.4.2.M20090127-1700"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.navigator"
+         download-size="0"
+         install-size="0"
+         version="3.3.102.M20090127-1700"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.navigator.resources"
+         download-size="0"
+         install-size="0"
+         version="3.3.101.M20080910-0800"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.views"
+         download-size="0"
+         install-size="0"
+         version="3.3.1.M20081112-0800"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.views.properties.tabbed"
+         download-size="0"
+         install-size="0"
+         version="3.4.2.M20090127-1700"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.workbench"
+         download-size="0"
+         install-size="0"
+         version="3.4.2.M20090127-1700"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.workbench.texteditor"
+         download-size="0"
+         install-size="0"
+         version="3.4.1.r341_v20080827-1100"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.configurator"
+         download-size="0"
+         install-size="0"
+         version="3.2.201.R34x_v20080819"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.core"
+         download-size="0"
+         install-size="0"
+         version="3.2.202.R34x_v20081128"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.ui"
+         download-size="0"
+         install-size="0"
+         version="3.2.101.R34x_v20081128"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit4"
+         download-size="0"
+         install-size="0"
+         version="4.3.1"/>
+
+   <plugin
+         id="org.eclipse.update.core.win32"
+         os="win32"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.win32.x86"
+         os="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net.win32.x86"
+         os="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.resources.win32.x86"
+         os="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.win32.x86"
+         os="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.win32.win32.x86"
+         os="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.win32"
+         os="win32"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>

diff --git a/taxeditor-feature/feature.xml b/taxeditor-feature/feature.xml
index 6102172f6041944c077714d560aabace2e442d01..a5b5909800e41752487023298865714eb60a8e9b 100644 (file)
--- a/taxeditor-feature/feature.xml
+++ b/taxeditor-feature/feature.xml
@@ -1,60 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<feature\r
-      id="eu.etaxonomy.taxeditor"\r
-      label="Taxeditor Feature"\r
-      version="2.0.0.v20090708-1713"\r
-      provider-name="EDIT">\r
-\r
-   <description url="http://www.example.com/description">\r
-      [Enter Feature Description here.]\r
-   </description>\r
-\r
-   <copyright url="http://www.example.com/copyright">\r
-      [Enter Copyright Description here.]\r
-   </copyright>\r
-\r
-   <license url="http://www.example.com/license">\r
-      [Enter License Description here.]\r
-   </license>\r
-\r
-   <url>\r
-      <update label="EDIT Taxonomic Editor" url="http://wp5.e-taxonomy.eu/taxeditor/update"/>\r
-   </url>\r
-\r
-   <includes\r
-         id="eu.etaxonomy.taxeditor.feature.dependencies"\r
-         version="0.0.0"/>\r
-\r
-   <includes\r
-         id="eu.etaxonomy.cdmLibrary"\r
-         version="0.0.0"/>\r
-\r
-   <plugin\r
-         id="eu.etaxonomy.taxeditor.application"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="2.0.0.v20090708-1713"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="eu.etaxonomy.taxeditor.editor"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="2.0.0.v20090708-1713"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="eu.etaxonomy.taxeditor.navigation"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="2.0.0.v20090708-1713"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="eu.etaxonomy.taxeditor.store"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="2.0.0.v20090708-1713"\r
-         unpack="false"/>\r
-\r
-</feature>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="eu.etaxonomy.taxeditor"
+      label="Taxeditor Feature"
+      version="2.0.0.v20090805-1724"
+      provider-name="EDIT">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <url>
+      <update label="EDIT Taxonomic Editor" url="http://wp5.e-taxonomy.eu/taxeditor/update"/>
+   </url>
+
+   <includes
+         id="eu.etaxonomy.taxeditor.feature.dependencies"
+         version="0.0.0"/>
+
+   <includes
+         id="eu.etaxonomy.cdmLibrary"
+         version="0.0.0"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.application"
+         download-size="0"
+         install-size="0"
+         version="2.0.0.v20090805-1724"
+         unpack="false"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.editor"
+         download-size="0"
+         install-size="0"
+         version="2.0.0.v20090805-1724"
+         unpack="false"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.navigation"
+         download-size="0"
+         install-size="0"
+         version="2.0.0.v20090805-1724"
+         unpack="false"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.store"
+         download-size="0"
+         install-size="0"
+         version="2.0.0.v20090805-1724"
+         unpack="false"/>
+
+   <plugin
+         id="eu.etaxonomy.taxeditor.bulkeditor"
+         download-size="0"
+         install-size="0"
+         version="2.0.0.v20090805-1724"
+         unpack="false"/>
+
+</feature>

diff --git a/taxeditor-navigation/META-INF/MANIFEST.MF b/taxeditor-navigation/META-INF/MANIFEST.MF
index 97bdb0e7ebde353d356f42278e7193baebb5e859..6e591f24a77dbe7050ed732fd9597562e1d7d11f 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.v20090708-1713
+Bundle-Version: 2.0.0.v20090805-1724
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.navigation,

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index 9a06bff562c876b99a0c319e9c1693adba9eb0d8..a7d1137d42b4928b2cd34c50069603e2069619d6 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -28,8 +28,6 @@ import org.eclipse.ui.navigator.CommonNavigator;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;\r
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r
 import eu.etaxonomy.taxeditor.model.DataChangeBridge;\r
 import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;\r
@@ -190,8 +188,9 @@ public class TaxonNavigator extends CommonNavigator implements IConversationEnab
         */\r
        @Override\r
        public void dispose() {\r
+               conversation.commit();\r
                conversation.unregisterForDataStoreChanges(this);\r
-\r
+               \r
                super.dispose();\r
        }\r
 }
\ No newline at end of file

diff --git a/taxeditor-updateSite/logs.zip b/taxeditor-updateSite/logs.zip
deleted file mode 100644 (file)
index 6426476..0000000
Binary files a/taxeditor-updateSite/logs.zip and /dev/null differ

diff --git a/taxeditor-updateSite/site.xml b/taxeditor-updateSite/site.xml
index 2107528e4fd3b21733f977a0f6a529ddaff20f72..c079168f062e06c5f8fd1e7c16a70c9c40757f58 100644 (file)
--- a/taxeditor-updateSite/site.xml
+++ b/taxeditor-updateSite/site.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/eu.etaxonomy.taxeditor_2.0.0.v200900805-1653.jar" id="eu.etaxonomy.taxeditor" version="2.0.0.v200900805-1653">
-      <category name="Taxonomic Editor"/>
-   </feature>
    <feature url="features/eu.etaxonomy.cdmLibrary_2.1.0.v20090708-1900.jar" id="eu.etaxonomy.cdmLibrary" version="2.1.0.v20090708-1900">
       <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">
+      <category name="Taxonomic Editor"/>
+   </feature>
    <category-def name="Taxonomic Editor" label="Taxonomic Editor"/>
    <category-def name="Cdm Library" label="Cdm Library"/>
 </site>