From: jenkins <jenkins-int@bgbm.org>
Date: Thu, 14 Jan 2016 10:33:51 +0000 (+0100)
Subject: Merge branch 'hotfix/3.12.3' into develop
X-Git-Tag: 4.0.0^2~183^2~4
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/0199ba4459c700afaab64942d0f14628bdda484c?hp=8509cfcd04643ecff31e52e8441d900cc47b2292

Merge branch 'hotfix/3.12.3' into develop
---

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index 1139c7e2b..0fa402adb 100644
--- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml
index 7453e2147..ae74af849 100644
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -21,11 +21,6 @@
             id="eu.etaxonomy.taxeditor.application.perspective.taxonomic"
             name="%perspective.name">
       </perspective>
-      <!--perspective
-            class="eu.etaxonomy.taxeditor.perspective.BulkEditing"
-            id="eu.etaxonomy.taxeditor.application.perspective.bulkeditor"
-            name="Bulk Editing">
-      </perspective-->
       <perspective
             class="eu.etaxonomy.taxeditor.perspective.PolytomousKey"
             id="eu.etaxonomy.taxeditor.application.perspective.polytomous"
@@ -65,30 +60,6 @@
             restorable="true">
       </view>
    </extension-->
- <extension
-       point="org.eclipse.ui.perspectiveExtensions">
-    <perspectiveExtension
-          targetID="eu.etaxonomy.taxeditor.application.perspective.bulkeditor">
-       <showInPart
-             id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
-       </showInPart>
-       <showInPart
-             id="eu.etaxonomy.taxeditor.bulkeditor.referencingobjectsview">
-       </showInPart>
-    </perspectiveExtension>
-    <perspectiveExtension
-          targetID="eu.etaxonomy.taxeditor.application.perspective.polytomous">
-       <showInPart
-             id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
-       </showInPart>
-    </perspectiveExtension>
-    <perspectiveExtension
-          targetID="eu.etaxonomy.taxeditor.application.perspective.uses">
-       <showInPart
-             id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
-       </showInPart>
-    </perspectiveExtension>
- </extension>
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index c01f492c8..263a9c8c5 100644
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index 6512f6cea..7f067720c 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
index 0f3dae0a7..686272846 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
@@ -1,510 +1,514 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-   <extension
-         id="application"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="eu.etaxonomy.taxeditor.bulkeditor.Application">
-         </run>
-      </application>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            class="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"
-            default="false"
-            id="bulkeditor.editor"
-            name="%editor.name">
-      </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.nameditor.TaxonNameEditor"
-            default="false"
-            id="nameeditor.editor"
-            name="%editor.name.0">
-      </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
-            name="%editor.name.1">
-      </editor>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">
-         <menu
-               id="bulkeditor.menus.openmenu"
-               label="%menu.label">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </menu>
-         <menu
-               label="%menu.label.0">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </menu>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:bulkeditor.menus.openmenu">
-         <dynamic
-               class="eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem"
-               id="taxeditor-bulkeditor.dynamicopenmenu">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </dynamic>
-         <!--command
-               commandId="taxeditor-nameeditor.commands.open"
-               label="Open Name Editor"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                     definitionId="pigsFly">
-               </reference>
-            </visibleWhen>
-         </command-->
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:#BulkEditorContext">
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"
-               label="%command.label"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isTaxonBulkEditorInput">
-               </reference>
-            </visibleWhen>
-         </command>
-         <separator
-               name="taxeditor-bulkeditor.separator1"
-               visible="true">
-         </separator>
-         <menu
-               label="%menu.label.1">
-            <dynamic
-                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"
-                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">
-               <visibleWhen
-                     checkEnabled="false">
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-               </visibleWhen>
-            </dynamic>
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </menu>
-        <separator
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         id="application"
+         point="org.eclipse.core.runtime.applications">
+      <application>
+         <run
+               class="eu.etaxonomy.taxeditor.bulkeditor.Application">
+         </run>
+      </application>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"
+            default="false"
+            id="bulkeditor.editor"
+            name="%editor.name">
+      </editor>
+      <editor
+            class="eu.etaxonomy.taxeditor.nameditor.TaxonNameEditor"
+            default="false"
+            id="nameeditor.editor"
+            name="%editor.name.0">
+      </editor>
+      <editor
+            class="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
+            default="false"
+            id="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
+            name="%editor.name.1">
+      </editor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">
+         <menu
+               id="bulkeditor.menus.openmenu"
+               label="%menu.label">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </menu>
+         <menu
+               label="%menu.label.0">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </menu>
+      </menuContribution>
+      <menuContribution
+            locationURI="menu:bulkeditor.menus.openmenu">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem"
+               id="taxeditor-bulkeditor.dynamicopenmenu">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </dynamic>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:#BulkEditorContext">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.bulkeditor.cdmViewerContextMenu">
+         </dynamic>
+         <separator
+               name="taxeditor-bulkeditor.separator1"
+               visible="true">
+         </separator>
+         <menu
+               label="%menu.label.1">
+            <dynamic
+                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"
+                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">
+               <visibleWhen
+                     checkEnabled="false">
+                  <reference
+                        definitionId="isCdmStoreConnected">
+                  </reference>
+               </visibleWhen>
+            </dynamic>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </menu>
+         <separator
                name="taxeditor-bulkeditor.separator4"
                visible="true">
-         </separator>
-         <command
-               commandId="bulkeditor.commands.setmergetarget"
-               label="%command.label.0"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isMergeEnabled">
-               </reference>
-            </visibleWhen>
-         </command>
-         
-         <command
-               commandId="bulkeditor.commands.setmergecandidate"
-               label="%command.label.1"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isMergeEnabled">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="bulkeditor.commands.removemergecandidate"
-               label="%command.label.2"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isMergeEnabled">
-               </reference>
-            </visibleWhen>
-         </command>
-      <!--menuContribution
-            locationURI="popup:org.eclipse.ui.popup.any"-->            
-         <command
-               commandId="bulkeditor.commands.mergegroup"
-               label="%command.label.3"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isMergeEnabled">
-               </reference>
-            </visibleWhen>
-         </command>
+         </separator>
+         <command
+               commandId="bulkeditor.commands.setmergetarget"
+               label="%command.label.0"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMergeEnabled">
+               </reference>
+            </visibleWhen>
+         </command>
+         
+         <command
+               commandId="bulkeditor.commands.setmergecandidate"
+               label="%command.label.1"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMergeEnabled">
+               </reference>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="bulkeditor.commands.removemergecandidate"
+               label="%command.label.2"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMergeEnabled">
+               </reference>
+            </visibleWhen>
+         </command>
+      <!--menuContribution
+            locationURI="popup:org.eclipse.ui.popup.any"-->            
+         <command
+               commandId="bulkeditor.commands.mergegroup"
+               label="%command.label.3"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMergeEnabled">
+               </reference>
+            </visibleWhen>
+         </command>
          <separator
                name="eu.etaxonomy.taxeditor.bulkeditor.separator1"
                visible="true">
          </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
-               label="%command.label.5"
-               style="push">
-           	   <visibleWhen
-           	   		checkEnabled="true">
-               		<and>
-               		<reference
-                     	definitionId="isConvertEnabled">
-               		</reference>
-               		<reference 
-               				definitionId="isTeam">
-               		</reference>
-            		</and>
-           		</visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
-               label="%command.label.6"
-               style="push">
-            	<visibleWhen 
-            		checkEnabled="true">>
-               		<and>
-               		<reference
-                     	definitionId="isConvertEnabled">
-               		</reference>
-               		<reference 
-               			definitionId="isPerson">
-               		</reference>
-            		</and>
-           		</visibleWhen>
-         </command>
-         <separator
-               name="taxeditor-bulkeditor.separator2"
-               visible="true">
-         </separator>
-         <menu
-               label="%menu.label.2">
-            <dynamic
-                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicMarkerTypeEditingMenu"
-                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">
-            </dynamic>
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </menu>
-         <separator
-               name="taxeditor-bulkeditor.separator3"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.bulkeditor.delete"
-               label="%command.label.4"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler"
-            id="bulkeditor.commands.mergegroup"
-            name="%command.name">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeTargetHandler"
-            id="bulkeditor.commands.setmergetarget"
-            name="%command.name.0">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.OpenBulkEditorHandler"
-            id="taxeditor-bulkeditor.dynamicopenmenu"
-            name="%command.name.1">
-         <commandParameter
-               id="taxeditor-bulkeditor.commandParameter.inputType"
-               name="%commandParameter.name"
-               values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">
-         </commandParameter>
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.NewObjectHandler"
-            id="taxeditor-bulkeditor.dynamicnewobjectcommand"
-            name="%command.name.2">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.DeleteObjectHandler"
-            id="taxeditor-bulkeditor.dynamicdeleteobjectcommand"
-            name="%command.name.3">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeCandidateHandler"
-            id="bulkeditor.commands.setmergecandidate"
-            name="%command.name.4">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.RemoveMergeCandidateHandler"
-            id="bulkeditor.commands.removemergecandidate"
-            name="%command.name.5">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMarkerFlagHandler"
-            id="taxeditor-bulkeditor.command.setMarkerFlag"
-            name="%command.name.6">
-      </command>
-      <command
-            id="eu.etaxonomy.taxeditor.bulkeditor.delete"
-            name="%command.name.7">
-      </command>
-      <command
-            id="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
-            name="%command.name.8">
-      </command>
-      <command
-            id="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
-            name="%command.name.10">
-      </command>
-      <!--command
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"
-            id="eu.etaxonomy.taxeditor.bulkeditor.command.new"
-            name="New Entity">
-      </command-->
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="merge_candidate_annotation"
-            colorPreferenceKey="merge_candidate_annotation_color"
-            colorPreferenceValue="220,220,255"
-            highlightPreferenceValue="true"
-            icon="icons/merge_candidate.gif"
-            includeOnPreferencePage="true"
-            label="%specification.label"
-            overviewRulerPreferenceKey="merge_candidate_annotation_overview"
-            overviewRulerPreferenceValue="true"
-            presentationLayer="0"
-            symbolicIcon="task"
-            textPreferenceKey="merge_candidate_annotation_text"
-            textPreferenceValue="false"
-            textStylePreferenceValue="BOX"
-            verticalRulerPreferenceKey="merge_candidate_annotation_vertical"
-            verticalRulerPreferenceValue="true">
-      </specification>
-      <specification
-            annotationType="merge_target_annotation"
-            colorPreferenceKey="merge_target_annotation_color"
-            colorPreferenceValue="220,220,255"
-            highlightPreferenceValue="true"
-            icon="icons/merge_target.gif"
-            includeOnPreferencePage="true"
-            label="%specification.label.0"
-            overviewRulerPreferenceKey="merge_target_annotation_overview"
-            overviewRulerPreferenceValue="true"
-            presentationLayer="1"
-            symbolicIcon="task"
-            textPreferenceKey="merge_target_annotation_text"
-            textPreferenceValue="false"
-            textStylePreferenceValue="BOX"
-            verticalRulerPreferenceKey="merge_target_annotation_vertical"
-            verticalRulerPreferenceValue="true">
-      </specification>      
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            name="merge_candidate_annotation">
-      </type>
-      <type
-            name="merge_target_annotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"
-            id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"
-            name="%view.name"
-            restorable="false">
-      </view>
-   </extension>   
-   <extension
-         point="org.eclipse.core.expressions.definitions">
-      <definition
-            id="isMergeEnabled">
-         <with
-               variable="activeEditor">
-            <test
-                  property="taxeditor-bulkeditor.propertyTester.isMergingEnabled">
-            </test>
-         </with>
-      </definition>
-      <definition
-            id="isConvertEnabled">
-         <with
-               variable="activeEditor">
-            <test
-                  property="taxeditor-bulkeditor.propertyTester.isConvertingEnabled">
-            </test>
-         </with>
-      </definition>
-      <definition
-            id="isTaxonBulkEditorInput">
-         <with
-               variable="activeEditor">
-            <test
-                  property="taxeditor-bulkeditor.propertyTester.isTaxonEditor">
-            </test>
-         </with>
-      </definition>
-       <definition
-            id="isTeam">
-         <with
-               variable="selection">
-            <test
-                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isTeam">
-            </test>
-         </with>
-      </definition>
-      <definition
-            id="isPerson">
-         <with
-               variable="selection">
-            <test
-                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isPerson">
-            </test>
-         </with>
-      </definition>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
-            id="taxeditor-bulkeditor.PropertyTester"
-            namespace="taxeditor-bulkeditor.propertyTester"
-            properties="isMergingEnabled, isDerivedUnitEditor, isTaxonEditor, isGroupEditor, isConvertingEnabled"
-            type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
-      </propertyTester>
-      <propertyTester
-            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
-            id="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
-            namespace="eu.etaxonomy.taxeditor.bulkeditor.command"
-            properties="isTeam, isPerson"
-            type="java.lang.Object">
-      </propertyTester>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:cut"
-            commandId="org.eclipse.ui.edit.cut">
-         <activeWhen>
-            <with
-                  variable="activeFocusControlId">
-               <equals
-                     value="bulkeditor.textControlId">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy"
-            commandId="org.eclipse.ui.edit.copy">
-         <activeWhen>
-            <with
-                  variable="activeFocusControlId">
-               <equals
-                     value="bulkeditor.textControlId">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:paste"
-            commandId="org.eclipse.ui.edit.paste">
-         <activeWhen>
-            <with
-                  variable="activeFocusControlId">
-               <equals
-                     value="bulkeditor.textControlId">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"
-            commandId="eu.etaxonomy.taxeditor.bulkeditor.delete">
-         <activeWhen>
-            <with
-                  variable="selection">
-               <instanceof
-                     value="eu.etaxonomy.taxeditor.model.LineSelection">
-               </instanceof>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertTeam2PersonHandler"
-            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person">
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertPerson2TeamHandler"
-            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team">
-      </handler>
-      
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
-            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorMarkerPreferencePage"
-            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.markerTypes"
-            name="%page.name">
-      </page>
-      <page
-            category="eu.etaxonomy.taxeditor.preferences.general"
-            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorGeneralPreferencePage"
-            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
-            name="%page.name.0">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="*">
-         <showInPart
-               id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"></showInPart>
-         <showInPart
-               id="eu.etaxonomy.taxeditor.view.detail">
-         </showInPart>
-      </perspectiveExtension>
-   </extension>
-<!-- start set marker -->
-
-</plugin>
+         <command
+               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
+               label="%command.label.5"
+               style="push">
+           	   <visibleWhen
+           	   		checkEnabled="true">
+               		<and>
+               		<reference
+                     	definitionId="isConvertEnabled">
+               		</reference>
+               		<reference 
+               				definitionId="isTeam">
+               		</reference>
+            		</and>
+           		</visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
+               label="%command.label.6"
+               style="push">
+            	<visibleWhen 
+            		checkEnabled="true">>
+               		<and>
+               		<reference
+                     	definitionId="isConvertEnabled">
+               		</reference>
+               		<reference 
+               			definitionId="isPerson">
+               		</reference>
+            		</and>
+           		</visibleWhen>
+         </command>
+         <separator
+               name="taxeditor-bulkeditor.separator2"
+               visible="true">
+         </separator>
+         <menu
+               label="%menu.label.2">
+            <dynamic
+                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicMarkerTypeEditingMenu"
+                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">
+            </dynamic>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </menu>
+         <separator
+               name="taxeditor-bulkeditor.separator3"
+               visible="true">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.bulkeditor.delete"
+               label="%command.label.4"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.referencingObjectsView.cdmViewerContextMenu">
+         </dynamic>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler"
+            id="bulkeditor.commands.mergegroup"
+            name="%command.name">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeTargetHandler"
+            id="bulkeditor.commands.setmergetarget"
+            name="%command.name.0">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.OpenBulkEditorHandler"
+            id="taxeditor-bulkeditor.dynamicopenmenu"
+            name="%command.name.1">
+         <commandParameter
+               id="taxeditor-bulkeditor.commandParameter.inputType"
+               name="%commandParameter.name"
+               values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">
+         </commandParameter>
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.NewObjectHandler"
+            id="taxeditor-bulkeditor.dynamicnewobjectcommand"
+            name="%command.name.2">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.DeleteObjectHandler"
+            id="taxeditor-bulkeditor.dynamicdeleteobjectcommand"
+            name="%command.name.3">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeCandidateHandler"
+            id="bulkeditor.commands.setmergecandidate"
+            name="%command.name.4">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.RemoveMergeCandidateHandler"
+            id="bulkeditor.commands.removemergecandidate"
+            name="%command.name.5">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMarkerFlagHandler"
+            id="taxeditor-bulkeditor.command.setMarkerFlag"
+            name="%command.name.6">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.bulkeditor.delete"
+            name="%command.name.7">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
+            name="%command.name.8">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
+            name="%command.name.10">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+            name="Open Referencing Objects View">
+      </command>
+      <!--command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"
+            id="eu.etaxonomy.taxeditor.bulkeditor.command.new"
+            name="New Entity">
+      </command-->
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.markerAnnotationSpecification">
+      <specification
+            annotationType="merge_candidate_annotation"
+            colorPreferenceKey="merge_candidate_annotation_color"
+            colorPreferenceValue="220,220,255"
+            highlightPreferenceValue="true"
+            icon="icons/merge_candidate.gif"
+            includeOnPreferencePage="true"
+            label="%specification.label"
+            overviewRulerPreferenceKey="merge_candidate_annotation_overview"
+            overviewRulerPreferenceValue="true"
+            presentationLayer="0"
+            symbolicIcon="task"
+            textPreferenceKey="merge_candidate_annotation_text"
+            textPreferenceValue="false"
+            textStylePreferenceValue="BOX"
+            verticalRulerPreferenceKey="merge_candidate_annotation_vertical"
+            verticalRulerPreferenceValue="true">
+      </specification>
+      <specification
+            annotationType="merge_target_annotation"
+            colorPreferenceKey="merge_target_annotation_color"
+            colorPreferenceValue="220,220,255"
+            highlightPreferenceValue="true"
+            icon="icons/merge_target.gif"
+            includeOnPreferencePage="true"
+            label="%specification.label.0"
+            overviewRulerPreferenceKey="merge_target_annotation_overview"
+            overviewRulerPreferenceValue="true"
+            presentationLayer="1"
+            symbolicIcon="task"
+            textPreferenceKey="merge_target_annotation_text"
+            textPreferenceValue="false"
+            textStylePreferenceValue="BOX"
+            verticalRulerPreferenceKey="merge_target_annotation_vertical"
+            verticalRulerPreferenceValue="true">
+      </specification>      
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.annotationTypes">
+      <type
+            name="merge_candidate_annotation">
+      </type>
+      <type
+            name="merge_target_annotation">
+      </type>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"
+            id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"
+            name="%view.name"
+            restorable="false">
+      </view>
+   </extension>   
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="isMergeEnabled">
+         <with
+               variable="activeEditor">
+            <test
+                  property="taxeditor-bulkeditor.propertyTester.isMergingEnabled">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isConvertEnabled">
+         <with
+               variable="activeEditor">
+            <test
+                  property="taxeditor-bulkeditor.propertyTester.isConvertingEnabled">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isTaxonBulkEditorInput">
+         <with
+               variable="activeEditor">
+            <test
+                  property="taxeditor-bulkeditor.propertyTester.isTaxonEditor">
+            </test>
+         </with>
+      </definition>
+       <definition
+            id="isTeam">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isTeam">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isPerson">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isPerson">
+            </test>
+         </with>
+      </definition>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
+            id="taxeditor-bulkeditor.PropertyTester"
+            namespace="taxeditor-bulkeditor.propertyTester"
+            properties="isMergingEnabled, isDerivedUnitEditor, isTaxonEditor, isGroupEditor, isConvertingEnabled"
+            type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
+      </propertyTester>
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
+            id="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
+            namespace="eu.etaxonomy.taxeditor.bulkeditor.command"
+            properties="isTeam, isPerson"
+            type="java.lang.Object">
+      </propertyTester>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:cut"
+            commandId="org.eclipse.ui.edit.cut">
+         <activeWhen>
+            <with
+                  variable="activeFocusControlId">
+               <equals
+                     value="bulkeditor.textControlId">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy"
+            commandId="org.eclipse.ui.edit.copy">
+         <activeWhen>
+            <with
+                  variable="activeFocusControlId">
+               <equals
+                     value="bulkeditor.textControlId">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:paste"
+            commandId="org.eclipse.ui.edit.paste">
+         <activeWhen>
+            <with
+                  variable="activeFocusControlId">
+               <equals
+                     value="bulkeditor.textControlId">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"
+            commandId="eu.etaxonomy.taxeditor.bulkeditor.delete">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <instanceof
+                     value="eu.etaxonomy.taxeditor.model.LineSelection">
+               </instanceof>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertTeam2PersonHandler"
+            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person">
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertPerson2TeamHandler"
+            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team">
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
+            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="bulkeditor.editor">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
+            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorMarkerPreferencePage"
+            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.markerTypes"
+            name="%page.name">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorGeneralPreferencePage"
+            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
+            name="%page.name.0">
+      </page>
+   </extension>
+   <extension
+         point="eu.etaxonomy.taxeditor.store.cdmViewer">
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+            selection="java.lang.Object"
+            viewerName="Referencing Objects View">
+      </viewCommandMapping>
+   </extension>
+<!-- start set marker -->
+
+</plugin>
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index 4bbbf5966..30c4c1186 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.etaxonomy</groupId>
 		<artifactId>taxeditor-parent</artifactId>
