Enabled keyboard navigation in editor pages and uploaded a new feature.

diff --git a/.gitattributes b/.gitattributes
index 6e47f01fd32135c0dd71b39f48541da64846ad57..8d19291de45e00e36bcf965e3dbf8e03d1397eca 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -687,6 +687,9 @@ taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/handler
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/handler/DeleteDescriptionElementHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/CreateChildTaxonHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditNewTaxonHandler.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/NextMemberHandler.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/PreviousMemberHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveTaxonHandler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/ShowPropertySheetHandler.java -text
@@ -747,6 +750,7 @@ taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPr
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CompletionProcessor.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/EditorPropertySheetEntry.java -text
+taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/ICdmBasePropertySource.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/MarkersPropertySource.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/SourceViewerConfig.java -text

diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index d1ed6646974219c50d965e624964835f7296e41a..c68bc2b70ae7e56862060af88b75df3bc3070648 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
 Bundle-Name: EDIT Taxonomic Editor
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 2.0.0.v200906021612
+Bundle-Version: 2.0.0.v20090603_1756
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin

diff --git a/taxeditor-application/plugin.xml b/taxeditor-application/plugin.xml
index 84e51a5ec0eb4810a9e5eaff57c569efd2caf98b..4804b90f8d97497d61e4dd71df2d1215b3bc19cb 100644 (file)
--- a/taxeditor-application/plugin.xml
+++ b/taxeditor-application/plugin.xml
@@ -112,6 +112,13 @@
             </command>
          </menu>
       </menuContribution>
+      <menuContribution
+            locationURI="menu:org.eclipse.ui.main.menu">
+         <menu
+               id="org.eclipse.ui.main.menu.navigate"
+               label="Navigate">
+         </menu>
+      </menuContribution>
       <menuContribution
             locationURI="menu:org.eclipse.ui.main.menu">
          <menu

diff --git a/taxeditor-editor/META-INF/MANIFEST.MF b/taxeditor-editor/META-INF/MANIFEST.MF
index 015c05e369d02109af2685cb583d9bd857fd5b22..8eeb145b05c4d37f2fe104a40f013038c40d6ae7 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.v200906021612
+Bundle-Version: 2.0.0.v20090603_1756
 Bundle-ClassPath: .,icons/
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0

diff --git a/taxeditor-editor/plugin.xml b/taxeditor-editor/plugin.xml
index f04831350e8739d9fe9b63b0ba50cf9f7be82d66..7d7737631854bfad0711d52f676c96b005753205 100644 (file)
--- a/taxeditor-editor/plugin.xml
+++ b/taxeditor-editor/plugin.xml
@@ -20,6 +20,12 @@
    </extension-->
    <extension
          point="org.eclipse.ui.editors">
+      <editor
+           class="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor"
+           icon="icons/edit_16x16.gif"
+           id="eu.etaxonomy.taxeditor.editor.multipagetaxonview"
+           name="Multitabbed Taxon Editor">
+         </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor"
             default="false"
@@ -454,6 +460,32 @@
                style="push">
          </command>
       </menuContribution>
+      <menuContribution
+            locationURI="menu:org.eclipse.ui.main.menu.navigate">
+         <menu
+               id="menu:org.eclipse.ui.main.menu.navigate.goto"
+               label="Go To">
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.command.previousMember"
+                  label="Previous Member"
+                  style="push">
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.command.nextMember"
+                  label="Next Member"
+                  style="push">
+            </command>
+         </menu>
+         <separator
+               name="taxeditor-editor.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.command.openParent"
+               label="Open Parent"
+               style="push">
+         </command>
+      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
@@ -586,6 +618,17 @@
             </not>
          </with>
       </definition>
+      <definition
+            id="isCdmObject">
+         <with
+               variable="activeMenuSelection">
+            <iterate>
+               <instanceof
+                     value="eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource">
+               </instanceof>
+            </iterate>
+         </with>
+      </definition>
    </extension>
    <extension
          name="Name Commands"
@@ -710,6 +753,24 @@
             name="Show Property Sheet">
       </command>
    </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.PreviousMemberHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.previousMember"
+            name="Previous Member">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.NextMemberHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.nextMember"
+            name="Next Member">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenParentHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.openParent"
+            name="Open Parent">
+      </command>
+   </extension>
    <extension
          point="org.eclipse.ui.elementFactories">
       <factory
@@ -734,4 +795,24 @@
          </view>
       </perspectiveExtension>
    </extension>
+   <extension
+         point="org.eclipse.ui.bindings">   
+      <key
+            commandId="eu.etaxonomy.taxeditor.editor.command.nextMember"
+            contextId="org.eclipse.ui.contexts.window"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M2+M3+ARROW_DOWN">
+      </key>
+      <key
+            commandId="eu.etaxonomy.taxeditor.editor.command.previousMember"
+            contextId="org.eclipse.ui.contexts.window"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M2+M3+ARROW_UP">
+      </key>
+      <scheme
+            description="The default key binding scheme for the Taxonomic Editor"
+            id="eu.etaxonomy.taxeditor.bindings.scheme.default"
+            name="Taxonomic Editor Default Key Bindings">
+      </scheme>
+   </extension>
 </plugin>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
index 671e19c2dc8ac3e8798b05f7aef72da2e093e02e..44b0f8a70c28f6f2390a0a70d42891f920348774 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
@@ -9,7 +9,9 @@
 \r
 package eu.etaxonomy.taxeditor.editor;\r
 \r
+import java.util.ArrayList;\r
 import java.util.HashSet;\r
+import java.util.List;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -287,8 +289,8 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
                } else {\r
                        selectedData = selection;\r
                        \r
-                       for (Composite composite : getAllComposites()) {\r
-                               if (composite instanceof GroupedComposite && selectedData.equals(composite.getData())) {\r
+                       for (GroupedComposite composite : getGroupedComposites()) {\r
+                               if (selectedData.equals(composite.getData())) {\r
                                        setSelection((GroupedComposite) composite);\r
                                        ((GroupedComposite) composite).drawBorder();\r
                                        ((GroupedComposite) composite).setSelected();\r
@@ -301,26 +303,61 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
                objectAffectedByLastOperation = null;\r
        }\r
        \r
-       protected HashSet<Composite> getAllComposites(){\r
-               HashSet<Composite> composites = new HashSet<Composite>();\r
-               composites.add(parent);\r
-               composites.addAll(getComposites(parent));\r
-               return composites;\r
+       /**\r
+        * This method returns all <code>GroupedComposite</code> controls currently attached to this editor.\r
+        * \r
+        * @return a <code>List</code> of <code>GroupedComposite</code> controls.\r
+        */\r
+       public List<GroupedComposite> getGroupedComposites(){\r
+               return getGroupedCompositesRecursively(scrolledForm.getBody(), new ArrayList<GroupedComposite>());\r
        }\r
+\r
        \r
-       public void setInput(IEditorInput input){\r
-               this.setInputWithNotify(input);         \r
+       /**\r
+        * Recursively traverse the composite hierarchy and collect all <code>GroupedComposite</code> controls.\r
+        * \r
+        * @param composite the composite to start recursing from\r
+        * @param groupedComposites a <code>List</code> the found composites are stored in \r
+        * @return a <code>List</code> containing all found <code>GroupedComposite</code> controls\r
+        */\r
+       private List<GroupedComposite> getGroupedCompositesRecursively(Composite composite, List<GroupedComposite> groupedComposites){\r
+               for(Control child : composite.getChildren()){\r
+                       if(child instanceof GroupedComposite){\r
+                               groupedComposites.add((GroupedComposite) child);\r
+                       }else if(child instanceof Composite){\r
+                               getGroupedCompositesRecursively((Composite) child, groupedComposites);\r
+                       }\r
+               }\r
+               return groupedComposites;\r
+       }\r
+       \r
+       /**\r
+        * @return\r
+        */\r
+       public List<GroupComposite> getGroupComposites() {\r
+               return getGroupCompositesRecursively(scrolledForm.getBody(), new ArrayList<GroupComposite>());\r
        }\r
        \r
-       private HashSet<Composite> getComposites(Composite composite){\r
-               HashSet<Composite> composites = new HashSet<Composite>();\r
+       /**\r
+        * Recursively traverse the composite hierarchy and collect all <code>GroupComposite</code> controls.\r
+        * \r
+        * @param composite the composite to start recursing from\r
+        * @param groupComposites a <code>List</code> the found composites are stored in \r
+        * @return a <code>List</code> containing all found <code>GroupComposite</code> controls\r
+        */\r
+       private List<GroupComposite> getGroupCompositesRecursively(Composite composite, List<GroupComposite> groupComposites){\r
                for(Control child : composite.getChildren()){\r
-                       if(child instanceof Composite){\r
-                               composites.add((Composite)child);\r
-                               composites.addAll(getComposites((Composite)child));\r
+                       if(child instanceof GroupComposite){\r
+                               groupComposites.add((GroupComposite) child);\r
+                       }else if(child instanceof Composite){\r
+                               getGroupCompositesRecursively((Composite) child, groupComposites);\r
                        }\r
-               } \r
-               return composites;\r
+               }\r
+               return groupComposites;\r
+       }\r
+       \r
+       public void setInput(IEditorInput input){\r
+               this.setInputWithNotify(input);         \r
        }\r
        \r
        /*\r
@@ -458,4 +495,38 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
                return control;\r
         }\r
        }\r
+       \r
+       /**\r
+        * \r
+        */\r
+       public void navigateToNextMember() {\r
+               try{\r
+                       List<GroupedComposite> composites = getGroupedCompositesRecursively(scrolledForm.getBody(), new ArrayList<GroupedComposite>());\r
+                       \r
+                       for(int i = 0; i < composites.size(); i++){\r
+                               if(selectedData == composites.get(i).getData()){\r
+                                       selectedData = composites.get(i+1).getData();\r
+                                       break;\r
+                               }\r
+                       }\r
+                       setFocus();\r
+               }catch(IndexOutOfBoundsException e){}\r
+       }\r
+       \r
+       /**\r
+        * \r
+        */\r
+       public void navigateToPreviousMember() {\r
+               try{\r
+                       List<GroupedComposite> composites = getGroupedCompositesRecursively(scrolledForm.getBody(), new ArrayList<GroupedComposite>());\r
+                       \r
+                       for(int i = 0; i < composites.size(); i++){\r
+                               if(selectedData == composites.get(i).getData()){\r
+                                       selectedData = composites.get(i-1).getData();\r
+                                       break;\r
+                               }\r
+                       }\r
+                       setFocus();\r
+               }catch(IndexOutOfBoundsException e){}\r
+       }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
index fc4a64a2302997d558c1f5a7866c9f65f68b1242..973e897aa1c60b87958b40e83ffcd5a4231a806b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
@@ -14,6 +14,7 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.forms.widgets.FormToolkit;\r
 \r
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
 import eu.etaxonomy.cdm.model.description.Distribution;\r
@@ -188,7 +189,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
                        DescriptionElementBase element) {\r
 \r
                // Get the element's feature\r
-               Feature feature = element.getFeature();\r
+               Feature feature = HibernateProxyHelper.deproxy(element.getFeature(), Feature.class);\r
                Assert.isNotNull(feature, "Element does not have a feature.");\r
                                                        \r
                // If the feature doesn't yet have a composite, create one\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java
index cbeb9850e8bebebbf8de61c8d39e47eb36497cf3..94119365cd01ea72f64728cf294dd2fb4111a7c6 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java
@@ -15,6 +15,7 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.taxeditor.editor.GroupComposite;\r
+import eu.etaxonomy.taxeditor.editor.GroupCompositeLabel;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -38,6 +39,8 @@ public class DescriptionFeatureGroupComposite extends GroupComposite {
                tlLayout.topMargin = 0;\r
                tlLayout.leftMargin = 10;\r
                setLayout(tlLayout);\r
+               \r
+               new GroupCompositeLabel(this, feature.getLabel());\r
        }\r
        \r
        public TaxonDescription getDescription() {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
index 1b74f7b236828342f6ea05b6510317b6d31ddd57..231af1c508caed07b8575dc1fd7e370bffd2c3f9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
@@ -160,7 +160,7 @@ public class TaxonDescriptionEditor extends AbstractTaxonEditor
        \r
        \r
        public Composite getDescriptionElement(DescriptionElementBase element) {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof DescriptionElementComposite){\r
                                if (element.equals \r
                                                (((DescriptionElementComposite) c).getElement())) {\r
@@ -174,7 +174,7 @@ public class TaxonDescriptionEditor extends AbstractTaxonEditor
        \r
        public Composite getDescriptionFeatureGroup(TaxonDescription description,\r
                        Feature feature) {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupComposites()){\r
                        if(c instanceof DescriptionFeatureGroupComposite){\r
                                if (description.equals(((DescriptionFeatureGroupComposite) c).getDescription()) &&\r
                                                feature.equals(((DescriptionFeatureGroupComposite) c).getFeature())) {\r
@@ -187,7 +187,7 @@ public class TaxonDescriptionEditor extends AbstractTaxonEditor
 \r
        \r
        public Composite getDescriptionGroup(TaxonDescription description) {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupComposites()){\r
                        if(c instanceof DescriptionGroupComposite){\r
                                if (description.equals \r
                                                (((DescriptionGroupComposite) c).getDescription())) {\r
@@ -198,9 +198,8 @@ public class TaxonDescriptionEditor extends AbstractTaxonEditor
                return null;\r
        }\r
 \r
-       \r
        public Composite getDescriptionLabel(TaxonDescription description) {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof DescriptionLabelComposite){\r
                                if (description.equals \r
                                                (((DescriptionLabelComposite) c).getDescription())) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/NextMemberHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/NextMemberHandler.java
new file mode 100644 (file)
index 0000000..66dcb82
--- /dev/null
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/NextMemberHandler.java
@@ -0,0 +1,32 @@
+/*
+ * 
+ */
+package eu.etaxonomy.taxeditor.editor.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+
+import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
+
+/**
+ * 
+ * @author n.hoffmann
+ * @created 03.06.2009
+ * @version 1.0
+ */
+public class NextMemberHandler extends AbstractHandler implements IHandler {
+
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+               MultiPageTaxonEditor editor = EditorUtil.getActiveEditor();
+               
+               AbstractTaxonEditor editorPage = editor.getActiveEditorPage();
+               
+               editorPage.navigateToNextMember();
+               
+               return null;
+       }
+}

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java
new file mode 100644 (file)
index 0000000..8622f00
--- /dev/null
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java
@@ -0,0 +1,45 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.editor.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.ui.PartInitException;
+
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+
+/**
+ * @author n.hoffmann
+ * @created 03.06.2009
+ * @version 1.0
+ */
+public class OpenParentHandler extends AbstractHandler implements IHandler {
+
+       /* (non-Javadoc)
+        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+        */
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+               Taxon parent = EditorUtil.getActiveEditor().getTaxon().getTaxonomicParent();
+               
+               if(parent != null){
+                       try {
+                               EditorUtil.open(parent.getUuid());
+                       } catch (PartInitException e) {
+                               throw new RuntimeException("Error opening parent taxon", e);
+                       }
+               }
+               
+               return null;
+       }
+}

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/PreviousMemberHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/PreviousMemberHandler.java
new file mode 100644 (file)
index 0000000..b35c5b8
--- /dev/null
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/PreviousMemberHandler.java
@@ -0,0 +1,41 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.editor.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+
+import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
+
+/**
+ * @author n.hoffmann
+ * @created 03.06.2009
+ * @version 1.0
+ */
+public class PreviousMemberHandler extends AbstractHandler implements IHandler {
+
+       /* (non-Javadoc)
+        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+        */
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+               MultiPageTaxonEditor editor = EditorUtil.getActiveEditor();
+               
+               AbstractTaxonEditor editorPage = editor.getActiveEditorPage();
+               
+               editorPage.navigateToPreviousMember();
+               
+               return null;
+       }
+}

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java
index 750b625ab6837ea58dc584e02178f5655eb1da11..3facda2d10a67b32cb6a117672c4d15b813b2a2a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java
@@ -104,7 +104,7 @@ public class TaxonImageEditor extends AbstractTaxonEditor {
         * @return\r
         */\r
        public GroupComposite getImageGroup() {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof ImagesGroupComposite){\r
                                return (GroupComposite) c;\r
                        }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java
index 082b736d26fac458ad7c13717fe1a7d4ed36df95..98f0b61338145a906e70022b86f57a6cfb25315e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java
@@ -10,9 +10,8 @@
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r
-import org.eclipse.ui.views.properties.IPropertySource;\r
-\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.name.SynonymPropertySource;\r
 \r
 /**\r
@@ -21,7 +20,7 @@ import eu.etaxonomy.taxeditor.propertysheet.name.SynonymPropertySource;
  * @version 1.0\r
  */\r
 public class BasionymSynonymPropertySource extends SynonymPropertySource\r
-               implements IPropertySource {\r
+               implements ICdmBasePropertySource {\r
        /**\r
         * @param synonym\r
         */\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
index 495d004bf15a63357e92c6724c77549e4e4e4a63..f9d56800ad96f6d32bc086e6f12f3f90f2feac5e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
@@ -187,7 +187,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
                \r
        \r
        public Composite getAcceptedName() {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof AcceptedNameComposite){\r
                                return c;\r
                        }\r
@@ -197,7 +197,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 \r
        \r
        public Composite getHomotypicGroup(HomotypicalGroup group) {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof HomotypicalGroupComposite){\r
                                if (group.equals(\r
                                                ((HomotypicalGroupComposite) c).getGroup())) {\r
@@ -210,7 +210,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 \r
        \r
        public Composite getMisappliedGroup() {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof MisappliedGroupComposite){\r
                                return c;\r
                        }\r
@@ -220,7 +220,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 \r
        \r
        public Composite getMisappliedName(Taxon misappliedName) {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof MisappliedNameComposite){\r
                                if (misappliedName.equals(\r
                                                ((MisappliedNameComposite) c).getMisappliedName())) {\r
@@ -233,7 +233,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 \r
        \r
        public Composite getSynonym(Synonym synonym) {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof SynonymComposite){\r
                                if (synonym.equals \r
                                                (((SynonymComposite) c).getSynonym())) {\r
@@ -246,7 +246,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 \r
        \r
        public Composite getConceptGroup() {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof ConceptGroupComposite){\r
                                return c;\r
                        }\r
@@ -256,7 +256,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 \r
        \r
        public Composite getConcept(Taxon relatedConcept) {\r
-               for(Composite c : getAllComposites()){\r
+               for(Composite c : getGroupedComposites()){\r
                        if(c instanceof ConceptComposite){\r
                                if (relatedConcept.equals \r
                                                (((ConceptComposite) c).getRelatedTaxon())) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java
index 333b95e0ae4571d885ef9351987e735e67b4376d..03cadac40b7469058f864d2b7e05a65ecf07e3f9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
-import org.eclipse.ui.views.properties.IPropertySource;\r
-\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 \r
 /**\r
@@ -18,7 +16,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @created 09.02.2009\r
  * @version 1.0\r
  */\r
-abstract public class AbstractEditorPropertySheet implements IPropertySource {\r
+abstract public class AbstractEditorPropertySheet implements ICdmBasePropertySource {\r
 \r
        /** \r
         * A reference to the taxon the concrete operation is working on \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java
index 91489b3600214d99b5f051ec54c9c7be0e3cd600..697570d49f1e098d4f7ae381c96969b0f6d577f9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java
@@ -4,7 +4,6 @@ import java.util.Collection;
 import java.util.Vector;\r
 \r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 /**\r
@@ -12,7 +11,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
  * @created 08.05.2008\r
  * @version 1.0\r
  */\r
-abstract public class CollectionPropertySource implements IPropertySource {\r
+abstract public class CollectionPropertySource implements ICdmBasePropertySource {\r
 \r
        protected Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r
        protected Collection<?> collection;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/ICdmBasePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/ICdmBasePropertySource.java
new file mode 100644 (file)
index 0000000..56599da
--- /dev/null
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/ICdmBasePropertySource.java
@@ -0,0 +1,24 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.propertysheet;
+
+import org.eclipse.ui.views.properties.IPropertySource;
+
+/**
+ * This interface was introduced to narrow the typification of a property source 
+ * down to CDM related objects.
+ * 
+ * @author n.hoffmann
+ * @created 03.06.2009
+ * @version 1.0
+ */
+public interface ICdmBasePropertySource extends IPropertySource{
+}

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java
index 2b300129aa0f0c2cafbf89bac28724ae4f71dc11..fc82508fe2ec3adac5e499e21746b1ba6105e1ad 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java
@@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @created 10.11.2008\r
  * @version 1.0\r
  */\r
-public class TimePeriodPropertySource implements IPropertySource {\r
+public class TimePeriodPropertySource implements ICdmBasePropertySource {\r
        \r
        private TimePeriod timePeriod;\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
index 93ab31c268f1668c566e3926985e63cd3e5c7312..001a52e861d85182a9a59731c227761694a2e18c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
@@ -17,7 +17,6 @@ import java.util.Vector;
 \r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
@@ -31,6 +30,7 @@ import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.DescriptionUtil;\r
 \r
@@ -39,7 +39,7 @@ import eu.etaxonomy.taxeditor.store.model.DescriptionUtil;
  * @created 29.08.2008\r
  * @version 1.0\r
  */\r
-public class DescriptionElementPropertySource implements IPropertySource {\r
+public class DescriptionElementPropertySource implements ICdmBasePropertySource {\r
        \r
        /**\r
         * The DescriptionElement whose properties are being displayed\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java
index 9b0c81e77db54cd7ae1a8aad284b842ae2ae2a84..ec6f4841af9dd77223dac0c7e22b14d78d5eb769 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java
@@ -12,17 +12,17 @@ package eu.etaxonomy.taxeditor.propertysheet.description;
 import java.util.Vector;\r
 \r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 \r
 /**\r
  * @author p.ciardelli\r
  * @created 29.08.2008\r
  * @version 1.0\r
  */\r
-public class TaxonDescriptionPropertySource implements IPropertySource {\r
+public class TaxonDescriptionPropertySource implements ICdmBasePropertySource {\r
        \r
        // The TaxonDescription whose properties are being displayed    \r
        private TaxonDescription taxonDescription;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
index 9b79702d042f645758f13ac1c5b994279abb2431..f42dc59902761810bc910fff46617ec42ffb9e92 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
@@ -14,18 +14,18 @@ import java.util.Vector;
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 \r
 /**\r
  * @author p.ciardelli\r
  * @created 30.03.2009\r
  * @version 1.0\r
  */\r
-public class ImagePropertySource implements IPropertySource {\r
+public class ImagePropertySource implements ICdmBasePropertySource {\r
        private static final Logger logger = Logger\r
                        .getLogger(ImagePropertySource.class);\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java
index 33825936fe7ff0a7b41942641b3d711538b36318..3827c9a3be941f410d8015dab37a5ced35f0fa3f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java
@@ -16,7 +16,6 @@ import java.util.Vector;
 \r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
@@ -24,13 +23,14 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 \r
 /**\r
  * @author p.ciardelli\r
  * @created 18.05.2009\r
  * @version 1.0\r
  */\r
-public class NomenclaturalAuthorshipPropertySource implements IPropertySource {\r
+public class NomenclaturalAuthorshipPropertySource implements ICdmBasePropertySource {\r
 \r
        // Property unique keys\r
        public static final String P_ID_EDITABLECACHE = "P_ID_EDITABLECACHE";           \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
index b36776e0728eb2fb58482aa7f32e5b5bf14ad7b3..5c99878508364d3026a6f07e963fb5d9fef3bee9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
@@ -20,7 +20,6 @@ import java.util.Vector;
 \r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
@@ -35,6 +34,7 @@ import eu.etaxonomy.cdm.model.reference.Generic;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.taxeditor.propertysheet.AnnotationsPropertyDescriptor;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.MarkersPropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.NomenclaturalReferencePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;\r
@@ -46,7 +46,7 @@ import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
  * @created 06.05.2008\r
  * @version 1.0\r
  */\r
-public class NonViralNamePropertySource implements IPropertySource {\r
+public class NonViralNamePropertySource implements ICdmBasePropertySource {\r
 \r
        // The name whose properties are being displayed\r
        NonViralName<?> name;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ScientificNamePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ScientificNamePropertySource.java
index 966931a21319051d918b5572916084de52e4976c..787280404324d87128a31212b89cecc707efa47e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ScientificNamePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ScientificNamePropertySource.java
@@ -18,12 +18,12 @@ import java.util.Vector;
 import org.apache.log4j.Logger;\r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.Resources;\r
 \r
 /**\r
@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @created 03.11.2008\r
  * @version 1.0\r
  */\r
-public class ScientificNamePropertySource implements IPropertySource {\r
+public class ScientificNamePropertySource implements ICdmBasePropertySource {\r
        private static final Logger logger = Logger\r
                        .getLogger(ScientificNamePropertySource.class);\r
 \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
index 43e9ea805e93c531d12cae12caf0cdd55b2e90d9..a34d2d2dea6eabe4cfbad304a3a3b92d508a067f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
@@ -16,7 +16,6 @@ import java.util.Vector;
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
@@ -27,6 +26,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.IReferenceSearch;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferenceSearchDescriptor;\r
@@ -39,7 +39,7 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @created 11.11.2008\r
  * @version 1.0\r
  */\r
-public class TaxonBasePropertySource implements IPropertySource {\r
+public class TaxonBasePropertySource implements ICdmBasePropertySource {\r
        private static final Logger logger = Logger\r
                        .getLogger(TaxonBasePropertySource.class);\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java
index 93dda0aec93dc0c9dbc285c6227be3ec851505ee..813a652e51239638df4322f61ed7607c70f7abd1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java
@@ -25,7 +25,6 @@ import java.util.Vector;
 import org.apache.log4j.Logger;\r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
@@ -55,6 +54,7 @@ import eu.etaxonomy.cdm.model.reference.SectionBase;
 import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
 import eu.etaxonomy.cdm.model.reference.Thesis;\r
 import eu.etaxonomy.cdm.model.reference.WebPage;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.TimePeriodPropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.YearValidator;\r
 import eu.etaxonomy.taxeditor.store.model.Resources;\r
@@ -95,7 +95,7 @@ import eu.etaxonomy.taxeditor.store.model.TimeUtil;
  * @created 03.11.2008\r
  * @version 1.0\r
  */\r
-public class ReferencePropertySource implements IPropertySource {\r
+public class ReferencePropertySource implements ICdmBasePropertySource {\r
        private static final Logger logger = Logger\r
                        .getLogger(ReferencePropertySource.class);\r
 \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
index df242c36a2bddc8e93a834f3bb1762db3145ce1f..156b1736bf74c861db7d6df383cc5e24072e4584 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
@@ -15,7 +15,6 @@ import java.beans.PropertyChangeListener;
 import java.util.Vector;\r
 \r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
@@ -25,6 +24,7 @@ import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
 import eu.etaxonomy.cdm.model.reference.Generic;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;\r
 \r
 /**\r
@@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;
  * @created 28.04.2009\r
  * @version 1.0\r
  */\r
-public class TypeDesignationPropertySource implements IPropertySource {\r
+public class TypeDesignationPropertySource implements ICdmBasePropertySource {\r
 \r
        private TypeDesignationBase<?> typeDesignation;\r
 \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java
index 3e48419acf9dfc2fef6cd6595385334ec45bc64f..47897474871820911280190baa0e70e80637ffa3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java
@@ -13,17 +13,17 @@ import java.util.Set;
 import java.util.Vector;\r
 \r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
-import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource;\r
 \r
 /**\r
  * @author p.ciardelli\r
  * @created 11.02.2009\r
  * @version 1.0\r
  */\r
-public class TypePropertySource implements IPropertySource {\r
+public class TypePropertySource implements ICdmBasePropertySource {\r
        \r
        /**\r
         * The name whose types are being displayed.\r

diff --git a/taxeditor-feature/feature.xml b/taxeditor-feature/feature.xml
index 98f4e75c9d6dc897c68a79f5f30e0a89f0ade0e4..bf4971ea02b267c2429312bce7e51b84a0a048be 100644 (file)
--- a/taxeditor-feature/feature.xml
+++ b/taxeditor-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor"
       label="Taxeditor Feature"
-      version="2.0.0.v200906021626"
+      version="2.0.0.v20090603_1757"
       provider-name="EDIT">
 
    <description url="http://www.example.com/description">
@@ -22,40 +22,39 @@
    </url>
 
    <includes
-         id="eu.etaxonomy.cdmLibrary"
-         version="0.0.0"
-         search-location="self"/>
+         id="eu.etaxonomy.taxeditor.feature.dependencies"
+         version="0.0.0"/>
 
    <includes
-         id="eu.etaxonomy.taxeditor.feature.dependencies"
+         id="eu.etaxonomy.cdmLibrary"
          version="0.0.0"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.application"
          download-size="0"
          install-size="0"
-         version="2.0.0.v200906021612"
+         version="2.0.0.v20090603_1756"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.editor"
          download-size="0"
          install-size="0"
-         version="2.0.0.v200906021612"
+         version="2.0.0.v20090603_1756"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.navigation"
          download-size="0"
          install-size="0"
-         version="2.0.0.v200906021612"
+         version="2.0.0.v20090603_1757"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.store"
          download-size="0"
          install-size="0"
-         version="2.0.0.v200906021612"
+         version="2.0.0.v20090603_1757"
          unpack="false"/>
 
 </feature>

diff --git a/taxeditor-navigation/META-INF/MANIFEST.MF b/taxeditor-navigation/META-INF/MANIFEST.MF
index 21e38473289fc60233b082487d1145e7e19fa1f6..d34b2b04fa9532724d08412c7a3cd396fb1a87f4 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.v200906021612
+Bundle-Version: 2.0.0.v20090603_1757
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.navigation,

diff --git a/taxeditor-navigation/plugin.xml b/taxeditor-navigation/plugin.xml
index 7304cc0c6e41d7f51b4fb0bb2251b13649173f7e..c8f59b729541973addcc5ecc357c888851eb9a09 100644 (file)
--- a/taxeditor-navigation/plugin.xml
+++ b/taxeditor-navigation/plugin.xml
@@ -102,11 +102,6 @@
                label="Taxonomic Tree"
                style="push">
          </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.showTreeView"
-               label="Tree"
-               style="push">
-         </command>
       </menuContribution>
    </extension>
    <extension

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index 0d7446617a0fdb70250efac77c6d3f6857bf70fe..5c8e7deb229ed136dacbb964f8bfd0ff0b83a2ca 100644 (file)
--- a/taxeditor-store/META-INF/MANIFEST.MF
+++ b/taxeditor-store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 2.0.0.v200906021612
+Bundle-Version: 2.0.0.v20090603_1757
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.handler,

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 12863770b913a636ecdda4a86c0f61beacdf5c63..99bf67be3ad847f2df413d1f9adb0faae7818b74 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -32,6 +32,7 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.common.VocabularyType;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
@@ -139,7 +140,7 @@ public class CdmStore{
        }
 
        private TermVocabulary<Feature> getFeaturesInternal() {
-               return applicationController.getDescriptionService().getDefaultFeatureVocabulary();
+               return applicationController.getTermService().getVocabulary(VocabularyType.Feature);
        }
        
        public static TermVocabulary<Feature> getFeatures() {
@@ -147,17 +148,15 @@ public class CdmStore{
        }
 
        public SortedSet<NameRelationshipType> getNameRelationshipTypes() {
-//             if (nameRelationshipTypes == null)
-               return applicationController.getNameService().getNameRelationshipTypeVocabulary()
-                                               .getTermsOrderedByLabels(Language.DEFAULT());
+               return applicationController.getTermService().getVocabulary(VocabularyType.NameRelationshipType).getTermsOrderedByLabels(Language.DEFAULT());
        }
 
        public TermVocabulary<NomenclaturalStatusType> getNomStatus() {
-               return applicationController.getNameService().getStatusTypeVocabulary();
+               return applicationController.getTermService().getVocabulary(VocabularyType.NomenclaturalStatusType);
        }
 
        private SortedSet<Rank> getRanksInternal() {
-               return applicationController.getNameService().getRankVocabulary().getOrderedTerms(null);
+               return ((OrderedTermVocabulary)applicationController.getTermService().getVocabulary(VocabularyType.Rank)).getOrderedTerms(null);
        }
        
        public static SortedSet<Rank> getRanks() {
@@ -173,7 +172,7 @@ public class CdmStore{
        }
 
        public OrderedTermVocabulary<TaxonRelationshipType> getTaxonRelationshipTypes() {
-               return applicationController.getTaxonService().getTaxonRelationshipTypeVocabulary();
+               return (OrderedTermVocabulary<TaxonRelationshipType>) applicationController.getTermService().getVocabulary(VocabularyType.TaxonRelationshipType);
        }
 
        public Set<Taxon> getTaxonomicChildren(Taxon parentTaxon) {
@@ -182,7 +181,7 @@ public class CdmStore{
        }
        
        public TermVocabulary<SpecimenTypeDesignationStatus> getSpecimenTypeDesignationStatus() {
-               return applicationController.getNameService().getSpecimenTypeDesignationVocabulary();
+               return applicationController.getTermService().getVocabulary(VocabularyType.SpecimenTypeDesignationStatus);
        }
 
        public void removeAllTaxa() {

diff --git a/taxeditor-updateSite/artifacts.xml b/taxeditor-updateSite/artifacts.xml
index 7a778d1f7ccd7177ee15cd823f97d36311e93223..2f5eb6fe4fe33acc95b388fede515ced52179673 100644 (file)
--- a/taxeditor-updateSite/artifacts.xml
+++ b/taxeditor-updateSite/artifacts.xml
@@ -3,14 +3,14 @@
 <repository name='file:/Users/nho/Documents/workspace/taxeditor/taxeditor-updateSite/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>
-    <property name='p2.timestamp' value='1243952831395'/>
+    <property name='p2.timestamp' value='1244044969235'/>
   </properties>
   <mappings size='3'>
     <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
     <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>
-  <artifacts size='74'>
+  <artifacts size='59'>
     <artifact classifier='osgi.bundle' id='org.eclipse.osgi.services' version='3.1.200.v20071203'>
       <properties size='3'>
         <property name='artifact.size' value='63665'/>
@@ -25,10 +25,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v200906021611'>
+    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v20090603_1757'>
       <properties size='2'>
-        <property name='artifact.size' value='845'/>
-        <property name='download.size' value='845'/>
+        <property name='artifact.size' value='841'/>
+        <property name='download.size' value='841'/>
       </properties>
     </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.ant.core' version='3.2.0.v20080529'>
@@ -45,6 +45,13 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v20090603_1756'>
+      <properties size='3'>
+        <property name='artifact.size' value='743066'/>
+        <property name='download.size' value='743066'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.update.ui' version='3.2.101.R34x_v20081128'>
       <properties size='3'>
         <property name='artifact.size' value='510047'/>
@@ -94,19 +101,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='1.1.0'>
-      <properties size='3'>
-        <property name='artifact.size' value='250951'/>
-        <property name='download.size' value='250951'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.cdmLibrary' version='2.1.0.84'>
-      <properties size='2'>
-        <property name='artifact.size' value='700'/>
-        <property name='download.size' value='700'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.ui.views' version='3.3.1.M20081112-0800'>
       <properties size='3'>
         <property name='artifact.size' value='79527'/>
@@ -134,6 +128,13 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.v20090603_1756'>
+      <properties size='3'>
+        <property name='artifact.size' value='250950'/>
+        <property name='download.size' value='250950'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.ui' version='3.4.2.M20090204-0800'>
       <properties size='3'>
         <property name='artifact.size' value='145333'/>
@@ -162,10 +163,11 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v200906021626'>
-      <properties size='2'>
-        <property name='artifact.size' value='846'/>
-        <property name='download.size' value='846'/>
+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.cdmLibrary' version='2.1.0.v20090603_1459'>
+      <properties size='3'>
+        <property name='artifact.size' value='49295539'/>
+        <property name='download.size' value='49295539'/>
+        <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.swt' version='3.4.2.v3452b'>
@@ -175,10 +177,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.core.runtime.compatibility.auth' version='3.2.100.v20070502'>
       <properties size='3'>
-        <property name='artifact.size' value='771377'/>
-        <property name='download.size' value='771377'/>
+        <property name='artifact.size' value='21215'/>
+        <property name='download.size' value='21215'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
@@ -189,13 +191,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.eclipse.core.runtime.compatibility.auth' version='3.2.100.v20070502'>
-      <properties size='3'>
-        <property name='artifact.size' value='21215'/>
-        <property name='download.size' value='21215'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.ui.carbon' version='4.0.0.I20080610-1200'>
       <properties size='3'>
         <property name='artifact.size' value='15178'/>
@@ -203,13 +198,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='1.0.0'>
-      <properties size='3'>
-        <property name='artifact.size' value='391981'/>
-        <property name='download.size' value='391981'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.swt.carbon.macosx' version='3.4.1.v3452b'>
       <properties size='3'>
         <property name='artifact.size' value='1852342'/>
@@ -217,13 +205,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'>
-      <properties size='3'>
-        <property name='artifact.size' value='49502'/>
-        <property name='download.size' value='49502'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.ui.forms' version='3.3.103.v20081027_34x'>
       <properties size='3'>
         <property name='artifact.size' value='298080'/>
@@ -231,33 +212,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'>
-      <properties size='3'>
-        <property name='artifact.size' value='771371'/>
-        <property name='download.size' value='771371'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'>
-      <properties size='3'>
-        <property name='artifact.size' value='262820'/>
-        <property name='download.size' value='262820'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.090602'>
-      <properties size='2'>
-        <property name='artifact.size' value='1642'/>
-        <property name='download.size' value='1642'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.eclipse.ui.navigator.resources' version='3.3.101.M20080910-0800'>
-      <properties size='3'>
-        <property name='artifact.size' value='115744'/>
-        <property name='download.size' value='115744'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.text' version='3.4.0.v20080605-1800'>
       <properties size='3'>
         <property name='artifact.size' value='244646'/>
@@ -265,30 +219,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'>
-      <properties size='3'>
-        <property name='artifact.size' value='49495'/>
-        <property name='download.size' value='49495'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='1.1.0'>
-      <properties size='2'>
-        <property name='artifact.size' value='775'/>
-        <property name='download.size' value='775'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'>
-      <properties size='3'>
-        <property name='artifact.size' value='251026'/>
-        <property name='download.size' value='251026'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='1.0.0'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.ui.navigator.resources' version='3.3.101.M20080910-0800'>
       <properties size='3'>
-        <property name='artifact.size' value='44075'/>
-        <property name='download.size' value='44075'/>
+        <property name='artifact.size' value='115744'/>
+        <property name='download.size' value='115744'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
@@ -299,12 +233,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='1.0.0'>
-      <properties size='2'>
-        <property name='artifact.size' value='1631'/>
-        <property name='download.size' value='1631'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.core.jobs' version='3.4.1.R34x_v20081128'>
       <properties size='3'>
         <property name='artifact.size' value='82559'/>
@@ -361,17 +289,17 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.eclipse.core.runtime' version='3.4.0.v20080512'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'>
       <properties size='3'>
-        <property name='artifact.size' value='69019'/>
-        <property name='download.size' value='69019'/>
+        <property name='artifact.size' value='347799'/>
+        <property name='download.size' value='347799'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.core.runtime' version='3.4.0.v20080512'>
       <properties size='3'>
-        <property name='artifact.size' value='347799'/>
-        <property name='download.size' value='347799'/>
+        <property name='artifact.size' value='69019'/>
+        <property name='download.size' value='69019'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
@@ -389,18 +317,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.cdmLibrary' version='2.1.0.84'>
-      <properties size='3'>
-        <property name='artifact.size' value='49293516'/>
-        <property name='download.size' value='49293516'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.eclipse.jface.databinding' version='1.2.1.M20080827-0800a'>
-      <properties size='3'>
-        <property name='artifact.size' value='196505'/>
-        <property name='download.size' value='196505'/>
-        <property name='download.contentType' value='application/zip'/>
+    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.cdmLibrary' version='2.1.0.v20090603_1459'>
+      <properties size='2'>
+        <property name='artifact.size' value='761'/>
+        <property name='download.size' value='761'/>
       </properties>
     </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.equinox.app' version='1.1.0.v20080421-2006'>
@@ -410,10 +330,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.jface.databinding' version='1.2.1.M20080827-0800a'>
       <properties size='3'>
-        <property name='artifact.size' value='251023'/>
-        <property name='download.size' value='251023'/>
+        <property name='artifact.size' value='196505'/>
+        <property name='download.size' value='196505'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
@@ -438,6 +358,13 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.v20090603_1757'>
+      <properties size='3'>
+        <property name='artifact.size' value='635984'/>
+        <property name='download.size' value='635984'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.jface' version='3.4.2.M20090107-0800'>
       <properties size='3'>
         <property name='artifact.size' value='1041252'/>
@@ -445,12 +372,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.090602'>
-      <properties size='2'>
-        <property name='artifact.size' value='841'/>
-        <property name='download.size' value='841'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.core.filesystem.macosx' version='1.0.0.v20080604-1400'>
       <properties size='3'>
         <property name='artifact.size' value='9594'/>
@@ -458,19 +379,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='1.1.0'>
-      <properties size='2'>
-        <property name='artifact.size' value='835'/>
-        <property name='download.size' value='835'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='1.0.0'>
-      <properties size='3'>
-        <property name='artifact.size' value='261580'/>
-        <property name='download.size' value='261580'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.core.filebuffers' version='3.4.0.v20080603-2000'>
       <properties size='3'>
         <property name='artifact.size' value='112005'/>
@@ -499,13 +407,6 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='1.0.0'>
-      <properties size='3'>
-        <property name='artifact.size' value='159937'/>
-        <property name='download.size' value='159937'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800'>
       <properties size='3'>
         <property name='artifact.size' value='945619'/>
@@ -513,10 +414,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'>
+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v20090603_1757'>
       <properties size='3'>
-        <property name='artifact.size' value='262815'/>
-        <property name='download.size' value='262815'/>
+        <property name='artifact.size' value='44055'/>
+        <property name='download.size' value='44055'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

diff --git a/taxeditor-updateSite/content.xml b/taxeditor-updateSite/content.xml
index 4383957b7f36b4f9b12ee4ed3ea393060a1dce45..08b2f347ab93dd2562bb1ad70ee875ff548d3f15 100644 (file)
--- a/taxeditor-updateSite/content.xml
+++ b/taxeditor-updateSite/content.xml
@@ -3,32 +3,161 @@
 <repository name='file:/Users/nho/Documents/workspace/taxeditor/taxeditor-updateSite/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>
-    <property name='p2.timestamp' value='1243952831402'/>
+    <property name='p2.timestamp' value='1244044969240'/>
   </properties>
   <references size='2'>
     <repository url='http://wp5.e-taxonomy.eu/taxeditor/update' type='1' options='0'/>
     <repository url='http://wp5.e-taxonomy.eu/taxeditor/update' type='0' options='0'/>
   </references>
-  <units size='94'>
-    <unit id='eu.etaxonomy.taxeditor.feature.group' version='1.1.0' singleton='false'>
-      <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,1.1.0)' severity='0'/>
-      <properties size='5'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
+  <units size='76'>
+    <unit id='eu.etaxonomy.taxeditor.application' version='2.0.0.v20090603_1756'>
+      <update id='eu.etaxonomy.taxeditor.application' range='[0.0.0,2.0.0.v20090603_1756)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' version='2.0.0.v20090603_1756'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.application' version='2.0.0.v20090603_1756'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='8'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' range='1.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.v20090603_1756'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.navigation;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin&#xA;Bundle-Name: EDIT Taxonomic Editor&#xA;Bundle-Version: 2.0.0.v20090603_1756&#xA;Bundle-Vendor: EDIT&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.v200906021611' singleton='false'>
+      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
         <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
         <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
         <property name='org.eclipse.equinox.p2.type.group' value='true'/>
       </properties>
       <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' version='1.1.0'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.v200906021611'/>
       </provides>
-      <requires size='6'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' range='[1.1.0,1.1.0]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' range='[1.0.0,1.0.0]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' range='[1.0.0,1.0.0]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' range='[1.0.0,1.0.0]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' range='[1.1.0,1.1.0]'>
+      <requires size='58'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.ibm.icu' range='[3.8.1.v20080530,3.8.1.v20080530]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='javax.servlet' range='[2.4.0.v200806031604,2.4.0.v200806031604]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ant.core' range='[3.2.0.v20080529,3.2.0.v20080529]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.commands' range='[3.4.0.I20080509-2000,3.4.0.I20080509-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.contenttype' range='[3.3.0.v20080604-1400,3.3.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding' range='[1.1.1.M20080827-0800b,1.1.1.M20080827-0800b]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding.beans' range='[1.1.1.M20080827-0800a,1.1.1.M20080827-0800a]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.expressions' range='[3.4.1.r342_v20081203-0800,3.4.1.r342_v20081203-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filebuffers' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem' range='[1.2.0.v20080604-1400,1.2.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.macosx' range='[1.0.0.v20080604-1400,1.0.0.v20080604-1400]'>
+          <filter>
+            (&amp;(osgi.os=macosx))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.jobs' range='[3.4.1.R34x_v20081128,3.4.1.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net' range='[1.1.0.I20080604,1.1.0.I20080604]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='[3.4.2.R34x_v20090126,3.4.2.R34x_v20090126]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.compatibility' range='[3.4.0.v20080604-1400,3.4.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='[3.4.0.v20080512,3.4.0.v20080512]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.auth' range='[3.2.100.v20070502,3.2.100.v20070502]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.registry' range='[3.2.200.v20080610,3.2.200.v20080610]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.variables' range='[3.2.100.v20080529-1300,3.2.100.v20080529-1300]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.app' range='[1.1.0.v20080421-2006,1.1.0.v20080421-2006]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.common' range='[3.4.0.v20080421-2006,3.4.0.v20080421-2006]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.preferences' range='[3.2.201.R34x_v20080709,3.2.201.R34x_v20080709]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.registry' range='[3.4.0.v20080516-0950,3.4.0.v20080516-0950]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security' range='[1.0.1.R34x_v20080721,1.0.1.R34x_v20080721]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.macosx' range='[1.0.0.v20080602-2000,1.0.0.v20080602-2000]'>
+          <filter>
+            (&amp;(osgi.os=macosx))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.help' range='[3.3.102.v20081014_34x,3.3.102.v20081014_34x]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface' range='[3.4.2.M20090107-0800,3.4.2.M20090107-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.databinding' range='[1.2.1.M20080827-0800a,1.2.1.M20080827-0800a]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='[3.4.2.r342_v20081119-0800,3.4.2.r342_v20081119-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='[3.4.3.R34x_v20081215-1030,3.4.3.R34x_v20081215-1030]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi.services' range='[3.1.200.v20071203,3.1.200.v20071203]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.pde.source' range='[3.4.0.v20080603,3.4.0.v20080603]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt' range='[3.4.2.v3452b,3.4.2.v3452b]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.carbon.macosx' range='[3.4.1.v3452b,3.4.1.v3452b]'>
+          <filter>
+            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.text' range='[3.4.0.v20080605-1800,3.4.0.v20080605-1800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='[3.4.2.M20090204-0800,3.4.2.M20090204-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.carbon' range='[4.0.0.I20080610-1200,4.0.0.I20080610-1200]'>
+          <filter>
+            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.forms' range='[3.3.103.v20081027_34x,3.3.103.v20081027_34x]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator' range='[3.3.102.M20090127-1700,3.3.102.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator.resources' range='[3.3.101.M20080910-0800,3.3.101.M20080910-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views' range='[3.3.1.M20081112-0800,3.3.1.M20081112-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views.properties.tabbed' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='[3.4.1.r341_v20080827-1100,3.4.1.r341_v20080827-1100]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.configurator' range='[3.2.201.R34x_v20080819,3.2.201.R34x_v20080819]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core' range='[3.2.202.R34x_v20081128,3.2.202.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.ui' range='[3.2.101.R34x_v20081128,3.2.101.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.junit4' range='[4.3.1,4.3.1]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core.win32' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.win32.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.win32' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[2.0.0.v200906021611,2.0.0.v200906021611]'>
           <filter>
             (org.eclipse.update.install.features=true)
           </filter>
@@ -44,28 +173,6 @@
         [Enter Copyright Description here.]
       </copyright>
     </unit>
-    <unit id='config.a.jre' version='1.6.0' singleton='false'>
-      <hostRequirements size='1'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
-      </hostRequirements>
-      <properties size='1'>
-        <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='config.a.jre' version='1.6.0'/>
-      </provides>
-      <requires size='1'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
-      </requires>
-      <touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='install'>
-
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
     <unit id='tooling.osgi.bundle.default' version='1.0.0' singleton='false'>
       <hostRequirements size='1'>
         <required namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' range='0.0.0' multiple='true' greedy='false'/>
@@ -98,210 +205,6 @@
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.navigation' version='1.0.0'>
-      <update id='eu.etaxonomy.taxeditor.navigation' range='[0.0.0,1.0.0)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - Navigation Bundle'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-      </properties>
-      <provides size='8'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' version='1.0.0'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' version='1.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.search' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.taxonomictree' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='13'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='1.0.0'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.navigator;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.navigator.resources;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin&#xA;Bundle-Version: 1.0.0&#xA;Export-Package: eu.etaxonomy.taxeditor.navigation,eu.etaxonomy.taxeditor.navigation.handler,eu.etaxonomy.taxeditor.navigation.internal,eu.etaxonomy.taxeditor.navigation.search,eu.etaxonomy.taxeditor.navigation.taxonomictree&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle&#xA;Bundle-Vendor: EDIT
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='tooling.source.default' version='1.0.0' singleton='false'>
-      <hostRequirements size='1'>
-        <required namespace='org.eclipse.equinox.p2.eclipse.type' name='source' range='0.0.0' optional='true' multiple='true' greedy='false'/>
-      </hostRequirements>
-      <properties size='1'>
-        <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
-      </properties>
-      <provides size='2'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='tooling.source.default' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.flavor' name='tooling' version='1.0.0'/>
-      </provides>
-      <requires size='1'>
-        <required namespace='org.eclipse.equinox.p2.eclipse.type' name='source' range='0.0.0' optional='true' multiple='true' greedy='false'/>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='2'>
-          <instruction key='uninstall'>
-            removeSourceBundle(bundle:${artifact})
-          </instruction>
-          <instruction key='install'>
-            addSourceBundle(bundle:${artifact})
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.store' version='1.0.0'>
-      <update id='eu.etaxonomy.taxeditor.store' range='[0.0.0,1.0.0)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - DataStore Bundle'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-      </properties>
-      <provides size='11'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' version='1.0.0'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' version='1.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.model' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.operations' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.parser' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.preference' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='9'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.1.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
-        <required namespace='java.package' name='junit.framework' range='0.0.0'/>
-        <required namespace='java.package' name='org.junit' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='1.0.0'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.handler,eu.etaxonomy.taxeditor.store,eu.etaxonomy.taxeditor.store.datasource,eu.etaxonomy.taxeditor.store.internal,eu.etaxonomy.taxeditor.store.model;uses:=&quot;eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon&quot;,eu.etaxonomy.taxeditor.store.operations,eu.etaxonomy.taxeditor.store.parser,eu.etaxonomy.taxeditor.store.preference&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.1.0&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin&#xA;Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle&#xA;Bundle-Version: 1.0.0&#xA;Bundle-Vendor: EDIT&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true&#xA;Import-Package: junit.framework,org.junit&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.jar' version='1.1.0'>
-      <update id='eu.etaxonomy.taxeditor.feature.jar' range='[0.0.0,1.1.0)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-      </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' version='1.1.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor' version='1.1.0'/>
-      </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
-      <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='1.1.0'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.editor' version='1.0.0'>
-      <update id='eu.etaxonomy.taxeditor.editor' range='[0.0.0,1.0.0)' severity='0'/>
-      <properties size='4'>
-        <property name='df_LT.Bundle-Vendor.0' value='EDIT'/>
-        <property name='df_LT.Bundle-Name.0' value='EDIT Taxonomic Editor - Editor Bundle'/>
-        <property name='org.eclipse.equinox.p2.name' value='%Bundle-Name.0'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%Bundle-Vendor.0'/>
-      </properties>
-      <provides size='18'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' version='1.0.0'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' version='1.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.description' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.images' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.name' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.reference' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type.wizard' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
-      </provides>
-      <requires size='15'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='1.0.0'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.editor,eu.etaxonomy.taxeditor.editor.description,eu.etaxonomy.taxeditor.editor.handler,eu.etaxonomy.taxeditor.editor.images,eu.etaxonomy.taxeditor.editor.internal,eu.etaxonomy.taxeditor.editor.name,eu.etaxonomy.taxeditor.propertysheet,eu.etaxonomy.taxeditor.propertysheet.description,eu.etaxonomy.taxeditor.propertysheet.images,eu.etaxonomy.taxeditor.propertysheet.name,eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard,eu.etaxonomy.taxeditor.propertysheet.reference,eu.etaxonomy.taxeditor.propertysheet.type,eu.etaxonomy.taxeditor.propertysheet.type.wizard&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface;bundle-version=&quot;3.4.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.expressions;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin&#xA;Bundle-Name: %Bundle-Name.0&#xA;Bundle-Version: 1.0.0&#xA;Bundle-Vendor: %Bundle-Vendor.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .,icons/
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
     <unit id='a.jre' version='1.6.0' singleton='false'>
       <provides size='117'>
         <provided namespace='org.eclipse.equinox.p2.iu' name='a.jre' version='1.6.0'/>
@@ -462,207 +365,217 @@
         <provided namespace='org.eclipse.equinox.p2.iu' name='Taxonomic Editor' version='0.0.0'/>
       </provides>
       <requires size='1'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' range='[1.1.0,1.1.0]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' range='[2.0.0.v20090603_1757,2.0.0.v20090603_1757]'/>
       </requires>
       <touchpoint id='null' version='0.0.0'/>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.application' version='1.1.0'>
-      <update id='eu.etaxonomy.taxeditor.application' range='[0.0.0,1.1.0)' severity='0'/>
+    <unit id='eu.etaxonomy.taxeditor.store' version='2.0.0.v20090603_1757'>
+      <update id='eu.etaxonomy.taxeditor.store' range='[0.0.0,2.0.0.v20090603_1757)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor'/>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - DataStore Bundle'/>
         <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
       </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' version='1.1.0'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.application' version='1.1.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor' version='0.0.0'/>
+      <provides size='14'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' version='2.0.0.v20090603_1757'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' version='2.0.0.v20090603_1757'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.view' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.wizard' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.model' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.operations' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.parser' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.preference' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='8'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+      <requires size='9'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.1.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
+        <required namespace='java.package' name='junit.framework' range='0.0.0'/>
+        <required namespace='java.package' name='org.junit' range='0.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='1.1.0'/>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.v20090603_1757'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: EDIT&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: EDIT Taxonomic Editor&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.navigation;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true&#xA;Bundle-Version: 1.1.0&#xA;Export-Package: eu.etaxonomy.taxeditor
+            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.handler,eu.etaxonomy.taxeditor.store,eu.etaxonomy.taxeditor.store.datasource,eu.etaxonomy.taxeditor.store.datasource.handler,eu.etaxonomy.taxeditor.store.datasource.view,eu.etaxonomy.taxeditor.store.datasource.wizard,eu.etaxonomy.taxeditor.store.internal,eu.etaxonomy.taxeditor.store.model;uses:=&quot;eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon&quot;,eu.etaxonomy.taxeditor.store.operations,eu.etaxonomy.taxeditor.store.parser,eu.etaxonomy.taxeditor.store.preference&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.1.0&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin&#xA;Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle&#xA;Bundle-Version: 2.0.0.v20090603_1757&#xA;Bundle-Vendor: EDIT&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true&#xA;Import-Package: junit.framework,org.junit&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='eu.etaxonomy.cdmLibrary.feature.group' version='2.1.0.84' singleton='false'>
-      <update id='eu.etaxonomy.cdmLibrary.feature.group' range='[0.0.0,2.1.0.84)' severity='0'/>
-      <properties size='5'>
-        <property name='org.eclipse.equinox.p2.name' value='CDM Library'/>
-        <property name='org.eclipse.equinox.p2.description' value='cdmLibrary eclipse plugin feature'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+    <unit id='config.a.jre' version='1.6.0' singleton='false'>
+      <hostRequirements size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
+      </hostRequirements>
+      <properties size='1'>
+        <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
       </properties>
       <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' version='2.1.0.84'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='config.a.jre' version='1.6.0'/>
       </provides>
-      <requires size='2'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary' range='[2.1.0.84,2.1.0.84]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.jar' range='[2.1.0.84,2.1.0.84]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
       </requires>
-      <touchpoint id='null' version='0.0.0'/>
+      <touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='install'>
+
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.v200906021611'>
+      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.v200906021611'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.v200906021611'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.v200906021611'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
       <licenses size='1'>
         <license url='http://www.example.com/license'>
-          to be added
+          [Enter License Description here.]
         </license>
       </licenses>
       <copyright url='http://www.example.com/copyright'>
         [Enter Copyright Description here.]
       </copyright>
     </unit>
-    <unit id='eu.etaxonomy.cdmLibrary' version='2.1.0.84'>
-      <update id='eu.etaxonomy.cdmLibrary' range='[0.0.0,2.1.0.84)' severity='0'/>
+    <unit id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v20090603_1756'>
+      <update id='eu.etaxonomy.taxeditor.editor' range='[0.0.0,2.0.0.v20090603_1756)' severity='0'/>
+      <properties size='4'>
+        <property name='df_LT.Bundle-Vendor.0' value='EDIT'/>
+        <property name='df_LT.Bundle-Name.0' value='EDIT Taxonomic Editor - Editor Bundle'/>
+        <property name='org.eclipse.equinox.p2.name' value='%Bundle-Name.0'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%Bundle-Vendor.0'/>
+      </properties>
+      <provides size='22'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.v20090603_1756'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.v20090603_1756'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.reference' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.description' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.images' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.name' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.reference' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type.wizard' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
+      </provides>
+      <requires size='15'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v20090603_1756'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Bundle-Name: %Bundle-Name.0&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Bundle-Vendor.0&#xA;Bundle-ClassPath: .,icons/&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 2.0.0.v20090603_1756&#xA;Bundle-Localization: plugin&#xA;Export-Package: eu.etaxonomy.taxeditor.editor,eu.etaxonomy.taxeditor.editor.description,eu.etaxonomy.taxeditor.editor.description.handler,eu.etaxonomy.taxeditor.editor.handler,eu.etaxonomy.taxeditor.editor.images,eu.etaxonomy.taxeditor.editor.images.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.propertysheet,eu.etaxonomy.taxeditor.propertysheet.description,eu.etaxonomy.taxeditor.propertysheet.images,eu.etaxonomy.taxeditor.propertysheet.name,eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard,eu.etaxonomy.taxeditor.propertysheet.reference,eu.etaxonomy.taxeditor.propertysheet.type,eu.etaxonomy.taxeditor.propertysheet.type.wizard&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface;bundle-version=&quot;3.4.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.expressions;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='tooling.source.default' version='1.0.0' singleton='false'>
+      <hostRequirements size='1'>
+        <required namespace='org.eclipse.equinox.p2.eclipse.type' name='source' range='0.0.0' optional='true' multiple='true' greedy='false'/>
+      </hostRequirements>
       <properties size='1'>
-        <property name='org.eclipse.equinox.p2.name' value='CDM Library Plug-in'/>
+        <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
       </properties>
-      <provides size='89'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary' version='2.1.0.84'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' version='2.1.0.84'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.application' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.application.eclipse' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.conversation' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service.config' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service.config.impl' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service.pager' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service.pager.impl' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.aspectj' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.common' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.database' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.database.types' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.datagenerator' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.ext' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.hibernate' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.abcd206' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.berlinModel' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.common' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.excel.common' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.excel.distribution' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.excel.taxa' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.jaxb' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.sdd' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.synthesys' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.taxonx' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.tcsxml' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.jaxb' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.agent' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.common' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.common.init' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.description' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.location' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.media' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.molecular' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.name' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.occurrence' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.reference' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.taxon' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.view' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.persistence.hibernate' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.persistence.query' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.cache.agent' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.cache.common' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.cache.name' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.cache.reference' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.exceptions' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.parser' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.chainsaw' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.config' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.helpers' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.jdbc' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.jmx' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.lf5' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.lf5.config' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.lf5.util' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.lf5.viewer' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.lf5.viewer.categoryexplorer' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.lf5.viewer.configure' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.lf5.viewer.images' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.net' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.nt' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.or' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.or.jms' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.or.sax' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.spi' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.varia' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.log4j.xml' version='0.0.0'/>
-        <provided namespace='java.package' name='org.joda.time' version='0.0.0'/>
-        <provided namespace='java.package' name='org.joda.time.base' version='0.0.0'/>
-        <provided namespace='java.package' name='org.joda.time.chrono' version='0.0.0'/>
-        <provided namespace='java.package' name='org.joda.time.convert' version='0.0.0'/>
-        <provided namespace='java.package' name='org.joda.time.field' version='0.0.0'/>
-        <provided namespace='java.package' name='org.joda.time.format' version='0.0.0'/>
-        <provided namespace='java.package' name='org.joda.time.tz' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.core' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.core.io' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.orm.hibernate3' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.transaction' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.transaction.annotation' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.transaction.config' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.transaction.interceptor' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.transaction.jta' version='0.0.0'/>
-        <provided namespace='java.package' name='org.springframework.transaction.support' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      <provides size='2'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='tooling.source.default' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.flavor' name='tooling' version='1.0.0'/>
       </provides>
-      <requires size='2'>
-        <required namespace='osgi.bundle' name='org.eclipse.osgi' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.pde.source' range='0.0.0'/>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.eclipse.type' name='source' range='0.0.0' optional='true' multiple='true' greedy='false'/>
       </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.cdmLibrary' version='2.1.0.84'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpoint id='null' version='0.0.0'/>
       <touchpointData size='1'>
         <instructions size='2'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-Version: 2.1.0.84&#xA;Export-Package: eu.etaxonomy.cdm,eu.etaxonomy.cdm.api.application,eu.etaxonomy.cdm.api.application.eclipse,eu.etaxonomy.cdm.api.conversation,eu.etaxonomy.cdm.api.service,eu.etaxonomy.cdm.api.service.config,eu.etaxonomy.cdm.api.service.config.impl,eu.etaxonomy.cdm.api.service.pager,eu.etaxonomy.cdm.api.service.pager.impl,eu.etaxonomy.cdm.aspectj,eu.etaxonomy.cdm.common,eu.etaxonomy.cdm.database,eu.etaxonomy.cdm.database.types,eu.etaxonomy.cdm.datagenerator,eu.etaxonomy.cdm.ext,eu.etaxonomy.cdm.hibernate,eu.etaxonomy.cdm.io.abcd206,eu.etaxonomy.cdm.io.berlinModel,eu.etaxonomy.cdm.io.common,eu.etaxonomy.cdm.io.excel.common,eu.etaxonomy.cdm.io.excel.distribution,eu.etaxonomy.cdm.io.excel.taxa,eu.etaxonomy.cdm.io.jaxb,eu.etaxonomy.cdm.io.sdd,eu.etaxonomy.cdm.io.synthesys,eu.etaxonomy.cdm.io.taxonx,eu.etaxonomy.cdm.io.tcsxml,eu.etaxonomy.cdm.jaxb,eu.etaxonomy.cdm.model.agent,eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.common.init,eu.etaxonomy.cdm.model.description,eu.etaxonomy.cdm.model.location,eu.etaxonomy.cdm.model.media,eu.etaxonomy.cdm.model.molecular,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.occurrence,eu.etaxonomy.cdm.model.reference,eu.etaxonomy.cdm.model.taxon,eu.etaxonomy.cdm.model.view,eu.etaxonomy.cdm.persistence.hibernate,eu.etaxonomy.cdm.persistence.query,eu.etaxonomy.cdm.strategy,eu.etaxonomy.cdm.strategy.cache.agent,eu.etaxonomy.cdm.strategy.cache.common,eu.etaxonomy.cdm.strategy.cache.name,eu.etaxonomy.cdm.strategy.cache.reference,eu.etaxonomy.cdm.strategy.exceptions,eu.etaxonomy.cdm.strategy.parser,org.apache.log4j;uses:=&quot;org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi&quot;,org.apache.log4j.chainsaw; uses:=&quot;org.apache.log4j,  javax.swing,  javax.swing.table,  org.apache.log4j.spi,  javax.swing.event,  org.xml.sax.helpers,  org.xml.sax&quot;,org.apache.log4j.config;uses:=&quot;org.apache.log4j&quot;,org.apache.log4j.helpers;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.jdbc;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.jmx;uses:=&quot;org.apache.log4j,org.apache.log4j.spi,javax.management&quot;,org.apache.log4j.lf5;uses:=&quot;org.apache.log4j.lf5.viewer,org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.lf5.config,org.apache.log4j.lf5.util;uses:=&quot;org.apache.log4j.lf5.viewer,org.apache.log4j.lf5&quot;,org.apache.log4j.lf5.viewer; uses:=&quot;org.apache.log4j.lf5.util,  org.apache.log4j.lf5.viewer.categoryexplorer,  org.apache.log4j.lf5,  javax.swing,  javax.swing.table,  javax.swing.event,  org.apache.log4j.lf5.viewer.configure&quot;,org.apache.log4j.lf5.viewer.categoryexplorer; uses:=&quot;org.apache.log4j.lf5,  javax.swing.tree,  javax.swing,  javax.swing.table,  javax.swing.event&quot;,org.apache.log4j.lf5.viewer.configure;uses:=&quot;org.apache.log4j.lf5.viewer,javax.swing.tree,org.w3c.dom&quot;,org.apache.log4j.lf5.viewer.images,org.apache.log4j.net; uses:=&quot;javax.naming,  org.apache.log4j.helpers,  org.apache.log4j,  javax.jms,  javax.mail.internet,  org.apache.log4j.spi,  javax.mail&quot;,org.apache.log4j.nt;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.or;uses:=&quot;org.apache.log4j.spi&quot;,org.apache.log4j.or.jms;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.or.sax;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.spi;uses:=&quot;org.apache.log4j,org.apache.log4j.or&quot;,org.apache.log4j.varia;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.xml; uses:=&quot;org.apache.log4j.config,  org.apache.log4j.helpers,  org.apache.log4j,  javax.xml.parsers,  org.apache.log4j.spi,  org.w3c.dom,  org.xml.sax&quot;,org.joda.time; uses:=&quot;org.joda.time.base,  org.joda.time.field,  org.joda.time.chrono,  org.joda.time.tz,  org.joda.time.format&quot;,org.joda.time.base;uses:=&quot;org.joda.time,org.joda.time.format&quot;,org.joda.time.chrono;uses:=&quot;org.joda.time.field,org.joda.time&quot;,org.joda.time.convert;uses:=&quot;org.joda.time,org.joda.time.format&quot;,org.joda.time.field;uses:=&quot;org.joda.time&quot;,org.joda.time.format;uses:=&quot;org.joda.time&quot;,org.joda.time.tz;uses:=&quot;org.joda.time&quot;,org.springframework.core,org.springframework.core.io,org.springframework.orm.hibernate3,org.springframework.transaction;uses:=&quot;org.springframework.core&quot;,org.springframework.transaction.annotation,org.springframework.transaction.config,org.springframework.transaction.interceptor,org.springframework.transaction.jta,org.springframework.transaction.support&#xA;Require-Bundle: org.eclipse.osgi,org.eclipse.pde.source&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: eu.etaxonomy.cdmLibrary;singleton:=true&#xA;Bundle-Name: CDM Library Plug-in&#xA;Bundle-ClassPath: antlr-2.7.6.jar,asm-attrs.jar,asm.jar,cglib-2.1.3.jar,commons-collections-3.2.jar,commons-logging-1.0.4.jar,dom4j-1.6.1.jar,ehcache-1.2.3.jar,ejb3-persistence.jar,hibernate-annotations-3.4.0-SNAPSHOT.jar,hibernate-commons-annotations-3.4.0-SNAPSHOT.jar,hibernate-core-3.4.0-SNAPSHOT.jar,hibernate-envers-3.4.0-SNAPSHOT.jar,hibernate-search-3.1.0.GA.jar,hibernate-tools-3.2.0.ga.jar,slf4j-api-1.5.2.jar,slf4j-log4j12-1.5.2.jar,javassist.jar,jdbc2_0-stdext.jar,jta.jar,junit-4.4.jar,log4j-1.2.14.jar,mysql-connector-java-3.1.14-bin.jar,xml-apis.jar,xercesImpl.jar,hsqldb.jar,jaxb-api.jar,jaxb-impl-2.0.jar,jdom-1.0.jar,msbase-2000.3.jar,mssqlserver-2000.3.jar,msutil-2000.3.jar,opencsv-1.8.jar,jtds-1.2.2.jar,postgresql-8.2-504.jdbc4.jar,aopalliance-1.0.jar,spring-2.5.jar,spring-beans-2.5.jar,spring-context-2.5.jar,spring-core-2.5.jar,spring-jdbc-2.5.jar,spring-orm-2.5.jar,spring-test-2.5.jar,spring-tx-2.5.jar,h2-1.0.73.jar,joda-time-1.5.jar,joda-time-hibernate-1.0.jar,sanselan-0.94-incubator.jar,poi-3.1-FINAL.jar,spring-security-core-2.0.4.jar,aspectjweaver-1.5.4.jar,lucene-core-2.4.0.jar,lucene-spellchecker-2.4.0.jar,lsid-client-1.1.2.jar,lsid-server-1.1.2.jar,wsdl4j-1.6.1.jar,spring-2.5.6.jar,spring-aop-2.5.6.jar,spring-beans-2.5.6.jar,spring-context-2.5.6.jar,spring-core-2.5.6.jar,spring-jdbc-2.5.6.jar,spring-modules-lucene-0.8a.jar,spring-orm-2.5.6.jar,spring-test-2.5.6.jar,spring-web-2.5.6.jar,spring-webmvc-2.5.6.jar,unitils-1.0.jar,jsr250-api-1.0.jar,cdmlib-commons-2.1.jar,cdmlib-ext-2.1.jar,cdmlib-io-2.1.jar,cdmlib-model-2.1.jar,cdmlib-persistence-2.1.jar,cdmlib-services-2.1.jar,cdmlib-persistence-2.1-tests.jar,hibernate-validator-3.1.0.GA.jar,aspectjrt-1.6.3.jar,aspectjweaver-1.6.3.jar,aspectjtools-1.6.3.jar,spring-aspects-2.5.6.jar,spring-agent-2.5.6.jar
+          <instruction key='uninstall'>
+            removeSourceBundle(bundle:${artifact})
           </instruction>
-          <instruction key='zipped'>
-            true
+          <instruction key='install'>
+            addSourceBundle(bundle:${artifact})
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='eu.etaxonomy.cdmLibrary.feature.jar' version='2.1.0.84'>
-      <update id='eu.etaxonomy.cdmLibrary.feature.jar' range='[0.0.0,2.1.0.84)' severity='0'/>
+    <unit id='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v20090603_1757'>
+      <update id='eu.etaxonomy.taxeditor.feature.jar' range='[0.0.0,2.0.0.v20090603_1757)' severity='0'/>
       <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='CDM Library'/>
-        <property name='org.eclipse.equinox.p2.description' value='cdmLibrary eclipse plugin feature'/>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
         <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
         <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.jar' version='2.1.0.84'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v20090603_1757'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.cdmLibrary' version='2.1.0.84'/>
+        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor' version='2.0.0.v20090603_1757'/>
       </provides>
       <filter>
         (org.eclipse.update.install.features=true)
       </filter>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.cdmLibrary' version='2.1.0.84'/>
+        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v20090603_1757'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
@@ -674,127 +587,33 @@
       </touchpointData>
       <licenses size='1'>
         <license url='http://www.example.com/license'>
-          to be added
+          [Enter License Description here.]
         </license>
       </licenses>
       <copyright url='http://www.example.com/copyright'>
         [Enter Copyright Description here.]
       </copyright>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='1.0.0' singleton='false'>
-      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[0.0.0,1.0.0)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
+    <unit id='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v20090603_1757' singleton='false'>
+      <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,2.0.0.v20090603_1757)' severity='0'/>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
         <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
         <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
         <property name='org.eclipse.equinox.p2.type.group' value='true'/>
       </properties>
       <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v20090603_1757'/>
       </provides>
-      <requires size='58'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='com.ibm.icu' range='[3.8.1.v20080530,3.8.1.v20080530]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='javax.servlet' range='[2.4.0.v200806031604,2.4.0.v200806031604]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ant.core' range='[3.2.0.v20080529,3.2.0.v20080529]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.commands' range='[3.4.0.I20080509-2000,3.4.0.I20080509-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.contenttype' range='[3.3.0.v20080604-1400,3.3.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding' range='[1.1.1.M20080827-0800b,1.1.1.M20080827-0800b]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding.beans' range='[1.1.1.M20080827-0800a,1.1.1.M20080827-0800a]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.expressions' range='[3.4.1.r342_v20081203-0800,3.4.1.r342_v20081203-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filebuffers' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem' range='[1.2.0.v20080604-1400,1.2.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.macosx' range='[1.0.0.v20080604-1400,1.0.0.v20080604-1400]'>
-          <filter>
-            (&amp;(osgi.os=macosx))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.jobs' range='[3.4.1.R34x_v20081128,3.4.1.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net' range='[1.1.0.I20080604,1.1.0.I20080604]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='[3.4.2.R34x_v20090126,3.4.2.R34x_v20090126]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.compatibility' range='[3.4.0.v20080604-1400,3.4.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='[3.4.0.v20080512,3.4.0.v20080512]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.auth' range='[3.2.100.v20070502,3.2.100.v20070502]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.registry' range='[3.2.200.v20080610,3.2.200.v20080610]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.variables' range='[3.2.100.v20080529-1300,3.2.100.v20080529-1300]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.app' range='[1.1.0.v20080421-2006,1.1.0.v20080421-2006]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.common' range='[3.4.0.v20080421-2006,3.4.0.v20080421-2006]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.preferences' range='[3.2.201.R34x_v20080709,3.2.201.R34x_v20080709]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.registry' range='[3.4.0.v20080516-0950,3.4.0.v20080516-0950]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security' range='[1.0.1.R34x_v20080721,1.0.1.R34x_v20080721]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.macosx' range='[1.0.0.v20080602-2000,1.0.0.v20080602-2000]'>
-          <filter>
-            (&amp;(osgi.os=macosx))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.help' range='[3.3.102.v20081014_34x,3.3.102.v20081014_34x]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface' range='[3.4.2.M20090107-0800,3.4.2.M20090107-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.databinding' range='[1.2.1.M20080827-0800a,1.2.1.M20080827-0800a]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='[3.4.2.r342_v20081119-0800,3.4.2.r342_v20081119-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='[3.4.3.R34x_v20081215-1030,3.4.3.R34x_v20081215-1030]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi.services' range='[3.1.200.v20071203,3.1.200.v20071203]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.pde.source' range='[3.4.0.v20080603,3.4.0.v20080603]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt' range='[3.4.2.v3452b,3.4.2.v3452b]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.carbon.macosx' range='[3.4.1.v3452b,3.4.1.v3452b]'>
-          <filter>
-            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.text' range='[3.4.0.v20080605-1800,3.4.0.v20080605-1800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='[3.4.2.M20090204-0800,3.4.2.M20090204-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.carbon' range='[4.0.0.I20080610-1200,4.0.0.I20080610-1200]'>
-          <filter>
-            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.forms' range='[3.3.103.v20081027_34x,3.3.103.v20081027_34x]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator' range='[3.3.102.M20090127-1700,3.3.102.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator.resources' range='[3.3.101.M20080910-0800,3.3.101.M20080910-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views' range='[3.3.1.M20081112-0800,3.3.1.M20081112-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views.properties.tabbed' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='[3.4.1.r341_v20080827-1100,3.4.1.r341_v20080827-1100]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.configurator' range='[3.2.201.R34x_v20080819,3.2.201.R34x_v20080819]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core' range='[3.2.202.R34x_v20081128,3.2.202.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.ui' range='[3.2.101.R34x_v20081128,3.2.101.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.junit4' range='[4.3.1,4.3.1]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core.win32' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.win32.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.win32' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[1.0.0,1.0.0]'>
+      <requires size='7'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[2.0.0.v200906021611,2.0.0.v200906021611]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.v20090603_1459,2.1.0.v20090603_1459]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' range='[2.0.0.v20090603_1756,2.0.0.v20090603_1756]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' range='[2.0.0.v20090603_1756,2.0.0.v20090603_1756]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' range='[2.0.0.v20090603_1757,2.0.0.v20090603_1757]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' range='[2.0.0.v20090603_1757,2.0.0.v20090603_1757]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' range='[2.0.0.v20090603_1757,2.0.0.v20090603_1757]'>
           <filter>
             (org.eclipse.update.install.features=true)
           </filter>
@@ -810,40 +629,48 @@
         [Enter Copyright Description here.]
       </copyright>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='1.0.0'>
-      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[0.0.0,1.0.0)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+    <unit id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v20090603_1757'>
+      <update id='eu.etaxonomy.taxeditor.navigation' range='[0.0.0,2.0.0.v20090603_1757)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - Navigation Bundle'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor.feature.dependencies' version='1.0.0'/>
+      <provides size='8'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v20090603_1757'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v20090603_1757'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.search' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.taxonomictree' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
+      <requires size='13'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
+      </requires>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='1.0.0'/>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v20090603_1757'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
-          <instruction key='zipped'>
-            true
+          <instruction key='manifest'>
+            Bundle-Vendor: EDIT&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.navigator;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.navigator.resources;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true&#xA;Bundle-Version: 2.0.0.v20090603_1757&#xA;Export-Package: eu.etaxonomy.taxeditor.navigation,eu.etaxonomy.taxeditor.navigation.handler,eu.etaxonomy.taxeditor.navigation.internal,eu.etaxonomy.taxeditor.navigation.search,eu.etaxonomy.taxeditor.navigation.taxonomictree
           </instruction>
         </instructions>
       </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
     </unit>
     <unit id='org.eclipse.core.resources.compatibility.translated_host_properties' version='3.4.0.v20080604-1400'>
       <hostRequirements size='1'>
@@ -861,7 +688,7 @@
       <update id='org.eclipse.ui.navigator.resources' range='[0.0.0,3.3.101.M20080910-0800)' severity='0'/>
       <properties size='4'>
         <property name='df_LT.Plugin.name' value='Navigator Workbench Components'/>
-        <property name='df_LT.Plugin.providerName' value='Eclipse.org'/>
+        <property name='df_LT.Plugin.providerName' value='Eclipse.org '/>
         <property name='org.eclipse.equinox.p2.name' value='%Plugin.name'/>
         <property name='org.eclipse.equinox.p2.provider' value='%Plugin.providerName'/>
       </properties>
@@ -893,7 +720,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ui.internal.navigator.resources.actions;x-internal:=true,org.eclipse.ui.internal.navigator.resources.plugin;x-internal:=true,org.eclipse.ui.internal.navigator.resources.workbench;x-internal:=true,org.eclipse.ui.internal.navigator.workingsets;x-internal:=true,org.eclipse.ui.navigator.resources&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui.ide;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.navigator;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.views.properties.tabbed;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.workbench.texteditor;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Version: 3.3.101.M20080910-0800&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ui.internal.navigator.resources.actions;x-internal:=true,org.eclipse.ui.internal.navigator.resources.plugin;x-internal:=true,org.eclipse.ui.internal.navigator.resources.workbench;x-internal:=true,org.eclipse.ui.internal.navigator.workingsets;x-internal:=true,org.eclipse.ui.navigator.resources&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui.ide;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.navigator;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.views.properties.tabbed;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.workbench.texteditor;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Version: 3.3.101.M20080910-0800&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -923,7 +750,7 @@
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Eclipse-PatchFragment: true&#xA;Bundle-Localization: fragment&#xA;Bundle-Name: %fragmentName&#xA;Bundle-ClassPath: runtime_registry_compatibility.jar&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.equinox.registry;bundle-version=&quot;[3.3.0,3.5.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.registry&#xA;Bundle-Version: 3.2.200.v20080610
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Eclipse-PatchFragment: true&#xA;Bundle-Localization: fragment&#xA;Bundle-Name: %fragmentName&#xA;Bundle-ClassPath: runtime_registry_compatibility.jar&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.equinox.registry;bundle-version=&quot;[3.3.0,3.5.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.registry&#xA;Bundle-Version: 3.2.200.v20080610&#xA;
           </instruction>
           <instruction key='zipped'>
             true
@@ -1041,7 +868,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: compatibility.jar,.&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Import-Package: com.ibm.icu.text,javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.3.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface.databinding;bundle-version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Export-Package: org.eclipse.ui;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.about,org.eclipse.ui.actions;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.activities,org.eclipse.ui.application,org.eclipse.ui.branding,org.eclipse.ui.browser;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.commands,org.eclipse.ui.contexts,org.eclipse.ui.dialogs;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.dnd,org.eclipse.ui.fieldassist,org.eclipse.ui.handlers,org.eclipse.ui.help,org.eclipse.ui.internal;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;; x-friends:=&quot;org.eclipse.ui,  org.eclipse.ui.intro,  org.eclipse.ui.ide,  org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.about;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.actions;x-internal:=true,org.eclipse.ui.internal.activities;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.activities.ws;x-internal:=true,org.eclipse.ui.internal.application;x-internal:=true,org.eclipse.ui.internal.browser;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;;x-internal:=true,org.eclipse.ui.internal.commands;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.contexts;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.decorators;x-friends:=&quot;org.eclipse.ui.ide&quot;,org.eclipse.ui.internal.dialogs;x-internal:=true,org.eclipse.ui.internal.dnd;x-friends:=&quot;org.eclipse.ui.intro,org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.editorsupport;x-internal:=true,org.eclipse.ui.internal.expressions;x-internal:=true,org.eclipse.ui.internal.handlers;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.help;x-internal:=true,org.eclipse.ui.internal.intro;x-internal:=true,org.eclipse.ui.internal.keys;x-internal:=true,org.eclipse.ui.internal.keys.model;x-internal:=true,org.eclipse.ui.internal.layout;x-friends:=&quot;org.eclipse.ui.presentations.r21,org.eclipse.ui.intro&quot;,org.eclipse.ui.internal.menus;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.misc;x-internal:=true,org.eclipse.ui.internal.model;x-internal:=true,org.eclipse.ui.internal.operations;x-internal:=true,org.eclipse.ui.internal.part;x-internal:=true,org.eclipse.ui.internal.preferences;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.presentations;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;;x-friends:=&quot;org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.presentations.classic;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.presentations.defaultpresentation;x-internal:=true,org.eclipse.ui.internal.presentations.util;x-friends:=&quot;org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.progress;x-internal:=true,org.eclipse.ui.internal.provisional.application;x-internal:=true,org.eclipse.ui.internal.provisional.presentations;x-internal:=true,org.eclipse.ui.internal.quickaccess;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.registry;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.services;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.splash;x-internal:=true,org.eclipse.ui.internal.statushandlers;x-internal:=true,org.eclipse.ui.internal.testing;x-internal:=true,org.eclipse.ui.internal.themes;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.tweaklets;x-internal:=true,org.eclipse.ui.internal.util;x-friends:=&quot;org.eclipse.ui,org.eclipse.ui.presentations.r21,org.eclipse.ui.ide&quot;,org.eclipse.ui.internal.wizards;x-internal:=true,org.eclipse.ui.internal.wizards.preferences;x-internal:=true,org.eclipse.ui.intro,org.eclipse.ui.keys,org.eclipse.ui.menus,org.eclipse.ui.model;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.operations,org.eclipse.ui.part;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.plugin,org.eclipse.ui.preferences,org.eclipse.ui.presentations,org.eclipse.ui.progress,org.eclipse.ui.services,org.eclipse.ui.splash,org.eclipse.ui.statushandlers,org.eclipse.ui.swt,org.eclipse.ui.testing,org.eclipse.ui.themes,org.eclipse.ui.views,org.eclipse.ui.wizards&#xA;Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin
+            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: compatibility.jar,.&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Import-Package: com.ibm.icu.text,javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.3.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface.databinding;bundle-version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Export-Package: org.eclipse.ui;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.about,org.eclipse.ui.actions;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.activities,org.eclipse.ui.application,org.eclipse.ui.branding,org.eclipse.ui.browser;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.commands,org.eclipse.ui.contexts,org.eclipse.ui.dialogs;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.dnd,org.eclipse.ui.fieldassist,org.eclipse.ui.handlers,org.eclipse.ui.help,org.eclipse.ui.internal;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;; x-friends:=&quot;org.eclipse.ui,  org.eclipse.ui.intro,  org.eclipse.ui.ide,  org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.about;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.actions;x-internal:=true,org.eclipse.ui.internal.activities;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.activities.ws;x-internal:=true,org.eclipse.ui.internal.application;x-internal:=true,org.eclipse.ui.internal.browser;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;;x-internal:=true,org.eclipse.ui.internal.commands;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.contexts;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.decorators;x-friends:=&quot;org.eclipse.ui.ide&quot;,org.eclipse.ui.internal.dialogs;x-internal:=true,org.eclipse.ui.internal.dnd;x-friends:=&quot;org.eclipse.ui.intro,org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.editorsupport;x-internal:=true,org.eclipse.ui.internal.expressions;x-internal:=true,org.eclipse.ui.internal.handlers;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.help;x-internal:=true,org.eclipse.ui.internal.intro;x-internal:=true,org.eclipse.ui.internal.keys;x-internal:=true,org.eclipse.ui.internal.keys.model;x-internal:=true,org.eclipse.ui.internal.layout;x-friends:=&quot;org.eclipse.ui.presentations.r21,org.eclipse.ui.intro&quot;,org.eclipse.ui.internal.menus;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.misc;x-internal:=true,org.eclipse.ui.internal.model;x-internal:=true,org.eclipse.ui.internal.operations;x-internal:=true,org.eclipse.ui.internal.part;x-internal:=true,org.eclipse.ui.internal.preferences;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.presentations;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;;x-friends:=&quot;org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.presentations.classic;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.presentations.defaultpresentation;x-internal:=true,org.eclipse.ui.internal.presentations.util;x-friends:=&quot;org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.progress;x-internal:=true,org.eclipse.ui.internal.provisional.application;x-internal:=true,org.eclipse.ui.internal.provisional.presentations;x-internal:=true,org.eclipse.ui.internal.quickaccess;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.registry;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.services;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.splash;x-internal:=true,org.eclipse.ui.internal.statushandlers;x-internal:=true,org.eclipse.ui.internal.testing;x-internal:=true,org.eclipse.ui.internal.themes;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.tweaklets;x-internal:=true,org.eclipse.ui.internal.util;x-friends:=&quot;org.eclipse.ui,org.eclipse.ui.presentations.r21,org.eclipse.ui.ide&quot;,org.eclipse.ui.internal.wizards;x-internal:=true,org.eclipse.ui.internal.wizards.preferences;x-internal:=true,org.eclipse.ui.intro,org.eclipse.ui.keys,org.eclipse.ui.menus,org.eclipse.ui.model;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.operations,org.eclipse.ui.part;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.plugin,org.eclipse.ui.preferences,org.eclipse.ui.presentations,org.eclipse.ui.progress,org.eclipse.ui.services,org.eclipse.ui.splash,org.eclipse.ui.statushandlers,org.eclipse.ui.swt,org.eclipse.ui.testing,org.eclipse.ui.themes,org.eclipse.ui.views,org.eclipse.ui.wizards&#xA;Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1082,7 +909,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.content.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.contenttype; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.eclipse.osgi.service.debug,org.eclipse.osgi.util;version=&quot;1.0.0&quot;,org.osgi.framework,org.osgi.util.tracker,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.3.0.v20080604-1400&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.content;x-internal:=true,org.eclipse.core.runtime.content&#xA;Require-Bundle: org.eclipse.equinox.preferences;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.registry;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.content.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.contenttype; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.eclipse.osgi.service.debug,org.eclipse.osgi.util;version=&quot;1.0.0&quot;,org.osgi.framework,org.osgi.util.tracker,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.3.0.v20080604-1400&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.content;x-internal:=true,org.eclipse.core.runtime.content&#xA;Require-Bundle: org.eclipse.equinox.preferences;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.registry;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1130,7 +957,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-ClassPath: .&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.core.commands&#xA;Bundle-Version: 3.4.0.I20080509-2000&#xA;Export-Package: org.eclipse.core.commands,org.eclipse.core.commands.common,org.eclipse.core.commands.contexts,org.eclipse.core.commands.operations,org.eclipse.core.commands.util,org.eclipse.core.internal.commands.operations;x-internal:=true,org.eclipse.core.internal.commands.util;x-internal:=true
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-ClassPath: .&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.core.commands&#xA;Bundle-Version: 3.4.0.I20080509-2000&#xA;Export-Package: org.eclipse.core.commands,org.eclipse.core.commands.common,org.eclipse.core.commands.contexts,org.eclipse.core.commands.operations,org.eclipse.core.commands.util,org.eclipse.core.internal.commands.operations;x-internal:=true,org.eclipse.core.internal.commands.util;x-internal:=true&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1170,7 +997,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;DynamicImport-Package: org.eclipse.core.internal.runtime.auth&#xA;Bundle-Version: 3.4.0.v20080512&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.preferences.legacy;x-internal:=true,org.eclipse.core.internal.runtime;x-friends:=&quot;org.eclipse.core.runtime.compatibility&quot;,org.eclipse.core.runtime;version=&quot;3.4.0&quot;&#xA;Require-Bundle: org.eclipse.osgi;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.jobs;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.registry;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.preferences;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.contenttype;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.runtime.compatibility.auth;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.equinox.app;bundle-version=&quot;[1.0.0,2.0.0)&quot;;visibility:=reexport
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;DynamicImport-Package: org.eclipse.core.internal.runtime.auth&#xA;Bundle-Version: 3.4.0.v20080512&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.preferences.legacy;x-internal:=true,org.eclipse.core.internal.runtime;x-friends:=&quot;org.eclipse.core.runtime.compatibility&quot;,org.eclipse.core.runtime;version=&quot;3.4.0&quot;&#xA;Require-Bundle: org.eclipse.osgi;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.jobs;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.registry;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.preferences;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.contenttype;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.runtime.compatibility.auth;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.equinox.app;bundle-version=&quot;[1.0.0,2.0.0)&quot;;visibility:=reexport&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1221,7 +1048,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.core.UpdateCore&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.core; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.202.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.configuration,org.eclipse.update.core,org.eclipse.update.core.model,org.eclipse.update.internal.core;x-friends:=&quot;org.eclipse.update.ui,org.eclipse.update.scheduler,org.eclipse.pde.build&quot;,org.eclipse.update.internal.core.connection;x-internal:=true,org.eclipse.update.internal.jarprocessor;x-friends:=&quot;org.eclipse.pde.build&quot;,org.eclipse.update.internal.mirror;x-internal:=true,org.eclipse.update.internal.model;x-friends:=&quot;org.eclipse.update.ui&quot;,org.eclipse.update.internal.operations;x-friends:=&quot;org.eclipse.update.ui,org.eclipse.update.scheduler&quot;,org.eclipse.update.internal.provisional;x-internal:=true,org.eclipse.update.internal.search;x-friends:=&quot;org.eclipse.update.ui&quot;,org.eclipse.update.internal.security;x-internal:=true,org.eclipse.update.internal.verifier;x-internal:=true,org.eclipse.update.operations,org.eclipse.update.search,org.eclipse.update.standalone&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.update.configurator;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.net;bundle-version=&quot;[1.0.0,2.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.core.UpdateCore&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.core; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.202.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.configuration,org.eclipse.update.core,org.eclipse.update.core.model,org.eclipse.update.internal.core;x-friends:=&quot;org.eclipse.update.ui,org.eclipse.update.scheduler,org.eclipse.pde.build&quot;,org.eclipse.update.internal.core.connection;x-internal:=true,org.eclipse.update.internal.jarprocessor;x-friends:=&quot;org.eclipse.pde.build&quot;,org.eclipse.update.internal.mirror;x-internal:=true,org.eclipse.update.internal.model;x-friends:=&quot;org.eclipse.update.ui&quot;,org.eclipse.update.internal.operations;x-friends:=&quot;org.eclipse.update.ui,org.eclipse.update.scheduler&quot;,org.eclipse.update.internal.provisional;x-internal:=true,org.eclipse.update.internal.search;x-friends:=&quot;org.eclipse.update.ui&quot;,org.eclipse.update.internal.security;x-internal:=true,org.eclipse.update.internal.verifier;x-internal:=true,org.eclipse.update.operations,org.eclipse.update.search,org.eclipse.update.standalone&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.update.configurator;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.net;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1264,7 +1091,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603-2000&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.editors.text,org.eclipse.ui.editors.text.templates,org.eclipse.ui.internal.editors.quickdiff;x-internal:=true,org.eclipse.ui.internal.editors.text;x-internal:=true,org.eclipse.ui.internal.texteditor;x-internal:=true,org.eclipse.ui.texteditor&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.ide;bundle-version=&quot;[3.3.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.jface.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui.workbench.texteditor;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.filebuffers;visibility:=reexport;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603-2000&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.editors.text,org.eclipse.ui.editors.text.templates,org.eclipse.ui.internal.editors.quickdiff;x-internal:=true,org.eclipse.ui.internal.editors.text;x-internal:=true,org.eclipse.ui.internal.texteditor;x-internal:=true,org.eclipse.ui.texteditor&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.ide;bundle-version=&quot;[3.3.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.jface.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui.workbench.texteditor;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.filebuffers;visibility:=reexport;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1297,7 +1124,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-Name: %fragmentName&#xA;Bundle-Version: 1.0.0.v20080604-1400&#xA;Fragment-Host: org.eclipse.core.filesystem;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Eclipse-PlatformFilter: (&amp; (osgi.os=macosx) (|(osgi.arch=x86) (osgi.arch=ppc)))&#xA;Bundle-SymbolicName: org.eclipse.core.filesystem.macosx; singleton:=true&#xA;Bundle-Localization: fragment&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName
+            Bundle-ManifestVersion: 2&#xA;Bundle-Name: %fragmentName&#xA;Bundle-Version: 1.0.0.v20080604-1400&#xA;Fragment-Host: org.eclipse.core.filesystem;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Eclipse-PlatformFilter: (&amp; (osgi.os=macosx) (|(osgi.arch=x86) (osgi.arch=ppc)))&#xA;Bundle-SymbolicName: org.eclipse.core.filesystem.macosx; singleton:=true&#xA;Bundle-Localization: fragment&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1343,7 +1170,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Name: %help_plugin_name&#xA;Bundle-Version: 3.3.102.v20081014_34x&#xA;Eclipse-LazyStart: true&#xA;Import-Package: javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-Activator: org.eclipse.help.internal.HelpPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport&#xA;Export-Package: org.eclipse.help,org.eclipse.help.internal; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ui.intro,  org.eclipse.ua.tests,  org.eclipse.ui.cheatsheets&quot;,org.eclipse.help.internal.context; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.ua.tests,  org.eclipse.help.webapp&quot;,org.eclipse.help.internal.dynamic; x-friends:=&quot;org.eclipse.ua.tests,  org.eclipse.help.ui,  org.eclipse.help.base,  org.eclipse.ui.intro,  org.eclipse.help.webapp,  org.eclipse.ui.cheatsheets&quot;,org.eclipse.help.internal.entityresolver; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.ui.cheatsheets,  org.eclipse.ua.tests&quot;,org.eclipse.help.internal.extension;x-friends:=&quot;org.eclipse.help.webapp,org.eclipse.help.base,org.eclipse.ua.tests&quot;,org.eclipse.help.internal.index; x-friends:=&quot;org.eclipse.help.webapp,  org.eclipse.ua.tests,  org.eclipse.help.ui,  org.eclipse.help.base&quot;,org.eclipse.help.internal.toc; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ua.tests&quot;,org.eclipse.help.internal.util; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ua.tests,  org.eclipse.ui.intro.universal&quot;&#xA;Bundle-SymbolicName: org.eclipse.help; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin
+            Bundle-Name: %help_plugin_name&#xA;Bundle-Version: 3.3.102.v20081014_34x&#xA;Eclipse-LazyStart: true&#xA;Import-Package: javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-Activator: org.eclipse.help.internal.HelpPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport&#xA;Export-Package: org.eclipse.help,org.eclipse.help.internal; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ui.intro,  org.eclipse.ua.tests,  org.eclipse.ui.cheatsheets&quot;,org.eclipse.help.internal.context; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.ua.tests,  org.eclipse.help.webapp&quot;,org.eclipse.help.internal.dynamic; x-friends:=&quot;org.eclipse.ua.tests,  org.eclipse.help.ui,  org.eclipse.help.base,  org.eclipse.ui.intro,  org.eclipse.help.webapp,  org.eclipse.ui.cheatsheets&quot;,org.eclipse.help.internal.entityresolver; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.ui.cheatsheets,  org.eclipse.ua.tests&quot;,org.eclipse.help.internal.extension;x-friends:=&quot;org.eclipse.help.webapp,org.eclipse.help.base,org.eclipse.ua.tests&quot;,org.eclipse.help.internal.index; x-friends:=&quot;org.eclipse.help.webapp,  org.eclipse.ua.tests,  org.eclipse.help.ui,  org.eclipse.help.base&quot;,org.eclipse.help.internal.toc; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ua.tests&quot;,org.eclipse.help.internal.util; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ua.tests,  org.eclipse.ui.intro.universal&quot;&#xA;Bundle-SymbolicName: org.eclipse.help; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1405,7 +1232,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.2.M20090107-0800&#xA;Import-Package: javax.xml.parsers,org.osgi.framework,org.w3c.dom,org.xml.sax&#xA;Bundle-Activator: org.eclipse.jface.internal.JFaceActivator&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.swt;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.commands;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Export-Package: org.eclipse.jface,org.eclipse.jface.action,org.eclipse.jface.action.images,org.eclipse.jface.bindings,org.eclipse.jface.bindings.keys,org.eclipse.jface.bindings.keys.formatting,org.eclipse.jface.commands,org.eclipse.jface.contexts,org.eclipse.jface.dialogs,org.eclipse.jface.dialogs.images,org.eclipse.jface.fieldassist,org.eclipse.jface.fieldassist.images,org.eclipse.jface.images,org.eclipse.jface.internal;x-friends:=&quot;org.eclipse.ui.workbench&quot;,org.eclipse.jface.internal.provisional.action;x-friends:=&quot;org.eclipse.ui.workbench&quot;,org.eclipse.jface.layout,org.eclipse.jface.menus,org.eclipse.jface.operation,org.eclipse.jface.preference,org.eclipse.jface.preference.images,org.eclipse.jface.resource,org.eclipse.jface.util,org.eclipse.jface.viewers,org.eclipse.jface.viewers.deferred,org.eclipse.jface.window,org.eclipse.jface.wizard,org.eclipse.jface.wizard.images&#xA;Bundle-SymbolicName: org.eclipse.jface&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin
+            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.2.M20090107-0800&#xA;Import-Package: javax.xml.parsers,org.osgi.framework,org.w3c.dom,org.xml.sax&#xA;Bundle-Activator: org.eclipse.jface.internal.JFaceActivator&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.swt;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.commands;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Export-Package: org.eclipse.jface,org.eclipse.jface.action,org.eclipse.jface.action.images,org.eclipse.jface.bindings,org.eclipse.jface.bindings.keys,org.eclipse.jface.bindings.keys.formatting,org.eclipse.jface.commands,org.eclipse.jface.contexts,org.eclipse.jface.dialogs,org.eclipse.jface.dialogs.images,org.eclipse.jface.fieldassist,org.eclipse.jface.fieldassist.images,org.eclipse.jface.images,org.eclipse.jface.internal;x-friends:=&quot;org.eclipse.ui.workbench&quot;,org.eclipse.jface.internal.provisional.action;x-friends:=&quot;org.eclipse.ui.workbench&quot;,org.eclipse.jface.layout,org.eclipse.jface.menus,org.eclipse.jface.operation,org.eclipse.jface.preference,org.eclipse.jface.preference.images,org.eclipse.jface.resource,org.eclipse.jface.util,org.eclipse.jface.viewers,org.eclipse.jface.viewers.deferred,org.eclipse.jface.window,org.eclipse.jface.wizard,org.eclipse.jface.wizard.images&#xA;Bundle-SymbolicName: org.eclipse.jface&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1446,7 +1273,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ui.internal.navigator;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.actions;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.dnd;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.extensions;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.filters;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources,org.eclipse.ui.tests.navigator&quot;,org.eclipse.ui.internal.navigator.sorters;x-internal:=true,org.eclipse.ui.internal.navigator.wizards;x-internal:=true,org.eclipse.ui.navigator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.workbench;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ui.internal.navigator.NavigatorPlugin&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Version: 3.3.102.M20090127-1700&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-SymbolicName: org.eclipse.ui.navigator; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ui.internal.navigator;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.actions;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.dnd;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.extensions;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.filters;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources,org.eclipse.ui.tests.navigator&quot;,org.eclipse.ui.internal.navigator.sorters;x-internal:=true,org.eclipse.ui.internal.navigator.wizards;x-internal:=true,org.eclipse.ui.navigator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.workbench;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ui.internal.navigator.NavigatorPlugin&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Version: 3.3.102.M20090127-1700&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-SymbolicName: org.eclipse.ui.navigator; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1482,7 +1309,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.provisional.configurator;x-friends:=&quot;org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.ui&quot;&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator&#xA;Bundle-Name: %bundleName&#xA;Bundle-Version: 1.0.0.v20080604&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator;singleton:=true&#xA;Import-Package: org.eclipse.osgi.framework.console;version=&quot;1.0.0&quot;;resolution:=optional,org.eclipse.osgi.service.datalocation;version=&quot;1.0.0&quot;;resolution:=optional,org.eclipse.osgi.service.resolver;version=&quot;1.2.0&quot;;resolution:=optional,org.osgi.framework;version=&quot;1.3.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2.0&quot;,org.osgi.service.startlevel;version=&quot;1.0.0&quot;,org.osgi.util.tracker;version=&quot;1.3.0&quot;&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.provisional.configurator;x-friends:=&quot;org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.ui&quot;&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator&#xA;Bundle-Name: %bundleName&#xA;Bundle-Version: 1.0.0.v20080604&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator;singleton:=true&#xA;Import-Package: org.eclipse.osgi.framework.console;version=&quot;1.0.0&quot;;resolution:=optional,org.eclipse.osgi.service.datalocation;version=&quot;1.0.0&quot;;resolution:=optional,org.eclipse.osgi.service.resolver;version=&quot;1.2.0&quot;;resolution:=optional,org.osgi.framework;version=&quot;1.3.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2.0&quot;,org.osgi.service.startlevel;version=&quot;1.0.0&quot;,org.osgi.util.tracker;version=&quot;1.3.0&quot;&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1527,7 +1354,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.ui.UpdateUI&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.ui; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.101.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.internal.ui;x-friends:=&quot;org.eclipse.update.scheduler&quot;,org.eclipse.update.internal.ui.model;x-internal:=true,org.eclipse.update.internal.ui.parts;x-internal:=true,org.eclipse.update.internal.ui.preferences;x-internal:=true,org.eclipse.update.internal.ui.properties;x-internal:=true,org.eclipse.update.internal.ui.security;x-internal:=true,org.eclipse.update.internal.ui.views;x-internal:=true,org.eclipse.update.internal.ui.wizards;x-friends:=&quot;org.eclipse.update.scheduler&quot;,org.eclipse.update.ui&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.update.core;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.update.configurator;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.ui.forms;bundle-version=&quot;[3.2.0,4.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.ui.UpdateUI&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.ui; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.101.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.internal.ui;x-friends:=&quot;org.eclipse.update.scheduler&quot;,org.eclipse.update.internal.ui.model;x-internal:=true,org.eclipse.update.internal.ui.parts;x-internal:=true,org.eclipse.update.internal.ui.preferences;x-internal:=true,org.eclipse.update.internal.ui.properties;x-internal:=true,org.eclipse.update.internal.ui.security;x-internal:=true,org.eclipse.update.internal.ui.views;x-internal:=true,org.eclipse.update.internal.ui.wizards;x-friends:=&quot;org.eclipse.update.scheduler&quot;,org.eclipse.update.ui&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.update.core;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.update.configurator;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.ui.forms;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1558,7 +1385,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Fragment-Host: org.eclipse.core.resources;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.4.0.v20080604-1400&#xA;Export-Package: org.eclipse.core.internal.indexing;x-internal:=true,org.eclipse.core.internal.localstore;x-internal:=true,org.eclipse.core.internal.properties;x-internal:=true,org.eclipse.core.internal.resources;x-internal:=true&#xA;Bundle-SymbolicName: org.eclipse.core.resources.compatibility&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %compatibilityFragmentName&#xA;Bundle-Vendor: %providerName
+            Bundle-ManifestVersion: 2&#xA;Fragment-Host: org.eclipse.core.resources;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.4.0.v20080604-1400&#xA;Export-Package: org.eclipse.core.internal.indexing;x-internal:=true,org.eclipse.core.internal.localstore;x-internal:=true,org.eclipse.core.internal.properties;x-internal:=true,org.eclipse.core.internal.resources;x-internal:=true&#xA;Bundle-SymbolicName: org.eclipse.core.resources.compatibility&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %compatibilityFragmentName&#xA;Bundle-Vendor: %providerName&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1594,7 +1421,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.views.ViewsPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ClassPath: .&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.views; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.3.1.M20081112-0800&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal.views;x-internal:=true,org.eclipse.ui.internal.views.contentoutline;x-internal:=true,org.eclipse.ui.internal.views.properties; ui.views=&quot;split&quot;; mandatory:=&quot;ui.views&quot;; x-internal:=true,org.eclipse.ui.views.contentoutline,org.eclipse.ui.views.properties; ui.views=&quot;split&quot;; mandatory:=&quot;ui.views&quot;&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.3.0,4.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.views.ViewsPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ClassPath: .&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.views; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.3.1.M20081112-0800&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal.views;x-internal:=true,org.eclipse.ui.internal.views.contentoutline;x-internal:=true,org.eclipse.ui.internal.views.properties; ui.views=&quot;split&quot;; mandatory:=&quot;ui.views&quot;; x-internal:=true,org.eclipse.ui.views.contentoutline,org.eclipse.ui.views.properties; ui.views=&quot;split&quot;; mandatory:=&quot;ui.views&quot;&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1640,7 +1467,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.1.r342_v20081203-0800&#xA;Import-Package: org.w3c.dom&#xA;Bundle-Activator: org.eclipse.core.internal.expressions.ExpressionPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Export-Package: org.eclipse.core.expressions,org.eclipse.core.internal.expressions;x-internal:=true,org.eclipse.core.internal.expressions.propertytester;x-internal:=true,org.eclipse.core.internal.expressions.util;x-internal:=true&#xA;Bundle-SymbolicName: org.eclipse.core.expressions; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin
+            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.1.r342_v20081203-0800&#xA;Import-Package: org.w3c.dom&#xA;Bundle-Activator: org.eclipse.core.internal.expressions.ExpressionPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Export-Package: org.eclipse.core.expressions,org.eclipse.core.internal.expressions;x-internal:=true,org.eclipse.core.internal.expressions.propertytester;x-internal:=true,org.eclipse.core.internal.expressions.util;x-internal:=true&#xA;Bundle-SymbolicName: org.eclipse.core.expressions; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1671,7 +1498,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.variables;x-internal:=true,org.eclipse.core.variables&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.variables.VariablesPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.2.100.v20080529-1300&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.variables; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.variables;x-internal:=true,org.eclipse.core.variables&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.variables.VariablesPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.2.100.v20080529-1300&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.variables; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1713,41 +1540,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-ActivationPolicy: lazy; exclude:=&quot;org.eclipse.core.internal.preferences.exchange&quot;&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.registry;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional&#xA;Bundle-Activator: org.eclipse.core.internal.preferences.Activator&#xA;Bundle-Vendor: %providerName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.2.201.R34x_v20080709&#xA;Bundle-Localization: plugin&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Export-Package: org.eclipse.core.internal.preferences;x-friends:=&quot;org.eclipse.core.resources,org.eclipse.core.runtime&quot;,org.eclipse.core.internal.preferences.exchange;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.runtime.preferences;version=&quot;3.2.0&quot;,org.osgi.service.prefs;version=&quot;1.1&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Eclipse-LazyStart: true; exceptions=&quot;org.eclipse.core.internal.preferences.exchange&quot;
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='toolingorg.eclipse.equinox.simpleconfigurator' version='1.0.0.v20080604' singleton='false'>
-      <hostRequirements size='2'>
-        <required namespace='osgi.bundle' name='org.eclipse.equinox.simpleconfigurator' range='1.0.0.v20080604'/>
-        <required namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' range='[1.0.0,2.0.0)' greedy='false'/>
-      </hostRequirements>
-      <properties size='1'>
-        <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
-      </properties>
-      <provides size='2'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='toolingorg.eclipse.equinox.simpleconfigurator' version='1.0.0.v20080604'/>
-        <provided namespace='org.eclipse.equinox.p2.flavor' name='tooling' version='1.0.0'/>
-      </provides>
-      <requires size='2'>
-        <required namespace='osgi.bundle' name='org.eclipse.equinox.simpleconfigurator' range='1.0.0.v20080604'/>
-        <required namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' range='[1.0.0,2.0.0)' greedy='false'/>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='4'>
-          <instruction key='uninstall'>
-            uninstallBundle(bundle:${artifact})
-          </instruction>
-          <instruction key='configure'>
-            setStartLevel(startLevel:1);markStarted(started: true);
-          </instruction>
-          <instruction key='install'>
-            installBundle(bundle:${artifact})
-          </instruction>
-          <instruction key='unconfigure'>
-            setStartLevel(startLevel:-1);markStarted(started: false);
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-ActivationPolicy: lazy; exclude:=&quot;org.eclipse.core.internal.preferences.exchange&quot;&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.registry;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional&#xA;Bundle-Activator: org.eclipse.core.internal.preferences.Activator&#xA;Bundle-Vendor: %providerName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.2.201.R34x_v20080709&#xA;Bundle-Localization: plugin&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Export-Package: org.eclipse.core.internal.preferences;x-friends:=&quot;org.eclipse.core.resources,org.eclipse.core.runtime&quot;,org.eclipse.core.internal.preferences.exchange;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.runtime.preferences;version=&quot;3.2.0&quot;,org.osgi.service.prefs;version=&quot;1.1&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Eclipse-LazyStart: true; exceptions=&quot;org.eclipse.core.internal.preferences.exchange&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1783,7 +1576,41 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.jobs.JobActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.jobs; singleton:=true&#xA;Import-Package: org.eclipse.osgi.service.debug,org.eclipse.osgi.util,org.osgi.framework;version=&quot;1.3.0&quot;,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.4.1.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.jobs;x-internal:=true,org.eclipse.core.runtime.jobs&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.jobs.JobActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.jobs; singleton:=true&#xA;Import-Package: org.eclipse.osgi.service.debug,org.eclipse.osgi.util,org.osgi.framework;version=&quot;1.3.0&quot;,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.4.1.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.jobs;x-internal:=true,org.eclipse.core.runtime.jobs&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='toolingorg.eclipse.equinox.simpleconfigurator' version='1.0.0.v20080604' singleton='false'>
+      <hostRequirements size='2'>
+        <required namespace='osgi.bundle' name='org.eclipse.equinox.simpleconfigurator' range='1.0.0.v20080604'/>
+        <required namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' range='[1.0.0,2.0.0)' greedy='false'/>
+      </hostRequirements>
+      <properties size='1'>
+        <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
+      </properties>
+      <provides size='2'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='toolingorg.eclipse.equinox.simpleconfigurator' version='1.0.0.v20080604'/>
+        <provided namespace='org.eclipse.equinox.p2.flavor' name='tooling' version='1.0.0'/>
+      </provides>
+      <requires size='2'>
+        <required namespace='osgi.bundle' name='org.eclipse.equinox.simpleconfigurator' range='1.0.0.v20080604'/>
+        <required namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' range='[1.0.0,2.0.0)' greedy='false'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='4'>
+          <instruction key='uninstall'>
+            uninstallBundle(bundle:${artifact})
+          </instruction>
+          <instruction key='configure'>
+            setStartLevel(startLevel:1);markStarted(started: true);
+          </instruction>
+          <instruction key='install'>
+            installBundle(bundle:${artifact})
+          </instruction>
+          <instruction key='unconfigure'>
+            setStartLevel(startLevel:-1);markStarted(started: false);
           </instruction>
         </instructions>
       </touchpointData>
@@ -1817,7 +1644,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Activator: org.eclipse.ui.internal.UIPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-ClassPath: .&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.2.M20090204-0800&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal;x-internal:=true&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui.workbench;bundle-version=&quot;[3.4.2,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.expressions;bundle-version=&quot;[3.4.0,4.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Activator: org.eclipse.ui.internal.UIPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-ClassPath: .&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.2.M20090204-0800&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal;x-internal:=true&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui.workbench;bundle-version=&quot;[3.4.2,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.expressions;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1853,7 +1680,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.security.osx;x-internal:=true,org.eclipse.equinox.internal.security.osx.nls;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: fragment&#xA;Require-Bundle: org.eclipse.swt;bundle-version=&quot;[3.4.0,4.0.0)&quot;;resolution:=optional&#xA;Eclipse-PlatformFilter: (&amp; (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )&#xA;Bundle-Name: %fragmentName&#xA;Bundle-Version: 1.0.0.v20080602-2000&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.security.macosx;singleton:=true&#xA;Fragment-Host: org.eclipse.equinox.security;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Manifest-Version: 1.0
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.security.osx;x-internal:=true,org.eclipse.equinox.internal.security.osx.nls;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: fragment&#xA;Require-Bundle: org.eclipse.swt;bundle-version=&quot;[3.4.0,4.0.0)&quot;;resolution:=optional&#xA;Eclipse-PlatformFilter: (&amp; (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )&#xA;Bundle-Name: %fragmentName&#xA;Bundle-Version: 1.0.0.v20080602-2000&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.security.macosx;singleton:=true&#xA;Fragment-Host: org.eclipse.equinox.security;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1889,7 +1716,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: fragment&#xA;Bundle-Name: %fragmentName&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.swt; bundle-version=&quot;[3.0.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.swt.carbon.macosx; singleton:=true&#xA;Bundle-Version: 3.4.1.v3452b&#xA;Export-Package: org.eclipse.swt.internal.carbon; x-internal:=true,org.eclipse.swt.internal.cocoa; x-internal:=true,org.eclipse.swt.internal.opengl.carbon; x-internal:=true&#xA;Eclipse-PlatformFilter: (&amp; (osgi.ws=carbon) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: fragment&#xA;Bundle-Name: %fragmentName&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.swt; bundle-version=&quot;[3.0.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.swt.carbon.macosx; singleton:=true&#xA;Bundle-Version: 3.4.1.v3452b&#xA;Export-Package: org.eclipse.swt.internal.carbon; x-internal:=true,org.eclipse.swt.internal.cocoa; x-internal:=true,org.eclipse.swt.internal.opengl.carbon; x-internal:=true&#xA;Eclipse-PlatformFilter: (&amp; (osgi.ws=carbon) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -1934,11 +1761,41 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Eclipse-ExtensibleAPI: true&#xA;Manifest-Version: 1.0&#xA;DynamicImport-Package: org.mozilla.xpcom&#xA;Bundle-SymbolicName: org.eclipse.swt; singleton:=true&#xA;Bundle-Version: 3.4.2.v3452b&#xA;Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclipse.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt.dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.program,org.eclipse.swt.widgets,org.eclipse.swt.internal; x-internal:=true,org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.swt.internal.theme; x-internal:=true
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Eclipse-ExtensibleAPI: true&#xA;Manifest-Version: 1.0&#xA;DynamicImport-Package: org.mozilla.xpcom&#xA;Bundle-SymbolicName: org.eclipse.swt; singleton:=true&#xA;Bundle-Version: 3.4.2.v3452b&#xA;Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclipse.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt.dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.program,org.eclipse.swt.widgets,org.eclipse.swt.internal; x-internal:=true,org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.swt.internal.theme; x-internal:=true&#xA;
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
+    <unit id='eu.etaxonomy.cdmLibrary.feature.group' version='2.1.0.v20090603_1459' singleton='false'>
+      <update id='eu.etaxonomy.cdmLibrary.feature.group' range='[0.0.0,2.1.0.v20090603_1459)' severity='0'/>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='CDM Library'/>
+        <property name='org.eclipse.equinox.p2.description' value='cdmLibrary eclipse plugin feature'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' version='2.1.0.v20090603_1459'/>
+      </provides>
+      <requires size='2'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary' range='[2.1.0.v20090603_1459,2.1.0.v20090603_1459]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.jar' range='[2.1.0.v20090603_1459,2.1.0.v20090603_1459]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          to be added
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
     <unit id='org.eclipse.ui.views.properties.tabbed' version='3.4.2.M20090127-1700'>
       <update id='org.eclipse.ui.views.properties.tabbed' range='[0.0.0,3.4.2.M20090127-1700)' severity='0'/>
       <properties size='4'>
@@ -1971,7 +1828,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Activator: org.eclipse.ui.internal.views.properties.tabbed.TabbedPropertyViewPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.views.properties.tabbed;singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal.views.properties.tabbed;x-internal:=true,org.eclipse.ui.internal.views.properties.tabbed.l10n;x-internal:=true,org.eclipse.ui.internal.views.properties.tabbed.view;x-friends:=&quot;org.eclipse.ui.tests.views.properties.tabbed&quot;,org.eclipse.ui.views.properties.tabbed&#xA;Require-Bundle: org.eclipse.ui.forms;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui.views;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Activator: org.eclipse.ui.internal.views.properties.tabbed.TabbedPropertyViewPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.views.properties.tabbed;singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal.views.properties.tabbed;x-internal:=true,org.eclipse.ui.internal.views.properties.tabbed.l10n;x-internal:=true,org.eclipse.ui.internal.views.properties.tabbed.view;x-friends:=&quot;org.eclipse.ui.tests.views.properties.tabbed&quot;,org.eclipse.ui.views.properties.tabbed&#xA;Require-Bundle: org.eclipse.ui.forms;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui.views;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2008,7 +1865,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.configurator.ConfigurationActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.configurator; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.201.R34x_v20080819&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.configurator,org.eclipse.update.internal.configurator;x-friends:=&quot;org.eclipse.update.core&quot;,org.eclipse.update.internal.configurator.branding;x-friends:=&quot;org.eclipse.update.core&quot;&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.osgi;bundle-version=&quot;[3.2.0,4.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.configurator.ConfigurationActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.configurator; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.201.R34x_v20080819&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.configurator,org.eclipse.update.internal.configurator;x-friends:=&quot;org.eclipse.update.core&quot;,org.eclipse.update.internal.configurator.branding;x-friends:=&quot;org.eclipse.update.core&quot;&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.osgi;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2085,7 +1942,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Name: %Plugin.name&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui.views;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.update.configurator;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.update.core;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.update.ui;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.jface.text;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.forms;bundle-version=&quot;[3.3.0,4.0.0)&quot;;resolution:=optional&#xA;Export-Package: org.eclipse.ui,org.eclipse.ui.actions,org.eclipse.ui.dialogs,org.eclipse.ui.ide,org.eclipse.ui.ide.dialogs,org.eclipse.ui.ide.fileSystem,org.eclipse.ui.ide.undo,org.eclipse.ui.internal.ide;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.actions;x-internal:=true,org.eclipse.ui.internal.ide.commands;x-internal:=true,org.eclipse.ui.internal.ide.dialogs;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.filesystem;x-internal:=true,org.eclipse.ui.internal.ide.handlers;x-internal:=true,org.eclipse.ui.internal.ide.misc;x-internal:=true,org.eclipse.ui.internal.ide.model;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.registry;x-internal:=true,org.eclipse.ui.internal.ide.undo;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.update;x-internal:=true,org.eclipse.ui.internal.views.bookmarkexplorer;x-internal:=true,org.eclipse.ui.internal.views.framelist;x-internal:=true,org.eclipse.ui.internal.views.markers;x-internal:=true,org.eclipse.ui.internal.views.navigator;x-internal:=true,org.eclipse.ui.internal.views.properties;x-internal:=true,org.eclipse.ui.internal.views.tasklist;x-internal:=true,org.eclipse.ui.internal.wizards.datatransfer;x-internal:=true,org.eclipse.ui.internal.wizards.newresource;x-internal:=true,org.eclipse.ui.model,org.eclipse.ui.part,org.eclipse.ui.views.bookmarkexplorer,org.eclipse.ui.views.framelist,org.eclipse.ui.views.markers,org.eclipse.ui.views.markers.internal;x-internal:=true,org.eclipse.ui.views.navigator,org.eclipse.ui.views.properties,org.eclipse.ui.views.tasklist,org.eclipse.ui.wizards.datatransfer,org.eclipse.ui.wizards.newresource&#xA;Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin
+            Bundle-Name: %Plugin.name&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui.views;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.update.configurator;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.update.core;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.update.ui;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.jface.text;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.forms;bundle-version=&quot;[3.3.0,4.0.0)&quot;;resolution:=optional&#xA;Export-Package: org.eclipse.ui,org.eclipse.ui.actions,org.eclipse.ui.dialogs,org.eclipse.ui.ide,org.eclipse.ui.ide.dialogs,org.eclipse.ui.ide.fileSystem,org.eclipse.ui.ide.undo,org.eclipse.ui.internal.ide;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.actions;x-internal:=true,org.eclipse.ui.internal.ide.commands;x-internal:=true,org.eclipse.ui.internal.ide.dialogs;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.filesystem;x-internal:=true,org.eclipse.ui.internal.ide.handlers;x-internal:=true,org.eclipse.ui.internal.ide.misc;x-internal:=true,org.eclipse.ui.internal.ide.model;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.registry;x-internal:=true,org.eclipse.ui.internal.ide.undo;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.update;x-internal:=true,org.eclipse.ui.internal.views.bookmarkexplorer;x-internal:=true,org.eclipse.ui.internal.views.framelist;x-internal:=true,org.eclipse.ui.internal.views.markers;x-internal:=true,org.eclipse.ui.internal.views.navigator;x-internal:=true,org.eclipse.ui.internal.views.properties;x-internal:=true,org.eclipse.ui.internal.views.tasklist;x-internal:=true,org.eclipse.ui.internal.wizards.datatransfer;x-internal:=true,org.eclipse.ui.internal.wizards.newresource;x-internal:=true,org.eclipse.ui.model,org.eclipse.ui.part,org.eclipse.ui.views.bookmarkexplorer,org.eclipse.ui.views.framelist,org.eclipse.ui.views.markers,org.eclipse.ui.views.markers.internal;x-internal:=true,org.eclipse.ui.views.navigator,org.eclipse.ui.views.properties,org.eclipse.ui.views.tasklist,org.eclipse.ui.wizards.datatransfer,org.eclipse.ui.wizards.newresource&#xA;Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2132,7 +1989,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Version: 1.1.0.v20080421-2006&#xA;Bundle-ActivationPolicy: lazy&#xA;Eclipse-LazyStart: true&#xA;Export-Package: org.eclipse.equinox.app;version=&quot;1.0&quot;,org.eclipse.equinox.internal.app;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.osgi.service.application;version=&quot;1.0&quot;&#xA;Import-Package: org.eclipse.osgi.framework.console;resolution:=optional,org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment; version=&quot;1.1&quot;,org.eclipse.osgi.service.runnable,org.eclipse.osgi.storagemanager,org.eclipse.osgi.util,org.osgi.framework;version=&quot;1.3&quot;,org.osgi.service.condpermadmin; resolution:=optional,org.osgi.service.event;version=&quot;1.0.0&quot;;resolution:=optional,org.osgi.service.packageadmin;version=&quot;1.2&quot;,org.osgi.util.tracker&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.equinox.internal.app.Activator&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.registry;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true&#xA;Comment-DynamicImport: this is only used to allow late binding of the package&#xA;DynamicImport-Package: org.osgi.service.event;version=&quot;1.0.0&quot;&#xA;Bundle-Vendor: %providerName&#xA;Bundle-Name: %pluginName&#xA;Bundle-ManifestVersion: 2
+            Bundle-Version: 1.1.0.v20080421-2006&#xA;Bundle-ActivationPolicy: lazy&#xA;Eclipse-LazyStart: true&#xA;Export-Package: org.eclipse.equinox.app;version=&quot;1.0&quot;,org.eclipse.equinox.internal.app;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.osgi.service.application;version=&quot;1.0&quot;&#xA;Import-Package: org.eclipse.osgi.framework.console;resolution:=optional,org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment; version=&quot;1.1&quot;,org.eclipse.osgi.service.runnable,org.eclipse.osgi.storagemanager,org.eclipse.osgi.util,org.osgi.framework;version=&quot;1.3&quot;,org.osgi.service.condpermadmin; resolution:=optional,org.osgi.service.event;version=&quot;1.0.0&quot;;resolution:=optional,org.osgi.service.packageadmin;version=&quot;1.2&quot;,org.osgi.util.tracker&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.equinox.internal.app.Activator&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.registry;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true&#xA;Comment-DynamicImport: this is only used to allow late binding of the package&#xA;DynamicImport-Package: org.osgi.service.event;version=&quot;1.0.0&quot;&#xA;Bundle-Vendor: %providerName&#xA;Bundle-Name: %pluginName&#xA;Bundle-ManifestVersion: 2&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2176,7 +2033,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-ClassPath: .&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.core.databinding.beans&#xA;Bundle-Version: 1.1.1.M20080827-0800a&#xA;Export-Package: org.eclipse.core.databinding.beans,org.eclipse.core.internal.databinding.beans;x-internal:=true
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-ClassPath: .&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.core.databinding.beans&#xA;Bundle-Version: 1.1.1.M20080827-0800a&#xA;Export-Package: org.eclipse.core.databinding.beans,org.eclipse.core.internal.databinding.beans;x-internal:=true&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2214,7 +2071,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.pde.source&#xA;Bundle-Name: %pluginName&#xA;Bundle-Localization: plugin&#xA;Bundle-Vendor: %providerName&#xA;Eclipse-SourceBundle: org.eclipse.pde;version=&quot;3.4.0.v20080603&quot;;roots:=&quot;.&quot;
+            Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.pde.source&#xA;Bundle-Name: %pluginName&#xA;Bundle-Localization: plugin&#xA;Bundle-Vendor: %providerName&#xA;Eclipse-SourceBundle: org.eclipse.pde;version=&quot;3.4.0.v20080603&quot;;roots:=&quot;.&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2248,7 +2105,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: fragment-carbon&#xA;Bundle-Name: %fragmentName&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.ui.carbon; singleton:=true&#xA;Bundle-Version: 4.0.0.I20080610-1200&#xA;Export-Package: org.eclipse.ui.internal.carbon;x-internal:=true;uses:=&quot;org.eclipse.ui&quot;&#xA;Eclipse-PlatformFilter: (osgi.ws=carbon)
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: fragment-carbon&#xA;Bundle-Name: %fragmentName&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.ui.carbon; singleton:=true&#xA;Bundle-Version: 4.0.0.I20080610-1200&#xA;Export-Package: org.eclipse.ui.internal.carbon;x-internal:=true;uses:=&quot;org.eclipse.ui&quot;&#xA;Eclipse-PlatformFilter: (osgi.ws=carbon)&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2295,7 +2152,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.auth.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.auth&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.util;version=&quot;1.0.0&quot;,org.osgi.framework,org.osgi.util.tracker&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.100.v20070502&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.runtime.auth;x-friends:=&quot;org.eclipse.core.runtime&quot;&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.auth.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.auth&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.util;version=&quot;1.0.0&quot;,org.osgi.framework,org.osgi.util.tracker&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.100.v20070502&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.runtime.auth;x-friends:=&quot;org.eclipse.core.runtime&quot;&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2333,7 +2190,7 @@
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 4.3.1&#xA;Export-Package: junit.extensions;version=&quot;4.3.1&quot;,junit.framework;version=&quot;4.3.1&quot;,junit.runner;version=&quot;4.3.1&quot;,junit.textui;version=&quot;4.3.1&quot;,org.junit;version=&quot;4.3.1&quot;,org.junit.internal;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.internal.requests;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.internal.runners;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.runner;version=&quot;4.3.1&quot;,org.junit.runner.manipulation;version=&quot;4.3.1&quot;,org.junit.runner.notification;version=&quot;4.3.1&quot;,org.junit.runners;version=&quot;4.3.1&quot;&#xA;Bundle-SymbolicName: org.junit4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-ClassPath: junit.jar&#xA;Bundle-Vendor: %providerName
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 4.3.1&#xA;Export-Package: junit.extensions;version=&quot;4.3.1&quot;,junit.framework;version=&quot;4.3.1&quot;,junit.runner;version=&quot;4.3.1&quot;,junit.textui;version=&quot;4.3.1&quot;,org.junit;version=&quot;4.3.1&quot;,org.junit.internal;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.internal.requests;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.internal.runners;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.runner;version=&quot;4.3.1&quot;,org.junit.runner.manipulation;version=&quot;4.3.1&quot;,org.junit.runner.notification;version=&quot;4.3.1&quot;,org.junit.runners;version=&quot;4.3.1&quot;&#xA;Bundle-SymbolicName: org.junit4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-ClassPath: junit.jar&#xA;Bundle-Vendor: %providerName&#xA;
           </instruction>
           <instruction key='zipped'>
             true
@@ -2377,7 +2234,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Name: %pluginName&#xA;Bundle-Version: 3.4.0.v20080421-2006&#xA;Eclipse-LazyStart: true&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.localization,org.eclipse.osgi.service.urlconversion,org.osgi.service.url,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.Activator&#xA;Bundle-Vendor: %providerName&#xA;Export-Package: org.eclipse.core.internal.boot;x-friends:=&quot;org.eclipse.core.resources,org.eclipse.core.runtime.compatibility,org.eclipse.pde.build&quot;,org.eclipse.core.internal.runtime;common=split;mandatory:=common; x-friends:=&quot;org.eclipse.core.contenttype,  org.eclipse.core.jobs,  org.eclipse.equinox.preferences,  org.eclipse.equinox.registry,  org.eclipse.core.runtime,  org.eclipse.core.runtime.compatibility,  org.eclipse.core.filesystem,  org.eclipse.equinox.security&quot;,org.eclipse.core.runtime;common=split;version=&quot;3.4.0&quot;;mandatory:=common&#xA;Bundle-SymbolicName: org.eclipse.equinox.common; singleton:=true&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin
+            Bundle-Name: %pluginName&#xA;Bundle-Version: 3.4.0.v20080421-2006&#xA;Eclipse-LazyStart: true&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.localization,org.eclipse.osgi.service.urlconversion,org.osgi.service.url,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.Activator&#xA;Bundle-Vendor: %providerName&#xA;Export-Package: org.eclipse.core.internal.boot;x-friends:=&quot;org.eclipse.core.resources,org.eclipse.core.runtime.compatibility,org.eclipse.pde.build&quot;,org.eclipse.core.internal.runtime;common=split;mandatory:=common; x-friends:=&quot;org.eclipse.core.contenttype,  org.eclipse.core.jobs,  org.eclipse.equinox.preferences,  org.eclipse.equinox.registry,  org.eclipse.core.runtime,  org.eclipse.core.runtime.compatibility,  org.eclipse.core.filesystem,  org.eclipse.equinox.security&quot;,org.eclipse.core.runtime;common=split;version=&quot;3.4.0&quot;;mandatory:=common&#xA;Bundle-SymbolicName: org.eclipse.equinox.common; singleton:=true&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2417,7 +2274,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.jface.databinding.swt,org.eclipse.jface.databinding.viewers,org.eclipse.jface.databinding.wizard,org.eclipse.jface.internal.databinding.provisional.swt;x-internal:=true,org.eclipse.jface.internal.databinding.provisional.viewers;x-internal:=true,org.eclipse.jface.internal.databinding.swt;x-internal:=true,org.eclipse.jface.internal.databinding.viewers;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.2.1.M20080827-0800a&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.jface.databinding&#xA;Import-Package: com.ibm.icu.text&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.jface.databinding.swt,org.eclipse.jface.databinding.viewers,org.eclipse.jface.databinding.wizard,org.eclipse.jface.internal.databinding.provisional.swt;x-internal:=true,org.eclipse.jface.internal.databinding.provisional.viewers;x-internal:=true,org.eclipse.jface.internal.databinding.swt;x-internal:=true,org.eclipse.jface.internal.databinding.viewers;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.2.1.M20080827-0800a&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.jface.databinding&#xA;Import-Package: com.ibm.icu.text&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2452,7 +2309,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.net;x-internal:=true,org.eclipse.core.net.proxy&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.security;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;3.4.0&quot;,org.eclipse.equinox.preferences;bundle-version=&quot;3.2.200&quot;,org.eclipse.osgi;bundle-version=&quot;3.4.0&quot;,org.eclipse.equinox.registry;bundle-version=&quot;3.4.0&quot;&#xA;Bundle-Activator: org.eclipse.core.internal.net.Activator&#xA;Bundle-Name: %PLUGIN_NAME&#xA;Bundle-Version: 1.1.0.I20080604&#xA;Bundle-Vendor: %PLUGIN_PROVIDER&#xA;Bundle-SymbolicName: org.eclipse.core.net;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.net;x-internal:=true,org.eclipse.core.net.proxy&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.security;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;3.4.0&quot;,org.eclipse.equinox.preferences;bundle-version=&quot;3.2.200&quot;,org.eclipse.osgi;bundle-version=&quot;3.4.0&quot;,org.eclipse.equinox.registry;bundle-version=&quot;3.4.0&quot;&#xA;Bundle-Activator: org.eclipse.core.internal.net.Activator&#xA;Bundle-Name: %PLUGIN_NAME&#xA;Bundle-Version: 1.1.0.I20080604&#xA;Bundle-Vendor: %PLUGIN_PROVIDER&#xA;Bundle-SymbolicName: org.eclipse.core.net;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2527,7 +2384,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Version: 3.4.3.R34x_v20081215-1030&#xA;Bundle-DocUrl: http://www.eclipse.org&#xA;Bundle-Copyright: %copyright&#xA;Eclipse-ExtensibleAPI: true&#xA;Eclipse-SystemBundle: true&#xA;Export-Package: org.eclipse.osgi.event;version=&quot;1.0&quot;,org.eclipse.osgi.framework.console;version=&quot;1.0&quot;,org.eclipse.osgi.framework.eventmgr;version=&quot;1.1&quot;,org.eclipse.osgi.framework.log;version=&quot;1.0&quot;,org.eclipse.osgi.service.datalocation;version=&quot;1.1&quot;,org.eclipse.osgi.service.debug;version=&quot;1.0&quot;,org.eclipse.osgi.service.environment;version=&quot;1.1&quot;,org.eclipse.osgi.service.localization;version=&quot;1.0&quot;,org.eclipse.osgi.service.pluginconversion;version=&quot;1.0&quot;,org.eclipse.osgi.service.resolver;version=&quot;1.2&quot;,org.eclipse.osgi.service.runnable;version=&quot;1.1&quot;,org.eclipse.osgi.service.security; version=&quot;1.0&quot;,org.eclipse.osgi.service.urlconversion;version=&quot;1.0&quot;,org.eclipse.osgi.signedcontent; version=&quot;1.0&quot;,org.eclipse.osgi.storagemanager;version=&quot;1.0&quot;,org.eclipse.osgi.util;version=&quot;1.1&quot;,org.osgi.framework;version=&quot;1.4&quot;,org.osgi.service.condpermadmin;version=&quot;1.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2&quot;,org.osgi.service.permissionadmin;version=&quot;1.2&quot;,org.osgi.service.startlevel;version=&quot;1.1&quot;,org.osgi.service.url;version=&quot;1.0&quot;,org.osgi.util.tracker;version=&quot;1.3.3&quot;,org.eclipse.core.runtime.adaptor;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.runtime.internal.adaptor;x-internal:=true,org.eclipse.core.runtime.internal.stats;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.osgi.baseadaptor;x-internal:=true,org.eclipse.osgi.baseadaptor.bundlefile;x-internal:=true,org.eclipse.osgi.baseadaptor.hooks;x-internal:=true,org.eclipse.osgi.baseadaptor.loader;x-internal:=true,org.eclipse.osgi.framework.adaptor;x-internal:=true,org.eclipse.osgi.framework.debug;x-internal:=true,org.eclipse.osgi.framework.internal.core;x-internal:=true,org.eclipse.osgi.framework.internal.protocol;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.bundleentry;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.bundleresource;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.reference;x-internal:=true,org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true,org.eclipse.osgi.framework.launcher;x-internal:=true,org.eclipse.osgi.framework.util;x-internal:=true,org.eclipse.osgi.internal.baseadaptor;x-internal:=true,org.eclipse.osgi.internal.module;x-internal:=true,org.eclipse.osgi.internal.profile;x-internal:=true,org.eclipse.osgi.internal.resolver;x-internal:=true,org.eclipse.osgi.internal.provisional.service.security; x-friends:=&quot;org.eclipse.equinox.security.ui&quot;;version=&quot;1.0.0&quot;,org.eclipse.osgi.internal.provisional.verifier;x-friends:=&quot;org.eclipse.update.core,org.eclipse.ui.workbench,org.eclipse.equinox.p2.artifact.repository&quot;,org.eclipse.osgi.internal.service.security;x-friends:=&quot;org.eclipse.equinox.security.ui&quot;,org.eclipse.osgi.internal.signedcontent; x-internal:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5,OSGi/Minimum-1.1&#xA;Bundle-Localization: systembundle&#xA;Bundle-SymbolicName: org.eclipse.osgi; singleton:=true&#xA;Export-Service: org.osgi.service.packageadmin.PackageAdmin,org.osgi.service.permissionadmin.PermissionAdmin,org.osgi.service.startlevel.StartLevel,org.eclipse.osgi.service.debug.DebugOptions&#xA;Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter&#xA;Bundle-Description: %systemBundle&#xA;Bundle-Vendor: %eclipse.org&#xA;Bundle-Name: %systemBundle&#xA;Bundle-ManifestVersion: 2
+            Bundle-Version: 3.4.3.R34x_v20081215-1030&#xA;Bundle-DocUrl: http://www.eclipse.org&#xA;Bundle-Copyright: %copyright&#xA;Eclipse-ExtensibleAPI: true&#xA;Eclipse-SystemBundle: true&#xA;Export-Package: org.eclipse.osgi.event;version=&quot;1.0&quot;,org.eclipse.osgi.framework.console;version=&quot;1.0&quot;,org.eclipse.osgi.framework.eventmgr;version=&quot;1.1&quot;,org.eclipse.osgi.framework.log;version=&quot;1.0&quot;,org.eclipse.osgi.service.datalocation;version=&quot;1.1&quot;,org.eclipse.osgi.service.debug;version=&quot;1.0&quot;,org.eclipse.osgi.service.environment;version=&quot;1.1&quot;,org.eclipse.osgi.service.localization;version=&quot;1.0&quot;,org.eclipse.osgi.service.pluginconversion;version=&quot;1.0&quot;,org.eclipse.osgi.service.resolver;version=&quot;1.2&quot;,org.eclipse.osgi.service.runnable;version=&quot;1.1&quot;,org.eclipse.osgi.service.security; version=&quot;1.0&quot;,org.eclipse.osgi.service.urlconversion;version=&quot;1.0&quot;,org.eclipse.osgi.signedcontent; version=&quot;1.0&quot;,org.eclipse.osgi.storagemanager;version=&quot;1.0&quot;,org.eclipse.osgi.util;version=&quot;1.1&quot;,org.osgi.framework;version=&quot;1.4&quot;,org.osgi.service.condpermadmin;version=&quot;1.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2&quot;,org.osgi.service.permissionadmin;version=&quot;1.2&quot;,org.osgi.service.startlevel;version=&quot;1.1&quot;,org.osgi.service.url;version=&quot;1.0&quot;,org.osgi.util.tracker;version=&quot;1.3.3&quot;,org.eclipse.core.runtime.adaptor;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.runtime.internal.adaptor;x-internal:=true,org.eclipse.core.runtime.internal.stats;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.osgi.baseadaptor;x-internal:=true,org.eclipse.osgi.baseadaptor.bundlefile;x-internal:=true,org.eclipse.osgi.baseadaptor.hooks;x-internal:=true,org.eclipse.osgi.baseadaptor.loader;x-internal:=true,org.eclipse.osgi.framework.adaptor;x-internal:=true,org.eclipse.osgi.framework.debug;x-internal:=true,org.eclipse.osgi.framework.internal.core;x-internal:=true,org.eclipse.osgi.framework.internal.protocol;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.bundleentry;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.bundleresource;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.reference;x-internal:=true,org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true,org.eclipse.osgi.framework.launcher;x-internal:=true,org.eclipse.osgi.framework.util;x-internal:=true,org.eclipse.osgi.internal.baseadaptor;x-internal:=true,org.eclipse.osgi.internal.module;x-internal:=true,org.eclipse.osgi.internal.profile;x-internal:=true,org.eclipse.osgi.internal.resolver;x-internal:=true,org.eclipse.osgi.internal.provisional.service.security; x-friends:=&quot;org.eclipse.equinox.security.ui&quot;;version=&quot;1.0.0&quot;,org.eclipse.osgi.internal.provisional.verifier;x-friends:=&quot;org.eclipse.update.core,org.eclipse.ui.workbench,org.eclipse.equinox.p2.artifact.repository&quot;,org.eclipse.osgi.internal.service.security;x-friends:=&quot;org.eclipse.equinox.security.ui&quot;,org.eclipse.osgi.internal.signedcontent; x-internal:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5,OSGi/Minimum-1.1&#xA;Bundle-Localization: systembundle&#xA;Bundle-SymbolicName: org.eclipse.osgi; singleton:=true&#xA;Export-Service: org.osgi.service.packageadmin.PackageAdmin,org.osgi.service.permissionadmin.PermissionAdmin,org.osgi.service.startlevel.StartLevel,org.eclipse.osgi.service.debug.DebugOptions&#xA;Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter&#xA;Bundle-Description: %systemBundle&#xA;Bundle-Vendor: %eclipse.org&#xA;Bundle-Name: %systemBundle&#xA;Bundle-ManifestVersion: 2&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2568,7 +2425,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %name&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %provider-name&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.forms&#xA;Import-Package: com.ibm.icu.text,javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.3.103.v20081027_34x&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.forms,org.eclipse.ui.forms.editor,org.eclipse.ui.forms.events,org.eclipse.ui.forms.widgets,org.eclipse.ui.internal.forms;x-internal:=true,org.eclipse.ui.internal.forms.widgets;x-friends:=&quot;org.eclipse.ui.tests.forms&quot;&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %name&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %provider-name&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.forms&#xA;Import-Package: com.ibm.icu.text,javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.3.103.v20081027_34x&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.forms,org.eclipse.ui.forms.editor,org.eclipse.ui.forms.events,org.eclipse.ui.forms.widgets,org.eclipse.ui.internal.forms;x-internal:=true,org.eclipse.ui.internal.forms.widgets;x-friends:=&quot;org.eclipse.ui.tests.forms&quot;&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2601,7 +2458,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ant.core,org.eclipse.ant.internal.core;x-friends:=&quot;org.eclipse.ant.ui&quot;,org.eclipse.ant.internal.core.contentDescriber;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.variables;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ant.core.AntCorePlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.2.0.v20080529&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true; exceptions=&quot;org.eclipse.ant.internal.core.contentDescriber&quot;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ant.core,org.eclipse.ant.internal.core;x-friends:=&quot;org.eclipse.ant.ui&quot;,org.eclipse.ant.internal.core.contentDescriber;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.variables;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ant.core.AntCorePlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.2.0.v20080529&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true; exceptions=&quot;org.eclipse.ant.internal.core.contentDescriber&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2640,7 +2497,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Import-Package: com.ibm.icu.text,com.ibm.icu.util&#xA;Require-Bundle: org.eclipse.core.commands;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.text&#xA;Bundle-Version: 3.4.0.v20080605-1800&#xA;Export-Package: org.eclipse.jface.text; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.link; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.projection,org.eclipse.jface.text.source; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.templates; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.text.edits,org.eclipse.text.undo
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Import-Package: com.ibm.icu.text,com.ibm.icu.util&#xA;Require-Bundle: org.eclipse.core.commands;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.text&#xA;Bundle-Version: 3.4.0.v20080605-1800&#xA;Export-Package: org.eclipse.jface.text; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.link; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.projection,org.eclipse.jface.text.source; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.templates; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.text.edits,org.eclipse.text.undo&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2688,7 +2545,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-Description: %osgiServicesDes&#xA;Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0&#xA;Bundle-Name: %osgiServices&#xA;Bundle-ContactAddress: www.eclipse.org&#xA;Bundle-Vendor: %eclipse.org&#xA;Bundle-Copyright: %copyright&#xA;Bundle-DocUrl: http://www.eclipse.org&#xA;DynamicImport-Package: javax.servlet,javax.servlet.http&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.1.200.v20071203&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.osgi.service.cm; version=&quot;1.2&quot;,org.osgi.service.component; version=&quot;1.0&quot;,org.osgi.service.device; version=&quot;1.1&quot;,org.osgi.service.event; version=&quot;1.1&quot;,org.osgi.service.http; version=&quot;1.2&quot;,org.osgi.service.io; version=&quot;1.0&quot;,org.osgi.service.log; version=&quot;1.3&quot;,org.osgi.service.metatype; version=&quot;1.1&quot;,org.osgi.service.provisioning; version=&quot;1.1&quot;,org.osgi.service.upnp; version=&quot;1.1&quot;,org.osgi.service.useradmin; version=&quot;1.1&quot;,org.osgi.service.wireadmin; version=&quot;1.0&quot;&#xA;Bundle-SymbolicName: org.eclipse.osgi.services&#xA;Import-Package: org.osgi.framework; version=1.2,javax.servlet; resolution:=&quot;optional&quot;,javax.servlet.http; resolution:=&quot;optional&quot;
+            Bundle-ManifestVersion: 2&#xA;Bundle-Description: %osgiServicesDes&#xA;Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0&#xA;Bundle-Name: %osgiServices&#xA;Bundle-ContactAddress: www.eclipse.org&#xA;Bundle-Vendor: %eclipse.org&#xA;Bundle-Copyright: %copyright&#xA;Bundle-DocUrl: http://www.eclipse.org&#xA;DynamicImport-Package: javax.servlet,javax.servlet.http&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.1.200.v20071203&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.osgi.service.cm; version=&quot;1.2&quot;,org.osgi.service.component; version=&quot;1.0&quot;,org.osgi.service.device; version=&quot;1.1&quot;,org.osgi.service.event; version=&quot;1.1&quot;,org.osgi.service.http; version=&quot;1.2&quot;,org.osgi.service.io; version=&quot;1.0&quot;,org.osgi.service.log; version=&quot;1.3&quot;,org.osgi.service.metatype; version=&quot;1.1&quot;,org.osgi.service.provisioning; version=&quot;1.1&quot;,org.osgi.service.upnp; version=&quot;1.1&quot;,org.osgi.service.useradmin; version=&quot;1.1&quot;,org.osgi.service.wireadmin; version=&quot;1.0&quot;&#xA;Bundle-SymbolicName: org.eclipse.osgi.services&#xA;Import-Package: org.osgi.framework; version=1.2,javax.servlet; resolution:=&quot;optional&quot;,javax.servlet.http; resolution:=&quot;optional&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2746,7 +2603,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.security.auth;x-internal:=true,org.eclipse.equinox.internal.security.auth.events;x-internal:=true,org.eclipse.equinox.internal.security.auth.ext.loader;x-internal:=true,org.eclipse.equinox.internal.security.auth.nls;x-internal:=true,org.eclipse.equinox.internal.security.credentials;x-internal:=true,org.eclipse.equinox.internal.security.storage;x-internal:=true,org.eclipse.equinox.internal.security.storage.friends;version=&quot;1.0.0&quot;;x-friends:=&quot;org.eclipse.equinox.security.ui&quot;,org.eclipse.equinox.security.auth;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.auth.credentials;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.auth.module;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.storage;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.storage.provider;version=&quot;1.0.0&quot;&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Activator: org.eclipse.equinox.internal.security.auth.AuthPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.0.1.R34x_v20080721&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.security;singleton:=true&#xA;Import-Package: javax.crypto,javax.crypto.spec,javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.eclipse.core.internal.runtime;common=split,org.eclipse.core.runtime;registry=split,org.eclipse.core.runtime.jobs,org.eclipse.core.runtime.preferences,org.eclipse.osgi.framework.log;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.datalocation;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.debug;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.environment;version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.osgi.util;version=&quot;[1.1.0,2.0.0)&quot;,org.osgi.framework;version=&quot;[1.4.0,2.0.0)&quot;,org.osgi.service.prefs;version=&quot;[1.1.0,2.0.0)&quot;,org.osgi.util.tracker;version=&quot;[1.3.3,2.0.0)&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.security.auth;x-internal:=true,org.eclipse.equinox.internal.security.auth.events;x-internal:=true,org.eclipse.equinox.internal.security.auth.ext.loader;x-internal:=true,org.eclipse.equinox.internal.security.auth.nls;x-internal:=true,org.eclipse.equinox.internal.security.credentials;x-internal:=true,org.eclipse.equinox.internal.security.storage;x-internal:=true,org.eclipse.equinox.internal.security.storage.friends;version=&quot;1.0.0&quot;;x-friends:=&quot;org.eclipse.equinox.security.ui&quot;,org.eclipse.equinox.security.auth;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.auth.credentials;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.auth.module;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.storage;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.storage.provider;version=&quot;1.0.0&quot;&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Activator: org.eclipse.equinox.internal.security.auth.AuthPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.0.1.R34x_v20080721&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.security;singleton:=true&#xA;Import-Package: javax.crypto,javax.crypto.spec,javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.eclipse.core.internal.runtime;common=split,org.eclipse.core.runtime;registry=split,org.eclipse.core.runtime.jobs,org.eclipse.core.runtime.preferences,org.eclipse.osgi.framework.log;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.datalocation;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.debug;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.environment;version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.osgi.util;version=&quot;[1.1.0,2.0.0)&quot;,org.osgi.framework;version=&quot;[1.4.0,2.0.0)&quot;,org.osgi.service.prefs;version=&quot;[1.1.0,2.0.0)&quot;,org.osgi.util.tracker;version=&quot;[1.3.3,2.0.0)&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2781,7 +2638,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.filesystem,org.eclipse.core.filesystem.provider,org.eclipse.core.internal.filesystem;x-internal:=true,org.eclipse.core.internal.filesystem.local;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.common,org.eclipse.equinox.registry,org.eclipse.osgi&#xA;Bundle-Activator: org.eclipse.core.internal.filesystem.Activator&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.2.0.v20080604-1400&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.filesystem; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.filesystem,org.eclipse.core.filesystem.provider,org.eclipse.core.internal.filesystem;x-internal:=true,org.eclipse.core.internal.filesystem.local;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.common,org.eclipse.equinox.registry,org.eclipse.osgi&#xA;Bundle-Activator: org.eclipse.core.internal.filesystem.Activator&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.2.0.v20080604-1400&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.filesystem; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2831,7 +2688,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Version: 3.4.0.v20080516-0950&#xA;Eclipse-ExtensibleAPI: true&#xA;Bundle-ActivationPolicy: lazy&#xA;Eclipse-LazyStart: true&#xA;Export-Package: org.eclipse.core.internal.adapter;x-internal:=true,org.eclipse.core.internal.registry;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.internal.registry.osgi;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.internal.registry.spi;x-internal:=true,org.eclipse.core.runtime;registry=split;version=&quot;3.4.0&quot;;mandatory:=registry,org.eclipse.core.runtime.dynamichelpers;version=&quot;3.4.0&quot;,org.eclipse.core.runtime.spi;version=&quot;3.4.0&quot;&#xA;Import-Package: javax.xml.parsers,org.eclipse.core.runtime.jobs;resolution:=optional,org.eclipse.osgi.framework.console;resolution:=optional,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment;resolution:=optional,org.eclipse.osgi.service.resolver;resolution:=optional,org.eclipse.osgi.storagemanager,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker,org.xml.sax,org.xml.sax.helpers&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.core.internal.registry.osgi.Activator&#xA;Bundle-ClassPath: runtime_registry_compatibility.jar, .&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.registry;singleton:=true&#xA;Bundle-Vendor: %providerName&#xA;Bundle-Name: %pluginName&#xA;Bundle-ManifestVersion: 2
+            Bundle-Version: 3.4.0.v20080516-0950&#xA;Eclipse-ExtensibleAPI: true&#xA;Bundle-ActivationPolicy: lazy&#xA;Eclipse-LazyStart: true&#xA;Export-Package: org.eclipse.core.internal.adapter;x-internal:=true,org.eclipse.core.internal.registry;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.internal.registry.osgi;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.internal.registry.spi;x-internal:=true,org.eclipse.core.runtime;registry=split;version=&quot;3.4.0&quot;;mandatory:=registry,org.eclipse.core.runtime.dynamichelpers;version=&quot;3.4.0&quot;,org.eclipse.core.runtime.spi;version=&quot;3.4.0&quot;&#xA;Import-Package: javax.xml.parsers,org.eclipse.core.runtime.jobs;resolution:=optional,org.eclipse.osgi.framework.console;resolution:=optional,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment;resolution:=optional,org.eclipse.osgi.service.resolver;resolution:=optional,org.eclipse.osgi.storagemanager,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker,org.xml.sax,org.xml.sax.helpers&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.core.internal.registry.osgi.Activator&#xA;Bundle-ClassPath: runtime_registry_compatibility.jar, .&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.registry;singleton:=true&#xA;Bundle-Vendor: %providerName&#xA;Bundle-Name: %pluginName&#xA;Bundle-ManifestVersion: 2&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2860,7 +2717,122 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-Name: %bundleName&#xA;Bundle-Version: 2.4.0.v200806031604&#xA;Export-Package: javax.servlet;version=&quot;2.4&quot;,javax.servlet.http;version=&quot;2.4&quot;,javax.servlet.resources;version=&quot;2.4&quot;&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-SymbolicName: javax.servlet&#xA;Bundle-Localization: plugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %bundleProvider
+            Bundle-ManifestVersion: 2&#xA;Bundle-Name: %bundleName&#xA;Bundle-Version: 2.4.0.v200806031604&#xA;Export-Package: javax.servlet;version=&quot;2.4&quot;,javax.servlet.http;version=&quot;2.4&quot;,javax.servlet.resources;version=&quot;2.4&quot;&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-SymbolicName: javax.servlet&#xA;Bundle-Localization: plugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %bundleProvider&#xA;
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.cdmLibrary' version='2.1.0.v20090603_1459'>
+      <update id='eu.etaxonomy.cdmLibrary' range='[0.0.0,2.1.0.v20090603_1459)' severity='0'/>
+      <properties size='1'>
+        <property name='org.eclipse.equinox.p2.name' value='CDM Library Plug-in'/>
+      </properties>
+      <provides size='89'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary' version='2.1.0.v20090603_1459'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' version='2.1.0.v20090603_1459'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.application' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.application.eclipse' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.conversation' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service.config' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service.config.impl' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service.pager' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.api.service.pager.impl' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.aspectj' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.common' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.database' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.database.types' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.datagenerator' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.ext' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.hibernate' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.abcd206' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.berlinModel' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.common' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.excel.common' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.excel.distribution' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.excel.taxa' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.jaxb' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.sdd' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.synthesys' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.taxonx' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.io.tcsxml' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.jaxb' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.agent' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.common' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.common.init' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.description' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.location' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.media' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.molecular' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.name' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.occurrence' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.reference' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.taxon' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.model.view' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.persistence.hibernate' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.persistence.query' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.cache.agent' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.cache.common' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.cache.name' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.cache.reference' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.exceptions' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.cdm.strategy.parser' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.chainsaw' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.config' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.helpers' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.jdbc' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.jmx' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.lf5' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.lf5.config' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.lf5.util' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.lf5.viewer' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.lf5.viewer.categoryexplorer' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.lf5.viewer.configure' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.lf5.viewer.images' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.net' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.nt' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.or' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.or.jms' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.or.sax' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.spi' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.varia' version='0.0.0'/>
+        <provided namespace='java.package' name='org.apache.log4j.xml' version='0.0.0'/>
+        <provided namespace='java.package' name='org.joda.time' version='0.0.0'/>
+        <provided namespace='java.package' name='org.joda.time.base' version='0.0.0'/>
+        <provided namespace='java.package' name='org.joda.time.chrono' version='0.0.0'/>
+        <provided namespace='java.package' name='org.joda.time.convert' version='0.0.0'/>
+        <provided namespace='java.package' name='org.joda.time.field' version='0.0.0'/>
+        <provided namespace='java.package' name='org.joda.time.format' version='0.0.0'/>
+        <provided namespace='java.package' name='org.joda.time.tz' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.core.io' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.orm.hibernate3' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.transaction' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.transaction.annotation' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.transaction.config' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.transaction.interceptor' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.transaction.jta' version='0.0.0'/>
+        <provided namespace='java.package' name='org.springframework.transaction.support' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='2'>
+        <required namespace='osgi.bundle' name='org.eclipse.osgi' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.pde.source' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.cdmLibrary' version='2.1.0.v20090603_1459'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='2'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Bundle-Version: 2.1.0.v20090603_1459&#xA;Export-Package: eu.etaxonomy.cdm,eu.etaxonomy.cdm.api.application,eu.etaxonomy.cdm.api.application.eclipse,eu.etaxonomy.cdm.api.conversation,eu.etaxonomy.cdm.api.service,eu.etaxonomy.cdm.api.service.config,eu.etaxonomy.cdm.api.service.config.impl,eu.etaxonomy.cdm.api.service.pager,eu.etaxonomy.cdm.api.service.pager.impl,eu.etaxonomy.cdm.aspectj,eu.etaxonomy.cdm.common,eu.etaxonomy.cdm.database,eu.etaxonomy.cdm.database.types,eu.etaxonomy.cdm.datagenerator,eu.etaxonomy.cdm.ext,eu.etaxonomy.cdm.hibernate,eu.etaxonomy.cdm.io.abcd206,eu.etaxonomy.cdm.io.berlinModel,eu.etaxonomy.cdm.io.common,eu.etaxonomy.cdm.io.excel.common,eu.etaxonomy.cdm.io.excel.distribution,eu.etaxonomy.cdm.io.excel.taxa,eu.etaxonomy.cdm.io.jaxb,eu.etaxonomy.cdm.io.sdd,eu.etaxonomy.cdm.io.synthesys,eu.etaxonomy.cdm.io.taxonx,eu.etaxonomy.cdm.io.tcsxml,eu.etaxonomy.cdm.jaxb,eu.etaxonomy.cdm.model.agent,eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.common.init,eu.etaxonomy.cdm.model.description,eu.etaxonomy.cdm.model.location,eu.etaxonomy.cdm.model.media,eu.etaxonomy.cdm.model.molecular,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.occurrence,eu.etaxonomy.cdm.model.reference,eu.etaxonomy.cdm.model.taxon,eu.etaxonomy.cdm.model.view,eu.etaxonomy.cdm.persistence.hibernate,eu.etaxonomy.cdm.persistence.query,eu.etaxonomy.cdm.strategy,eu.etaxonomy.cdm.strategy.cache.agent,eu.etaxonomy.cdm.strategy.cache.common,eu.etaxonomy.cdm.strategy.cache.name,eu.etaxonomy.cdm.strategy.cache.reference,eu.etaxonomy.cdm.strategy.exceptions,eu.etaxonomy.cdm.strategy.parser,org.apache.log4j;uses:=&quot;org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi&quot;,org.apache.log4j.chainsaw; uses:=&quot;org.apache.log4j,  javax.swing,  javax.swing.table,  org.apache.log4j.spi,  javax.swing.event,  org.xml.sax.helpers,  org.xml.sax&quot;,org.apache.log4j.config;uses:=&quot;org.apache.log4j&quot;,org.apache.log4j.helpers;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.jdbc;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.jmx;uses:=&quot;org.apache.log4j,org.apache.log4j.spi,javax.management&quot;,org.apache.log4j.lf5;uses:=&quot;org.apache.log4j.lf5.viewer,org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.lf5.config,org.apache.log4j.lf5.util;uses:=&quot;org.apache.log4j.lf5.viewer,org.apache.log4j.lf5&quot;,org.apache.log4j.lf5.viewer; uses:=&quot;org.apache.log4j.lf5.util,  org.apache.log4j.lf5.viewer.categoryexplorer,  org.apache.log4j.lf5,  javax.swing,  javax.swing.table,  javax.swing.event,  org.apache.log4j.lf5.viewer.configure&quot;,org.apache.log4j.lf5.viewer.categoryexplorer; uses:=&quot;org.apache.log4j.lf5,  javax.swing.tree,  javax.swing,  javax.swing.table,  javax.swing.event&quot;,org.apache.log4j.lf5.viewer.configure;uses:=&quot;org.apache.log4j.lf5.viewer,javax.swing.tree,org.w3c.dom&quot;,org.apache.log4j.lf5.viewer.images,org.apache.log4j.net; uses:=&quot;javax.naming,  org.apache.log4j.helpers,  org.apache.log4j,  javax.jms,  javax.mail.internet,  org.apache.log4j.spi,  javax.mail&quot;,org.apache.log4j.nt;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.or;uses:=&quot;org.apache.log4j.spi&quot;,org.apache.log4j.or.jms;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.or.sax;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.spi;uses:=&quot;org.apache.log4j,org.apache.log4j.or&quot;,org.apache.log4j.varia;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.xml; uses:=&quot;org.apache.log4j.config,  org.apache.log4j.helpers,  org.apache.log4j,  javax.xml.parsers,  org.apache.log4j.spi,  org.w3c.dom,  org.xml.sax&quot;,org.joda.time; uses:=&quot;org.joda.time.base,  org.joda.time.field,  org.joda.time.chrono,  org.joda.time.tz,  org.joda.time.format&quot;,org.joda.time.base;uses:=&quot;org.joda.time,org.joda.time.format&quot;,org.joda.time.chrono;uses:=&quot;org.joda.time.field,org.joda.time&quot;,org.joda.time.convert;uses:=&quot;org.joda.time,org.joda.time.format&quot;,org.joda.time.field;uses:=&quot;org.joda.time&quot;,org.joda.time.format;uses:=&quot;org.joda.time&quot;,org.joda.time.tz;uses:=&quot;org.joda.time&quot;,org.springframework.core,org.springframework.core.io,org.springframework.orm.hibernate3,org.springframework.transaction;uses:=&quot;org.springframework.core&quot;,org.springframework.transaction.annotation,org.springframework.transaction.config,org.springframework.transaction.interceptor,org.springframework.transaction.jta,org.springframework.transaction.support&#xA;Require-Bundle: org.eclipse.osgi,org.eclipse.pde.source&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: eu.etaxonomy.cdmLibrary;singleton:=true&#xA;Bundle-Name: CDM Library Plug-in&#xA;Bundle-ClassPath: antlr-2.7.6.jar,asm-attrs.jar,asm.jar,cglib-2.1.3.jar,commons-collections-3.2.jar,commons-logging-1.0.4.jar,dom4j-1.6.1.jar,ehcache-1.2.3.jar,ejb3-persistence.jar,hibernate-annotations-3.4.0-SNAPSHOT.jar,hibernate-commons-annotations-3.4.0-SNAPSHOT.jar,hibernate-core-3.4.0-SNAPSHOT.jar,hibernate-envers-3.4.0-SNAPSHOT.jar,hibernate-search-3.1.0.GA.jar,hibernate-tools-3.2.0.ga.jar,slf4j-api-1.5.2.jar,slf4j-log4j12-1.5.2.jar,javassist.jar,jdbc2_0-stdext.jar,jta.jar,junit-4.4.jar,log4j-1.2.14.jar,mysql-connector-java-3.1.14-bin.jar,xml-apis.jar,xercesImpl.jar,hsqldb.jar,jaxb-api.jar,jaxb-impl-2.0.jar,jdom-1.0.jar,msbase-2000.3.jar,mssqlserver-2000.3.jar,msutil-2000.3.jar,opencsv-1.8.jar,jtds-1.2.2.jar,postgresql-8.2-504.jdbc4.jar,aopalliance-1.0.jar,spring-2.5.jar,spring-beans-2.5.jar,spring-context-2.5.jar,spring-core-2.5.jar,spring-jdbc-2.5.jar,spring-orm-2.5.jar,spring-test-2.5.jar,spring-tx-2.5.jar,h2-1.0.73.jar,joda-time-1.5.jar,joda-time-hibernate-1.0.jar,sanselan-0.94-incubator.jar,poi-3.1-FINAL.jar,spring-security-core-2.0.4.jar,aspectjweaver-1.5.4.jar,lucene-core-2.4.0.jar,lucene-spellchecker-2.4.0.jar,lsid-client-1.1.2.jar,lsid-server-1.1.2.jar,wsdl4j-1.6.1.jar,spring-2.5.6.jar,spring-aop-2.5.6.jar,spring-beans-2.5.6.jar,spring-context-2.5.6.jar,spring-core-2.5.6.jar,spring-jdbc-2.5.6.jar,spring-modules-lucene-0.8a.jar,spring-orm-2.5.6.jar,spring-test-2.5.6.jar,spring-web-2.5.6.jar,spring-webmvc-2.5.6.jar,unitils-1.0.jar,jsr250-api-1.0.jar,cdmlib-commons-2.1.jar,cdmlib-ext-2.1.jar,cdmlib-io-2.1.jar,cdmlib-model-2.1.jar,cdmlib-persistence-2.1.jar,cdmlib-services-2.1.jar,cdmlib-persistence-2.1-tests.jar,hibernate-validator-3.1.0.GA.jar,aspectjrt-1.6.3.jar,aspectjweaver-1.6.3.jar,aspectjtools-1.6.3.jar,spring-aspects-2.5.6.jar,spring-agent-2.5.6.jar&#xA;
+          </instruction>
+          <instruction key='zipped'>
+            true
           </instruction>
         </instructions>
       </touchpointData>
@@ -2897,7 +2869,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ClassPath: icu-jse4.jar,icu-data.jar,.&#xA;Bundle-SymbolicName: com.ibm.icu; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.8.1.v20080530&#xA;Bundle-Localization: plugin&#xA;Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright IBM Corp. 2000, 2008. All Rights Reserved. IBM is a registered trademark of IBM Corp.&#xA;Eclipse-ExtensibleAPI: true&#xA;Export-Package: com.ibm.icu.lang;version=&quot;3.8.1&quot;,com.ibm.icu.math;version=&quot;3.8.1&quot;,com.ibm.icu.text;version=&quot;3.8.1&quot;,com.ibm.icu.util;version=&quot;3.8.1&quot;,com.ibm.icu.impl;x-internal:=true,com.ibm.icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt38b;x-internal:=true,com.ibm.icu.impl.data.icudt38b.brkitr;x-internal:=true,com.ibm.icu.impl.data.icudt38b.coll;x-internal:=true,com.ibm.icu.impl.data.icudt38b.rbnf;x-internal:=true,com.ibm.icu.impl.data.icudt38b.translit;x-internal:=true
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ClassPath: icu-jse4.jar,icu-data.jar,.&#xA;Bundle-SymbolicName: com.ibm.icu; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.8.1.v20080530&#xA;Bundle-Localization: plugin&#xA;Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright IBM Corp. 2000, 2008. All Rights Reserved. IBM is a registered trademark of IBM Corp.&#xA;Eclipse-ExtensibleAPI: true&#xA;Export-Package: com.ibm.icu.lang;version=&quot;3.8.1&quot;,com.ibm.icu.math;version=&quot;3.8.1&quot;,com.ibm.icu.text;version=&quot;3.8.1&quot;,com.ibm.icu.util;version=&quot;3.8.1&quot;,com.ibm.icu.impl;x-internal:=true,com.ibm.icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt38b;x-internal:=true,com.ibm.icu.impl.data.icudt38b.brkitr;x-internal:=true,com.ibm.icu.impl.data.icudt38b.coll;x-internal:=true,com.ibm.icu.impl.data.icudt38b.rbnf;x-internal:=true,com.ibm.icu.impl.data.icudt38b.translit;x-internal:=true&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2933,7 +2905,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.filebuffers.FileBuffersPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.core.filebuffers; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603-2000&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.filebuffers,org.eclipse.core.filebuffers.manipulation,org.eclipse.core.internal.filebuffers;x-internal:=true&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.filebuffers.FileBuffersPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.core.filebuffers; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603-2000&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.filebuffers,org.eclipse.core.filebuffers.manipulation,org.eclipse.core.internal.filebuffers;x-internal:=true&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
@@ -2955,948 +2927,103 @@
         <provided namespace='java.package' name='org.eclipse.core.internal.properties' version='0.0.0'/>
         <provided namespace='java.package' name='org.eclipse.core.internal.propertytester' version='0.0.0'/>
         <provided namespace='java.package' name='org.eclipse.core.internal.refresh' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.resources' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.resources.mapping' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.resources.refresh.win32' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.utils' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.watson' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.resources' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.resources.mapping' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.resources.refresh' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.resources.team' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
-      </provides>
-      <requires size='4'>
-        <required namespace='osgi.bundle' name='org.eclipse.ant.core' range='[3.1.0,4.0.0)' optional='true'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='[3.1.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='[1.1.0,2.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.eclipse.core.resources' version='3.4.2.R34x_v20090126'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.dtree;x-internal:=true,org.eclipse.core.internal.events;x-internal:=true,org.eclipse.core.internal.localstore;x-internal:=true,org.eclipse.core.internal.properties;x-internal:=true,org.eclipse.core.internal.propertytester;x-internal:=true,org.eclipse.core.internal.refresh;x-internal:=true,org.eclipse.core.internal.resources;x-internal:=true,org.eclipse.core.internal.resources.mapping;x-internal:=true,org.eclipse.core.internal.resources.refresh.win32;x-internal:=true,org.eclipse.core.internal.utils;x-internal:=true,org.eclipse.core.internal.watson;x-internal:=true,org.eclipse.core.resources,org.eclipse.core.resources.mapping,org.eclipse.core.resources.refresh,org.eclipse.core.resources.team&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ant.core;bundle-version=&quot;[3.1.0,4.0.0)&quot;;resolution:=optional,org.eclipse.core.expressions;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.4.2.R34x_v20090126&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.resources; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b' singleton='false'>
-      <update id='org.eclipse.core.databinding' range='[0.0.0,1.1.1.M20080827-0800b)' severity='0'/>
-      <properties size='4'>
-        <property name='df_LT.providerName' value='Eclipse.org'/>
-        <property name='df_LT.pluginName' value='JFace Data Binding'/>
-        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
-      </properties>
-      <provides size='20'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'/>
-        <provided namespace='osgi.bundle' name='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.conversion' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.observable' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.list' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.map' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.masterdetail' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.set' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.value' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.util' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.databinding.validation' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.databinding' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.conversion' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.observable' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.observable.masterdetail' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.observable.tree' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.validation' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
-      </provides>
-      <requires size='5'>
-        <required namespace='osgi.bundle' name='org.eclipse.equinox.common' range='[3.2.0,4.0.0)'/>
-        <required namespace='java.package' name='com.ibm.icu.text' range='0.0.0'/>
-        <required namespace='java.package' name='org.osgi.framework' range='[1.4.0,2.0.0)' optional='true'/>
-        <required namespace='java.package' name='org.osgi.util.tracker' range='[1.3.3,2.0.0)' optional='true'/>
-        <required namespace='java.package' name='org.eclipse.osgi.framework.log' range='[1.0.0,2.0.0)' optional='true'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.internal.databinding.Activator&#xA;Bundle-Vendor: %providerName&#xA;Import-Package-Comment: see http://wiki.eclipse.org/&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 1.1.1.M20080827-0800b&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.databinding,org.eclipse.core.databinding.conversion;x-internal:=false,org.eclipse.core.databinding.observable,org.eclipse.core.databinding.observable.list;x-internal:=false,org.eclipse.core.databinding.observable.map,org.eclipse.core.databinding.observable.masterdetail,org.eclipse.core.databinding.observable.set;x-internal:=false,org.eclipse.core.databinding.observable.value;x-internal:=false,org.eclipse.core.databinding.util,org.eclipse.core.databinding.validation;x-internal:=false,org.eclipse.core.internal.databinding;x-friends:=&quot;org.eclipse.core.databinding.beans&quot;,org.eclipse.core.internal.databinding.conversion;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.observable;x-internal:=true,org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.observable.tree;x-friends:=&quot;org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.validation;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;&#xA;Bundle-SymbolicName: org.eclipse.core.databinding&#xA;Import-Package: com.ibm.icu.text,org.osgi.framework;version=&quot;[1.4.0,2.0.0)&quot;;resolution:=optional,org.osgi.util.tracker;version=&quot;[1.3.3,2.0.0)&quot;;resolution:=optional,org.eclipse.osgi.framework.log;version=&quot;[1.0.0,2.0.0)&quot;;resolution:=optional
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800' singleton='false'>
-      <update id='org.eclipse.jface.text' range='[0.0.0,3.4.2.r342_v20081119-0800)' severity='0'/>
-      <properties size='4'>
-        <property name='df_LT.providerName' value='Eclipse.org'/>
-        <property name='df_LT.pluginName' value='JFace Text'/>
-        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
-      </properties>
-      <provides size='27'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800'/>
-        <provided namespace='osgi.bundle' name='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800'/>
-        <provided namespace='java.package' name='org.eclipse.jface.contentassist' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.contentassist.images' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.internal.text' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.internal.text.html' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.internal.text.link.contentassist' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.internal.text.revisions' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.internal.text.source' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.contentassist' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.formatter' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.hyperlink' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.information' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.link' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.presentation' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.quickassist' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.reconciler' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.revisions' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.rules' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.source' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.source.projection' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.source.projection.images' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.templates' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.jface.text.templates.persistence' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
-      </provides>
-      <requires size='4'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.text' range='[3.4.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface' range='[3.4.0,4.0.0)'/>
-        <required namespace='java.package' name='com.ibm.icu.text' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Import-Package: com.ibm.icu.text&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.jface.text&#xA;Bundle-Version: 3.4.2.r342_v20081119-0800&#xA;Export-Package: org.eclipse.jface.contentassist,org.eclipse.jface.contentassist.images,org.eclipse.jface.internal.text;x-internal:=true,org.eclipse.jface.internal.text.html;x-friends:=&quot;org.eclipse.ui.workbench.texteditor, org.eclipse.ui.editors, org.eclipse.jdt.debug.ui, org.eclipse.jdt.ui, org.eclipse.ant.ui, org.eclipse.ltk.ui.refactoring&quot;,org.eclipse.jface.internal.text.link.contentassist;x-internal:=true,org.eclipse.jface.internal.text.revisions;x-internal:=true,org.eclipse.jface.internal.text.source;x-internal:=true,org.eclipse.jface.text,org.eclipse.jface.text.contentassist,org.eclipse.jface.text.formatter,org.eclipse.jface.text.hyperlink,org.eclipse.jface.text.information,org.eclipse.jface.text.link,org.eclipse.jface.text.presentation,org.eclipse.jface.text.quickassist,org.eclipse.jface.text.reconciler,org.eclipse.jface.text.revisions,org.eclipse.jface.text.rules,org.eclipse.jface.text.source,org.eclipse.jface.text.source.projection,org.eclipse.jface.text.source.projection.images,org.eclipse.jface.text.templates,org.eclipse.jface.text.templates.persistence
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='org.eclipse.ui.workbench.texteditor' version='3.4.1.r341_v20080827-1100'>
-      <update id='org.eclipse.ui.workbench.texteditor' range='[0.0.0,3.4.1.r341_v20080827-1100)' severity='0'/>
-      <properties size='4'>
-        <property name='df_LT.providerName' value='Eclipse.org'/>
-        <property name='df_LT.pluginName' value='Text Editor Framework'/>
-        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
-      </properties>
-      <provides size='17'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' version='3.4.1.r341_v20080827-1100'/>
-        <provided namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' version='3.4.1.r341_v20080827-1100'/>
-        <provided namespace='java.package' name='org.eclipse.ui.contentassist' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.quickdiff' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.rulers' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.spelling' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.texteditor' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.texteditor.link' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.texteditor.quickdiff' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.texteditor.rulers' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.texteditor.spelling' version='0.0.0'/>
-        <provided namespace='java.package' name='org.eclipse.ui.texteditor.templates' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
-      </provides>
-      <requires size='5'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='[3.4.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='[3.4.0,4.0.0)'/>
-        <required namespace='java.package' name='com.ibm.icu.text' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.eclipse.ui.workbench.texteditor' version='3.4.1.r341_v20080827-1100'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.texteditor.TextEditorPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.1.r341_v20080827-1100&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.contentassist,org.eclipse.ui.internal.texteditor;x-internal:=true; texteditor=&quot;split&quot;; mandatory:=&quot;texteditor&quot;,org.eclipse.ui.internal.texteditor.quickdiff;x-internal:=true,org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence;x-internal:=true,org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer;x-internal:=true,org.eclipse.ui.internal.texteditor.rulers;x-internal:=true,org.eclipse.ui.internal.texteditor.spelling;x-internal:=true,org.eclipse.ui.texteditor; texteditor=&quot;split&quot;; mandatory:=&quot;texteditor&quot;,org.eclipse.ui.texteditor.link,org.eclipse.ui.texteditor.quickdiff,org.eclipse.ui.texteditor.rulers,org.eclipse.ui.texteditor.spelling,org.eclipse.ui.texteditor.templates&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.090602'>
-      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[0.0.0,2.0.0.090602)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-      </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.090602'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.090602'/>
-      </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
-      <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.090602'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'>
-      <update id='eu.etaxonomy.taxeditor.editor' range='[0.0.0,2.0.0.090602)' severity='0'/>
-      <properties size='4'>
-        <property name='df_LT.Bundle-Vendor.0' value='EDIT'/>
-        <property name='df_LT.Bundle-Name.0' value='EDIT Taxonomic Editor - Editor Bundle'/>
-        <property name='org.eclipse.equinox.p2.name' value='%Bundle-Name.0'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%Bundle-Vendor.0'/>
-      </properties>
-      <provides size='22'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.reference' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.description' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.images' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.name' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.reference' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type.wizard' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
-      </provides>
-      <requires size='15'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.editor,eu.etaxonomy.taxeditor.editor.description,eu.etaxonomy.taxeditor.editor.description.handler,eu.etaxonomy.taxeditor.editor.handler,eu.etaxonomy.taxeditor.editor.images,eu.etaxonomy.taxeditor.editor.images.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.propertysheet,eu.etaxonomy.taxeditor.propertysheet.description,eu.etaxonomy.taxeditor.propertysheet.images,eu.etaxonomy.taxeditor.propertysheet.name,eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard,eu.etaxonomy.taxeditor.propertysheet.reference,eu.etaxonomy.taxeditor.propertysheet.type,eu.etaxonomy.taxeditor.propertysheet.type.wizard&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface;bundle-version=&quot;3.4.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.expressions;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin&#xA;Bundle-Name: %Bundle-Name.0&#xA;Bundle-Version: 2.0.0.090602&#xA;Bundle-Vendor: %Bundle-Vendor.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .,icons/
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'>
-      <update id='eu.etaxonomy.taxeditor.store' range='[0.0.0,2.0.0.090602)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - DataStore Bundle'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-      </properties>
-      <provides size='14'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.view' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.wizard' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.model' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.operations' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.parser' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.preference' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='9'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.1.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
-        <required namespace='java.package' name='junit.framework' range='0.0.0'/>
-        <required namespace='java.package' name='org.junit' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.handler,eu.etaxonomy.taxeditor.store,eu.etaxonomy.taxeditor.store.datasource,eu.etaxonomy.taxeditor.store.datasource.handler,eu.etaxonomy.taxeditor.store.datasource.view,eu.etaxonomy.taxeditor.store.datasource.wizard,eu.etaxonomy.taxeditor.store.internal,eu.etaxonomy.taxeditor.store.model;uses:=&quot;eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon&quot;,eu.etaxonomy.taxeditor.store.operations,eu.etaxonomy.taxeditor.store.parser,eu.etaxonomy.taxeditor.store.preference&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.1.0&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin&#xA;Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle&#xA;Bundle-Version: 2.0.0.090602&#xA;Bundle-Vendor: EDIT&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true&#xA;Import-Package: junit.framework,org.junit&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'>
-      <update id='eu.etaxonomy.taxeditor.application' range='[0.0.0,2.0.0.090602)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-      </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='8'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' range='1.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-Vendor: EDIT&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: EDIT Taxonomic Editor&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.navigation;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true&#xA;Bundle-Version: 2.0.0.090602&#xA;Export-Package: eu.etaxonomy.taxeditor
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'>
-      <update id='eu.etaxonomy.taxeditor.navigation' range='[0.0.0,2.0.0.090602)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - Navigation Bundle'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-      </properties>
-      <provides size='8'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.search' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.taxonomictree' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='13'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.navigator;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.navigator.resources;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin&#xA;Bundle-Version: 2.0.0.090602&#xA;Export-Package: eu.etaxonomy.taxeditor.navigation,eu.etaxonomy.taxeditor.navigation.handler,eu.etaxonomy.taxeditor.navigation.internal,eu.etaxonomy.taxeditor.navigation.search,eu.etaxonomy.taxeditor.navigation.taxonomictree&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle&#xA;Bundle-Vendor: EDIT
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.090602' singleton='false'>
-      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[0.0.0,2.0.0.090602)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.090602'/>
-      </provides>
-      <requires size='58'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='com.ibm.icu' range='[3.8.1.v20080530,3.8.1.v20080530]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='javax.servlet' range='[2.4.0.v200806031604,2.4.0.v200806031604]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ant.core' range='[3.2.0.v20080529,3.2.0.v20080529]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.commands' range='[3.4.0.I20080509-2000,3.4.0.I20080509-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.contenttype' range='[3.3.0.v20080604-1400,3.3.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding' range='[1.1.1.M20080827-0800b,1.1.1.M20080827-0800b]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding.beans' range='[1.1.1.M20080827-0800a,1.1.1.M20080827-0800a]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.expressions' range='[3.4.1.r342_v20081203-0800,3.4.1.r342_v20081203-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filebuffers' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem' range='[1.2.0.v20080604-1400,1.2.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.macosx' range='[1.0.0.v20080604-1400,1.0.0.v20080604-1400]'>
-          <filter>
-            (&amp;(osgi.os=macosx))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.jobs' range='[3.4.1.R34x_v20081128,3.4.1.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net' range='[1.1.0.I20080604,1.1.0.I20080604]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='[3.4.2.R34x_v20090126,3.4.2.R34x_v20090126]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.compatibility' range='[3.4.0.v20080604-1400,3.4.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='[3.4.0.v20080512,3.4.0.v20080512]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.auth' range='[3.2.100.v20070502,3.2.100.v20070502]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.registry' range='[3.2.200.v20080610,3.2.200.v20080610]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.variables' range='[3.2.100.v20080529-1300,3.2.100.v20080529-1300]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.app' range='[1.1.0.v20080421-2006,1.1.0.v20080421-2006]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.common' range='[3.4.0.v20080421-2006,3.4.0.v20080421-2006]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.preferences' range='[3.2.201.R34x_v20080709,3.2.201.R34x_v20080709]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.registry' range='[3.4.0.v20080516-0950,3.4.0.v20080516-0950]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security' range='[1.0.1.R34x_v20080721,1.0.1.R34x_v20080721]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.macosx' range='[1.0.0.v20080602-2000,1.0.0.v20080602-2000]'>
-          <filter>
-            (&amp;(osgi.os=macosx))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.help' range='[3.3.102.v20081014_34x,3.3.102.v20081014_34x]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface' range='[3.4.2.M20090107-0800,3.4.2.M20090107-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.databinding' range='[1.2.1.M20080827-0800a,1.2.1.M20080827-0800a]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='[3.4.2.r342_v20081119-0800,3.4.2.r342_v20081119-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='[3.4.3.R34x_v20081215-1030,3.4.3.R34x_v20081215-1030]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi.services' range='[3.1.200.v20071203,3.1.200.v20071203]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.pde.source' range='[3.4.0.v20080603,3.4.0.v20080603]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt' range='[3.4.2.v3452b,3.4.2.v3452b]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.carbon.macosx' range='[3.4.1.v3452b,3.4.1.v3452b]'>
-          <filter>
-            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.text' range='[3.4.0.v20080605-1800,3.4.0.v20080605-1800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='[3.4.2.M20090204-0800,3.4.2.M20090204-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.carbon' range='[4.0.0.I20080610-1200,4.0.0.I20080610-1200]'>
-          <filter>
-            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.forms' range='[3.3.103.v20081027_34x,3.3.103.v20081027_34x]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator' range='[3.3.102.M20090127-1700,3.3.102.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator.resources' range='[3.3.101.M20080910-0800,3.3.101.M20080910-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views' range='[3.3.1.M20081112-0800,3.3.1.M20081112-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views.properties.tabbed' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='[3.4.1.r341_v20080827-1100,3.4.1.r341_v20080827-1100]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.configurator' range='[3.2.201.R34x_v20080819,3.2.201.R34x_v20080819]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core' range='[3.2.202.R34x_v20081128,3.2.202.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.ui' range='[3.2.101.R34x_v20081128,3.2.101.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.junit4' range='[4.3.1,4.3.1]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core.win32' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.win32.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.win32' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[2.0.0.090602,2.0.0.090602]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.090602'>
-      <update id='eu.etaxonomy.taxeditor.feature.jar' range='[0.0.0,2.0.0.090602)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-      </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.090602'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor' version='2.0.0.090602'/>
-      </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
-      <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.090602'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.090602' singleton='false'>
-      <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,2.0.0.090602)' severity='0'/>
-      <properties size='5'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.090602'/>
-      </provides>
-      <requires size='7'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[2.0.0.090602,2.0.0.090602]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' range='[2.0.0.090602,2.0.0.090602]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' range='[2.0.0.090602,2.0.0.090602]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' range='[2.0.0.090602,2.0.0.090602]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' range='[2.0.0.090602,2.0.0.090602]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' range='[2.0.0.090602,2.0.0.090602]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
-    </unit>
-    <unit id='Cdm Library' version='0.0.0'>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='Cdm Library'/>
-        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='Cdm Library' version='0.0.0'/>
-      </provides>
-      <requires size='1'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.v200906021611' singleton='false'>
-      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.v200906021611'/>
-      </provides>
-      <requires size='58'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='com.ibm.icu' range='[3.8.1.v20080530,3.8.1.v20080530]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='javax.servlet' range='[2.4.0.v200806031604,2.4.0.v200806031604]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ant.core' range='[3.2.0.v20080529,3.2.0.v20080529]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.commands' range='[3.4.0.I20080509-2000,3.4.0.I20080509-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.contenttype' range='[3.3.0.v20080604-1400,3.3.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding' range='[1.1.1.M20080827-0800b,1.1.1.M20080827-0800b]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding.beans' range='[1.1.1.M20080827-0800a,1.1.1.M20080827-0800a]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.expressions' range='[3.4.1.r342_v20081203-0800,3.4.1.r342_v20081203-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filebuffers' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem' range='[1.2.0.v20080604-1400,1.2.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.macosx' range='[1.0.0.v20080604-1400,1.0.0.v20080604-1400]'>
-          <filter>
-            (&amp;(osgi.os=macosx))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.jobs' range='[3.4.1.R34x_v20081128,3.4.1.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net' range='[1.1.0.I20080604,1.1.0.I20080604]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='[3.4.2.R34x_v20090126,3.4.2.R34x_v20090126]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.compatibility' range='[3.4.0.v20080604-1400,3.4.0.v20080604-1400]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='[3.4.0.v20080512,3.4.0.v20080512]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.auth' range='[3.2.100.v20070502,3.2.100.v20070502]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.registry' range='[3.2.200.v20080610,3.2.200.v20080610]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.variables' range='[3.2.100.v20080529-1300,3.2.100.v20080529-1300]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.app' range='[1.1.0.v20080421-2006,1.1.0.v20080421-2006]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.common' range='[3.4.0.v20080421-2006,3.4.0.v20080421-2006]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.preferences' range='[3.2.201.R34x_v20080709,3.2.201.R34x_v20080709]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.registry' range='[3.4.0.v20080516-0950,3.4.0.v20080516-0950]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security' range='[1.0.1.R34x_v20080721,1.0.1.R34x_v20080721]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.macosx' range='[1.0.0.v20080602-2000,1.0.0.v20080602-2000]'>
-          <filter>
-            (&amp;(osgi.os=macosx))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.help' range='[3.3.102.v20081014_34x,3.3.102.v20081014_34x]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface' range='[3.4.2.M20090107-0800,3.4.2.M20090107-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.databinding' range='[1.2.1.M20080827-0800a,1.2.1.M20080827-0800a]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='[3.4.2.r342_v20081119-0800,3.4.2.r342_v20081119-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='[3.4.3.R34x_v20081215-1030,3.4.3.R34x_v20081215-1030]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi.services' range='[3.1.200.v20071203,3.1.200.v20071203]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.pde.source' range='[3.4.0.v20080603,3.4.0.v20080603]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt' range='[3.4.2.v3452b,3.4.2.v3452b]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.carbon.macosx' range='[3.4.1.v3452b,3.4.1.v3452b]'>
-          <filter>
-            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.text' range='[3.4.0.v20080605-1800,3.4.0.v20080605-1800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='[3.4.2.M20090204-0800,3.4.2.M20090204-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.carbon' range='[4.0.0.I20080610-1200,4.0.0.I20080610-1200]'>
-          <filter>
-            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.forms' range='[3.3.103.v20081027_34x,3.3.103.v20081027_34x]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator' range='[3.3.102.M20090127-1700,3.3.102.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator.resources' range='[3.3.101.M20080910-0800,3.3.101.M20080910-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views' range='[3.3.1.M20081112-0800,3.3.1.M20081112-0800]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views.properties.tabbed' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='[3.4.1.r341_v20080827-1100,3.4.1.r341_v20080827-1100]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.configurator' range='[3.2.201.R34x_v20080819,3.2.201.R34x_v20080819]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core' range='[3.2.202.R34x_v20081128,3.2.202.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.ui' range='[3.2.101.R34x_v20081128,3.2.101.R34x_v20081128]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.junit4' range='[4.3.1,4.3.1]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core.win32' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.win32.win32.x86' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32)(osgi.arch=x86))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.win32' range='0.0.0'>
-          <filter>
-            (&amp;(osgi.os=win32))
-          </filter>
-        </required>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[2.0.0.v200906021611,2.0.0.v200906021611]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v200906021611' singleton='false'>
-      <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
-      <properties size='5'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v200906021611'/>
-      </provides>
-      <requires size='7'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[2.0.0.v200906021611,2.0.0.v200906021611]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' range='[2.0.0.v200906021611,2.0.0.v200906021611]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'>
-      <update id='eu.etaxonomy.taxeditor.editor' range='[0.0.0,2.0.0.v200906021612)' severity='0'/>
-      <properties size='4'>
-        <property name='df_LT.Bundle-Vendor.0' value='EDIT'/>
-        <property name='df_LT.Bundle-Name.0' value='EDIT Taxonomic Editor - Editor Bundle'/>
-        <property name='org.eclipse.equinox.p2.name' value='%Bundle-Name.0'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%Bundle-Vendor.0'/>
-      </properties>
-      <provides size='22'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.reference' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.description' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.images' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.name' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.reference' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type.wizard' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
-      </provides>
-      <requires size='15'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.editor,eu.etaxonomy.taxeditor.editor.description,eu.etaxonomy.taxeditor.editor.description.handler,eu.etaxonomy.taxeditor.editor.handler,eu.etaxonomy.taxeditor.editor.images,eu.etaxonomy.taxeditor.editor.images.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.propertysheet,eu.etaxonomy.taxeditor.propertysheet.description,eu.etaxonomy.taxeditor.propertysheet.images,eu.etaxonomy.taxeditor.propertysheet.name,eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard,eu.etaxonomy.taxeditor.propertysheet.reference,eu.etaxonomy.taxeditor.propertysheet.type,eu.etaxonomy.taxeditor.propertysheet.type.wizard&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface;bundle-version=&quot;3.4.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.expressions;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin&#xA;Bundle-Name: %Bundle-Name.0&#xA;Bundle-Version: 2.0.0.v200906021612&#xA;Bundle-Vendor: %Bundle-Vendor.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .,icons/
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'>
-      <update id='eu.etaxonomy.taxeditor.navigation' range='[0.0.0,2.0.0.v200906021612)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - Navigation Bundle'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-      </properties>
-      <provides size='8'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.search' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.taxonomictree' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='13'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.resources' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.resources.mapping' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.resources.refresh.win32' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.utils' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.watson' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.resources' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.resources.mapping' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.resources.refresh' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.resources.team' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
+      </provides>
+      <requires size='4'>
+        <required namespace='osgi.bundle' name='org.eclipse.ant.core' range='[3.1.0,4.0.0)' optional='true'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='[3.1.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='[1.1.0,2.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'/>
+        <artifact classifier='osgi.bundle' id='org.eclipse.core.resources' version='3.4.2.R34x_v20090126'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.navigator;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.navigator.resources;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin&#xA;Bundle-Version: 2.0.0.v200906021612&#xA;Export-Package: eu.etaxonomy.taxeditor.navigation,eu.etaxonomy.taxeditor.navigation.handler,eu.etaxonomy.taxeditor.navigation.internal,eu.etaxonomy.taxeditor.navigation.search,eu.etaxonomy.taxeditor.navigation.taxonomictree&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle&#xA;Bundle-Vendor: EDIT
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.dtree;x-internal:=true,org.eclipse.core.internal.events;x-internal:=true,org.eclipse.core.internal.localstore;x-internal:=true,org.eclipse.core.internal.properties;x-internal:=true,org.eclipse.core.internal.propertytester;x-internal:=true,org.eclipse.core.internal.refresh;x-internal:=true,org.eclipse.core.internal.resources;x-internal:=true,org.eclipse.core.internal.resources.mapping;x-internal:=true,org.eclipse.core.internal.resources.refresh.win32;x-internal:=true,org.eclipse.core.internal.utils;x-internal:=true,org.eclipse.core.internal.watson;x-internal:=true,org.eclipse.core.resources,org.eclipse.core.resources.mapping,org.eclipse.core.resources.refresh,org.eclipse.core.resources.team&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ant.core;bundle-version=&quot;[3.1.0,4.0.0)&quot;;resolution:=optional,org.eclipse.core.expressions;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.4.2.R34x_v20090126&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.resources; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true&#xA;
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'>
-      <update id='eu.etaxonomy.taxeditor.store' range='[0.0.0,2.0.0.v200906021612)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - DataStore Bundle'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+    <unit id='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b' singleton='false'>
+      <update id='org.eclipse.core.databinding' range='[0.0.0,1.1.1.M20080827-0800b)' severity='0'/>
+      <properties size='4'>
+        <property name='df_LT.providerName' value='Eclipse.org'/>
+        <property name='df_LT.pluginName' value='JFace Data Binding'/>
+        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
       </properties>
-      <provides size='14'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.handler' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.view' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.wizard' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.internal' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.model' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.operations' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.parser' version='0.0.0'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.preference' version='0.0.0'/>
+      <provides size='20'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'/>
+        <provided namespace='osgi.bundle' name='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.conversion' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.observable' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.list' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.map' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.masterdetail' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.set' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.observable.value' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.util' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.databinding.validation' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.databinding' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.conversion' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.observable' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.observable.masterdetail' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.observable.tree' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.core.internal.databinding.validation' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
       </provides>
-      <requires size='9'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.1.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
-        <required namespace='java.package' name='junit.framework' range='0.0.0'/>
-        <required namespace='java.package' name='org.junit' range='0.0.0'/>
+      <requires size='5'>
+        <required namespace='osgi.bundle' name='org.eclipse.equinox.common' range='[3.2.0,4.0.0)'/>
+        <required namespace='java.package' name='com.ibm.icu.text' range='0.0.0'/>
+        <required namespace='java.package' name='org.osgi.framework' range='[1.4.0,2.0.0)' optional='true'/>
+        <required namespace='java.package' name='org.osgi.util.tracker' range='[1.3.3,2.0.0)' optional='true'/>
+        <required namespace='java.package' name='org.eclipse.osgi.framework.log' range='[1.0.0,2.0.0)' optional='true'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'/>
+        <artifact classifier='osgi.bundle' id='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.handler,eu.etaxonomy.taxeditor.store,eu.etaxonomy.taxeditor.store.datasource,eu.etaxonomy.taxeditor.store.datasource.handler,eu.etaxonomy.taxeditor.store.datasource.view,eu.etaxonomy.taxeditor.store.datasource.wizard,eu.etaxonomy.taxeditor.store.internal,eu.etaxonomy.taxeditor.store.model;uses:=&quot;eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon&quot;,eu.etaxonomy.taxeditor.store.operations,eu.etaxonomy.taxeditor.store.parser,eu.etaxonomy.taxeditor.store.preference&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.1.0&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin&#xA;Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle&#xA;Bundle-Version: 2.0.0.v200906021612&#xA;Bundle-Vendor: EDIT&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true&#xA;Import-Package: junit.framework,org.junit&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.internal.databinding.Activator&#xA;Bundle-Vendor: %providerName&#xA;Import-Package-Comment: see http://wiki.eclipse.org/&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 1.1.1.M20080827-0800b&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.databinding,org.eclipse.core.databinding.conversion;x-internal:=false,org.eclipse.core.databinding.observable,org.eclipse.core.databinding.observable.list;x-internal:=false,org.eclipse.core.databinding.observable.map,org.eclipse.core.databinding.observable.masterdetail,org.eclipse.core.databinding.observable.set;x-internal:=false,org.eclipse.core.databinding.observable.value;x-internal:=false,org.eclipse.core.databinding.util,org.eclipse.core.databinding.validation;x-internal:=false,org.eclipse.core.internal.databinding;x-friends:=&quot;org.eclipse.core.databinding.beans&quot;,org.eclipse.core.internal.databinding.conversion;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.observable;x-internal:=true,org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.observable.tree;x-friends:=&quot;org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.validation;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;&#xA;Bundle-SymbolicName: org.eclipse.core.databinding&#xA;Import-Package: com.ibm.icu.text,org.osgi.framework;version=&quot;[1.4.0,2.0.0)&quot;;resolution:=optional,org.osgi.util.tracker;version=&quot;[1.3.3,2.0.0)&quot;;resolution:=optional,org.eclipse.osgi.framework.log;version=&quot;[1.0.0,2.0.0)&quot;;resolution:=optional&#xA;
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v200906021611'>
-      <update id='eu.etaxonomy.taxeditor.feature.jar' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
+    <unit id='eu.etaxonomy.cdmLibrary.feature.jar' version='2.1.0.v20090603_1459'>
+      <update id='eu.etaxonomy.cdmLibrary.feature.jar' range='[0.0.0,2.1.0.v20090603_1459)' severity='0'/>
       <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.name' value='CDM Library'/>
+        <property name='org.eclipse.equinox.p2.description' value='cdmLibrary eclipse plugin feature'/>
         <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
         <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v200906021611'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.jar' version='2.1.0.v20090603_1459'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor' version='2.0.0.v200906021611'/>
+        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.cdmLibrary' version='2.1.0.v20090603_1459'/>
       </provides>
       <filter>
         (org.eclipse.update.install.features=true)
       </filter>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v200906021611'/>
+        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.cdmLibrary' version='2.1.0.v20090603_1459'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
@@ -3908,152 +3035,126 @@
       </touchpointData>
       <licenses size='1'>
         <license url='http://www.example.com/license'>
-          [Enter License Description here.]
+          to be added
         </license>
       </licenses>
       <copyright url='http://www.example.com/copyright'>
         [Enter Copyright Description here.]
       </copyright>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.v200906021611'>
-      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+    <unit id='Cdm Library' version='0.0.0'>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Cdm Library'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.v200906021611'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.v200906021611'/>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='Cdm Library' version='0.0.0'/>
       </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
-      <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.v200906021611'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.v20090603_1459,2.1.0.v20090603_1459]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'>
-      <update id='eu.etaxonomy.taxeditor.application' range='[0.0.0,2.0.0.v200906021612)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+    <unit id='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800' singleton='false'>
+      <update id='org.eclipse.jface.text' range='[0.0.0,3.4.2.r342_v20081119-0800)' severity='0'/>
+      <properties size='4'>
+        <property name='df_LT.providerName' value='Eclipse.org'/>
+        <property name='df_LT.pluginName' value='JFace Text'/>
+        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
       </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'/>
-        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'/>
-        <provided namespace='java.package' name='eu.etaxonomy.taxeditor' version='0.0.0'/>
+      <provides size='27'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800'/>
+        <provided namespace='osgi.bundle' name='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800'/>
+        <provided namespace='java.package' name='org.eclipse.jface.contentassist' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.contentassist.images' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.internal.text' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.internal.text.html' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.internal.text.link.contentassist' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.internal.text.revisions' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.internal.text.source' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.contentassist' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.formatter' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.hyperlink' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.information' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.link' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.presentation' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.quickassist' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.reconciler' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.revisions' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.rules' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.source' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.source.projection' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.source.projection.images' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.templates' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.jface.text.templates.persistence' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
       </provides>
-      <requires size='8'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
-        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' range='1.0.0'/>
+      <requires size='4'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.text' range='[3.4.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface' range='[3.4.0,4.0.0)'/>
+        <required namespace='java.package' name='com.ibm.icu.text' range='0.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'/>
+        <artifact classifier='osgi.bundle' id='org.eclipse.jface.text' version='3.4.2.r342_v20081119-0800'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: EDIT&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: EDIT Taxonomic Editor&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.navigation;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true&#xA;Bundle-Version: 2.0.0.v200906021612&#xA;Export-Package: eu.etaxonomy.taxeditor
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Import-Package: com.ibm.icu.text&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.jface.text&#xA;Bundle-Version: 3.4.2.r342_v20081119-0800&#xA;Export-Package: org.eclipse.jface.contentassist,org.eclipse.jface.contentassist.images,org.eclipse.jface.internal.text;x-internal:=true,org.eclipse.jface.internal.text.html;x-friends:=&quot;org.eclipse.ui.workbench.texteditor, org.eclipse.ui.editors, org.eclipse.jdt.debug.ui, org.eclipse.jdt.ui, org.eclipse.ant.ui, org.eclipse.ltk.ui.refactoring&quot;,org.eclipse.jface.internal.text.link.contentassist;x-internal:=true,org.eclipse.jface.internal.text.revisions;x-internal:=true,org.eclipse.jface.internal.text.source;x-internal:=true,org.eclipse.jface.text,org.eclipse.jface.text.contentassist,org.eclipse.jface.text.formatter,org.eclipse.jface.text.hyperlink,org.eclipse.jface.text.information,org.eclipse.jface.text.link,org.eclipse.jface.text.presentation,org.eclipse.jface.text.quickassist,org.eclipse.jface.text.reconciler,org.eclipse.jface.text.revisions,org.eclipse.jface.text.rules,org.eclipse.jface.text.source,org.eclipse.jface.text.source.projection,org.eclipse.jface.text.source.projection.images,org.eclipse.jface.text.templates,org.eclipse.jface.text.templates.persistence&#xA;
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v200906021626' singleton='false'>
-      <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,2.0.0.v200906021626)' severity='0'/>
-      <properties size='5'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v200906021626'/>
-      </provides>
-      <requires size='7'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[2.0.0.v200906021611,2.0.0.v200906021611]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' range='[2.0.0.v200906021626,2.0.0.v200906021626]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
-    </unit>
-    <unit id='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v200906021626'>
-      <update id='eu.etaxonomy.taxeditor.feature.jar' range='[0.0.0,2.0.0.v200906021626)' severity='0'/>
+    <unit id='org.eclipse.ui.workbench.texteditor' version='3.4.1.r341_v20080827-1100'>
+      <update id='org.eclipse.ui.workbench.texteditor' range='[0.0.0,3.4.1.r341_v20080827-1100)' severity='0'/>
       <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
-        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
-        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
-        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+        <property name='df_LT.providerName' value='Eclipse.org'/>
+        <property name='df_LT.pluginName' value='Text Editor Framework'/>
+        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v200906021626'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor' version='2.0.0.v200906021626'/>
+      <provides size='17'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' version='3.4.1.r341_v20080827-1100'/>
+        <provided namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' version='3.4.1.r341_v20080827-1100'/>
+        <provided namespace='java.package' name='org.eclipse.ui.contentassist' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.quickdiff' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.rulers' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.internal.texteditor.spelling' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.texteditor' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.texteditor.link' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.texteditor.quickdiff' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.texteditor.rulers' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.texteditor.spelling' version='0.0.0'/>
+        <provided namespace='java.package' name='org.eclipse.ui.texteditor.templates' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
       </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
+      <requires size='5'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='[3.4.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='[3.4.0,4.0.0)'/>
+        <required namespace='java.package' name='com.ibm.icu.text' range='0.0.0'/>
+      </requires>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v200906021626'/>
+        <artifact classifier='osgi.bundle' id='org.eclipse.ui.workbench.texteditor' version='3.4.1.r341_v20080827-1100'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
-          <instruction key='zipped'>
-            true
+          <instruction key='manifest'>
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.texteditor.TextEditorPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.1.r341_v20080827-1100&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.contentassist,org.eclipse.ui.internal.texteditor;x-internal:=true; texteditor=&quot;split&quot;; mandatory:=&quot;texteditor&quot;,org.eclipse.ui.internal.texteditor.quickdiff;x-internal:=true,org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence;x-internal:=true,org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer;x-internal:=true,org.eclipse.ui.internal.texteditor.rulers;x-internal:=true,org.eclipse.ui.internal.texteditor.spelling;x-internal:=true,org.eclipse.ui.texteditor; texteditor=&quot;split&quot;; mandatory:=&quot;texteditor&quot;,org.eclipse.ui.texteditor.link,org.eclipse.ui.texteditor.quickdiff,org.eclipse.ui.texteditor.rulers,org.eclipse.ui.texteditor.spelling,org.eclipse.ui.texteditor.templates&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;
           </instruction>
         </instructions>
       </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.example.com/license'>
-          [Enter License Description here.]
-        </license>
-      </licenses>
-      <copyright url='http://www.example.com/copyright'>
-        [Enter Copyright Description here.]
-      </copyright>
     </unit>
   </units>
 </repository>

diff --git a/taxeditor-updateSite/site.xml b/taxeditor-updateSite/site.xml
index 48108cd0beb4571eb3076289241ca9d2e6719677..9302d3fac2d5ba9841eba201ff1448bf0d42eb20 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.cdmLibrary_2.1.0.84.jar" id="eu.etaxonomy.cdmLibrary" version="2.1.0.84">
-      <category name="Cdm Library"/>
-   </feature>
-   <feature url="features/eu.etaxonomy.taxeditor_2.0.0.v200906021626.jar" id="eu.etaxonomy.taxeditor" version="2.0.0.v200906021626">
+   <feature url="features/eu.etaxonomy.taxeditor_2.0.0.v20090603_1757.jar" id="eu.etaxonomy.taxeditor" version="2.0.0.v20090603_1757">
       <category name="Taxonomic Editor"/>
    </feature>
+   <feature url="features/eu.etaxonomy.cdmLibrary_2.1.0.v20090603_1459.jar" id="eu.etaxonomy.cdmLibrary" version="2.1.0.v20090603_1459">
+      <category name="Cdm Library"/>
+   </feature>
    <category-def name="Taxonomic Editor" label="Taxonomic Editor"/>
    <category-def name="Cdm Library" label="Cdm Library"/>
 </site>