-		<version>3.12.2</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index 789596477..6c76b4374 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.jface.viewers.ISelection;
@@ -30,10 +31,13 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.TreeNode;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchPart;
 
@@ -54,16 +58,12 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.model.DescriptionHelper;
-import eu.etaxonomy.taxeditor.model.LineSelection;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 
 /**
- * <p>ReferencingObjectsView class.</p>
- *
  * @author p.ciardelli
  * @created 08.07.2009
  * @version 1.0
@@ -72,7 +72,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 	private static final Logger logger = Logger
 			.getLogger(ReferencingObjectsView.class);
 
-	/** Constant <code>ID="eu.etaxonomy.taxeditor.bulkeditor.refer"{trunked}</code> */
 	public static final String ID = "eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects";
 
 	private TableViewer viewer;
@@ -85,9 +84,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 	    cdmEntitySession = CdmStore.getCurrentSessionManager().bindNullSession();
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
 	/** {@inheritDoc} */
 	@Override
 	public void createViewer(Composite parent) {
@@ -99,11 +95,8 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 		viewer.setContentProvider(new ReferencingObjectsContentProvider());
 		viewer.setLabelProvider(new ReferencingObjectsLabelProvider());
 		viewer.setCellModifier(new ICellModifier() {
-
             @Override
             public void modify(Object element, String property, Object value) {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
@@ -126,7 +119,16 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                 return true;
             }
         });
-//		viewer.setInput(new ArrayList<CdmBase>());
+
+        //create context menu
+        MenuManager menuManager = new MenuManager();
+        getSite().registerContextMenu(menuManager, viewer);
+        Control control = viewer.getControl();
+        Menu menu = menuManager.createContextMenu(control);
+        control.setMenu(menu);
+
+        // Propagate selection from viewer
+        getSite().setSelectionProvider(viewer);
 	}
 
 	/**
@@ -159,11 +161,7 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 	public void setFocus() {
 	    cdmEntitySession.bind();
 	}
-	/**
-	 * <p>updateReferencingObjects</p>
-	 *
-	 * @param entity a {@link eu.etaxonomy.cdm.model.common.IdentifiableEntity} object.
-	 */
+
 	public void updateReferencingObjects(final UUID entityUUID, final Class objectClass) {
 
 		final Display display = Display.getCurrent();
@@ -246,9 +244,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 
 	class ReferencingClassComparator implements Comparator<CdmBase> {
 
-		/* (non-Javadoc)
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
 		@Override
         public int compare(CdmBase o1, CdmBase o2) {
 			String string1 = o1.getClass().getSimpleName();
@@ -264,9 +259,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 		}
 	}
 
-	/**
-	 *
-	 */
 	private void updateView(List<CdmBase> referencingObjects) {
 		if (viewer != null && !viewer.getControl().isDisposed()){
 			try{
@@ -287,37 +279,29 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 	/** {@inheritDoc} */
 	@Override
     public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if(! (part instanceof BulkEditor)){
-			setContentDescription("");
-			showEmptyPage();
-			return;
-		}
-
-		if(! (selection instanceof LineSelection)){
-			return;
-		}
-		LineSelection lineSelection = (LineSelection) selection;
-
-		if(lineSelection.size() != 1){
-			return;
-		}
-
-		if(! (lineSelection.getFirstElement() instanceof IdentifiableEntity)){
-			return;
-		}
-
-		showViewer(part, lineSelection);
+        if(part == this){
+            return;
+        }
+        if(selection instanceof IStructuredSelection){
+            showViewer(part, (IStructuredSelection) selection);
+        }
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#showViewer(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
 	/** {@inheritDoc} */
 	@Override
 	public void showViewer(IWorkbenchPart part, IStructuredSelection selection) {
 	//	this.part = part;
 
-		updateReferencingObjects(((IdentifiableEntity) selection.getFirstElement()).getUuid(),selection.getFirstElement().getClass() );
+		Object firstElement = selection.getFirstElement();
+		if(firstElement instanceof TreeNode){
+		    firstElement = ((TreeNode) firstElement).getValue();
+		}
+		if(firstElement instanceof IdentifiableEntity){
+		    updateReferencingObjects(((IdentifiableEntity) firstElement).getUuid(),firstElement.getClass() );
+		}
+		else{
+            setContentDescription("");
+		}
 	}
 
 	/** {@inheritDoc} */
@@ -331,27 +315,18 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#getViewer()
-	 */
 	/** {@inheritDoc} */
 	@Override
 	public Viewer getViewer() {
 		return viewer;
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#dirtyStateChanged()
-	 */
 	/** {@inheritDoc} */
 	@Override
 	public void changed(Object object) {
 		// no editing in this view
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#onComplete()
-	 */
 	/** {@inheritDoc} */
 	@Override
 	public boolean onComplete() {
@@ -359,7 +334,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 	}
 
 	public void refresh(){
-
 		selectionService.removePostSelectionListener(this);
 		selectionService.removeSelectionListener(this);
 		selectionService.addPostSelectionListener(this);
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index bfffeca41..8ee99d5d8 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,201 +1,251 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/doxia-core-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-4.2.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/itextpdf-5.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javassist-3.17.1-GA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.3.GA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-memory-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-misc-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-phonetic-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20110523.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-aop-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-beans-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-context-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-context-support-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/validation-api-1.0.0.GA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xalan-2.6.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlunit-1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.12.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.12.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.12.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.12.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.2.jar" sourcepath="/home/cmathew/.m2/repository/eu/etaxonomy/cdmlib-persistence/3.12.0-SNAPSHOT/cdmlib-persistence-3.12.2-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.12.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.12.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.12.2.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-csv-1.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-core-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/dtd-parser-1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/easymock-2.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/FastInfoset-1.2.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-5.0.1.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-core-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-5.5.2.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-5.5.2.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-5.2.2.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-cdi-5.2.2.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/httpclient-cache-4.2.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-2.21.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/istack-commons-tools-2.21.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.6.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.6.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jandex-2.0.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/javassist-3.20.0-GA.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/javax.el-2.2.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/javax.el-api-2.2.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.12.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-jxc-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.3.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.7.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jena-arq-2.13.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jena-core-2.13.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jena-tdb-1.1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/joda-time-2.9.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jsonld-java-0.5.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jta-1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.7.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/libthrift-0.9.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-backward-codecs-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-facet-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-join-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-memory-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-misc-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-queries-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/mapstruct-1.0.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/p6spy-2.1.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/plexus-component-annotations-1.5.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.0.15.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/poi-3.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1205-jdbc42.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/relaxngDatatype-20020414.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/rngom-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.7.0-1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-aop-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-aspects-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-beans-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-context-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-context-support-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-core-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-expression-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-jdbc-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-orm-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-oxm-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-plugin-core-1.2.0.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-plugin-metadata-1.2.0.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-security-config-4.0.3.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-security-core-4.0.3.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-security-web-4.0.3.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-test-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-tx-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-web-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-webmvc-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-core-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-schema-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-spi-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-spring-web-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-swagger-common-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-swagger2-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/standard-1.1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/stax-ex-1.7.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.5.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/swagger-models-1.5.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/tools.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/txw2-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.6.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xom-1.2.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xsom-20140925.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="src" path="src/main/java"/>
+    <classpathentry kind="src" path="src/main/resources"/>
+    <classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 02b11526a..161e5639b 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -186,6 +186,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.strategy.merge,
  eu.etaxonomy.cdm.strategy.parser,
  eu.etaxonomy.cdm.strategy.parser.location,
+ eu.etaxonomy.cdm.test.integration,
  eu.etaxonomy.cdm.validation,
  eu.etaxonomy.cdm.validation.annotation,
  eu.etaxonomy.cdm.validation.constraint,
@@ -273,7 +274,7 @@ Export-Package: com.google.api,
    org.w3c.dom,
    org.xml.sax",
  org.apache.lucene.index,
- org.apache.lucene.queryParser,
+ org.apache.lucene.queryparser.classic,
  org.apache.lucene.util,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
@@ -300,7 +301,6 @@ Export-Package: com.google.api,
  org.hibernate.persister.collection,
  org.hibernate.persister.entity,
  org.hibernate.pretty,
- org.hibernate.property,
  org.hibernate.proxy,
  org.hibernate.proxy.pojo.javassist,
  org.hibernate.search,
@@ -421,7 +421,6 @@ Export-Package: com.google.api,
  org.springframework.security.core.context,
  org.springframework.security.core.userdetails,
  org.springframework.security.provisioning,
- org.springframework.security.remoting.httpinvoker,
  org.springframework.stereotype,
  org.springframework.transaction;uses:="org.springframework.core",
  org.springframework.transaction.annotation;uses:="javax.ejb,org.springframework.transaction.interceptor",
@@ -477,15 +476,16 @@ Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
  lib/antlr-2.7.7.jar,
  lib/aopalliance-1.0.jar,
- lib/aspectjrt-1.7.1.jar,
- lib/aspectjweaver-1.7.1.jar,
+ lib/apache-log4j-extras-1.2.17.jar,
+ lib/aspectjrt-1.8.7.jar,
+ lib/aspectjweaver-1.8.7.jar,
  lib/avro-1.6.3.jar,
  lib/batik-anim-1.7.jar,
  lib/batik-awt-util-1.7.jar,
  lib/batik-bridge-1.7.jar,
  lib/batik-css-1.7.jar,
  lib/batik-dom-1.7.jar,
- lib/batik-ext-1.7.jar,
+ lib/batik-ext-1.8.jar,
  lib/batik-extension-1.7.jar,
  lib/batik-gvt-1.7.jar,
  lib/batik-js-1.7.jar,
@@ -496,175 +496,224 @@ Bundle-ClassPath: .,
  lib/batik-transcoder-1.7.jar,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
- lib/c3p0-0.9.2.jar,
- lib/cglib-nodep-2.2.2.jar,
+ lib/c3p0-0.9.5.2.jar,
+ lib/cdmlib-commons-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-io-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-model-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-print-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-services-3.13.0-SNAPSHOT.jar,
+ lib/cglib-3.2.0.jar,
+ lib/cglib-nodep-3.2.0.jar,
+ lib/classmate-1.3.1.jar,
+ lib/codemodel-2.2.11.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
- lib/commons-beanutils-1.8.3.jar,
- lib/commons-codec-20041127.091804.jar,
- lib/commons-collections-3.2.1.jar,
+ lib/commons-beanutils-1.9.2.jar,
+ lib/commons-codec-1.10.jar,
+ lib/commons-collections-3.2.2.jar,
+ lib/commons-csv-1.0.jar,
  lib/commons-dbcp-1.4.jar,
  lib/commons-io-2.4.jar,
  lib/commons-lang-2.6.jar,
- lib/commons-logging-1.1.2.jar,
+ lib/commons-lang3-3.3.2.jar,
+ lib/commons-logging-1.2.jar,
  lib/commons-pool-1.5.4.jar,
  lib/concurrent-1.3.4.jar,
  lib/dbunit-2.4.9.jar,
  lib/dom4j-1.6.1.jar,
- lib/doxia-core-1.3.jar,
- lib/doxia-logging-api-1.3.jar,
- lib/doxia-module-apt-1.3.jar,
- lib/doxia-module-xhtml-1.3.jar,
- lib/doxia-sink-api-1.3.jar,
+ lib/doxia-core-1.6.jar,
+ lib/doxia-logging-api-1.6.jar,
+ lib/doxia-module-apt-1.6.jar,
+ lib/doxia-module-xhtml-1.6.jar,
+ lib/doxia-sink-api-1.6.jar,
  lib/dozer-5.3.0.jar,
- lib/easymock-3.1.jar,
+ lib/dtd-parser-1.1.jar,
+ lib/easymock-2.3.jar,
  lib/easymockclassextension-2.3.jar,
- lib/ehcache-core-2.6.9.jar,
+ lib/ehcache-core-2.6.11.jar,
  lib/ezmorph-1.0.6.jar,
+ lib/FastInfoset-1.2.13.jar,
  lib/fop-1.1.jar,
- lib/guava-r05.jar,
- lib/h2-1.3.170.jar,
+ lib/google-api-translate-java-0.92.jar,
+ lib/guava-19.0.jar,
+ lib/h2-1.4.190.jar,
+ lib/h2mig_pagestore_addon.jar,
  lib/hamcrest-core-1.3.jar,
- lib/hibernate-c3p0-4.1.10.Final.jar,
+ lib/hibernate-c3p0-5.0.6.Final.jar,
  lib/hibernate-cglib-repack-2.1_3.jar,
- lib/hibernate-commons-annotations-4.0.1.Final.jar,
- lib/hibernate-core-4.1.10.Final.jar,
- lib/hibernate-ehcache-4.1.10.Final.jar,
- lib/hibernate-entitymanager-4.1.10.Final.jar,
- lib/hibernate-envers-4.1.10.Final.jar,
- lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,
+ lib/hibernate-commons-annotations-5.0.1.Final.jar,
+ lib/hibernate-core-5.0.6.Final.jar,
+ lib/hibernate-ehcache-5.0.6.Final.jar,
+ lib/hibernate-entitymanager-5.0.6.Final.jar,
+ lib/hibernate-envers-5.0.6.Final.jar,
+ lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,
  lib/hibernate-search-4.2.0.Final.jar,
  lib/hibernate-search-analyzers-4.2.0.Final.jar,
- lib/hibernate-search-engine-4.2.0.Final.jar,
- lib/hibernate-search-orm-4.2.0.Final.jar,
- lib/hibernate-validator-4.3.1.Final.jar,
- lib/hsqldb-1.8.0.10.jar,
- lib/httpclient-4.2.3.jar,
- lib/httpcore-4.2.4.jar,
+ lib/hibernate-search-engine-5.5.2.Final.jar,
+ lib/hibernate-search-orm-5.5.2.Final.jar,
+ lib/hibernate-validator-5.2.2.Final.jar,
+ lib/hibernate-validator-cdi-5.2.2.Final.jar,
+ lib/hsqldb-2.3.3.jar,
+ lib/httpclient-4.5.1.jar,
+ lib/httpclient-cache-4.2.6.jar,
+ lib/httpcore-4.4.4.jar,
+ lib/httpmime-4.5.1.jar,
  lib/icu4j-2.6.1.jar,
- lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
  lib/identificationKeyAPI-1.0-SNAPSHOT.jar,
- lib/itextpdf-5.4.0.jar,
+ lib/istack-commons-runtime-2.21.jar,
+ lib/istack-commons-tools-2.21.jar,
+ lib/itextpdf-5.5.8.jar,
+ lib/jackson-annotations-2.6.4.jar,
+ lib/jackson-core-2.6.4.jar,
  lib/jackson-core-asl-1.8.8.jar,
+ lib/jackson-databind-2.6.4.jar,
  lib/jackson-mapper-asl-1.8.8.jar,
  lib/jakarta-regexp-1.4.jar,
- lib/javassist-3.17.1-GA.jar,
- lib/jaxb-api-2.2.7.jar,
- lib/jaxb-impl-2.2-EA.jar,
- lib/jaxb-xjc-2.2-EA.jar,
+ lib/jandex-2.0.0.Final.jar,
+ lib/javassist-3.20.0-GA.jar,
+ lib/javax.el-2.2.6.jar,
+ lib/javax.el-api-2.2.5.jar,
+ lib/javax.servlet-api-3.1.0.jar,
+ lib/jaxb-api-2.2.12.jar,
+ lib/jaxb-core-2.2.11.jar,
+ lib/jaxb-jxc-2.2.11.jar,
+ lib/jaxb-runtime-2.2.11.jar,
+ lib/jaxb-xjc-2.2.11.jar,
  lib/jaxb1-impl-2.2-EA.jar,
  lib/jaxen-1.1.4.jar,
- lib/jboss-logging-3.1.3.GA.jar,
+ lib/jaxen-1.1.6.jar,
+ lib/jboss-logging-3.3.0.Final.jar,
  lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
+ lib/jcl-over-slf4j-1.7.6.jar,
  lib/jdbc4-2.0.jar,
  lib/jdom-1.1.3.jar,
- lib/joda-time-2.1.jar,
+ lib/jdom2-2.0.6.jar,
+ lib/jena-arq-2.13.0.jar,
+ lib/jena-core-2.13.0.jar,
+ lib/jena-iri-1.1.2.jar,
+ lib/jena-tdb-1.1.2.jar,
+ lib/joda-time-2.9.1.jar,
+ lib/json-20090211.jar,
  lib/json-lib-2.4-jdk15.jar,
+ lib/jsonld-java-0.5.1.jar,
  lib/jsr250-api-1.0.jar,
- lib/jtds-1.3.0.jar,
- lib/junit-4.11.jar,
- lib/junit-benchmarks-0.5.0.jar,
+ lib/jta-1.1.jar,
+ lib/jtds-1.3.1.jar,
+ lib/junit-4.12.jar,
+ lib/junit-benchmarks-0.7.2.jar,
+ lib/libthrift-0.9.2.jar,
  lib/log4j-1.2.17.jar,
  lib/lsid-client-1.1.2.jar,
  lib/lsid-server-1.1.2.jar,
- lib/lucene-analyzers-3.6.2.jar,
- lib/lucene-core-3.6.2.jar,
- lib/lucene-facet-3.6.2.jar,
- lib/lucene-grouping-3.6.2.jar,
- lib/lucene-highlighter-3.6.2.jar,
- lib/lucene-kuromoji-3.6.2.jar,
- lib/lucene-memory-3.6.2.jar,
- lib/lucene-misc-3.6.2.jar,
- lib/lucene-phonetic-3.6.2.jar,
- lib/lucene-queries-3.6.2.jar,
- lib/lucene-smartcn-3.6.2.jar,
- lib/lucene-spatial-3.6.2.jar,
- lib/lucene-spellchecker-3.6.2.jar,
- lib/lucene-stempel-3.6.2.jar,
- lib/mchange-commons-java-0.2.3.3.jar,
- lib/mysql-connector-java-5.1.24.jar,
+ lib/lucene-analyzers-common-5.4.0.jar,
+ lib/lucene-backward-codecs-5.4.0.jar,
+ lib/lucene-core-5.4.0.jar,
+ lib/lucene-facet-5.4.0.jar,
+ lib/lucene-grouping-5.4.0.jar,
+ lib/lucene-highlighter-5.4.0.jar,
+ lib/lucene-join-5.4.0.jar,
+ lib/lucene-memory-5.4.0.jar,
+ lib/lucene-misc-5.4.0.jar,
+ lib/lucene-queries-5.4.0.jar,
+ lib/lucene-queryparser-5.4.0.jar,
+ lib/lucene-sandbox-5.4.0.jar,
+ lib/lucene-suggest-5.4.0.jar,
+ lib/mapstruct-1.0.0.Final.jar,
+ lib/mchange-commons-java-0.2.11.jar,
+ lib/mysql-connector-java-5.1.38.jar,
  lib/objenesis-1.2.jar,
+ lib/odfdom-0.8.jar,
  lib/odfdom-java-0.8.7.jar,
  lib/ognl-2.6.9.jar,
  lib/opencsv-2.3.jar,
- lib/org.eclipse.equinox.common-3.6.0.v20110523.jar,
- lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,
  lib/org.osgi.core-1.0.0.jar,
- lib/org.springframework.aop-3.2.2.RELEASE.jar,
- lib/org.springframework.aspects-3.2.2.RELEASE.jar,
- lib/org.springframework.beans-3.2.2.RELEASE.jar,
- lib/org.springframework.context-3.2.2.RELEASE.jar,
- lib/org.springframework.core-3.2.2.RELEASE.jar,
- lib/org.springframework.expression-3.2.2.RELEASE.jar,
- lib/org.springframework.jdbc-3.2.2.RELEASE.jar,
- lib/org.springframework.orm-3.2.2.RELEASE.jar,
- lib/org.springframework.oxm-3.2.2.RELEASE.jar,
- lib/org.springframework.test-3.2.2.RELEASE.jar,
- lib/org.springframework.transaction-3.2.2.RELEASE.jar,
- lib/org.springframework.web-3.2.2.RELEASE.jar,
- lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,
  lib/osgi-3.6.0.jar,
- lib/p6spy-1.3.jar,
+ lib/p6spy-2.1.3.jar,
  lib/paranamer-2.3.jar,
  lib/plexus-classworlds-1.2-alpha-9.jar,
+ lib/plexus-component-annotations-1.5.5.jar,
  lib/plexus-container-default-1.0-alpha-30.jar,
- lib/plexus-utils-2.0.5.jar,
- lib/postgresql-9.1-901.jdbc4.jar,
+ lib/plexus-utils-3.0.15.jar,
+ lib/poi-3.13.jar,
+ lib/poi-ooxml-3.13.jar,
+ lib/poi-ooxml-schemas-3.13.jar,
+ lib/postgresql-9.4-1205-jdbc42.jar,
+ lib/relaxngDatatype-20020414.jar,
+ lib/rngom-2.2.11.jar,
  lib/sanselan-0.97-incubator.jar,
+ lib/Saxon-HE-9.7.0-1.jar,
  lib/servlet-api-2.5.jar,
- lib/slf4j-api-1.7.2.jar,
- lib/slf4j-log4j12-1.7.2.jar,
+ lib/slf4j-api-1.7.13.jar,
+ lib/slf4j-log4j12-1.7.13.jar,
+ lib/slf4j-nop-1.7.13.jar,
  lib/snappy-java-1.0.4.1.jar,
  lib/solr-analysis-extras-3.6.2.jar,
  lib/solr-core-3.6.2.jar,
  lib/solr-solrj-3.6.2.jar,
- lib/spring-aop-3.2.2.RELEASE.jar,
- lib/spring-beans-3.2.2.RELEASE.jar,
- lib/spring-context-3.2.2.RELEASE.jar,
- lib/spring-context-support-3.2.2.RELEASE.jar,
- lib/spring-core-3.2.2.RELEASE.jar,
- lib/spring-expression-3.2.2.RELEASE.jar,
+ lib/spring-aop-4.2.4.RELEASE.jar,
+ lib/spring-aspects-4.2.4.RELEASE.jar,
+ lib/spring-beans-4.2.4.RELEASE.jar,
+ lib/spring-context-4.2.4.RELEASE.jar,
+ lib/spring-context-support-4.2.4.RELEASE.jar,
+ lib/spring-core-4.2.4.RELEASE.jar,
+ lib/spring-expression-4.2.4.RELEASE.jar,
+ lib/spring-jdbc-4.2.4.RELEASE.jar,
  lib/spring-modules-cache-0.7.jar,
- lib/spring-security-config-3.1.3.RELEASE.jar,
- lib/spring-security-core-3.1.3.RELEASE.jar,
+ lib/spring-orm-4.2.4.RELEASE.jar,
+ lib/spring-oxm-4.2.4.RELEASE.jar,
+ lib/spring-plugin-core-1.2.0.RELEASE.jar,
+ lib/spring-plugin-metadata-1.2.0.RELEASE.jar,
+ lib/spring-security-config-4.0.3.RELEASE.jar,
+ lib/spring-security-core-4.0.3.RELEASE.jar,
+ lib/spring-security-web-4.0.3.RELEASE.jar,
+ lib/spring-test-4.2.4.RELEASE.jar,
+ lib/spring-tx-4.2.4.RELEASE.jar,
+ lib/spring-web-4.2.4.RELEASE.jar,
+ lib/spring-webmvc-4.2.4.RELEASE.jar,
+ lib/springfox-core-2.3.1.jar,
+ lib/springfox-schema-2.3.1.jar,
+ lib/springfox-spi-2.3.1.jar,
+ lib/springfox-spring-web-2.3.1.jar,
+ lib/springfox-swagger-common-2.3.1.jar,
+ lib/springfox-swagger2-2.3.1.jar,
+ lib/standard-1.1.2.jar,
  lib/stax-1.2.0.jar,
  lib/stax-api-1.0.1.jar,
+ lib/stax-ex-1.7.7.jar,
+ lib/swagger-annotations-1.5.5.jar,
+ lib/swagger-models-1.5.5.jar,
+ lib/tools.jar,
+ lib/txw2-2.2.11.jar,
+ lib/unitils-core-3.4.2.jar,
+ lib/unitils-database-3.4.2.jar,
+ lib/unitils-dbmaintainer-3.4.2.jar,
+ lib/unitils-dbunit-3.4.2.jar,
+ lib/unitils-easymock-3.4.2.jar,
+ lib/unitils-inject-3.4.2.jar,
+ lib/unitils-mock-3.4.2.jar,
+ lib/unitils-orm-3.4.2.jar,
+ lib/unitils-spring-3.4.2.jar,
  lib/usertype.jodatime-2.0.1.jar,
  lib/usertype.spi-2.0.1.jar,
- lib/validation-api-1.0.0.GA.jar,
- lib/wsdl4j-1.6.2.jar,
- lib/xalan-2.6.0.jar,
+ lib/validation-api-1.1.0.Final.jar,
+ lib/wsdl4j-1.6.3.jar,
+ lib/xalan-2.7.0.jar,
  lib/xercesImpl-2.11.0.jar,
  lib/xml-apis-1.0.b2.jar,
  lib/xml-apis-ext-1.3.04.jar,
  lib/xml-resolver-1.2.jar,
+ lib/xmlbeans-2.6.0.jar,
  lib/xmlgraphics-commons-1.5.jar,
- lib/xmlParserAPIs-2.6.2.jar,
  lib/xmlpull-1.1.3.1.jar,
- lib/xmlunit-1.4.jar,
- lib/xom-1.0.jar,
+ lib/xmlunit-1.6.jar,
+ lib/xom-1.2.5.jar,
  lib/xpp3_min-1.1.4c.jar,
  lib/xpp3-1.1.4c.jar,
- lib/xstream-1.4.4.jar,
+ lib/xsom-20140925.jar,
+ lib/xstream-1.4.8.jar,
  lib/yjp-controller-api-redist-9.0.8.jar,
- lib/google-api-translate-java-0.92.jar,
- lib/odfdom-0.8.jar,
- lib/h2mig_pagestore_addon.jar,
- lib/spring-security-remoting-3.1.3.RELEASE.jar,
- lib/jena-core-2.11.2.jar,
- lib/jena-iri-1.0.2.jar,
- lib/poi-3.10-FINAL.jar,
- lib/poi-ooxml-3.10-FINAL.jar,
- lib/xmlbeans-2.3.0.jar,
- lib/poi-ooxml-schemas-3.10-FINAL.jar,
- lib/swagger-annotations-1.3.5.jar,
- lib/apache-log4j-extras-1.2.17.jar,
- lib/cdmlib-commons-3.12.2.jar,
- lib/cdmlib-ext-3.12.2.jar,
- lib/cdmlib-io-3.12.2.jar,
- lib/cdmlib-model-3.12.2.jar,
- lib/cdmlib-persistence-3.12.2.jar,
- lib/cdmlib-print-3.12.2.jar,
- lib/cdmlib-remote-3.12.2.jar,
- lib/cdmlib-services-3.12.2.jar
+ lib/cdmlib-test-3.13.0-SNAPSHOT.jar
 Import-Package: eu.etaxonomy.cdm.api.application
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 1510adfaf..92017a373 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -1,17 +1,20 @@
 bin.includes = META-INF/,\
                .,\
+               lib/spring-security-remoting-3.1.3.RELEASE.jar,\
+               resources/cdm.map.ser,\
                lib/activation-1.1.1.jar,\
                lib/antlr-2.7.7.jar,\
                lib/aopalliance-1.0.jar,\
-               lib/aspectjrt-1.7.1.jar,\
-               lib/aspectjweaver-1.7.1.jar,\
+               lib/apache-log4j-extras-1.2.17.jar,\
+               lib/aspectjrt-1.8.7.jar,\
+               lib/aspectjweaver-1.8.7.jar,\
                lib/avro-1.6.3.jar,\
                lib/batik-anim-1.7.jar,\
                lib/batik-awt-util-1.7.jar,\
                lib/batik-bridge-1.7.jar,\
                lib/batik-css-1.7.jar,\
                lib/batik-dom-1.7.jar,\
-               lib/batik-ext-1.7.jar,\
+               lib/batik-ext-1.8.jar,\
                lib/batik-extension-1.7.jar,\
                lib/batik-gvt-1.7.jar,\
                lib/batik-js-1.7.jar,\
@@ -22,179 +25,226 @@ bin.includes = META-INF/,\
                lib/batik-transcoder-1.7.jar,\
                lib/batik-util-1.7.jar,\
                lib/batik-xml-1.7.jar,\
-               lib/c3p0-0.9.2.jar,\
-               lib/cglib-nodep-2.2.2.jar,\
+               lib/c3p0-0.9.5.2.jar,\
+               lib/cdmlib-commons-3.13.0-SNAPSHOT.jar,\
+               lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,\
+               lib/cdmlib-io-3.13.0-SNAPSHOT.jar,\
+               lib/cdmlib-model-3.13.0-SNAPSHOT.jar,\
+               lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,\
+               lib/cdmlib-print-3.13.0-SNAPSHOT.jar,\
+               lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,\
+               lib/cdmlib-services-3.13.0-SNAPSHOT.jar,\
+               lib/cglib-3.2.0.jar,\
+               lib/cglib-nodep-3.2.0.jar,\
+               lib/classmate-1.3.1.jar,\
+               lib/codemodel-2.2.11.jar,\
                lib/com.springsource.org.aopalliance-1.0.0.jar,\
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\
-               lib/commons-beanutils-1.8.3.jar,\
-               lib/commons-codec-20041127.091804.jar,\
-               lib/commons-collections-3.2.1.jar,\
+               lib/commons-beanutils-1.9.2.jar,\
+               lib/commons-codec-1.10.jar,\
+               lib/commons-collections-3.2.2.jar,\
+               lib/commons-csv-1.0.jar,\
                lib/commons-dbcp-1.4.jar,\
                lib/commons-io-2.4.jar,\
                lib/commons-lang-2.6.jar,\
-               lib/commons-logging-1.1.2.jar,\
+               lib/commons-lang3-3.3.2.jar,\
+               lib/commons-logging-1.2.jar,\
                lib/commons-pool-1.5.4.jar,\
                lib/concurrent-1.3.4.jar,\
                lib/dbunit-2.4.9.jar,\
                lib/dom4j-1.6.1.jar,\
-               lib/doxia-core-1.3.jar,\
-               lib/doxia-logging-api-1.3.jar,\
-               lib/doxia-module-apt-1.3.jar,\
-               lib/doxia-module-xhtml-1.3.jar,\
-               lib/doxia-sink-api-1.3.jar,\
+               lib/doxia-core-1.6.jar,\
+               lib/doxia-logging-api-1.6.jar,\
+               lib/doxia-module-apt-1.6.jar,\
+               lib/doxia-module-xhtml-1.6.jar,\
+               lib/doxia-sink-api-1.6.jar,\
                lib/dozer-5.3.0.jar,\
-               lib/easymock-3.1.jar,\
+               lib/dtd-parser-1.1.jar,\
+               lib/easymock-2.3.jar,\
                lib/easymockclassextension-2.3.jar,\
-               lib/ehcache-core-2.6.9.jar,\
+               lib/ehcache-core-2.6.11.jar,\
                lib/ezmorph-1.0.6.jar,\
+               lib/FastInfoset-1.2.13.jar,\
                lib/fop-1.1.jar,\
-               lib/guava-r05.jar,\
-               lib/h2-1.3.170.jar,\
+               lib/google-api-translate-java-0.92.jar,\
+               lib/guava-19.0.jar,\
+               lib/h2-1.4.190.jar,\
+               lib/h2mig_pagestore_addon.jar,\
                lib/hamcrest-core-1.3.jar,\
-               lib/hibernate-c3p0-4.1.10.Final.jar,\
+               lib/hibernate-c3p0-5.0.6.Final.jar,\
                lib/hibernate-cglib-repack-2.1_3.jar,\
-               lib/hibernate-commons-annotations-4.0.1.Final.jar,\
-               lib/hibernate-core-4.1.10.Final.jar,\
-               lib/hibernate-ehcache-4.1.10.Final.jar,\
-               lib/hibernate-entitymanager-4.1.10.Final.jar,\
-               lib/hibernate-envers-4.1.10.Final.jar,\
-               lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,\
+               lib/hibernate-commons-annotations-5.0.1.Final.jar,\
+               lib/hibernate-core-5.0.6.Final.jar,\
+               lib/hibernate-ehcache-5.0.6.Final.jar,\
+               lib/hibernate-entitymanager-5.0.6.Final.jar,\
+               lib/hibernate-envers-5.0.6.Final.jar,\
+               lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,\
                lib/hibernate-search-4.2.0.Final.jar,\
                lib/hibernate-search-analyzers-4.2.0.Final.jar,\
-               lib/hibernate-search-engine-4.2.0.Final.jar,\
-               lib/hibernate-search-orm-4.2.0.Final.jar,\
-               lib/hibernate-validator-4.3.1.Final.jar,\
-               lib/hsqldb-1.8.0.10.jar,\
-               lib/httpclient-4.2.3.jar,\
-               lib/httpcore-4.2.4.jar,\
+               lib/hibernate-search-engine-5.5.2.Final.jar,\
+               lib/hibernate-search-orm-5.5.2.Final.jar,\
+               lib/hibernate-validator-5.2.2.Final.jar,\
+               lib/hibernate-validator-cdi-5.2.2.Final.jar,\
+               lib/hsqldb-2.3.3.jar,\
+               lib/httpclient-4.5.1.jar,\
+               lib/httpclient-cache-4.2.6.jar,\
+               lib/httpcore-4.4.4.jar,\
+               lib/httpmime-4.5.1.jar,\
                lib/icu4j-2.6.1.jar,\
-               lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\
                lib/identificationKeyAPI-1.0-SNAPSHOT.jar,\
-               lib/itextpdf-5.4.0.jar,\
+               lib/istack-commons-runtime-2.21.jar,\
+               lib/istack-commons-tools-2.21.jar,\
+               lib/itextpdf-5.5.8.jar,\
+               lib/jackson-annotations-2.6.4.jar,\
+               lib/jackson-core-2.6.4.jar,\
                lib/jackson-core-asl-1.8.8.jar,\
+               lib/jackson-databind-2.6.4.jar,\
                lib/jackson-mapper-asl-1.8.8.jar,\
                lib/jakarta-regexp-1.4.jar,\
-               lib/javassist-3.17.1-GA.jar,\
-               lib/jaxb-api-2.2.7.jar,\
-               lib/jaxb-impl-2.2-EA.jar,\
-               lib/jaxb-xjc-2.2-EA.jar,\
+               lib/jandex-2.0.0.Final.jar,\
+               lib/javassist-3.20.0-GA.jar,\
+               lib/javax.el-2.2.6.jar,\
+               lib/javax.el-api-2.2.5.jar,\
+               lib/javax.servlet-api-3.1.0.jar,\
+               lib/jaxb-api-2.2.12.jar,\
+               lib/jaxb-core-2.2.11.jar,\
+               lib/jaxb-jxc-2.2.11.jar,\
+               lib/jaxb-runtime-2.2.11.jar,\
+               lib/jaxb-xjc-2.2.11.jar,\
                lib/jaxb1-impl-2.2-EA.jar,\
                lib/jaxen-1.1.4.jar,\
-               lib/jboss-logging-3.1.3.GA.jar,\
+               lib/jaxen-1.1.6.jar,\
+               lib/jboss-logging-3.3.0.Final.jar,\
                lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\
+               lib/jcl-over-slf4j-1.7.6.jar,\
                lib/jdbc4-2.0.jar,\
                lib/jdom-1.1.3.jar,\
-               lib/joda-time-2.1.jar,\
+               lib/jdom2-2.0.6.jar,\
+               lib/jena-arq-2.13.0.jar,\
+               lib/jena-core-2.13.0.jar,\
+               lib/jena-iri-1.1.2.jar,\
+               lib/jena-tdb-1.1.2.jar,\
+               lib/joda-time-2.9.1.jar,\
+               lib/json-20090211.jar,\
                lib/json-lib-2.4-jdk15.jar,\
+               lib/jsonld-java-0.5.1.jar,\
                lib/jsr250-api-1.0.jar,\
-               lib/jtds-1.3.0.jar,\
-               lib/junit-4.11.jar,\
-               lib/junit-benchmarks-0.5.0.jar,\
+               lib/jta-1.1.jar,\
+               lib/jtds-1.3.1.jar,\
+               lib/junit-4.12.jar,\
+               lib/junit-benchmarks-0.7.2.jar,\
+               lib/libthrift-0.9.2.jar,\
                lib/log4j-1.2.17.jar,\
                lib/lsid-client-1.1.2.jar,\
                lib/lsid-server-1.1.2.jar,\
-               lib/lucene-analyzers-3.6.2.jar,\
-               lib/lucene-core-3.6.2.jar,\
-               lib/lucene-facet-3.6.2.jar,\
-               lib/lucene-grouping-3.6.2.jar,\
-               lib/lucene-highlighter-3.6.2.jar,\
-               lib/lucene-kuromoji-3.6.2.jar,\
-               lib/lucene-memory-3.6.2.jar,\
-               lib/lucene-misc-3.6.2.jar,\
-               lib/lucene-phonetic-3.6.2.jar,\
-               lib/lucene-queries-3.6.2.jar,\
-               lib/lucene-smartcn-3.6.2.jar,\
-               lib/lucene-spatial-3.6.2.jar,\
-               lib/lucene-spellchecker-3.6.2.jar,\
-               lib/lucene-stempel-3.6.2.jar,\
-               lib/mchange-commons-java-0.2.3.3.jar,\
-               lib/mysql-connector-java-5.1.24.jar,\
+               lib/lucene-analyzers-common-5.4.0.jar,\
+               lib/lucene-backward-codecs-5.4.0.jar,\
+               lib/lucene-core-5.4.0.jar,\
+               lib/lucene-facet-5.4.0.jar,\
+               lib/lucene-grouping-5.4.0.jar,\
+               lib/lucene-highlighter-5.4.0.jar,\
+               lib/lucene-join-5.4.0.jar,\
+               lib/lucene-memory-5.4.0.jar,\
+               lib/lucene-misc-5.4.0.jar,\
+               lib/lucene-queries-5.4.0.jar,\
+               lib/lucene-queryparser-5.4.0.jar,\
+               lib/lucene-sandbox-5.4.0.jar,\
+               lib/lucene-suggest-5.4.0.jar,\
+               lib/mapstruct-1.0.0.Final.jar,\
+               lib/mchange-commons-java-0.2.11.jar,\
+               lib/mysql-connector-java-5.1.38.jar,\
                lib/objenesis-1.2.jar,\
+               lib/odfdom-0.8.jar,\
                lib/odfdom-java-0.8.7.jar,\
                lib/ognl-2.6.9.jar,\
                lib/opencsv-2.3.jar,\
-               lib/org.eclipse.equinox.common-3.6.0.v20110523.jar,\
-               lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,\
                lib/org.osgi.core-1.0.0.jar,\
-               lib/org.springframework.aop-3.2.2.RELEASE.jar,\
-               lib/org.springframework.aspects-3.2.2.RELEASE.jar,\
-               lib/org.springframework.beans-3.2.2.RELEASE.jar,\
-               lib/org.springframework.context-3.2.2.RELEASE.jar,\
-               lib/org.springframework.core-3.2.2.RELEASE.jar,\
-               lib/org.springframework.expression-3.2.2.RELEASE.jar,\
-               lib/org.springframework.jdbc-3.2.2.RELEASE.jar,\
-               lib/org.springframework.orm-3.2.2.RELEASE.jar,\
-               lib/org.springframework.oxm-3.2.2.RELEASE.jar,\
-               lib/org.springframework.test-3.2.2.RELEASE.jar,\
-               lib/org.springframework.transaction-3.2.2.RELEASE.jar,\
-               lib/org.springframework.web-3.2.2.RELEASE.jar,\
-               lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,\
                lib/osgi-3.6.0.jar,\
-               lib/p6spy-1.3.jar,\
+               lib/p6spy-2.1.3.jar,\
                lib/paranamer-2.3.jar,\
                lib/plexus-classworlds-1.2-alpha-9.jar,\
+               lib/plexus-component-annotations-1.5.5.jar,\
                lib/plexus-container-default-1.0-alpha-30.jar,\
-               lib/plexus-utils-2.0.5.jar,\
-               lib/postgresql-9.1-901.jdbc4.jar,\
+               lib/plexus-utils-3.0.15.jar,\
+               lib/poi-3.13.jar,\
+               lib/poi-ooxml-3.13.jar,\
+               lib/poi-ooxml-schemas-3.13.jar,\
+               lib/postgresql-9.4-1205-jdbc42.jar,\
+               lib/relaxngDatatype-20020414.jar,\
+               lib/rngom-2.2.11.jar,\
                lib/sanselan-0.97-incubator.jar,\
+               lib/Saxon-HE-9.7.0-1.jar,\
                lib/servlet-api-2.5.jar,\
-               lib/slf4j-api-1.7.2.jar,\
-               lib/slf4j-log4j12-1.7.2.jar,\
+               lib/slf4j-api-1.7.13.jar,\
+               lib/slf4j-log4j12-1.7.13.jar,\
+               lib/slf4j-nop-1.7.13.jar,\
                lib/snappy-java-1.0.4.1.jar,\
                lib/solr-analysis-extras-3.6.2.jar,\
                lib/solr-core-3.6.2.jar,\
                lib/solr-solrj-3.6.2.jar,\
-               lib/spring-aop-3.2.2.RELEASE.jar,\
-               lib/spring-beans-3.2.2.RELEASE.jar,\
-               lib/spring-context-3.2.2.RELEASE.jar,\
-               lib/spring-context-support-3.2.2.RELEASE.jar,\
-               lib/spring-core-3.2.2.RELEASE.jar,\
-               lib/spring-expression-3.2.2.RELEASE.jar,\
+               lib/spring-aop-4.2.4.RELEASE.jar,\
+               lib/spring-aspects-4.2.4.RELEASE.jar,\
+               lib/spring-beans-4.2.4.RELEASE.jar,\
+               lib/spring-context-4.2.4.RELEASE.jar,\
+               lib/spring-context-support-4.2.4.RELEASE.jar,\
+               lib/spring-core-4.2.4.RELEASE.jar,\
+               lib/spring-expression-4.2.4.RELEASE.jar,\
+               lib/spring-jdbc-4.2.4.RELEASE.jar,\
                lib/spring-modules-cache-0.7.jar,\
-               lib/spring-security-config-3.1.3.RELEASE.jar,\
-               lib/spring-security-core-3.1.3.RELEASE.jar,\
+               lib/spring-orm-4.2.4.RELEASE.jar,\
+               lib/spring-oxm-4.2.4.RELEASE.jar,\
+               lib/spring-plugin-core-1.2.0.RELEASE.jar,\
+               lib/spring-plugin-metadata-1.2.0.RELEASE.jar,\
+               lib/spring-security-config-4.0.3.RELEASE.jar,\
+               lib/spring-security-core-4.0.3.RELEASE.jar,\
+               lib/spring-security-web-4.0.3.RELEASE.jar,\
+               lib/spring-test-4.2.4.RELEASE.jar,\
+               lib/spring-tx-4.2.4.RELEASE.jar,\
+               lib/spring-web-4.2.4.RELEASE.jar,\
+               lib/spring-webmvc-4.2.4.RELEASE.jar,\
+               lib/springfox-core-2.3.1.jar,\
+               lib/springfox-schema-2.3.1.jar,\
+               lib/springfox-spi-2.3.1.jar,\
+               lib/springfox-spring-web-2.3.1.jar,\
+               lib/springfox-swagger-common-2.3.1.jar,\
+               lib/springfox-swagger2-2.3.1.jar,\
+               lib/standard-1.1.2.jar,\
                lib/stax-1.2.0.jar,\
                lib/stax-api-1.0.1.jar,\
+               lib/stax-ex-1.7.7.jar,\
+               lib/swagger-annotations-1.5.5.jar,\
+               lib/swagger-models-1.5.5.jar,\
+               lib/tools.jar,\
+               lib/txw2-2.2.11.jar,\
+               lib/unitils-core-3.4.2.jar,\
+               lib/unitils-database-3.4.2.jar,\
+               lib/unitils-dbmaintainer-3.4.2.jar,\
+               lib/unitils-dbunit-3.4.2.jar,\
+               lib/unitils-easymock-3.4.2.jar,\
+               lib/unitils-inject-3.4.2.jar,\
+               lib/unitils-mock-3.4.2.jar,\
+               lib/unitils-orm-3.4.2.jar,\
+               lib/unitils-spring-3.4.2.jar,\
                lib/usertype.jodatime-2.0.1.jar,\
                lib/usertype.spi-2.0.1.jar,\
-               lib/validation-api-1.0.0.GA.jar,\
-               lib/wsdl4j-1.6.2.jar,\
-               lib/xalan-2.6.0.jar,\
+               lib/validation-api-1.1.0.Final.jar,\
+               lib/wsdl4j-1.6.3.jar,\
+               lib/xalan-2.7.0.jar,\
                lib/xercesImpl-2.11.0.jar,\
                lib/xml-apis-1.0.b2.jar,\
                lib/xml-apis-ext-1.3.04.jar,\
                lib/xml-resolver-1.2.jar,\
+               lib/xmlbeans-2.6.0.jar,\
                lib/xmlgraphics-commons-1.5.jar,\
-               lib/xmlParserAPIs-2.6.2.jar,\
                lib/xmlpull-1.1.3.1.jar,\
-               lib/xmlunit-1.4.jar,\
-               lib/xom-1.0.jar,\
+               lib/xmlunit-1.6.jar,\
+               lib/xom-1.2.5.jar,\
                lib/xpp3_min-1.1.4c.jar,\
                lib/xpp3-1.1.4c.jar,\
-               lib/xstream-1.4.4.jar,\
+               lib/xsom-20140925.jar,\
+               lib/xstream-1.4.8.jar,\
                lib/yjp-controller-api-redist-9.0.8.jar,\
-               lib/google-api-translate-java-0.92.jar,\
-               lib/odfdom-0.8.jar,\
-               lib/h2mig_pagestore_addon.jar,\
-               lib/spring-security-remoting-3.1.3.RELEASE.jar,\
-               lib/spring-security-remoting-3.1.3.RELEASE.jar,\
-               lib/jena-core-2.11.2.jar,\
-               lib/jena-iri-1.0.2.jar,\
-               lib/poi-3.10-FINAL.jar,\
-               lib/poi-ooxml-3.10-FINAL.jar,\
-               lib/poi-ooxml-schemas-3.10-FINAL.jar,\
-               lib/xmlbeans-2.3.0.jar,\
-               lib/swagger-annotations-1.3.5.jar,\
-               lib/cdmlib-commons-3.12.2.jar,\
-               lib/cdmlib-ext-3.12.2.jar,\
-               lib/cdmlib-io-3.12.2.jar,\
-               lib/cdmlib-model-3.12.2.jar,\
-               lib/cdmlib-persistence-3.12.2.jar,\
-               lib/cdmlib-print-3.12.2.jar,\
-               lib/cdmlib-remote-3.12.2.jar,\
-               lib/cdmlib-services-3.12.2.jar,\
-               lib/apache-log4j-extras-1.2.17.jar,\
-               resources/cdm.map.ser
+               lib/cdmlib-test-3.13.0-SNAPSHOT.jar
 
 jars.compile.order = .
 output.. = bin/
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar
new file mode 100644
index 000000000..933e4eeac
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar
new file mode 100644
index 000000000..28045859a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar
deleted file mode 100644
index 351409c83..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar
new file mode 100644
index 000000000..26dcea2dd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar
deleted file mode 100644
index 9949bc528..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar
new file mode 100644
index 000000000..ca1829a58
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar
deleted file mode 100644
index 57fb27327..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar
new file mode 100644
index 000000000..6a09ca364
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar
deleted file mode 100644
index 5dea94b48..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar
new file mode 100644
index 000000000..579cedd98
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar
new file mode 100644
index 000000000..51e2d8512
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar
deleted file mode 100644
index 02d81e880..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar
new file mode 100644
index 000000000..e11f7cb6b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar
new file mode 100644
index 000000000..01bf55b92
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar
new file mode 100644
index 000000000..02f3da463
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar
deleted file mode 100644
index 218510bc5..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar
new file mode 100644
index 000000000..7d075edf4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar
new file mode 100644
index 000000000..1d7417c40
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar
deleted file mode 100644
index 0df1030ea..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar
deleted file mode 100644
index c35fa1fee..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar
new file mode 100644
index 000000000..fa5df82a6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar
new file mode 100644
index 000000000..5f58e4016
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar
new file mode 100644
index 000000000..2ce08ae99
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar
deleted file mode 100644
index d6a543c4e..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar
new file mode 100644
index 000000000..93a3b9f6d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar
deleted file mode 100644
index 9f8fb36e5..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar
new file mode 100644
index 000000000..4f595c65f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar
deleted file mode 100644
index 59e009b26..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar
new file mode 100644
index 000000000..aa3d9095d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar
deleted file mode 100644
index ae4f3c64a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar
new file mode 100644
index 000000000..90803483a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar
deleted file mode 100644
index b888a407a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar
new file mode 100644
index 000000000..ca6607eb0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar
similarity index 61%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar
index 10ca4b67f..7ddd397d3 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar
new file mode 100644
index 000000000..e6e6c4e40
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar
new file mode 100644
index 000000000..190213e35
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar
deleted file mode 100644
index 4b79dd1a8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar
similarity index 79%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar
index 99dd2d26e..0eb926ba4 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar
new file mode 100644
index 000000000..b175ca867
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar
deleted file mode 100644
index 0407b9c01..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar
deleted file mode 100644
index 869798e48..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar
new file mode 100644
index 000000000..8b11e2e82
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar
deleted file mode 100644
index 7eb1a03c8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar
new file mode 100644
index 000000000..f3fedee40
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar
deleted file mode 100644
index ac9d6741d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar
new file mode 100644
index 000000000..82e425dc2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar
deleted file mode 100644
index a8ac85d65..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar
new file mode 100644
index 000000000..593d33f57
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar
deleted file mode 100644
index f534c034b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar
new file mode 100644
index 000000000..7f694d00a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar
deleted file mode 100644
index 92d74fd3a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar
new file mode 100644
index 000000000..2e5c7892c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar
deleted file mode 100644
index f54d7489b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar
new file mode 100644
index 000000000..d533819bf
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
deleted file mode 100644
index 1e9f71b8c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar
new file mode 100644
index 000000000..e2f2c5928
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar
deleted file mode 100644
index 3acd5ac09..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar
new file mode 100644
index 000000000..13da63d37
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar
deleted file mode 100644
index 9f384c8a2..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar
new file mode 100644
index 000000000..8ebf70bf5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar
deleted file mode 100644
index 565679363..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar
new file mode 100644
index 000000000..ba4276432
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar
new file mode 100644
index 000000000..37f8ab1fb
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar
deleted file mode 100644
index e010269dd..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar
new file mode 100644
index 000000000..2f05edf10
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar
deleted file mode 100644
index 53c1c262b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar
new file mode 100644
index 000000000..b9c0c1c25
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar
new file mode 100644
index 000000000..f6a7cd4d1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar
deleted file mode 100644
index 9f45bd91c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar
new file mode 100644
index 000000000..ac4a87730
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar
new file mode 100644
index 000000000..53a642012
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar
deleted file mode 100755
index 2ec64a81a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar
new file mode 100644
index 000000000..aa950a84e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar
new file mode 100644
index 000000000..acfa7e3cc
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar
deleted file mode 100644
index e1e27130d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar
new file mode 100644
index 000000000..3f6ea6c30
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar
new file mode 100644
index 000000000..9efc5bd9b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar
new file mode 100644
index 000000000..1a31f17c2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar
new file mode 100644
index 000000000..5812b4714
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar
new file mode 100644
index 000000000..d24086ae4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar
deleted file mode 100644
index a24898076..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar
new file mode 100644
index 000000000..0f1ff725d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar
new file mode 100644
index 000000000..90a9ab5d2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar
new file mode 100644
index 000000000..4a3001ee8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar
new file mode 100644
index 000000000..6b14c3d26
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar
new file mode 100644
index 000000000..3f4638ce6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar
deleted file mode 100644
index ae2adeecd..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar
new file mode 100644
index 000000000..cc0aad1f8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar
deleted file mode 100644
index 4977608b4..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar
new file mode 100644
index 000000000..79db7c459
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar
new file mode 100644
index 000000000..a1f047f66
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar
deleted file mode 100644
index f8e5ff8fb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar
new file mode 100644
index 000000000..0a753d0b6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar
new file mode 100644
index 000000000..52f47a4f4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar
deleted file mode 100644
index ff3a103c0..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar
new file mode 100644
index 000000000..ea45d4d34
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar
new file mode 100644
index 000000000..1a1ceeec5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar
new file mode 100644
index 000000000..2850ca10c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar
new file mode 100644
index 000000000..3b17e6e7f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar
deleted file mode 100644
index 7d7d21082..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar
new file mode 100644
index 000000000..ba93796c9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar
deleted file mode 100644
index f54fb49bb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar
new file mode 100644
index 000000000..d520498e6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar
new file mode 100644
index 000000000..580c9cdf6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar
deleted file mode 100644
index b2aca95bb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar
new file mode 100644
index 000000000..583e06a08
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar
new file mode 100644
index 000000000..ef2909409
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar
new file mode 100644
index 000000000..d61cc0f70
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar
new file mode 100644
index 000000000..7736ec9f0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar
similarity index 50%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar
index 60f119cac..518b425d3 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar
deleted file mode 100644
index aaf744484..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar
new file mode 100644
index 000000000..3a7fc266c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar
deleted file mode 100644
index b1e1c5135..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar
new file mode 100644
index 000000000..93aee137f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar
new file mode 100644
index 000000000..39143a50c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar
deleted file mode 100644
index 752c71448..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar
new file mode 100644
index 000000000..16b447e17
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar
new file mode 100644
index 000000000..73ae74e4b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar
deleted file mode 100644
index cc374b707..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar
new file mode 100644
index 000000000..52d41e54a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar
deleted file mode 100644
index 7b8d21c43..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar
new file mode 100644
index 000000000..fa65b53ba
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar
deleted file mode 100644
index 37a44066b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar
new file mode 100644
index 000000000..694e569af
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar
deleted file mode 100644
index 47923cc46..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar
new file mode 100644
index 000000000..fc565b589
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar
new file mode 100644
index 000000000..34193e1da
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar
deleted file mode 100644
index 093efbd8f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar
deleted file mode 100644
index 5e1937f46..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar
new file mode 100644
index 000000000..0853094dc
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar
deleted file mode 100644
index 627665604..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar
new file mode 100644
index 000000000..4cc68c3b9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar
deleted file mode 100644
index b67de4cb2..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar
deleted file mode 100644
index 8e2c2b755..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar
new file mode 100644
index 000000000..52e3d0218
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar
new file mode 100644
index 000000000..d928ea956
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar
new file mode 100644
index 000000000..b68415977
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar
deleted file mode 100644
index ea5930b36..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar
deleted file mode 100644
index 2f2bf0b31..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar
deleted file mode 100644
index 501701dc8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar
deleted file mode 100644
index bf8393379..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar
new file mode 100644
index 000000000..4c0156d9e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar
new file mode 100644
index 000000000..20a0d2c71
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar
new file mode 100644
index 000000000..88f1d47d3
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar
deleted file mode 100644
index c44160e2b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar
deleted file mode 100644
index c640a8d1a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar
new file mode 100644
index 000000000..be09493c0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
deleted file mode 100644
index 4cf488ee3..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
deleted file mode 100644
index f131a431c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar
deleted file mode 100644
index 3b9cbb1c7..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar
deleted file mode 100644
index b8c059525..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar
deleted file mode 100644
index 172c39541..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar
deleted file mode 100644
index e285a2104..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar
deleted file mode 100644
index 0b73e4acf..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar
deleted file mode 100644
index f992bff33..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar
deleted file mode 100644
index a46dc3a1c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar
deleted file mode 100644
index 412412be6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar
deleted file mode 100644
index 84af61cbf..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar
deleted file mode 100644
index 30962d0e0..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar
deleted file mode 100644
index 4d4c662bf..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar
deleted file mode 100644
index bfe1d9737..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar
deleted file mode 100644
index 015aacdd6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar
deleted file mode 100644
index 44b8987f3..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar
new file mode 100644
index 000000000..e15837718
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar
new file mode 100644
index 000000000..e4de16fef
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar
deleted file mode 100644
index 1cf1a7a60..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar
new file mode 100644
index 000000000..feab196ec
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar
deleted file mode 100644
index 8862e2175..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar
new file mode 100644
index 000000000..a9e380085
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar
deleted file mode 100644
index 0782b07d4..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar
new file mode 100644
index 000000000..726768cfd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar
similarity index 70%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar
index 24d719e70..bd883978b 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar
deleted file mode 100644
index 63e54165e..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar
new file mode 100644
index 000000000..0e470f5ea
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar
new file mode 100644
index 000000000..db9206f63
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar
new file mode 100644
index 000000000..00cf5b444
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar
new file mode 100644
index 000000000..f07884ee7
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar
deleted file mode 100644
index 1a8870833..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar
new file mode 100644
index 000000000..a8dd5c5a4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar
deleted file mode 100644
index 5dfcf4b91..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar
new file mode 100644
index 000000000..5496e46a1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar
deleted file mode 100644
index 386fe329f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..7fb0ba7ee
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..8be842461
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar
deleted file mode 100644
index 52d0ae60b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..89232b49c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar
deleted file mode 100644
index b027ab850..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..38cfab65a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar
deleted file mode 100644
index f1df10b9c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..d979371a7
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar
deleted file mode 100644
index 906326dea..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..f2cd8fb58
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar
deleted file mode 100644
index b5c6f1a6d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..483f3f1fd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..4f0abf1cd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..e4f6ccae8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..f191a6b4b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar
new file mode 100644
index 000000000..c290363e2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar
new file mode 100644
index 000000000..6eaa98c77
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar
deleted file mode 100644
index 37f66bc2b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar
new file mode 100644
index 000000000..427c2b2e6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar
deleted file mode 100644
index 81e356681..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar
new file mode 100644
index 000000000..18c51b3a3
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar
deleted file mode 100644
index 6268e5868..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar
new file mode 100644
index 000000000..018f1920b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..f5a669108
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..dda3bc062
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..d7885958e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..ee878144a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar
new file mode 100644
index 000000000..0cedf119b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar
new file mode 100644
index 000000000..e1ccee673
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar
new file mode 100644
index 000000000..2dd98732a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar
new file mode 100644
index 000000000..c64b035ac
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar
new file mode 100644
index 000000000..31302c9fe
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar
new file mode 100644
index 000000000..31744dfbc
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar
new file mode 100644
index 000000000..bc528acb9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar
new file mode 100644
index 000000000..31a6aad6c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar
deleted file mode 100644
index 6c6f5c236..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar
new file mode 100644
index 000000000..b1f4405ba
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar
new file mode 100644
index 000000000..a14a5ff73
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar
new file mode 100644
index 000000000..4f98c8060
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar
new file mode 100644
index 000000000..eca81b252
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar
new file mode 100644
index 000000000..01b1f9567
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar
new file mode 100644
index 000000000..25351e108
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar
new file mode 100644
index 000000000..588258e85
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar
new file mode 100644
index 000000000..538064a8e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar
deleted file mode 100644
index 1ff2dd718..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar
new file mode 100644
index 000000000..de8540386
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar
deleted file mode 100644
index b9ffc36b9..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar
new file mode 100644
index 000000000..b9c10b97c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld b/eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld
new file mode 100644
index 000000000..e52ffe837
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+    
+  <description>JSTL 1.1 XML library</description>
+  <display-name>JSTL XML</display-name>
+  <tlib-version>1.1</tlib-version>
+  <short-name>x</short-name>
+  <uri>http://java.sun.com/jsp/jstl/xml</uri>
+
+  <validator>
+    <description>
+        Provides validation features for JSTL XML tags.
+    </description>
+    <validator-class>
+	org.apache.taglibs.standard.tlv.JstlXmlTLV
+    </validator-class>
+  </validator>
+
+  <tag>
+    <description>
+        Simple conditional tag that establishes a context for
+        mutually exclusive conditional operations, marked by
+        &lt;when&gt; and &lt;otherwise&gt;
+    </description>
+    <name>choose</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <description>
+	Like &lt;%= ... &gt;, but for XPath expressions.
+    </description>
+    <name>out</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ExprTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
+        <name>select</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Determines whether characters &lt;,&gt;,&amp;,'," in the
+resulting string should be converted to their
+corresponding character entity codes. Default
+value is true.
+        </description>
+        <name>escapeXml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        XML conditional tag, which evalutes its body if the
+        supplied XPath expression evalutes to 'true' as a boolean
+    </description>
+    <name>if</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The test condition that tells whether or not the
+body content should be processed.
+        </description>
+        <name>select</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+resulting value of the test condition. The type
+of the scoped variable is Boolean.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	XML iteration tag.
+    </description>
+    <name>forEach</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped variable
+has nested visibility. Its type depends on the
+result of the XPath expression in the select
+attribute.
+        </description>
+	<name>var</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
+	<name>select</name>
+	<required>true</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Iteration begins at the item located at the
+specified index. First item of the collection has
+index 0.
+        </description>
+	<name>begin</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration ends at the item located at the specified
+index (inclusive).
+        </description>
+	<name>end</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration will only process every step items of
+the collection, starting with the first one.
+        </description>
+	<name>step</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of type
+javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+        </description>
+	<name>varStatus</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
+	and runs only if all of the prior conditions evaluated to
+	'false'
+    </description>
+    <name>otherwise</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <description>
+        Adds a parameter to a containing 'transform' tag's Transformer
+    </description>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the transformation parameter.
+        </description>
+        <name>name</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Value of the parameter.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Parses XML content from 'source' attribute or 'body'
+    </description>
+    <name>parse</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParseTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is implementation
+dependent.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+        </description>
+        <name>varDom</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for varDom.
+        </description>
+        <name>scopeDom</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Deprecated. Use attribute 'doc' instead.
+        </description>
+        <name>xml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Source XML document to be parsed.
+        </description>
+        <name>doc</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+The system identifier (URI) for parsing the
+XML document.
+        </description>
+        <name>systemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Filter to be applied to the source
+document.
+        </description>
+        <name>filter</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Saves the result of an XPath expression evaluation in a 'scope'
+    </description>
+    <name>set</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable to hold
+the value specified in the action. The type of the
+scoped variable is whatever type the select
+expression evaluates to.
+        </description>
+        <name>var</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
+	<name>select</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+	Conducts a transformation given a source XML document
+	and an XSLT stylesheet
+    </description>
+    <name>transform</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.TransformTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported
+scoped variable for the
+transformed XML
+document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Result
+Object that captures or
+processes the transformation
+result.
+        </description>
+        <name>result</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Deprecated. Use attribute
+'doc' instead.
+        </description>
+        <name>xml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Source XML document to be
+transformed. (If exported by
+&lt;x:set&gt;, it must correspond
+to a well-formed XML
+document, not a partial
+document.)
+        </description>
+        <name>doc</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Deprecated. Use attribute
+'docSystemId' instead.
+        </description>
+        <name>xmlSystemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+The system identifier (URI)
+for parsing the XML
+document.
+        </description>
+        <name>docSystemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+javax.xml.transform.Source
+Transformation stylesheet as
+a String, Reader, or
+Source object.
+        </description>
+	<name>xslt</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+The system identifier (URI)
+for parsing the XSLT
+stylesheet.
+        </description>
+	<name>xsltSystemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Subtag of &lt;choose&gt; that includes its body if its
+        expression evalutes to 'true'
+    </description>
+    <name>when</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The test condition that tells whether or
+not the body content should be
+processed
+        </description>
+        <name>select</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+</taglib>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar
deleted file mode 100644
index 73cf175fa..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar
new file mode 100644
index 000000000..007be3960
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar
deleted file mode 100644
index 2dd837714..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar
similarity index 55%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar
index ccd816342..d1b66271f 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar
deleted file mode 100644
index d7c072d2d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar
new file mode 100644
index 000000000..b9328ef00
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar
deleted file mode 100644
index 22cd958b6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar
new file mode 100644
index 000000000..1f71ab920
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar
new file mode 100644
index 000000000..f391598d9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar
deleted file mode 100644
index dcedd5aad..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar
new file mode 100644
index 000000000..a493c3b99
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index c261a449b..444633d72 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
@@ -39,7 +39,7 @@
                 cdmlib-remote-webapp
               </excludeArtifactIds>
               <includeArtifactIds>
-                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote
+                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdmlib-test
               </includeArtifactIds>
               <outputDirectory>${basedir}/lib</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
@@ -177,6 +177,11 @@
       </id>
       <url>http://repository.springsource.com/maven/bundles/external
       </url>
+    </repository>
+	 <repository>
+        <id>repository.springsource.release</id>
+        <name>SpringSource GA Repository</name>
+        <url>http://repo.springsource.org/release</url>
     </repository>
   </repositories>
   <dependencies>
@@ -226,6 +231,11 @@
       <artifactId>cdmlib-ext</artifactId>
       <version>${cdmlib.version}</version>
     </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-test</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
 
     <!-- <dependency> -->
     <!-- <groupId>org.eclipse.jetty</groupId> -->
@@ -348,78 +358,78 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.context</artifactId>
-      <version>3.2.2.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.context.support</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-context</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.aspects</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-context-support</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.test</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-aspects</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.beans</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-test</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.transaction</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-beans</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.web</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-tx</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.core</artifactId>
-      <version>3.2.2.RELEASE</version>
-    </dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-web</artifactId>
+		<version>4.2.4.RELEASE</version>
+	</dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.aop</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-core</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.expression</artifactId>
-      <version>3.2.2.RELEASE</version>
+      <artifactId>spring-aop</artifactId>
+      <version>4.2.4.RELEASE</version>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.orm</artifactId>
-      <version>3.2.2.RELEASE</version>
-    </dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-expression</artifactId>
+		<version>4.2.4.RELEASE</version>
+	</dependency>
+   <dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-orm</artifactId>
+		<version>4.2.4.RELEASE</version>
+	</dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.jdbc</artifactId>
-      <version>3.2.2.RELEASE</version>
-    </dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-jdbc</artifactId>
+		<version>4.2.4.RELEASE</version>
+	</dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>3.1.3.RELEASE</version>
+      <version>4.0.3.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>3.1.3.RELEASE</version>
+      <version>4.0.3.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-remoting</artifactId>
-      <version>3.1.3.RELEASE</version>
+      <version>4.0.3.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 47757c986..cdb3a1cdb 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -19,7 +19,7 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.remoting.httpinvoker.CommonsHttpInvokerRequestExecutor;
+import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor;
 import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.authentication.AuthenticationProvider;
@@ -128,7 +128,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
         this.remoteSource = remoteSource;
     }
 
-    private Object getService(Class<?> clazz, String serviceSuffix, CommonsHttpInvokerRequestExecutor executor) {
+    private Object getService(Class<?> clazz, String serviceSuffix, HttpComponentsHttpInvokerRequestExecutor executor) {
         if(serviceMap.containsKey(clazz)) {
             return serviceMap.get(clazz);
         }
@@ -140,7 +140,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
     public static Object getService(Class<?> clazz,
             String serviceSuffix,
             ICdmRemoteSource remoteSource,
-            CommonsHttpInvokerRequestExecutor executor) {
+            HttpComponentsHttpInvokerRequestExecutor executor) {
 
         String baseUrl;
         if(remoteSource.getContextPath() == null || remoteSource.getContextPath().equals("")) {
@@ -305,16 +305,16 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
 
 
     public static IUserService getUserService(ICdmRemoteSource remoteSource) {
-        return (IUserService) getService(IUserService.class, "/remoting-public/user.service", remoteSource, new CommonsHttpInvokerRequestExecutor());
+        return (IUserService) getService(IUserService.class, "/remoting-public/user.service", remoteSource, new HttpComponentsHttpInvokerRequestExecutor());
     }
 
     @Override
     public IMetadataService getMetadataService() {
-        return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", new CommonsHttpInvokerRequestExecutor());
+        return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", new HttpComponentsHttpInvokerRequestExecutor());
     }
 
     public static IMetadataService getMetadataService(ICdmRemoteSource remoteSource) {
-        return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", remoteSource, new CommonsHttpInvokerRequestExecutor());
+        return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", remoteSource, new HttpComponentsHttpInvokerRequestExecutor());
     }
 
     @Override
@@ -426,7 +426,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
         if(cdmPermissionEvaluator != null) {
             return cdmPermissionEvaluator;
         }
-        List<AccessDecisionVoter> decisionVoters = new ArrayList<AccessDecisionVoter>();
+        List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
         decisionVoters.add(new GrantAlwaysVoter());
         decisionVoters.add(new TaxonNodeVoter());
         decisionVoters.add(new TaxonBaseVoter());
diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java
index cf53ea5e1..997526936 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java
@@ -17,12 +17,20 @@ import net.sf.ehcache.Element;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
-import org.hibernate.property.Getter;
+import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.property.access.spi.Getter;
 import org.osgi.framework.Bundle;
 
+import org.hibernate.boot.Metadata;
+
 
 public class CdmModelCacher {
 
@@ -63,22 +71,39 @@ public class CdmModelCacher {
 
 
     public Map<String, CdmModelFieldPropertyFromClass> generateModelClassMap() {
-
-        Configuration configuration = buildConfiguration(HB_CONFIG_FILE_PATH);
-        Iterator<PersistentClass> classMappingIterator =   configuration.getClassMappings();
-
-        Map<String, CdmModelFieldPropertyFromClass> modelClassMap = new HashMap<String, CdmModelFieldPropertyFromClass>();
-
-        while(classMappingIterator.hasNext()) {
-            PersistentClass persistentClass = classMappingIterator.next();
-            Class mappedClass = persistentClass.getMappedClass();
-            String mappedClassName = mappedClass.getName();
-
-            CdmModelFieldPropertyFromClass cmgmfc = new CdmModelFieldPropertyFromClass(mappedClassName);
-            System.out.println("Adding class : " + mappedClassName + " to cache");
-            addGetters(persistentClass, cmgmfc);
-            modelClassMap.put(mappedClassName, cmgmfc);
-        }
+    	
+    	// A SessionFactory is set up once for an application!
+    	final StandardServiceRegistry registry = new StandardServiceRegistryBuilder()
+    			.configure(HB_CONFIG_FILE_PATH) // configures settings from hibernate.cfg.xml
+    			.build();
+    	SessionFactory sessionFactory = null;
+    	Map<String, CdmModelFieldPropertyFromClass> modelClassMap = new HashMap<String, CdmModelFieldPropertyFromClass>();
+    	try {
+    		sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory();
+    		Configuration configuration = buildConfiguration(HB_CONFIG_FILE_PATH);
+        	Map<String, ClassMetadata> classMetaDataMap = sessionFactory.getAllClassMetadata();
+        	Metadata metadata = new MetadataSources( registry ).getMetadataBuilder().applyImplicitNamingStrategy( ImplicitNamingStrategyJpaCompliantImpl.INSTANCE ).build();
+           
+
+            for(ClassMetadata classMetaData :classMetaDataMap.values()) {
+            	Class mappedClass = classMetaData.getMappedClass();
+               
+                String mappedClassName = mappedClass.getName();
+               
+                PersistentClass persistentClass =metadata.getEntityBinding(mappedClassName);
+                CdmModelFieldPropertyFromClass cmgmfc = new CdmModelFieldPropertyFromClass(mappedClassName);
+                System.out.println("Adding class : " + mappedClassName + " to cache");
+                addGetters(persistentClass, cmgmfc);
+                modelClassMap.put(mappedClassName, cmgmfc);
+            }
+    	}
+    	catch (Exception e) {
+    		// The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory
+    		// so destroy it manually.
+    		StandardServiceRegistryBuilder.destroy( registry );
+    	}
+    	
+    	
         return modelClassMap;
     }
 
diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
index 952ceb925..0ec0dd91c 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
@@ -368,12 +368,12 @@ public class CdmServerInfo {
     public static List<CdmServerInfo> getCdmServers() {
         if(cdmServerInfoList == null) {
             cdmServerInfoList = new ArrayList<CdmServerInfo>();
-            cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80));
+//            cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80));
             //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80));
             cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80));
            // cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80));
-           //cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80));
-           // cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080));
+           cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80));
+            cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080));
             cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST,NULL_PORT));
         }
         return cdmServerInfoList;
diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
index 692a3bae1..f46b81ae5 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
@@ -13,7 +13,8 @@ import java.io.IOException;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.springframework.remoting.httpinvoker.CommonsHttpInvokerRequestExecutor;
+import org.apache.http.client.methods.HttpPost;
+import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor;
 import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
@@ -25,11 +26,11 @@ import eu.etaxonomy.cdm.api.application.CdmApplicationState;
  * @date 27 Jan 2015
  *
  */
-public class CdmAuthenticatedHttpInvokerRequestExecutor extends CommonsHttpInvokerRequestExecutor {
+public class CdmAuthenticatedHttpInvokerRequestExecutor extends HttpComponentsHttpInvokerRequestExecutor {
 
     @Override
-    protected PostMethod createPostMethod(HttpInvokerClientConfiguration config) throws IOException {
-        PostMethod postMethod = super.createPostMethod(config);
+    protected HttpPost createHttpPost(HttpInvokerClientConfiguration config) throws IOException {
+    	HttpPost postMethod = super.createHttpPost(config);
 
         SecurityContext securityContext = CdmApplicationState.getCurrentSecurityContext();
         if(securityContext != null) {
@@ -37,7 +38,7 @@ public class CdmAuthenticatedHttpInvokerRequestExecutor extends CommonsHttpInvok
             if ((auth != null) && (auth.getName() != null) &&
                     (auth.getCredentials() != null)) {
                 String base64 = auth.getName() + ":" + auth.getCredentials().toString();
-                postMethod.setRequestHeader("Authorization", "Basic " +
+                postMethod.setHeader("Authorization", "Basic " +
                         new String(Base64.encodeBase64(base64.getBytes())));
             }
         }
diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
index f2debccfe..2224ce5ad 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
@@ -236,11 +236,11 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
 		if ( isTempSession ) {
 			// TODO: On the next major release, add an
 			// 'isJTA' or 'getTransactionFactory' method to Session.
-			isJTA = session.getTransactionCoordinator()
+			/*isJTA = session.getTransactionCoordinator()
 					.getTransactionContext().getTransactionEnvironment()
 					.getTransactionFactory()
-					.compatibleWithJtaSynchronization();
-
+					.compatibleWithJtaSynchronization();*/
+			isJTA = session.getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta();
 			if ( !isJTA ) {
 				// Explicitly handle the transactions only if we're not in
 				// a JTA environment.  A lazy loading temporary session can
diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
index 591594804..f9920b678 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
@@ -203,10 +203,12 @@ public abstract class AbstractLazyInitializer implements LazyInitializer {
 
 				// TODO: On the next major release, add an
 				// 'isJTA' or 'getTransactionFactory' method to Session.
-				boolean isJTA = session.getTransactionCoordinator()
+				/*boolean isJTA = session.getTransactionCoordinator()
 						.getTransactionContext().getTransactionEnvironment()
 						.getTransactionFactory()
 						.compatibleWithJtaSynchronization();
+				*/
+				boolean isJTA = session.getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta();
 
 				if ( !isJTA ) {
 					// Explicitly handle the transactions only if we're not in
diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 543857970..1c730c98c 100644
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
index d6cc82eab..3450b36a5 100644
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
@@ -148,7 +148,7 @@ command.label.54 = Delete (with children)
 command.tooltip = Show Only Individuals Associations
 command.label.55 = Open Associated Specimens
 command.name.41 = Show Only Individual Associations
-command.name.42 = Open Taxon Editor
+command.name.42 = Open Taxon Editor for taxon
 command.name.43 = Create Field Unit
 command.name.44 = Deep Delete
 command.name.46 = Move Synonym (Homotypical Group) to another Accepted Taxon
diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 7cf094832..18e6e63e8 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -776,7 +776,7 @@
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.derivate.delete"
+               commandId="org.eclipse.ui.edit.delete"
                label="%command.label.52"
                style="push">
          </command>
@@ -786,6 +786,10 @@
                label="%command.label.54"
                style="push">
          </command>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.derivativeEditor.CdmViewerContextMenu">
+         </dynamic>
          <dynamic
                class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
                id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
@@ -1120,7 +1124,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.view.derivate.command.delete">
+            commandId="org.eclipse.ui.edit.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -1152,6 +1156,18 @@
             </reference>
          </activeWhen>
       </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
+            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
    </extension>
    <extension
          name="%extension.name"
@@ -1453,21 +1469,27 @@
             name="%command.name.41">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenTaxonEditorHandler"
-            id="eu.etaxonomy.taxeditor.editor.openTaxonEditor"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonHandler"
+            id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon"
             name="%command.name.42">
          <commandParameter
-               id="eu.etaxonomy.taxeditor.editor.taxonParameter"
+               id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon.uuid"
                name="%commandParameter.name"
                optional="false"
-               typeId="eu.etaxonomy.taxeditor.editor.taxonParameterType">
+               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
+         </commandParameter>
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonNodeHandler"
+            id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode"
+            name="Open Taxon Editor for taxonnode">
+         <commandParameter
+               id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode.uuid"
+               name="taxon node uuid"
+               optional="true"
+               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
          </commandParameter>
       </command>
-      <commandParameterType
-            converter="eu.etaxonomy.taxeditor.editor.handler.TaxonParameterConverter"
-            id="eu.etaxonomy.taxeditor.editor.taxonParameterType"
-            type="eu.etaxonomy.cdm.model.taxon.TaxonBase">
-      </commandParameterType>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
             id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
@@ -1490,12 +1512,6 @@
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
             id="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
             name="Open Derivative Editor">
-         <commandParameter
-               id="eu.etaxonomy.taxeditor.specimenUuidParameter"
-               name="Specimen UUID parameter"
-               optional="true"
-               typeId="eu.etaxonomy.taxeditor.specimenUuidParameterType">
-         </commandParameter>
       </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ListenToSelectionChangeHandler"
@@ -1504,14 +1520,6 @@
       </command>
         
    </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <commandParameterType
-            converter="eu.etaxonomy.taxeditor.handler.UuidParameterConverter"
-            id="eu.etaxonomy.taxeditor.specimenUuidParameterType"
-            type="java.util.UUID">
-      </commandParameterType>
-   </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
       <definition
@@ -1754,8 +1762,15 @@
    </extension>
    <extension
           point="eu.etaxonomy.taxeditor.store.cdmViewer">
-       <cdmViewer
-             class="eu.etaxonomy.taxeditor.editor.EditorCdmViewer">
-       </cdmViewer>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode"
+            selection="eu.etaxonomy.cdm.model.taxon.TaxonNode"
+            viewerName="Taxon Editor">
+      </viewCommandMapping>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon"
+            selection="eu.etaxonomy.cdm.model.taxon.TaxonBase"
+            viewerName="TaxonEditor">
+      </viewCommandMapping>
     </extension>
 </plugin>
diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml
index 1c9533c66..aad686213 100644
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
 	<groupId>eu.etaxonomy</groupId>
 	<artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorCdmViewer.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorCdmViewer.java
deleted file mode 100644
index 796d19aa3..000000000
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorCdmViewer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2015 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;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.ui.PartInitException;
-
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.view.ICdmViewer;
-
-/**
- * @author pplitzner
- * @date Feb 23, 2015
- *
- */
-public class EditorCdmViewer implements ICdmViewer {
-
-    private final Logger logger = Logger.getLogger(EditorCdmViewer.class);
-
-    @Override
-    public void show(Object input, Class<?> viewerClass) {
-        try {
-            if(viewerClass.equals(MultiPageTaxonEditor.class)){
-                if(input instanceof TaxonBase){
-                    TaxonEditorInput editorInput = TaxonEditorInput.NewInstanceFromTaxonBase(((TaxonBase<?>) input).getUuid());
-                    EditorUtil.open(editorInput);
-                }
-            }
-            else if(viewerClass.equals(DerivateView.class)){
-                if(input instanceof SpecimenOrObservationBase){
-                }
-            }
-        } catch (PartInitException e) {
-            String errorMessage = "Could not open editor";
-            logger.error(errorMessage, e);
-            MessagingUtils.error(EditorCdmViewer.class, errorMessage, e);
-        }
-    }
-
-    @Override
-    public Map<Class<?>, String> getViewerClasses(Object input) {
-        Map<Class<?>, String> viewerNameMap = new HashMap<Class<?>, String>();
-        if(input instanceof TaxonBase){
-            viewerNameMap.put(MultiPageTaxonEditor.class, "Taxon Editor");
-        }
-        return viewerNameMap;
-    }
-
-}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenTaxonEditorHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenTaxonEditorHandler.java
deleted file mode 100644
index b416726cd..000000000
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenTaxonEditorHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-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.ParameterType;
-import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.ui.PartInitException;
-
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-
-
-public class OpenTaxonEditorHandler extends AbstractHandler {
-
-    @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException {
-        Object object = event.getObjectParameterForExecution("eu.etaxonomy.taxeditor.editor.taxonParameter");
-
-        try {
-            ParameterType parameterType = event.getCommand().getParameterType("eu.etaxonomy.taxeditor.editor.taxonParameter");
-            if(parameterType.isCompatible(object)){
-                EditorUtil.openTaxonEditor(object);
-            }
-        } catch (NotDefinedException e) {
-            MessagingUtils.error(this.getClass(), "Parameter type not defined", e);
-        } catch (PartInitException e) {
-            MessagingUtils.error(OpenTaxonEditorHandler.class, "Error opening the editor", e);
-        }
-        return null;
-    }
-
-}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/TaxonParameterConverter.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/TaxonParameterConverter.java
deleted file mode 100644
index 0283f4de8..000000000
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/TaxonParameterConverter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.etaxonomy.taxeditor.editor.handler;
-
-import java.util.UUID;
-
-import org.eclipse.core.commands.AbstractParameterValueConverter;
-import org.eclipse.core.commands.ParameterValueConversionException;
-
-import eu.etaxonomy.cdm.api.service.ITaxonService;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-public class TaxonParameterConverter extends AbstractParameterValueConverter {
-
-    public TaxonParameterConverter() {
-    }
-
-    @Override
-    public Object convertToObject(String parameterValue) throws ParameterValueConversionException {
-        return CdmStore.getService(ITaxonService.class).load(UUID.fromString(parameterValue));
-    }
-
-    @Override
-    public String convertToString(Object parameterValue) throws ParameterValueConversionException {
-        if(parameterValue instanceof TaxonBase<?>){
-            return ((TaxonBase<?>) parameterValue).getUuid().toString();
-        }
-        return null;
-    }
-
-}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java
new file mode 100644
index 000000000..03db45a0c
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java
@@ -0,0 +1,33 @@
+package eu.etaxonomy.taxeditor.editor.handler.defaultHandler;
+import java.util.UUID;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.ui.PartInitException;
+
+import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
+import eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenHandlerBase;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+
+public class DefaultOpenTaxonEditorForTaxonHandler extends DefaultOpenHandlerBase<TaxonBase> {
+
+    @Override
+    protected TaxonBase getEntity(UUID uuid) {
+        return CdmStore.getService(ITaxonService.class).load(uuid);
+    }
+
+    @Override
+    protected void open(ExecutionEvent event, TaxonBase entity) {
+        TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(entity.getUuid());
+        try {
+            EditorUtil.open(input);
+        } catch (PartInitException e) {
+            MessagingUtils.error(DefaultOpenTaxonEditorForTaxonHandler.class, "Could not open taxon editor for taxon "+input.getTaxon(), e);
+        }
+    }
+
+}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonNodeHandler.java
new file mode 100644
index 000000000..52937c8af
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonNodeHandler.java
@@ -0,0 +1,33 @@
+package eu.etaxonomy.taxeditor.editor.handler.defaultHandler;
+import java.util.UUID;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.ui.PartInitException;
+
+import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
+import eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenHandlerBase;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+
+public class DefaultOpenTaxonEditorForTaxonNodeHandler extends DefaultOpenHandlerBase<TaxonNode> {
+
+    @Override
+    protected TaxonNode getEntity(UUID uuid) {
+        return CdmStore.getService(ITaxonNodeService.class).load(uuid);
+    }
+
+    @Override
+    protected void open(ExecutionEvent event, TaxonNode entity) {
+        TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(entity.getTaxon().getUuid());
+        try {
+            EditorUtil.open(input);
+        } catch (PartInitException e) {
+            MessagingUtils.error(DefaultOpenTaxonEditorForTaxonNodeHandler.class, "Could not open taxon editor for taxon "+input.getTaxon(), e);
+        }
+    }
+
+}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
index 30289e812..0516b1a42 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
@@ -18,7 +18,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index 9d43c0087..96726beeb 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
@@ -18,7 +18,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index fc6cf73c4..0289d9a84 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@ -18,7 +18,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index a6504a980..5ef7e43ec 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -202,6 +202,8 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
 
         //init tree
         updateRootEntities();
+        //reset status bar
+        getEditorSite().getActionBars().getStatusLineManager().setMessage("");
 
         //add drag'n'drop support
         Transfer[] transfers = new Transfer[] {LocalSelectionTransfer.getTransfer(),};
@@ -219,12 +221,13 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
                 conversation.bind();
             }
             /*
-             * If the active session is not the session of the Derivate Editor then we will
-             * save it, bind temporarily to our session and rebind to the original session.
-             * This happens e.g. if a selection change happens in the taxon editor and
-             * "Link with editor" is enabled. The selection change event and thus the
-             * loading in updateRootEntities() happens in the session of the taxon
-             * editor.
+             * If the active session is not the session of the Derivative Editor
+             * then we will save the active session for later, bind temporarily
+             * to our session and rebind to the original session when we are
+             * done. This happens e.g. if a selection change happens in the
+             * taxon editor and "Link with editor" is enabled. The selection
+             * change event and thus the loading in updateRootEntities() happens
+             * in the session of the taxon editor.
              */
             ICdmEntitySession previousCdmEntitySession = CdmStore.getCurrentSessionManager().getActiveSession();
             if(cdmEntitySession != null) {
@@ -531,8 +534,10 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
     @Override
     public void contextStop(IMemento memento, IProgressMonitor monitor) {
         derivateSearchCompositeController.setEnabled(false);
-        viewer.getTree().setEnabled(false);
-        viewer.setInput(null);
+        if(!viewer.getTree().isDisposed()) {
+            viewer.getTree().setEnabled(false);
+            viewer.setInput(null);
+        }
     }
 
     /**
diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml b/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
index 3c5daa72e..5866cb9c5 100644
--- a/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.jre.linux64"
       label="Taxonomic Editor JRE Linux64"
-      version="3.12.2"
+      version="3.13.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux"
diff --git a/eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml b/eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
index 3d6d43116..51fe94a7f 100644
--- a/eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>
diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index d01880694..8755ff47d 100644
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.12.2"
+      version="3.13.0.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
index ceb885f30..dfce9d3ec 100644
--- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.etaxonomy</groupId>
 		<artifactId>taxeditor-parent</artifactId>
-		<version>3.12.2</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index 3292b2225..ed9466cb8 100644
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.12.2"
+      version="3.13.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index 5e6f25caf..8559b504c 100644
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index 5039c7930..4c68b0500 100644
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml
index 26efcfd85..b6ed32164 100644
--- a/eu.etaxonomy.taxeditor.help/pom.xml
+++ b/eu.etaxonomy.taxeditor.help/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.etaxonomy</groupId>
 		<artifactId>taxeditor-parent</artifactId>
-		<version>3.12.2</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index 29e53df23..fc6f279c3 100644
--- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Bundle-ClassPath: .,
  lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,
  lib/bioinfweb-commons-core-2-SNAPSHOT.jar,
diff --git a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
index 2eed6cd2a..c64aa4e41 100644
--- a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
index b105c55aa..09b035b17 100644
--- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eu.etaxonomy.taxeditor.molecular/pom.xml b/eu.etaxonomy.taxeditor.molecular/pom.xml
index 5831dff6a..597d3ce7c 100644
--- a/eu.etaxonomy.taxeditor.molecular/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index c311a31fc..a50da2514 100644
--- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index 9767c38e9..85bdb4838 100644
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -174,36 +174,10 @@
                name="taxeditor-navigation.separator1"
                visible="true">
          </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"
-               label="%command.label.5"
-               style="push">       
-            <visibleWhen
-                  checkEnabled="true">
-               <or>
-                  <reference
-                        definitionId="isTaxonNode">
-                  </reference>
-                  <reference
-                        definitionId="isTaxonomicTree">
-                  </reference>
-               </or>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.store.open"
-               label="Edit"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <with
-                     variable="selection">
-                  <reference
-                        definitionId="isClassification">
-                  </reference>
-               </with>
-            </visibleWhen>
-         </command>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.navigation.cdmViewerContextMenu">
+         </dynamic>
          <command
                commandId="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonym"
                label="%command.label.6"
@@ -420,11 +394,6 @@
    </extension>
    <extension
          point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.EditHandler"
-            id="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"
-            name="%command.name.1">
-      </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.MoveTaxonHandler"
             id="eu.etaxonomy.taxeditor.navigation.command.update.moveTaxon"
@@ -903,10 +872,4 @@
          </test>
       </definition>
    </extension>
-   <extension
-         point="eu.etaxonomy.taxeditor.store.cdmViewer">
-      <cdmViewer
-            class="eu.etaxonomy.taxeditor.navigation.NavigationCdmViewer">
-      </cdmViewer>
-   </extension>
 </plugin>
diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml
index 5fedf05dd..fc8120224 100644
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.etaxonomy</groupId>
 		<artifactId>taxeditor-parent</artifactId>
-		<version>3.12.2</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationCdmViewer.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationCdmViewer.java
deleted file mode 100644
index 8ba357df8..000000000
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationCdmViewer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.etaxonomy.taxeditor.navigation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-
-import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
-import eu.etaxonomy.taxeditor.view.ICdmViewer;
-
-public class NavigationCdmViewer implements ICdmViewer {
-
-
-    @SuppressWarnings("unused")
-    private final Logger logger = Logger.getLogger(NavigationCdmViewer.class);
-
-    @Override
-    public void show(Object input, Class<?> viewerClass) {
-        if(viewerClass.equals(NewClassificationWizard.class)){
-            if(input instanceof Classification){
-                Classification classification = (Classification)input;
-                NewClassificationWizard classificationWizard = new NewClassificationWizard();
-                classificationWizard.init(null, null);
-                classificationWizard.setEntity(classification);
-                WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), classificationWizard);
-                dialog.open();
-            }
-        }
-    }
-
-    @Override
-    public Map<Class<?>, String> getViewerClasses(Object input) {
-        Map<Class<?>, String> viewerNameMap = new HashMap<Class<?>, String>();
-        if(input instanceof Classification){
-            viewerNameMap.put(NewClassificationWizard.class, "Classification Wizard");
-        }
-        return viewerNameMap;
-    }
-
-}
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
index a266c8d92..8c36e2a18 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
@@ -12,10 +12,6 @@ package eu.etaxonomy.taxeditor.navigation;
 import java.util.Set;
 import java.util.UUID;
 
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.NotEnabledException;
-import org.eclipse.core.commands.NotHandledException;
-import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.commands.operations.UndoContext;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -25,7 +21,6 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.navigator.CommonViewer;
 
 import eu.etaxonomy.cdm.model.common.ICdmBase;
@@ -35,7 +30,6 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
@@ -55,27 +49,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 public class NavigationUtil extends AbstractUtility{
 	private static IUndoContext defaultUndoContext;
 
-	/**
-	 * <p>executeEditHandler</p>
-	 */
-	public static void executeEditHandler(){
-
-		String commandId = "eu.etaxonomy.taxeditor.navigation.command.update.editSelection";
-
-		IHandlerService handlerService = (IHandlerService) AbstractUtility.getService(IHandlerService.class);
-		try {
-			handlerService.executeCommand(commandId, null);
-		} catch (ExecutionException e) {
-			MessagingUtils.error(NavigationUtil.class, e);
-		} catch (NotDefinedException e) {
-			MessagingUtils.error(NavigationUtil.class, e);
-		} catch (NotEnabledException e) {
-			MessagingUtils.error(NavigationUtil.class, e);
-		} catch (NotHandledException e) {
-			MessagingUtils.error(NavigationUtil.class, e);
-		}
-	}
-
 	/**
 	 * <p>openEditor</p>
 	 *
@@ -108,23 +81,6 @@ public class NavigationUtil extends AbstractUtility{
 		}
 	}
 
-	public static void openEditor(Object selectedObject){
-		if (selectedObject instanceof UuidAndTitleCache){
-			Class type = ((UuidAndTitleCache) selectedObject).getType();
-			if(type == Taxon.class || type == Synonym.class){
-				try {
-					EditorUtil.openTaxonBase(((UuidAndTitleCache) selectedObject).getUuid());
-				} catch (PartInitException e) {
-					MessagingUtils.error(NavigationUtil.class, "Error opening the editor", e);
-				}
-			}
-		}else if(selectedObject instanceof ICdmBase){
-			openEditor((ICdmBase) selectedObject);
-		}else{
-			MessagingUtils.error(NavigationUtil.class, new IllegalArgumentException("Selected object is not supported: " + selectedObject));
-		}
-	}
-
 	/**
 	 * <p>openEmpty</p>
 	 *
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index c2d28d358..fe13ff0e9 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -25,6 +25,7 @@ import java.util.UUID;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IViewSite;
@@ -54,6 +55,7 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.LoginManager;
+import eu.etaxonomy.taxeditor.view.CdmViewerChooser;
 
 /**
  * Taxonomic tree implementation using Common Navigator Framework.
@@ -449,8 +451,12 @@ public class TaxonNavigator extends CommonNavigator implements
 
 	/** {@inheritDoc} */
 	@Override
-	protected void handleDoubleClick(DoubleClickEvent anEvent) {
-		NavigationUtil.executeEditHandler();
+	protected void handleDoubleClick(DoubleClickEvent event) {
+        if(event.getSelection() instanceof IStructuredSelection){
+            Object selectedObject = ((IStructuredSelection) event.getSelection()).getFirstElement();
+            CdmViewerChooser chooser = new CdmViewerChooser(getSite().getShell());
+            chooser.chooseViewer(selectedObject);
+        }
 		// If the double click is passed up to the super-class it will
 		// expand/collapse trees.
 		// We do not want that
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java
deleted file mode 100644
index e4876d35a..000000000
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package eu.etaxonomy.taxeditor.navigation.navigator.handler;
-// $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.
-*/
-
-
-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.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
-import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
-
-/**
- * <p>EditHandler class.</p>
- *
- * @author n.hoffmann
- * @created May 12, 2010
- * @version 1.0
- */
-public class EditHandler extends AbstractHandler implements IHandler{
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	/** {@inheritDoc} */
-	@Override
-    public Object execute(ExecutionEvent event) throws ExecutionException {
-
-		ISelection selection = HandlerUtil.getCurrentSelection(event);
-
-		if(selection instanceof IStructuredSelection){
-			final IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-
-			if(structuredSelection.size() == 1 && structuredSelection.getFirstElement() instanceof Classification){
-				Classification classification = (Classification) structuredSelection.getFirstElement();
-
-				NewClassificationWizard classificationWizard = new NewClassificationWizard();
-				classificationWizard.init(null, null);
-				classificationWizard.setEntity(classification);
-				WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), classificationWizard);
-				dialog.open();
-
-			}
-			else{
-
-				Job job = new Job("Opening editor") {
-
-					@Override
-					protected IStatus run(IProgressMonitor monitor) {
-						for(final Object selectedObject : structuredSelection.toArray()){
-
-							Display.getDefault().asyncExec(new Runnable(){
-
-								@Override
-                                public void run() {
-									NavigationUtil.openEditor(selectedObject);
-								}
-
-							});
-						}
-						return Status.OK_STATUS;
-					}
-				};
-
-				job.schedule();
-			}
-		}
-
-		return null;
-	}
-}
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
index 74fdee6b0..8651303a0 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
@@ -21,6 +21,7 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -37,17 +38,21 @@ import org.eclipse.ui.part.ViewPart;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
+import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+import eu.etaxonomy.cdm.model.taxon.Synonym;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.model.IContextListener;
-import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.navigation.search.SearchBar.SearchOption;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.view.CdmViewerChooser;
 
 /**
  * <p>SearchResultView class.</p>
@@ -116,7 +121,17 @@ public class SearchResultView extends ViewPart implements IConversationEnabled{
 		resultViewer.addDoubleClickListener(new IDoubleClickListener() {
 			@Override
             public void doubleClick(DoubleClickEvent event) {
-				NavigationUtil.executeEditHandler();
+			    if(event.getSelection() instanceof IStructuredSelection){
+			        Object selectedObject = ((IStructuredSelection) event.getSelection()).getFirstElement();
+			        if (selectedObject instanceof UuidAndTitleCache){
+			            Class type = ((UuidAndTitleCache) selectedObject).getType();
+			            if(type == Taxon.class || type == Synonym.class){
+			                TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).load(((UuidAndTitleCache) selectedObject).getUuid());
+			                CdmViewerChooser chooser = new CdmViewerChooser(getSite().getShell());
+			                chooser.chooseViewer(taxonBase);
+			            }
+			        }
+			    }
 			}
 		});
 
diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 703f32dfd..698da0fd6 100644
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
index d70a27335..bfc5d9a13 100644
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>taxeditor-parent</artifactId>
 		<groupId>eu.etaxonomy</groupId>
-		<version>3.12.2</version>
+		<version>3.13.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 18e1aa842..174805138 100644
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
@@ -15,6 +15,7 @@ Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.editor.definedterm.input,
  eu.etaxonomy.taxeditor.featuretree,
  eu.etaxonomy.taxeditor.handler,
+ eu.etaxonomy.taxeditor.handler.defaultHandler,
  eu.etaxonomy.taxeditor.io,
  eu.etaxonomy.taxeditor.io.wizard,
  eu.etaxonomy.taxeditor.labels,
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index c2c090a7a..242111fb2 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -135,7 +135,7 @@ page.name.31 = Order of Taxonnodes
 extension.name.0 = Popup Menu Commands
 command.name.8 = Clone Datasource
 command.name.9 = Open Feature Tree Editor Wizard
-command.name.10 = Open Password Wizzard
+command.name.10 = Open Password Wizard
 command.name.11 = Open Distribution Editor Wizard
 command.name.12 = Connect
 wizard.name.18 = CSV
@@ -151,11 +151,17 @@ activity.description.2 = ROLE_USER_MANAGER dependent ui contributions
 activity.name.2 = UserManagement
 activity.description.3 = ROLE_PROJECT_MANAGER dependent ui contributions
 activity.name.3 = ProjectManagement
-extension-point.name = Cdm Viewer
 Bundle-Vendor = EDIT
 Bundle-Name = DataStore Bundle
 command.name.13 = delete
 command.name.14 = delete
 page.name.32 = Taxon Navigator
 page.name.33 = Sort of Taxonnodes
-command.name.15 = Open
\ No newline at end of file
+command.name.15 = Open
+view.name.SESSIONS = Sessions
+command.label.SESSION = Sessions
+command.label.CONNECT = Connect
+command.label.RE_CONNECT = Re-Connect
+command.name.CONNECT = Connect
+command.name.RE_CONNECT = Re-Connect
+command.name.OPEN_CLASSIFICATION_WIZARD = Open Classification Wizard
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
index 8f10c0d1b..dabd0ee48 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -132,4 +132,26 @@ page.name.30 = Sprache
 page.name.32 = Taxon Navigator
 page.name.33 = Sortierung im TaxonNavigator
 command.label.clone = Klonen
-command.label.openInSpecimenEditor = \u00d6ffnen im Specimen-Editor
\ No newline at end of file
+command.label.openInSpecimenEditor = \u00d6ffnen im Specimen-Editor
+page.name.31 = Taxon-Node-Reihenfolge
+extension.name.0 = Popup Menu Befehle
+command.name.8 = Datenquelle klonen
+command.name.9 = \u00d6ffne Feature Tree-Wizard
+command.name.10 = \u00d6ffne Passwort-Wizard
+command.name.11 = \u00d6ffne Verbreitungs-Wizard
+command.name.12 = Verbinden
+wizard.name.18 = CSV
+wizard.name.19 = CSV_NAME
+wizard.name.20 = CSV_PRINT
+command.name.13 = L\u00f6schen
+command.name.14 = L\u00f6schen
+page.name.32 = Taxon Navigator
+page.name.33 = Reihenfolge der Taxon-Nodes
+command.name.15 = \u00d6ffnen
+view.name.SESSIONS = Sessions
+command.label.SESSION = Sessions
+command.label.CONNECT = Verbinden
+command.label.RE_CONNECT = Aktualisiere Verbundung
+command.name.CONNECT = Verbinden
+command.name.RE_CONNECT = Aktualisiere Verbundung
+command.name.OPEN_CLASSIFICATION_WIZARD = \u00d6ffne Klassifikations-Wizard
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
index f88d6402c..ad2787688 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
@@ -34,3 +34,6 @@ LoginDialog_PASSWORD=Password
 LoginDialog_REALLY_CANCEL=Do you really want to cancel?
 LoginDialog_USER_LOGIN=User Login
 LoginDialog_USER_NAME=Username
+
+CdmViewerContextMenu_OPEN=Open (%s)
+CdmViewerContextMenu_OPEN_IN=Open in...
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
index ca0430e50..fc145379c 100644
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
@@ -33,3 +33,7 @@ LoginDialog_PASSWORD=Passwort
 LoginDialog_REALLY_CANCEL=Wollen Sie wirklich abbrechen?
 LoginDialog_USER_LOGIN=Benutzer Login
 LoginDialog_USER_NAME=Benutzername
+
+CdmViewerContextMenu_OPEN=\u00d6ffnen (%s)
+CdmViewerContextMenu_OPEN_IN=\u00d6ffne mit...
+
diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index 8e7a4532b..c3082aa12 100644
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <plugin>
-   <extension-point id="eu.etaxonomy.taxeditor.store.cdmViewer" name="%extension-point.name" schema="schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd"/>
+   <extension-point id="eu.etaxonomy.taxeditor.store.cdmViewer" name="Cdm Viewer" schema="schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd"/>
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
@@ -268,7 +268,7 @@
         allowMultiple="false"
         class="eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"
         id="eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"
-        name="Sessions"
+        name="%view.name.SESSIONS"
         restorable="false">
   </view>
    </extension>
@@ -375,7 +375,7 @@
             </command>
             <command
                   commandId="org.eclipse.ui.views.showView"
-                  label="Sessions"
+                  label="%command.label.SESSION"
                   style="push">
                <parameter
                      name="org.eclipse.ui.views.showView.viewId"
@@ -408,7 +408,7 @@
             locationURI="menu:org.eclipse.ui.main.menu.file?after=eu.etaxonomy.taxeditor.application.filemenu.io">
          <command
                commandId="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow"
-               label="Connect"
+               label="%command.label.CONNECT"
                style="push">
          </command>
          <command
@@ -424,7 +424,7 @@
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.store.operations.reconnect"
-               label="Re-Connect"
+               label="%command.label.RE_CONNECT"
                style="push">
             <visibleWhen
                   checkEnabled="true">
@@ -697,12 +697,12 @@
       </command>
       <command
             id="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow"
-            name="Connect">
+            name="%command.name.CONNECT">
       </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.handler.ReconnectHandler"
             id="eu.etaxonomy.taxeditor.store.operations.reconnect"
-            name="Re-Connect">
+            name="%command.name.RE_CONNECT">
       </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.definedterm.handler.OpenDefinedTermEditorHandler"
@@ -756,6 +756,25 @@
             id="eu.etaxonomy.taxeditor.store.open"
             name="%command.name.15">
       </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenClassificationWizardHandler"
+            id="eu.etaxonomy.taxeditor.command.openClassificationWizard"
+            name="%command.name.OPEN_CLASSIFICATION_WIZARD">
+         <commandParameter
+               id="eu.etaxonomy.taxeditor.command.openClassificationWizard.uuid"
+               name="Classification Uuid"
+               optional="true"
+               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
+         </commandParameter>
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <commandParameterType
+            converter="eu.etaxonomy.taxeditor.handler.UuidsParameterTypeConverter"
+            id="eu.etaxonomy.taxeditor.uuidParameterType"
+            type="java.util.UUID">
+      </commandParameterType>
    </extension>
    <extension
          point="org.eclipse.ui.importWizards">
@@ -1365,4 +1384,12 @@
       </variable>
    </sourceProvider>
 </extension>
+<extension
+      point="eu.etaxonomy.taxeditor.store.cdmViewer">
+   <viewCommandMapping
+         commandId="eu.etaxonomy.taxeditor.command.openClassificationWizard"
+         selection="eu.etaxonomy.cdm.model.taxon.Classification"
+         viewerName="Classification Wizard">
+   </viewCommandMapping>
+</extension>
 </plugin>
diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml
index ee576be60..852fd4f0a 100644
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -3,7 +3,7 @@
   <parent>
 	<groupId>eu.etaxonomy</groupId>
 	<artifactId>taxeditor-parent</artifactId>
-	<version>3.12.2</version>
+	<version>3.13.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.store/schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd b/eu.etaxonomy.taxeditor.store/schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd
index 42791ec3b..7393c60f6 100644
--- a/eu.etaxonomy.taxeditor.store/schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd
+++ b/eu.etaxonomy.taxeditor.store/schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd
@@ -21,7 +21,7 @@
       </annotation>
       <complexType>
          <sequence>
-            <element ref="cdmViewer" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="viewCommandMapping" minOccurs="0" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -50,22 +50,37 @@
       </complexType>
    </element>
 
-   <element name="cdmViewer">
+   <element name="viewCommandMapping">
       <annotation>
          <documentation>
-            A Cdm Viewer knows what viewer or editor can show which input.
+            Maps a viewing class, like editors or views, to a command which opens it.
          </documentation>
       </annotation>
       <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="class" type="string" use="required">
+         <attribute name="commandId" type="string" use="required">
             <annotation>
                <documentation>
-                  The class of the viewer.
+                  The command which opens the viewer to show the selected object
                </documentation>
                <appInfo>
-                  <meta.attribute kind="java" basedOn=":eu.etaxonomy.taxeditor.view.ICdmViewer"/>
+                  <meta.attribute kind="identifier" basedOn="org.eclipse.ui.commands/command/@id"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="viewerName" type="string">
+            <annotation>
+               <documentation>
+                  The name of the viewer which shows the selected element
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="selection" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The class of the selected element
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java"/>
                </appInfo>
             </annotation>
          </attribute>
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
index eb3f83291..9d094c53a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
@@ -42,6 +42,8 @@ public class Messages extends NLS {
     public static String CdmDataSourceViewPart_7;
     public static String CdmDataSourceViewPart_8;
     public static String CdmDataSourceViewPart_9;
+    public static String CdmViewerContextMenu_OPEN;
+    public static String CdmViewerContextMenu_OPEN_IN;
     public static String ChangeConnectionHandler_ALREADY_CONNECTING;
     public static String ChangeConnectionHandler_CONFIRM_DATASOURCE;
     public static String ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidParameterConverter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidsParameterTypeConverter.java
similarity index 67%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidParameterConverter.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidsParameterTypeConverter.java
index 5bd3db11e..e23482714 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidParameterConverter.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidsParameterTypeConverter.java
@@ -5,10 +5,17 @@ import java.util.UUID;
 import org.eclipse.core.commands.AbstractParameterValueConverter;
 import org.eclipse.core.commands.ParameterValueConversionException;
 
-public class UuidParameterConverter extends AbstractParameterValueConverter {
+/**
+ * Converts {@link UUID}s to a string representation
+ * and vica versa.
+ *
+ * @author pplitzner
+ * @date Sep 15, 2015
+ *
+ */
+public class UuidsParameterTypeConverter extends AbstractParameterValueConverter {
 
-    public UuidParameterConverter() {
-        // TODO Auto-generated constructor stub
+    public UuidsParameterTypeConverter() {
     }
 
     @Override
@@ -21,4 +28,4 @@ public class UuidParameterConverter extends AbstractParameterValueConverter {
         return parameterValue.toString();
     }
 
-}
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenClassificationWizardHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenClassificationWizardHandler.java
new file mode 100644
index 000000000..879be2056
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenClassificationWizardHandler.java
@@ -0,0 +1,31 @@
+package eu.etaxonomy.taxeditor.handler.defaultHandler;
+
+import java.util.UUID;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.PlatformUI;
+
+import eu.etaxonomy.cdm.api.service.IClassificationService;
+import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+public class DefaultOpenClassificationWizardHandler extends DefaultOpenHandlerBase<Classification> {
+
+    @Override
+    protected Classification getEntity(UUID uuid) {
+        return CdmStore.getService(IClassificationService.class).load(uuid);
+    }
+
+    @Override
+    protected void open(ExecutionEvent event, Classification entity) {
+        NewClassificationWizard classificationWizard = new NewClassificationWizard();
+        classificationWizard.init(null, null);
+        classificationWizard.setEntity(entity);
+        WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), classificationWizard);
+        dialog.open();
+    }
+
+
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenHandlerBase.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenHandlerBase.java
new file mode 100644
index 000000000..f96b1c36c
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenHandlerBase.java
@@ -0,0 +1,51 @@
+package eu.etaxonomy.taxeditor.handler.defaultHandler;
+
+import java.util.UUID;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.ParameterType;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+
+public abstract class DefaultOpenHandlerBase <T> extends AbstractHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        String commandId = event.getCommand().getId();
+        String uuidParameterId = commandId+".uuid";
+        //check if uuid parameter is set
+        if(event.getParameter(uuidParameterId)!=null){
+            Object object = event.getObjectParameterForExecution(uuidParameterId);
+            ParameterType parameterType;
+            try {
+                parameterType = event.getCommand().getParameterType(uuidParameterId);
+                if(parameterType.isCompatible(object)){
+                    T entity = getEntity((UUID) object);
+                    open(event, entity);
+                }
+            } catch (NotDefinedException e) {
+                MessagingUtils.error(DefaultOpenHandlerBase.class, "Error while opening classification!", e);
+            }
+        }
+        //if not try current selection
+        else{
+            ISelection selection = HandlerUtil.getCurrentSelection(event);
+            if(selection instanceof IStructuredSelection){
+                open(event, (T) ((IStructuredSelection) selection).getFirstElement());
+            }
+        }
+        return null;
+    }
+
+
+    protected abstract T getEntity(UUID uuid);
+
+    protected abstract void open(ExecutionEvent event, T entity);
+
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsView.java
new file mode 100644
index 000000000..88514b95a
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsView.java
@@ -0,0 +1,16 @@
+package eu.etaxonomy.taxeditor.handler.defaultHandler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
+
+public class OpenReferencingObjectsView extends AbstractHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        return AbstractUtility.showView("eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects");
+    }
+
+}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
index 3988724a7..81278277d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;
 
-import eu.etaxonomy.cdm.persistence.hibernate.permission.SecurityExceptionUtils;
+import eu.etaxonomy.cdm.test.integration.SecurityExceptionUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
index ed5059677..1ef071eac 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
@@ -104,6 +104,7 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
 		TableWrapLayout layout = LayoutConstants.LAYOUT();
 		layout.bottomMargin = 10;
 		layout.rightMargin = 5;
+		layout.horizontalSpacing = 5;
 
 		client.setLayout(layout);
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java
deleted file mode 100644
index d1f5293ee..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java
+++ /dev/null
@@ -1,321 +0,0 @@
-// $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.view;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.part.ViewPart;
-
-import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
-
-/**
- * <p>Abstract AbstractSplitableViewPart class.</p>
- *
- * @author n.hoffmann
- * @created Feb 12, 2010
- * @version 1.0
- */
-public abstract class AbstractSplitableViewPart extends ViewPart implements ISelectionListener{
-	
-	static final int VIEW_ORIENTATION_VERTICAL = 0;
-	static final int VIEW_ORIENTATION_HORIZONTAL = 1;
-	static final int VIEW_ORIENTATION_SINGLE = 2;
-	static final int VIEW_ORIENTATION_AUTOMATIC = 3;
-
-	private static final int PAGE_EMPTY = 0;
-    private static final int PAGE_VIEWER = 1;
-	
-	private final IDialogSettings dialogSettings;
-	
-	private SashForm detailSplitter;
-
-	private Composite parent;
-
-	private PageBook pagebook;
-
-	private int orientation;
-
-	private int currentOrientation;
-//
-	private boolean showViewer2;
-
-	private Viewer viewer1;
-	
-	private Viewer viewer2;
-	
-	private Label emptySelectionLabel;
-
-	private ISelectionService selectionService;
-
-	
-	/**
-	 * <p>Constructor for AbstractSplitableViewPart.</p>
-	 */
-	public AbstractSplitableViewPart() {
-		super();
-		
-		dialogSettings = TaxeditorStorePlugin.getDefault().getDialogSettings();
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	/** {@inheritDoc} */
-	@Override
-	public void createPartControl(Composite parent) {	
-		selectionService = getSite().getWorkbenchWindow().getSelectionService();
-		selectionService.addSelectionListener(this);
-		selectionService.addPostSelectionListener(this);
-		
-		
-		this.parent = parent;
-		addResizeListener(parent);
-		pagebook = new PageBook(parent, SWT.NULL);
-		
-		// Page 1: Viewers
-		createDetailSplitter(pagebook);
-		viewer1 = createViewer1(detailSplitter);
-		viewer2 = createViewer2(detailSplitter);
-		
-		// Page 2: Nothing selected
-        emptySelectionLabel = new Label(pagebook, SWT.TOP + SWT.LEFT + SWT.WRAP);
-        emptySelectionLabel.setText("Current selection does not support this view"); //
-		
-		showPage(PAGE_EMPTY);
-		
-		initOrientation();
-		
-		// FIXME since this class is not used at the moment we will not have to fix this soon
-		// it might also become irrelevant in future uses
-		// set the selection if there is an open editor
-//		if(EditorUtil.getActiveMultiPageTaxonEditor() != null){
-//			selectionChanged(EditorUtil.getActiveMultiPageTaxonEditor(), EditorUtil.getCurrentSelection());
-//		}
-	}
-	
-    private void initOrientation() {
-
-        try {
-            orientation = dialogSettings.getInt(getDialogstoreVieworientationKey());
-
-            if ((orientation < 0) || (orientation > 3)) {
-            	orientation = VIEW_ORIENTATION_AUTOMATIC;
-            }
-        } catch (NumberFormatException e) {
-        	orientation = VIEW_ORIENTATION_AUTOMATIC;
-        }
-
-        // force the update
-        currentOrientation = -1;
-        setOrientation(orientation);
-    }
-	
-    /**
-     * <p>getDialogstoreVieworientationKey</p>
-     *
-     * @return a {@link java.lang.String} object.
-     */
-    protected abstract String getDialogstoreVieworientationKey();
-
-    /**
-     * <p>showEmptyPage</p>
-     */
-    public void showEmptyPage(){
-    	showPage(PAGE_EMPTY);
-    }
-    
-    /**
-     * <p>showViewer</p>
-     */
-    public void showViewer(){
-    	showPage(PAGE_VIEWER);
-    }
-    
-	private void showPage(int page) {
-        if (page == PAGE_EMPTY) {
-            pagebook.showPage(emptySelectionLabel);
-        } else {
-            pagebook.showPage(detailSplitter);
-        }
-    }
-
-	private void addResizeListener(Composite parent) {
-		parent.addControlListener(new ControlListener() {
-			public void controlMoved(ControlEvent e) {
-			}
-			public void controlResized(ControlEvent e) {
-				computeOrientation();
-			}
-		});
-	}
-	
-	void computeOrientation() {
-		saveSplitterRatio();
-		dialogSettings.put(getDialogstoreVieworientationKey(), orientation);
-		if (orientation != VIEW_ORIENTATION_AUTOMATIC) {
-			setOrientation(orientation);
-		}
-		else {
-			if (orientation == VIEW_ORIENTATION_SINGLE)
-				return;
-			Point size= parent.getSize();
-			if (size.x != 0 && size.y != 0) {
-				if (size.x > size.y)
-					setOrientation(VIEW_ORIENTATION_HORIZONTAL);
-				else
-					setOrientation(VIEW_ORIENTATION_VERTICAL);
-			}
-		}
-	}
-	
-	private void saveSplitterRatio() {
-		if (detailSplitter != null && ! detailSplitter.isDisposed()) {
-	        int[] weigths = detailSplitter.getWeights();
-	        int ratio = (weigths[0] * 1000) / (weigths[0] + weigths[1]);
-			String key= getDialogStoreRatioKey() + currentOrientation;
-	        dialogSettings.put(key, ratio);
-		}
-	}
-	
-    /**
-     * <p>getDialogStoreRatioKey</p>
-     *
-     * @return a {@link java.lang.String} object.
-     */
-    protected abstract String getDialogStoreRatioKey();
-
-	void setOrientation(int orientation) {
-        if (currentOrientation != orientation) {
-            if ((getViewer1() != null) 
-            	&& !getViewer1().getControl().isDisposed() 
-            	&& (detailSplitter != null) 
-            	&& !detailSplitter.isDisposed()) {
-                
-            	if (orientation == VIEW_ORIENTATION_SINGLE) {
-                    setShowViewer2(false);
-                } else {
-                    if (currentOrientation == VIEW_ORIENTATION_SINGLE) {
-                    	setShowViewer2(true);
-                    }
-                    boolean horizontal = orientation == VIEW_ORIENTATION_HORIZONTAL;
-                    detailSplitter.setOrientation(horizontal ? SWT.HORIZONTAL
-                                                                     : SWT.VERTICAL);
-                }
-
-                detailSplitter.layout();
-            }
-
-            updateCheckedState();
-
-            currentOrientation = orientation;
-
-			restoreSplitterRatio();
-        }
-    }
-    
-	/**
-	 * @param show
-	 */
-	private void setShowViewer2(boolean show) {
-		showViewer2 = show;
-		showOrHideViewer2();		
-	}
-
-	/**
-	 * 
-	 */
-	private void showOrHideViewer2() {
-        if (showViewer2) {
-        	detailSplitter.setMaximizedControl(null);
-        } else {
-        	detailSplitter.setMaximizedControl(getViewer1().getControl());
-        }
-	}
-
-	private void restoreSplitterRatio() {
-		String ratio= dialogSettings.get(getDialogStoreRatioKey() + currentOrientation);
-		if (ratio == null)
-			return;
-		int intRatio= Integer.parseInt(ratio);
-		detailSplitter.setWeights(new int[] {intRatio, 1000 - intRatio});
-	}
-    
-	private void updateCheckedState() {
-//		for (int i= 0; i < fToggleOrientationActions.length; i++) {
-//			fToggleOrientationActions[i].setChecked(fOrientation == fToggleOrientationActions[i].getOrientation());
-//		}
-	}
-	
-	/**
-	 * <p>createViewer1</p>
-	 *
-	 * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
-	 * @return a {@link org.eclipse.jface.viewers.Viewer} object.
-	 */
-	protected abstract Viewer createViewer1(Composite parent);
-	
-
-	/**
-	 * <p>createViewer2</p>
-	 *
-	 * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
-	 * @return a {@link org.eclipse.jface.viewers.Viewer} object.
-	 */
-	protected abstract Viewer createViewer2(Composite parent);
-	
-
-	/**
-	 * @param pagebook2
-	 */
-	private void createDetailSplitter(Composite parent) {
-		detailSplitter = new SashForm(parent, SWT.HORIZONTAL);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
-	 */
-	/** {@inheritDoc} */
-	@Override
-	public void dispose() {
-		selectionService.removeSelectionListener(this);
-		selectionService.removePostSelectionListener(this);
-		super.dispose();
-	}
-
-	/**
-	 * <p>Getter for the field <code>viewer1</code>.</p>
-	 *
-	 * @return a {@link org.eclipse.jface.viewers.Viewer} object.
-	 */
-	protected Viewer getViewer1() {
-		return viewer1;
-	}
-
-	/**
-	 * <p>Getter for the field <code>viewer2</code>.</p>
-	 *
-	 * @return a {@link org.eclipse.jface.viewers.Viewer} object.
-	 */
-	protected Viewer getViewer2() {
-		return viewer2;
-	}
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java
index 6efcc81d0..939f753b6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java
@@ -9,9 +9,13 @@
  */
 package eu.etaxonomy.taxeditor.view;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
+import java.util.UUID;
 
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.jface.dialogs.PopupDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
@@ -27,6 +31,12 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.IHandlerService;
+
+import eu.etaxonomy.cdm.model.common.ICdmBase;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 
 /**
  * This class opens a popup dialog and provides the possibility to choose from a
@@ -38,8 +48,8 @@ import org.eclipse.swt.widgets.Table;
  */
 public class CdmViewerChooser extends PopupDialog implements ISelectionChangedListener, ILabelProvider{
 
+    private Map<String, String> nameViewerMap;
     private Object input;
-    private Map<Entry<Class<?>, String>, ICdmViewer> nameViewerMap;
 
     public CdmViewerChooser(Shell parentShell) {
         this(parentShell, SWT.RESIZE | SWT.ON_TOP, true, false, false, false, false, "Open in ...",
@@ -59,13 +69,12 @@ public class CdmViewerChooser extends PopupDialog implements ISelectionChangedLi
      */
     public void chooseViewer(Object input){
         this.input = input;
-        this.nameViewerMap = CdmViewerUtil.getNameViewerMap(input);
+        this.nameViewerMap = CdmViewerUtil.getAvailableViewers(input);
 
         //if only one editor is available then open it
         if(nameViewerMap.size()==1){
-            Entry<Class<?>, String> next = nameViewerMap.keySet().iterator().next();
-            ICdmViewer cdmViewer = nameViewerMap.get(next);
-            cdmViewer.show(input, next.getKey());
+            String commandId = nameViewerMap.keySet().iterator().next();
+            executeCommand(commandId, input);
         }
         else{
             if(nameViewerMap.isEmpty()){
@@ -75,6 +84,32 @@ public class CdmViewerChooser extends PopupDialog implements ISelectionChangedLi
         }
     }
 
+    private void executeCommand(String commandId, Object input) {
+        ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
+        //get the command from plugin.xml
+        Command command = commandService.getCommand(commandId);
+
+        //set uuid parameter
+        if(input instanceof ICdmBase){
+            Map<String, UUID> params = new HashMap<String, UUID>();
+            params.put(commandId+".uuid", ((ICdmBase) input).getUuid());
+
+            //build the parameterized command
+            ParameterizedCommand pc = ParameterizedCommand.generateCommand(command, params);
+
+            if(command.isEnabled()) {
+                IHandlerService handlerService = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
+                try {
+                    handlerService.executeCommand(pc, null);
+                } catch (NotDefinedException nde) {
+                    throw new RuntimeException("Could not find open command: " + commandId);
+                } catch (Exception exception) {
+                    MessagingUtils.error(getClass(), "An exception occured while trying execute "+commandId, exception);
+                }
+            }
+        }
+    }
+
     @Override
     protected Control createDialogArea(Composite parent) {
         TableViewer viewer = new TableViewer(new Table(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION));
@@ -90,10 +125,8 @@ public class CdmViewerChooser extends PopupDialog implements ISelectionChangedLi
         ISelection selection = event.getSelection();
         if(selection instanceof IStructuredSelection){
             Object firstElement = ((IStructuredSelection) selection).getFirstElement();
-            if(nameViewerMap.containsKey(firstElement)){
-                Entry<Class<?>, String> entry = (Entry<Class<?>, String>)firstElement;
-                ICdmViewer cdmViewer = nameViewerMap.get(entry);
-                cdmViewer.show(input, entry.getKey());
+            if(firstElement instanceof String && nameViewerMap.containsKey(firstElement)){
+                executeCommand((String) firstElement, this.input);
                 this.close();
             }
         }
@@ -101,12 +134,7 @@ public class CdmViewerChooser extends PopupDialog implements ISelectionChangedLi
 
     @Override
     public String getText(Object element) {
-        String text = null;
-        if(nameViewerMap.containsKey(element)){
-            Entry<Class<?>, String> entry = (Entry<Class<?>, String>) element;
-            text = entry.getValue();
-        }
-        return text;
+        return nameViewerMap.get(element);
     }
 
     @Override
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java
index 712bec9d8..2811fe14a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java
@@ -1,8 +1,13 @@
 package eu.etaxonomy.taxeditor.view;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.UUID;
 
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.viewers.ISelection;
@@ -15,6 +20,12 @@ import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.CompoundContributionItem;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.IHandlerService;
+
+import eu.etaxonomy.cdm.model.common.ICdmBase;
+import eu.etaxonomy.taxeditor.Messages;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 
 /**
  * Generic context menu for opening elements in the taxeditor.
@@ -28,46 +39,89 @@ public class CdmViewerContextMenu extends CompoundContributionItem {
                 new ContributionItem() {
                     @Override
                     public void fill(Menu menu, int index) {
-                        MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
-                        addItem.setText("Open in...");
-                        Menu addMenu = new Menu(menu);
-                        addItem.setMenu(addMenu);
                         final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
                         final ISelection selection = window.getActivePage().getSelection();
                         if(selection instanceof IStructuredSelection){
                             Object firstElement = ((IStructuredSelection) selection).getFirstElement();
-                            Map<Entry<Class<?>, String>, ICdmViewer> nameViewerMap = CdmViewerUtil.getNameViewerMap(firstElement);
-                            for(Entry<Entry<Class<?>, String>, ICdmViewer> entry:nameViewerMap.entrySet()){
-                                Entry<Class<?>, String> viewerClass = entry.getKey();
-                                MenuItem menuItem = new MenuItem(addMenu, SWT.NONE);
-                                menuItem.setText(viewerClass.getValue());
-                                menuItem.addSelectionListener(new OpenInViewerListener(entry.getValue(), firstElement, viewerClass.getKey()));
+                            Map<String, String> availableViewers = CdmViewerUtil.getAvailableViewers(firstElement);
+                            Map<Command, String> enabledCommands = getEnabledCommands(availableViewers);
+
+                            //check if only one or multiple viewers/commands are available
+                            if(enabledCommands.size()==1){
+                                Entry<Command, String> entry = enabledCommands.entrySet().iterator().next();
+                                final Command command = entry.getKey();
+                                String viewerName = entry.getValue();
+
+                                MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
+                                addItem.setText(String.format(Messages.CdmViewerContextMenu_OPEN, viewerName));
+                                addItem.addSelectionListener(new CommandInvoker(command, firstElement)) ;
+                            }
+                            else if(enabledCommands.size()>1){
+                                MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
+                                addItem.setText(Messages.CdmViewerContextMenu_OPEN_IN);
+                                Menu addMenu = new Menu(menu);
+                                addItem.setMenu(addMenu);
+                                for(Entry<Command, String> entry:enabledCommands.entrySet()){
+                                    final Command command = entry.getKey();
+                                    String viewerName = entry.getValue();
+
+                                    MenuItem menuItem = new MenuItem(addMenu, SWT.NONE);
+                                    menuItem.setText(viewerName);
+                                    menuItem.addSelectionListener(new CommandInvoker(command, firstElement)) ;
+                                }
                             }
                         }
                     }
+
                 }
         };
         return contributionItems;
     }
 
-    private class OpenInViewerListener extends SelectionAdapter {
+    private Map<Command, String> getEnabledCommands(Map<String, String> availableViewers) {
+        Map<Command, String> enabledCommands = new HashMap<Command, String>();
+        for(Entry<String, String> entry:availableViewers.entrySet()){
+            final String commandId = entry.getKey();
+            ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
+            Command command = commandService.getCommand(commandId);
+            if(command.isEnabled()){
+                enabledCommands.put(command, entry.getValue());
+            }
+        }
+        return enabledCommands;
+    }
 
-        private final ICdmViewer cdmViewer;
-        private final Object input;
-        private final Class<?> viewerClass;
+    private final class CommandInvoker extends SelectionAdapter {
+        private final Command command;
+        private final Object selectedObject;
 
-        public OpenInViewerListener(ICdmViewer cdmViewer, Object input, Class<?> viewerClass) {
-            super();
-            this.cdmViewer = cdmViewer;
-            this.input = input;
-            this.viewerClass = viewerClass;
+        private CommandInvoker(Command command, Object selectedObject) {
+            this.command = command;
+            this.selectedObject = selectedObject;
         }
 
         @Override
         public void widgetSelected(SelectionEvent e) {
-            cdmViewer.show(input, viewerClass);
+            IHandlerService handlerService = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
+            Map<String, UUID> params = new HashMap<String, UUID>();
+            if(selectedObject instanceof ICdmBase){
+                params.put(command.getId()+".uuid", ((ICdmBase) selectedObject).getUuid()); //$NON-NLS-1$
+            }
+            ParameterizedCommand parameterizedCommand = ParameterizedCommand.generateCommand(command, params);
+            try {
+                if(parameterizedCommand!=null){
+                    handlerService.executeCommand(parameterizedCommand, null);
+                }
+                else{
+                    handlerService.executeCommand(command.getId(), null);
+                }
+            } catch (NotDefinedException nde) {
+                throw new RuntimeException("Could not find open command: " + command.getId()); //$NON-NLS-1$
+            } catch (Exception exception) {
+                MessagingUtils.error(getClass(), "An exception occured while trying execute "+command.getId(), exception); //$NON-NLS-1$
+            }
+            PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getSelection();
         }
-
     }
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java
index 6f5c6f67a..4436ced69 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java
@@ -11,49 +11,61 @@ package eu.etaxonomy.taxeditor.view;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.commands.Command;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
 
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 /**
+ * Scans eu.etaxonomy.taxeditor.store.cdmViewer extension point.
  * @author pplitzner
  * @date Jul 7, 2015
  *
  */
 public class CdmViewerUtil {
 
-    public static  Map<Entry<Class<?>, String>, ICdmViewer> getNameViewerMap(Object input){
-        Map<Entry<Class<?>, String>, ICdmViewer> nameViewerMap = new HashMap<Entry<Class<?>, String>, ICdmViewer>();
-    
-        IExtensionRegistry reg = Platform.getExtensionRegistry();
-        IConfigurationElement[] extensions = reg
-                .getConfigurationElementsFor("eu.etaxonomy.taxeditor.store.cdmViewer");
-        for (IConfigurationElement configElement : extensions) {
-            try {
-                Object object = configElement.createExecutableExtension("class");
-                if(object instanceof ICdmViewer){
-                    ICdmViewer cdmViewer = (ICdmViewer)object;
-                    Map<Class<?>, String> viewerClasses = cdmViewer.getViewerClasses(input);
-                    for (Entry<Class<?>, String> entry : viewerClasses.entrySet()) {
-                        nameViewerMap.put(entry, cdmViewer);
+    /**
+     * Returns a map of available commands to open the given input.
+     * Keys are the command IDs and values are their string representations.
+     *
+     * @param input
+     *            the object which should be handled by the available commands
+     * @return a key-value map of available commands and their string
+     *         representation
+     */
+    public static  Map<String, String> getAvailableViewers(Object input){
+        Map<String, String> commandViewerNameMap = new HashMap<String, String>();
+
+        if(input!=null){
+            IExtensionRegistry reg = Platform.getExtensionRegistry();
+            IConfigurationElement[] extensions = reg
+                    .getConfigurationElementsFor("eu.etaxonomy.taxeditor.store.cdmViewer"); //$NON-NLS-1$
+            for (IConfigurationElement configElement : extensions) {
+                if(configElement.getName().equals("viewCommandMapping")){ //$NON-NLS-1$
+                    try {
+                        String commandId = configElement.getAttribute("commandId"); //$NON-NLS-1$
+                        String viewerName = configElement.getAttribute("viewerName"); //$NON-NLS-1$
+                        Class<?> selectionClass = Class.forName(configElement.getAttribute("selection")); //$NON-NLS-1$
+                        if(selectionClass.isAssignableFrom(input.getClass())){
+                            ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
+                            Command command = commandService.getCommand(commandId);
+                            //TODO: maybe pass the command directly instead of just the command id
+                            if(command.isEnabled()){
+                                commandViewerNameMap.put(commandId, viewerName);
+                            }
+                        }
+                    } catch (ClassNotFoundException e) {
+                        MessagingUtils.error(CdmViewerChooser.class, "Could not initalize selection class element of cdmViewer extension", e); //$NON-NLS-1$
                     }
                 }
-                else{
-                    MessagingUtils.error(CdmViewerChooser.class, new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Could not load cdmViewer extension"));
-                }
-            } catch (CoreException e) {
-                MessagingUtils.error(CdmViewerChooser.class, "Could not load cdmViewer extension", e);
             }
         }
-        return nameViewerMap;
+        return commandViewerNameMap;
     }
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/ICdmViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/ICdmViewer.java
deleted file mode 100644
index 92063cfb2..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/ICdmViewer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2015 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.view;
-
-import java.util.Map;
-
-
-/**
- * Implementors of this interface provide a mapping of input elements to views
- * or editors which can display information or provide editing functionality for
- * the input elements.
- *
- * @author pplitzner
- * @date Feb 23, 2015
- *
- */
-public interface ICdmViewer {
-
-    /**
-     * For the given input a map is returned specifying the available viewer
-     * classes as keys and their string representation as values
-     *
-     * @param input
-     *            the input for which the viewer classes should be returned
-     * @return a map holding the viewer classes as keys and their string
-     *         representations as values
-     */
-    public Map<Class<?>, String> getViewerClasses(Object input);
-
-    /**
-     * Opens the viewer defined by the given viewerClass for the given input.
-     * @param input the input for which a viewer should be opened
-     * @param viewerClass the qualified class name of the viewer
-     */
-    public void show(Object input, Class<?> viewerClass);
-
-}
diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
index 638f230d4..19cd2a23c 100644
--- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webapp
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 3.12.2
+Bundle-Version: 3.13.0.qualifier
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index f066186c7..599000551 100644
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index e9c12f963..93dd50416 100644
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.12.2">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.13.0.qualifier">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
index bdb8b695c..475079be8 100644
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.12.2" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.13.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 2f8383507..feee2d8f1 100644
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.2</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 3c20df4e1..645ffb536 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.12.2</version>
+  <version>3.13.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -18,10 +18,10 @@
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.12.2</cdmlib.version>
+    <cdmlib.version>3.13.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.12.2</taxeditor.version>
+    <taxeditor.version>3.13.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
   </properties>