merge from trunk

author Cherian Mathew <c.mathew@bgbm.org>

Tue, 20 Jan 2015 11:20:50 +0000 (11:20 +0000)

committer Cherian Mathew <c.mathew@bgbm.org>

Tue, 20 Jan 2015 11:20:50 +0000 (11:20 +0000)
author Cherian Mathew <c.mathew@bgbm.org>
Tue, 20 Jan 2015 11:20:50 +0000 (11:20 +0000)
committer Cherian Mathew <c.mathew@bgbm.org>
Tue, 20 Jan 2015 11:20:50 +0000 (11:20 +0000)
diff --git a/.gitattributes b/.gitattributes

index 5c6ccc8d4c14993dd50759ded5245b3fffea0231..a0720766d6718e1e3be6b0e0ea0597f810bbded7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -278,7 +278,9 @@ eu.etaxonomy.taxeditor.cdmlib/lib/paranamer-2.3.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar -text
@@ -319,6 +321,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.0.b2.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-ext-1.3.04.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/xml-resolver-1.2.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.5.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/xmlpull-1.1.3.1.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar -text
@@ -505,6 +508,9 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/o
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/RemoveHomotypicalGroupBasionymOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/MarkerManager.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationContextListener.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationDaemon.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistContentProvider.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorComparator.java -text
@@ -570,6 +576,7 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/d
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/SingleReadSequenceContextMenu.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/DeleteDerivateHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivateEditorForTaxonHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java -text
@@ -594,6 +601,7 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/d
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateSpecimenDescriptionOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/EditInXper2Handler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionElementsOperation.java -text
@@ -622,6 +630,15 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/u
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityClassMarkerField.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityIdMarkerField.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/InvalidValueMarkerField.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyDescriptionMarkerField.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyFieldNameMarkerField.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyTypeNameMarkerField.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidationProblemsView.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorClassMarkerField.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorMessageMarkerField.java -text
  eu.etaxonomy.taxeditor.editor/src/main/resources/TaonDescriptionEditor.screen -text
  eu.etaxonomy.taxeditor.editor/src/main/resources/log4j.properties -text
  eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/Application.java -text
@@ -1267,6 +1284,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/Abst
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExportWizard.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ClassificationChooserWizardPage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/CsvExportWizard.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/DarwinCoreArchiveExportWizard.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/EndnoteImportWizard.java -text
@@ -1355,12 +1373,12 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHa
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultLanguageEditorPreferencePage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/FeatureTreePreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/InitNomenclaturalCodePrefDialog.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageEditorPreferencePage.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MatchingPreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MobotOpenUrlPreferences.java -text
diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF

index c0a1e5305a51085dc4c3b011580435e32ee755ba..99055f26e7ed42234ec716f3c3e5083444ae2fa8 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: Application
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
  Bundle-Vendor: EDIT
  Bundle-Localization: OSGI-INF/l10n/plugin
diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml

index eade0b2f589707db8585fb8e4915d315235c0840..435e7cd564d081c7cfcd170cd541597a845b5d44 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -4,7 +4,7 @@
    <parent>
      <groupId>eu.etaxonomy</groupId>
      <artifactId>taxeditor-parent</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-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 8baea95b92bab2b281a65f9e050699c8a0fa8fed..0980a03864035ee9ae6e9b29dcc84274b1eb2f36 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: Bulkeditor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
  Bundle-Vendor: EDIT
  Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml

index f3242396cf6859591351e57e55b93bd46d8f1519..14d406739b8b61b7a38c310142d6db5142556daf 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -4,7 +4,7 @@
         <parent>
                 <groupId>eu.etaxonomy</groupId>
                 <artifactId>taxeditor-parent</artifactId>
-               <version>3.4.0-SNAPSHOT</version>
+               <version>3.4.1-SNAPSHOT</version>
         </parent>
  
         <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java

index b2fdb3cfb9934c5b7bcb863739e5a36dbf1d87d7..2830dd82d6e82a8325140e7e0450403c191bec7c 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java
@@ -1,9 +1,9 @@
  // $Id$
  /**
  * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
  */
@@ -25,7 +25,9 @@ import org.eclipse.ui.IWorkbench;
  import org.eclipse.ui.IWorkbenchPreferencePage;
  
  import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.store.CdmStore;
  import eu.etaxonomy.taxeditor.store.TermStore;
  
  /**
@@ -45,7 +47,11 @@ public class BulkEditorMarkerPreferencePage extends PreferencePage implements IW
         @Override
         public void init(IWorkbench workbench) {
                 setPreferenceStore(PreferencesUtil.getPreferenceStore());
-               markerTypeEditingMap = PreferencesUtil.getEditMarkerTypePreferences();
+               if(!CdmStore.isActive()) {
+            MessagingUtils.noDataSourceWarningDialog(null);
+               }else{
+                   markerTypeEditingMap = PreferencesUtil.getEditMarkerTypePreferences();
+               }
         }
  
         /* (non-Javadoc)
@@ -55,32 +61,33 @@ public class BulkEditorMarkerPreferencePage extends PreferencePage implements IW
         protected Control createContents(Composite parent) {
                 Composite container = new Composite(parent, SWT.NULL);
                 container.setLayout(new GridLayout());
+        if(CdmStore.isActive()){
+            for (final MarkerType markerType : TermStore.getTerms(MarkerType.class)) {
+                final Button button = new Button(container, SWT.CHECK);
+                button.setText(String.format("Edit '%s' markers", markerType.getLabel()));
  
-               for (final MarkerType markerType : TermStore.getTerms(MarkerType.class)) {
-                       final Button button = new Button(container, SWT.CHECK);
-                       button.setText(String.format("Edit '%s' markers", markerType.getLabel()));
-               
-                       button.addSelectionListener(new SelectionAdapter() {
-                               public void widgetSelected(SelectionEvent e) {
-                                       markerTypeEditingMap.put(markerType, button.getSelection());
-                               }
-                       });
-                       
-                       boolean edit = markerTypeEditingMap.get(markerType) == null ? true : markerTypeEditingMap.get(markerType); 
-                       
-                       button.setSelection(edit);
-               }
-               
+                button.addSelectionListener(new SelectionAdapter() {
+                    @Override
+                    public void widgetSelected(SelectionEvent e) {
+                        markerTypeEditingMap.put(markerType, button.getSelection());
+                    }
+                });
+
+                boolean edit = markerTypeEditingMap.get(markerType) == null ? true : markerTypeEditingMap.get(markerType);
+
+                button.setSelection(edit);
+            }
+        }
                 return container;
         }
-       
+
         /* (non-Javadoc)
          * @see org.eclipse.jface.preference.PreferencePage#performOk()
          */
         @Override
         public boolean performOk() {
                 PreferencesUtil.setEditMarkerTypePreferences(markerTypeEditingMap);
-               
+
                 return super.performOk();
         }
  }
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath

index fa5110638352333387f3b46ebbd829f87843db55..42b8f157a620b8191d31257a365d06d434b53052 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -139,7 +139,6 @@
         <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/poi-3.9.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"/>
@@ -193,21 +192,17 @@
         <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/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.1-SNAPSHOT.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 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 b769f00ef896c5f8a277d70823565fcf4d53f6c5..d767f9af578403eed3ace6ea27ed64a52b087ab1 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: CDM Library Dependencies Plugin
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
  Eclipse-BundleShape: dir
  Export-Package: com.google.api,
   com.google.api.detect,
@@ -94,6 +94,7 @@ Export-Package: com.google.api,
   eu.etaxonomy.cdm.model.occurrence,
   eu.etaxonomy.cdm.model.reference,
   eu.etaxonomy.cdm.model.taxon,
+ eu.etaxonomy.cdm.model.validation,
   eu.etaxonomy.cdm.model.view,
   eu.etaxonomy.cdm.model.view.context,
   eu.etaxonomy.cdm.persistence.dao,
@@ -177,6 +178,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.validation,
   eu.etaxonomy.cdm.validation.annotation,
   eu.etaxonomy.cdm.validation.constraint,
   eu.etaxonomy.remote.dto.rdf,
@@ -582,7 +584,6 @@ Bundle-ClassPath: .,
   lib/plexus-classworlds-1.2-alpha-9.jar,
   lib/plexus-container-default-1.0-alpha-30.jar,
   lib/plexus-utils-2.0.5.jar,
- lib/poi-3.9.jar,
   lib/postgresql-9.1-901.jdbc4.jar,
   lib/sanselan-0.97-incubator.jar,
   lib/servlet-api-2.5.jar,
@@ -636,19 +637,23 @@ Bundle-ClassPath: .,
   lib/spring-security-remoting-3.1.3.RELEASE.jar,
   lib/jena-core-2.11.2.jar,
   lib/jena-iri-1.0.2.jar,
- lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.4.0-SNAPSHOT.jar
+ lib/cdmlib-commons-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-services-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.4.1-SNAPSHOT.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
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties

index 6998ff191edf9d47c221f33d932f7679a720db05..f1e77063eb9b35e474c7dc0a7e027a5aec4ab5cf 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -135,7 +135,6 @@ bin.includes = META-INF/,\
                 lib/plexus-classworlds-1.2-alpha-9.jar,\\r
                 lib/plexus-container-default-1.0-alpha-30.jar,\\r
                 lib/plexus-utils-2.0.5.jar,\\r
-               lib/poi-3.9.jar,\\r
                 lib/postgresql-9.1-901.jdbc4.jar,\\r
                 lib/sanselan-0.97-incubator.jar,\\r
                 lib/servlet-api-2.5.jar,\\r
@@ -190,22 +189,27 @@ bin.includes = META-INF/,\
                 lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
                 lib/jena-core-2.11.2.jar,\\r
                 lib/jena-iri-1.0.2.jar,\\r
-               lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.4.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.4.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.4.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-services-3.4.0-SNAPSHOT.jar\r
+               lib/poi-3.10-FINAL.jar,\\r
+               lib/poi-ooxml-3.10-FINAL.jar,\\r
+               lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
+               lib/xmlbeans-2.3.0.jar,\\r
+               lib/cdmlib-commons-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-commons-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-ext-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-io-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-model-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-print-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-remote-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-services-3.4.1-SNAPSHOT.jar\r
+\r
  jars.compile.order = .\r
  output.. = bin/\r
  source.. = src/main/java/,\\r
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar

similarity index 54%

rename from eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar

rename to eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar

index 0f462880ea30349656038eca3bc94320efef0179..8862e217587e06a41c2a5dd8703e683428df8a54 100644 (file)

Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.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

new file mode 100644 (file)

index 0000000..0782b07

Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.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.10-FINAL.jar

new file mode 100644 (file)

index 0000000..24d719e

Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar

new file mode 100644 (file)

index 0000000..ccd8163

Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml

index 6ab2a13c1a5508fd16d85578e64acc41f207294d..8fa3b68bb6c54691a9d878c1fded60f47d4efc50 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,7 +4,7 @@
    <parent>\r
      <groupId>eu.etaxonomy</groupId>\r
      <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.4.0-SNAPSHOT</version>\r
+    <version>3.4.1-SNAPSHOT</version>\r
    </parent>\r
    <modelVersion>4.0.0</modelVersion>\r
    <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war

index fe9d863890893a93e40953a98ed439a5ae97b33d..3ddb42caf84af18e02d6adee86491b41e5537d24 100644 (file)

Binary files a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war and b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war differ
diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF

index eb50aa616f97c77a16671e23e7ce9d3dcb04ddb3..144fd8b310f6cf42d6eb78988123299647288844 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: Editor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
  Bundle-Vendor: %Bundle-Vendor.0
  Bundle-Localization: OSGI-INF/l10n/plugin
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.ui,
   eu.etaxonomy.taxeditor.bulkeditor,
   org.eclipse.zest.core,
   org.eclipse.zest.layouts,
- eu.etaxonomy.taxeditor.cdmlib
+ eu.etaxonomy.taxeditor.cdmlib,
+ org.eclipse.ui.ide;bundle-version="3.7.0"
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Bundle-ActivationPolicy: lazy
  Import-Package: org.eclipse.core.databinding.beans,
diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties

index 8224ccffde6806160e0f5a86c61e245d315edb53..52948142215da5bdb8576fb4b13076811118e938 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
@@ -129,4 +129,14 @@ command.name.37 = Use Existing Image
  command.name.38 = Open Checklist Editor\r
  command.name.39 = New Datasource\r
  wizard.name = Specimen Search/Import\r
-wizard.description = Queries data provider for specimens with specified parameters.\nNote: Query results are currently limited to 100.
-\ No newline at end of file
+wizard.description = Queries data provider for specimens with specified parameters.\nNote: Query results are currently limited to 100.\r
+command.name.40 = Validation\r
+view.name.6 = Validation\r
+marker.field.0 = Object Type\r
+marker.field.1 = Object\r
+marker.field.2 = Attribute\r
+marker.field.3 = Problematic Value\r
+marker.field.4 = Problem description\r
+marker.field.5 = Validator\r
+marker.field.6 = Entity Class\r
+marker.field.7 = Entity Id
+\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties

index cde90f57ab9ac3d73bd60eca09090805549d1a99..a44064c3a68ee6025d3e3596016b12f30935769e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
@@ -128,4 +128,14 @@ command.name.37 = Benutze vorhandenes Bild
  command.name.38 = \u00d6ffne Checklist Editor
  command.name.39 = Neue Datenquelle
  wizard.name = Specimen Suche/Import
-wizard.description = Sendet eine Anfrage mit den eingegebenen Parametern an den Datenprovider.\nHinweis: Die Anzahl der Anfrageergebnisse sind auf 100 begrenzt.
-\ No newline at end of file
+wizard.description = Sendet eine Anfrage mit den eingegebenen Parametern an den Datenprovider.\nHinweis: Die Anzahl der Anfrageergebnisse sind auf 100 begrenzt.
+command.name.40 = Validierung
+view.name.6 = Validierung
+marker.field.0 = Objekt Typ
+marker.field.1 = Objekt
+marker.field.2 = Attribut
+marker.field.3 = Problematischer Wert
+marker.field.4 = Problem Beschreibung
+marker.field.5 = Validierer
+marker.field.6 = Entitäts Klasse
+marker.field.7 = Entitäts ID
+\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties

index 552f93a522181099bd0d2c04f36ee6471a3e4bd3..65d48bae536842cd7d76985773f77ae134851e3f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties
@@ -128,4 +128,14 @@ command.name.37 = Use Existing Image
  command.name.38 = Open Checklist Editor\r
  command.name.39 = New Datasource\r
  wizard.name = Specimen Search/Import\r
-wizard.description = Queries data provider for specimens with specified parameters.\nNote: Query results are currently limited to 100.
-\ No newline at end of file
+wizard.description = Queries data provider for specimens with specified parameters.\nNote: Query results are currently limited to 100.\r
+command.name.40 = Validation\r
+view.name.6 = Validation\r
+marker.field.0 = Object Type\r
+marker.field.1 = Object\r
+marker.field.2 = Attribute\r
+marker.field.3 = Problematic Value\r
+marker.field.4 = Problem description\r
+marker.field.5 = Validator\r
+marker.field.6 = Entity Class\r
+marker.field.7 = Entity Id
+\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml

index 23f66c05e7de39952e872b023b34fa340fe6e6c4..f0ff65922f1da3becbff4dd81078b2d8529edc3e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -144,8 +144,107 @@
                 id="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifResponseImportView"
                 name="%view.name.5">
           </view>
+         <view
+               allowMultiple="false"
+               category="eu.etaxonomy.taxeditor.editor.category"
+               class="eu.etaxonomy.taxeditor.editor.view.validation.ValidationProblemsView"
+               icon="icons/edit_16x16.gif"
+               id="eu.etaxonomy.taxeditor.editor.view.validation.problems"
+               name="%view.name.6">
+         </view>
        </extension>
-   <extension
+      
+       <!-- VALIDATION RELATED STUFF -->
+       <extension point="org.eclipse.ui.menus">
+       <menuContribution locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+                       <separator
+                  name="eu.etaxonomy.taxeditor.store.showViewMenu.validation.separator"
+                  visible="true">
+            </separator>
+                       <command
+                             commandId="org.eclipse.ui.views.showView"
+                             label="%command.name.40"
+                             style="push">
+                          <parameter
+                                name="org.eclipse.ui.views.showView.viewId"
+                                value="eu.etaxonomy.taxeditor.editor.view.validation.problems">
+                          </parameter>
+                       </command>
+               </menuContribution>
+       </extension>
+       <extension point="org.eclipse.core.resources.markers" name="Validation Error" id="eu.etaxonomy.taxeditor.markers.validationerror">
+               <super type="org.eclipse.core.resources.problemmarker"/>
+               <attribute name="databaseId"/>
+               <attribute name="userFriendlyTypeName"/>
+               <attribute name="userFriendlyDescription"/>
+               <attribute name="userFriendlyFieldName"/>
+               <attribute name="validatorMessage"/>
+               <attribute name="invalidValue"/>
+               <attribute name="validatorClass"/>
+               <attribute name="entityClass"/>
+               <attribute name="entityId"/>
+               <persistent value="false"/>
+       </extension>
+
+       <extension point="org.eclipse.ui.ide.markerSupport">
+           <markerContentGenerator
+                   id="eu.etaxonomy.taxeditor.editor.validation.ValidationProblemsMarkerGenerator" 
+                   name="Validation Problems Marker Generator">  
+               <markerTypeReference id="eu.etaxonomy.taxeditor.markers.validationerror" />
+               
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyDescription" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyFieldName" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.validatorMessage" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.invalidValue" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.validatorClass" visible="false" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.entityClass" visible="false" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.entityId" visible="false" />
+           </markerContentGenerator>
+           
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyTypeNameMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName"
+                       name="%marker.field.0">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyDescriptionMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyDescription"
+                       name="%marker.field.1">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyFieldNameMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyFieldName"
+                       name="%marker.field.2 = Attribute">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.InvalidValueMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.invalidValue"
+                       name="%marker.field.3 = Problematic Value">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.ValidatorMessageMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.validatorMessage"
+                       name="%marker.field.4 = Problem description">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.ValidatorClassMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.validatorClass"
+                       name="%marker.field.5">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.EntityClassMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.entityClass"
+                       name="%marker.field.6">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.EntityIdMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.entityId"
+                       name="%marker.field.7">
+               </markerField>
+       </extension>
+       
+  <extension
           point="org.eclipse.ui.elementFactories">
        <factory
              class="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"
@@ -610,6 +709,16 @@
                 label="Delete"
                 style="push">
           </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.derivate.createFieldUnit"
+               label="Create Field Unit"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
+               label="Delete (with children)"
+               style="push">
+         </command>
        </menuContribution>
        <menuContribution
              locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
@@ -840,6 +949,12 @@
                 commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
                 label="Open Associated Derivates"
                 style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
           </command>
           <separator
                 name="eu.etaxonomy.taxeditor.editor.separator1"
@@ -1265,6 +1380,16 @@
              id="eu.etaxonomy.taxeditor.editor.taxonParameterType"
              type="eu.etaxonomy.cdm.model.taxon.TaxonBase">
        </commandParameterType>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.CreateFieldUnitHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivate.createFieldUnit"
+            name="Create Field Unit">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
+            name="Deep Delete">
+      </command>
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">
diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml

index da6a8af2debc17899cd751175c23fe4640af33b8..cd90412b9f3b16556df7afbdafeecd0d3cdcd37a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -4,7 +4,7 @@
    <parent>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>taxeditor-parent</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
    </parent>
    
    <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java

index 7da4103c24ade1664baba8b9e114c6d6753fe38d..dd87e5ba54b89f4be7e5547f621733200e88f075 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
@@ -6,6 +6,7 @@ import org.osgi.framework.BundleContext;
  
  import eu.etaxonomy.taxeditor.editor.EditorStateManager;
  import eu.etaxonomy.taxeditor.editor.UseObjectManager;
+import eu.etaxonomy.taxeditor.editor.validation.ValidationContextListener;
  import eu.etaxonomy.taxeditor.store.CdmStore;
  
  /**
@@ -43,6 +44,9 @@ public class TaxeditorEditorPlugin extends AbstractUIPlugin {
                 EditorStateManager stateManager = new EditorStateManager();
                 CdmStore.getContextManager().addContextListener(stateManager);
                 
+               ValidationContextListener vcl = new ValidationContextListener();
+               CdmStore.getContextManager().addContextListener(vcl);
+               
                 plugin = this;
                 logger.trace("Plugin started: " + this.getBundle().getSymbolicName());
         }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/MarkerManager.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/MarkerManager.java

new file mode 100644 (file)

index 0000000..fa46f70
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/MarkerManager.java
@@ -0,0 +1,290 @@
+package eu.etaxonomy.taxeditor.editor.validation;\r
+\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Set;\r
+\r
+import javax.xml.validation.Validator;\r
+\r
+import org.eclipse.core.resources.IMarker;\r
+import org.eclipse.core.resources.IResource;\r
+import org.eclipse.core.resources.IWorkspaceRoot;\r
+import org.eclipse.core.resources.ResourcesPlugin;\r
+import org.eclipse.core.runtime.CoreException;\r
+\r
+import eu.etaxonomy.cdm.model.validation.EntityConstraintViolation;\r
+import eu.etaxonomy.cdm.model.validation.EntityValidationResult;\r
+import eu.etaxonomy.cdm.model.validation.Severity;\r
+\r
+/**\r
+ * A class responsible for refreshing problem markers coming from the CVI\r
+ * (Cdmlib Validation Infrastructure).\r
+ * \r
+ * @author ayco_holleman\r
+ * \r
+ */\r
+/*\r
+ * See following for problems with icons in Problems view\r
+ * http://stackoverflow.com\r
+ * /questions/13497258/markers-view-shows-my-marker-with-\r
+ * a-red-square-insted-of-error-warning-icon\r
+ * http://stackoverflow.com/questions/2888207\r
+ * /eclipse-plugin-custom-icon-for-a-marker\r
+ * http://www.eclipse.org/articles/Article-Mark%20My%20Words/mark-my-words.html\r
+ * http\r
+ * ://cubussapiens.hu/2010/11/markers-and-annotations-in-eclipse-for-error-feedback\r
+ * /\r
+ * \r
+ * See here for difficulty of attaching markers to non-resources (files,\r
+ * folders):\r
+ * http://stackoverflow.com/questions/12493179/eclipse-virtual-resources\r
+ */\r
+public class MarkerManager {\r
+\r
+       public static final String MARKER_TYPE_ID = "eu.etaxonomy.taxeditor.markers.validationerror";\r
+\r
+       /**\r
+        * The primary key (id) of the EntityValidationResult record\r
+        */\r
+       public static final String ATTRIB_DATABASE_ID = "databaseId";\r
+\r
+       // The values of the following constants must correspond to the attributes\r
+       // defined for the org.eclipse.core.resources.markers extension point in\r
+       // plugin.xml\r
+\r
+       /**\r
+        * A user-friendly description of the type of the entity\r
+        */\r
+       public static final String ATTRIB_USER_FRIENDLY_TYPE_NAME = "userFriendlyTypeName";\r
+       /**\r
+        * A user-friendly description of the entity\r
+        */\r
+       public static final String ATTRIB_USER_FRIENDLY_DESCRIPTION = "userFriendlyDescription";\r
+       /**\r
+        * The field whose value violated a constraint\r
+        */\r
+       public static final String ATTRIB_USER_FRIENDLY_FIELD_NAME = "userFriendlyFieldName";\r
+       /**\r
+        * The value violating a constraint\r
+        */\r
+       public static final String ATTRIB_INVALID_VALUE = "invalidValue";\r
+       /**\r
+        * The message from the {@link Validator} about what was wrong.\r
+        */\r
+       public static final String ATTRIB_VALIDATOR_MESSAGE = "validatorMessage";\r
+       /**\r
+        * The class of the {@link Validator} coding for the constraint\r
+        */\r
+       public static final String ATTRIB_VALIDATOR_CLASS = "validatorClass";\r
+       /**\r
+        * The class of the validated entity\r
+        */\r
+       public static final String ATTRIB_ENTITY_CLASS = "entityClass";\r
+       /**\r
+        * The id of the validated entity\r
+        */\r
+       public static final String ATTRIB_ENTITY_ID = "entityId";\r
+\r
+       private final IWorkspaceRoot root;\r
+       private final IMarker[] markers;\r
+       private final List<EntityValidationResult> results;\r
+       private final HashMap<Integer, EntityValidationResult> resultMap;\r
+       private final HashMap<Integer, IMarker> markerMap;\r
+\r
+\r
+       MarkerManager(List<EntityValidationResult> results) throws CoreException\r
+       {\r
+               this.root = ResourcesPlugin.getWorkspace().getRoot();\r
+               this.markers = root.findMarkers(MARKER_TYPE_ID, true, IResource.DEPTH_INFINITE);\r
+               this.markerMap = new HashMap<Integer, IMarker>();\r
+               for (IMarker marker : markers) {\r
+                       markerMap.put(getDatabaseId(marker), marker);\r
+               }\r
+               this.results = results;\r
+               this.resultMap = new HashMap<Integer, EntityValidationResult>();\r
+               for (EntityValidationResult result : results) {\r
+                       resultMap.put(result.getId(), result);\r
+               }\r
+       }\r
+\r
+\r
+       /**\r
+        * Delete all markers that refer to errors that do not exist any longer\r
+        * (i.e. the corresponding database record has been deleted).\r
+        * \r
+        * @return The number of deleted markers\r
+        * \r
+        * @throws CoreException\r
+        */\r
+       int deleteObsoleteMarkers() throws CoreException\r
+       {\r
+               int i = 0;\r
+               IMarker[] markers = root.findMarkers(MARKER_TYPE_ID, true, IResource.DEPTH_INFINITE);\r
+               for (IMarker marker : markers) {\r
+                       if (isObsoleteMarker(marker)) {\r
+                               ++i;\r
+                               marker.delete();\r
+                       }\r
+               }\r
+               return i;\r
+       }\r
+\r
+\r
+       /**\r
+        * Create markers for new errors (i.e. no marker has been created for them\r
+        * yet).\r
+        * \r
+        * @return The number of new markers\r
+        * \r
+        * @throws CoreException\r
+        */\r
+       int createMarkers() throws CoreException\r
+       {\r
+               int i = 0;\r
+               IMarker[] markers = root.findMarkers(MARKER_TYPE_ID, true, IResource.DEPTH_INFINITE);\r
+               for (EntityValidationResult result : results) {\r
+                       if (!isNewResult(result)) {\r
+                               continue;\r
+                       }\r
+                       Set<EntityConstraintViolation> problems = result.getEntityConstraintViolations();\r
+                       for (EntityConstraintViolation problem : problems) {\r
+                               if (markerExistsForProblem(problem, markers)) {\r
+                                       continue;\r
+                               }\r
+                               IMarker marker = root.createMarker(MARKER_TYPE_ID);\r
+                               ++i;\r
+                               if (problem.getSeverity() == Severity.ERROR) {\r
+                                       marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);\r
+                               }\r
+                               else if (problem.getSeverity() == Severity.WARNING) {\r
+                                       marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);\r
+                               }\r
+                               else {\r
+                                       marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO);\r
+                               }\r
+                               marker.setAttribute(IMarker.MESSAGE, problem.getMessage());\r
+                               marker.setAttribute(ATTRIB_DATABASE_ID, result.getId());\r
+                               marker.setAttribute(ATTRIB_USER_FRIENDLY_TYPE_NAME, result.getUserFriendlyTypeName());\r
+                               marker.setAttribute(ATTRIB_USER_FRIENDLY_DESCRIPTION, result.getUserFriendlyDescription());\r
+                               marker.setAttribute(ATTRIB_USER_FRIENDLY_FIELD_NAME, problem.getUserFriendlyFieldName());\r
+                               marker.setAttribute(ATTRIB_VALIDATOR_MESSAGE, problem.getMessage());\r
+                               marker.setAttribute(ATTRIB_INVALID_VALUE, problem.getInvalidValue());\r
+                               marker.setAttribute(ATTRIB_VALIDATOR_CLASS, problem.getValidator());\r
+                               marker.setAttribute(ATTRIB_ENTITY_CLASS, result.getValidatedEntityClass());\r
+                               marker.setAttribute(ATTRIB_ENTITY_ID, result.getValidatedEntityId());\r
+                       }\r
+               }\r
+               return i;\r
+       }\r
+\r
+\r
+       /**\r
+        * Is there a problem marker that captures the specified\r
+        * {@link EntityConstraintViolation}? See\r
+        * {@link #markerCapturesProblem(IMarker, EntityConstraintViolation)}.\r
+        * \r
+        * @param problem\r
+        * @param markers\r
+        * @return\r
+        * @throws CoreException\r
+        */\r
+       private boolean markerExistsForProblem(EntityConstraintViolation problem, IMarker[] markers) throws CoreException\r
+       {\r
+               for (IMarker marker : markers) {\r
+                       if (markerCapturesProblem(marker, problem)) {\r
+                               return true;\r
+                       }\r
+               }\r
+               return false;\r
+       }\r
+\r
+\r
+       /**\r
+        * <p>\r
+        * This method determines whether the problem exposed by the specified\r
+        * marker is <b>de facto</b> equivalent to the specified\r
+        * {@code EntityConstraintViolation}. When the CVI validates an entity, it\r
+        * first deletes previous validation results for that entity and only then\r
+        * saves the new validation result. Thus you cannot rely on the database id\r
+        * of the {@code EntityConstraintViolation} to determine equivalence. Maybe\r
+        * later we can make the CVI more sophisticated in this respect. Or maybe\r
+        * see if solving it through the equals() method of\r
+        * {@code EntityValidationResult} and/or {@code EntityConstraintViolation}\r
+        * is possible. But for now this is the easiest solution.\r
+        * </p>\r
+        * <p>\r
+        * The reason we check for equivalence, is that we don't want to\r
+        * unnecessarily update the Problems view. If a marker is there, we don't\r
+        * want to replace it with an equivalent marker, because that might lead to\r
+        * strange click behaviour for end users (e.g. selected problems will\r
+        * disappear and re-appear unselected).\r
+        * </p>\r
+        * \r
+        * @param marker\r
+        * @param problem\r
+        * @return\r
+        * @throws CoreException\r
+        */\r
+       private static boolean markerCapturesProblem(IMarker marker, EntityConstraintViolation problem) throws CoreException\r
+       {\r
+               EntityValidationResult result = problem.getEntityValidationResult();\r
+               if (!marker.getAttribute(ATTRIB_ENTITY_CLASS).equals(result.getValidatedEntityClass())) {\r
+                       return false;\r
+               }\r
+               if (!marker.getAttribute(ATTRIB_ENTITY_ID).equals(result.getValidatedEntityId())) {\r
+                       return false;\r
+               }\r
+               if (!marker.getAttribute(ATTRIB_USER_FRIENDLY_FIELD_NAME).equals(problem.getPropertyPath())) {\r
+                       return false;\r
+               }\r
+               if (!marker.getAttribute(ATTRIB_INVALID_VALUE).equals(problem.getInvalidValue())) {\r
+                       return false;\r
+               }\r
+               if (!marker.getAttribute(ATTRIB_VALIDATOR_CLASS).equals(problem.getValidator())) {\r
+                       return false;\r
+               }\r
+               return true;\r
+       }\r
+\r
+\r
+       /**\r
+        * Is this a marker without a corresponding database record (\r
+        * {@link EntityValidationResult})?\r
+        * \r
+        * @param marker\r
+        * @return\r
+        * @throws CoreException\r
+        */\r
+       private boolean isObsoleteMarker(IMarker marker) throws CoreException\r
+       {\r
+               return resultMap.get(getDatabaseId(marker)) == null;\r
+       }\r
+\r
+\r
+       /**\r
+        * Is this an {@link EntityValidationResult} for which no marker has been\r
+        * created yet?\r
+        * \r
+        * @param result\r
+        * @return\r
+        */\r
+       private boolean isNewResult(EntityValidationResult result)\r
+       {\r
+               return markerMap.get(result.getId()) == null;\r
+       }\r
+\r
+\r
+       /**\r
+        * Get the id of the {@link EntityValidationResult} that was stored as one\r
+        * of the marker's attributes.\r
+        * \r
+        * @param marker\r
+        * @return\r
+        * @throws CoreException\r
+        */\r
+       private static Integer getDatabaseId(IMarker marker) throws CoreException\r
+       {\r
+               return (Integer) marker.getAttribute(ATTRIB_DATABASE_ID);\r
+       }\r
+\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationContextListener.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationContextListener.java

new file mode 100644 (file)

index 0000000..2c47e92
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationContextListener.java
@@ -0,0 +1,76 @@
+package eu.etaxonomy.taxeditor.editor.validation;\r
+\r
+import org.apache.log4j.Logger;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.ui.IMemento;\r
+\r
+import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;\r
+import eu.etaxonomy.taxeditor.model.IContextListener;\r
+\r
+/**\r
+ * An {@code IContextListener} responsible for starting the\r
+ * {@link ValidationDaemon}.\r
+ * \r
+ * @see TaxeditorEditorPlugin#start(org.osgi.framework.BundleContext)\r
+ * \r
+ * @author ayco_holleman\r
+ * \r
+ */\r
+public class ValidationContextListener implements IContextListener {\r
+\r
+       @SuppressWarnings("unused")\r
+       private static final Logger logger = Logger.getLogger(ValidationContextListener.class);\r
+\r
+       private ValidationDaemon daemon;\r
+\r
+\r
+       public ValidationContextListener(){\r
+       }\r
+\r
+\r
+       @Override\r
+       public void contextAboutToStop(IMemento memento, IProgressMonitor monitor){\r
+               if (daemon != null) {\r
+                       daemon.cancel();\r
+                       daemon.setCancelRequested();\r
+               }\r
+       }\r
+\r
+\r
+       @Override\r
+       public void contextStop(IMemento memento, IProgressMonitor monitor){\r
+               if (daemon != null) {\r
+                       daemon.cancel();\r
+                       daemon.setCancelRequested();\r
+               }\r
+       }\r
+\r
+\r
+       @Override\r
+       public void contextStart(IMemento memento, IProgressMonitor monitor){\r
+               if (daemon == null) {\r
+                       daemon = new ValidationDaemon();\r
+               }\r
+               daemon.schedule();\r
+       }\r
+\r
+\r
+       @Override\r
+       public void contextRefresh(IProgressMonitor monitor){\r
+               if (daemon != null) {\r
+                       daemon.cancel();\r
+                       daemon.setCancelRequested();\r
+               }\r
+       }\r
+\r
+\r
+       @Override\r
+       public void workbenchShutdown(IMemento memento, IProgressMonitor monitor){\r
+               if (daemon != null) {\r
+                       daemon.cancel();\r
+                       daemon.setCancelRequested();\r
+                       daemon = null;\r
+               }\r
+       }\r
+\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationDaemon.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationDaemon.java

new file mode 100644 (file)

index 0000000..466c220
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationDaemon.java
@@ -0,0 +1,86 @@
+package eu.etaxonomy.taxeditor.editor.validation;\r
+\r
+import java.util.List;\r
+\r
+import org.apache.log4j.Logger;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+import org.eclipse.core.runtime.Status;\r
+import org.eclipse.core.runtime.jobs.Job;\r
+\r
+import eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService;\r
+import eu.etaxonomy.cdm.api.service.IEntityValidationResultService;\r
+import eu.etaxonomy.cdm.model.validation.EntityValidationResult;\r
+import eu.etaxonomy.taxeditor.model.MessagingUtils;\r
+import eu.etaxonomy.taxeditor.store.CdmStore;\r
+\r
+/**\r
+ * A job that repeatedly checks the error tables and refreshes the problem\r
+ * markers created from them.\r
+ * \r
+ * @author ayco_holleman\r
+ * \r
+ */\r
+public class ValidationDaemon extends Job {\r
+\r
+       @SuppressWarnings("unused")\r
+       private static final Logger logger = Logger.getLogger(ValidationDaemon.class);\r
+\r
+       private final IEntityValidationResultService validationResultService;\r
+       \r
+       @SuppressWarnings("unused")\r
+       /* Not currently needed but present for future use if/when required */\r
+       private final IEntityConstraintViolationService constraintViolationService;\r
+\r
+       private boolean cancelRequested = false;\r
+\r
+       public ValidationDaemon(){\r
+               super("Initializing validation module");\r
+//             StoreUtil.info("Initializing validation module");\r
+               MessagingUtils.info("Initializing validation module");\r
+               constraintViolationService = CdmStore.getService(IEntityConstraintViolationService.class);\r
+               validationResultService = CdmStore.getService(IEntityValidationResultService.class);\r
+       }\r
+\r
+       \r
+       @Override\r
+       protected void canceling(){\r
+               cancelRequested = true;\r
+       }\r
+\r
+\r
+       /**\r
+        * This method is called by {@link ValidationContextListener} rather than\r
+        * {@link Job#cancel()}, because that method does not have the desired\r
+        * effect.\r
+        */\r
+       public void setCancelRequested(){\r
+               cancelRequested = true;\r
+       }\r
+\r
+\r
+       @Override\r
+       protected IStatus run(IProgressMonitor monitor){\r
+               MarkerManager markerManager;\r
+               List<EntityValidationResult> results;\r
+               try {\r
+                       while (!cancelRequested) {\r
+                               results = validationResultService.getValidationResults();\r
+                               markerManager = new MarkerManager(results);\r
+                               markerManager.deleteObsoleteMarkers();\r
+                               markerManager.createMarkers();\r
+                               // Might want to make this configurable:\r
+                               Thread.sleep(5000);\r
+                       }\r
+//                     StoreUtil.info("Validation module stopped");\r
+                       MessagingUtils.info("Validation module stopped");\r
+                       return Status.OK_STATUS;\r
+               }\r
+               catch (Throwable t) {\r
+//                     StoreUtil.info("Validation module terminated unexpectedly: " + t.getMessage());\r
+                       MessagingUtils.info("Validation module terminated unexpectedly: " + t.getMessage());\r
+                       return Status.CANCEL_STATUS;\r
+               }\r
+       }\r
+\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java

index eb6962944a98b2b5015d45bb42bf619ae164db2b..f57ae29ebf2e78d4be686d0df48811dd11b0f1dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
@@ -33,6 +33,7 @@ import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;
  import eu.etaxonomy.cdm.model.agent.Person;
  import eu.etaxonomy.cdm.model.agent.Team;
  import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
  import eu.etaxonomy.cdm.model.common.LSID;
@@ -57,13 +58,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
   */
  public class TransientAgentService implements IAgentService {
  
-    private IAgentService defaultAgentService;
+    private IAgentService defaultService;
  
      /**
       * @param defaultAgentService
       */
      public TransientAgentService(IAgentService defaultAgentService) {
-        this.defaultAgentService = defaultAgentService;
+        this.defaultService = defaultAgentService;
      }
  
      /**
@@ -77,7 +78,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<AuditEventRecord<AgentBase>> pageAuditEvents(AgentBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultAgentService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
+        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
      }
  
      /**
@@ -92,7 +93,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<Annotation> getAnnotations(AgentBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -102,7 +103,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<Institution> searchInstitutionByCode(String code) {
-        return defaultAgentService.searchInstitutionByCode(code);
+        return defaultService.searchInstitutionByCode(code);
      }
  
      /**
@@ -114,7 +115,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<InstitutionalMembership> getInstitutionalMemberships(Person person, Integer pageSize, Integer pageNumber) {
-        return defaultAgentService.getInstitutionalMemberships(person, pageSize, pageNumber);
+        return defaultService.getInstitutionalMemberships(person, pageSize, pageNumber);
      }
  
      /**
@@ -123,7 +124,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public void clear() {
-        defaultAgentService.clear();
+        defaultService.clear();
      }
  
      /**
@@ -133,7 +134,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public void lock(AgentBase t, LockOptions lockOptions) {
-        defaultAgentService.lock(t, lockOptions);
+        defaultService.lock(t, lockOptions);
      }
  
      /**
@@ -144,7 +145,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public void refresh(AgentBase t, LockOptions lockOptions, List<String> propertyPaths) {
-        defaultAgentService.refresh(t, lockOptions, propertyPaths);
+        defaultService.refresh(t, lockOptions, propertyPaths);
      }
  
      /**
@@ -156,7 +157,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<Person> getMembers(Team team, Integer pageSize, Integer pageNumber) {
-        return defaultAgentService.getMembers(team, pageSize, pageNumber);
+        return defaultService.getMembers(team, pageSize, pageNumber);
      }
  
      /**
@@ -165,7 +166,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public void updateTitleCache() {
-        defaultAgentService.updateTitleCache();
+        defaultService.updateTitleCache();
      }
  
      /**
@@ -175,7 +176,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AuditEventRecord<AgentBase> getNextAuditEvent(AgentBase t) {
-        return defaultAgentService.getNextAuditEvent(t);
+        return defaultService.getNextAuditEvent(t);
      }
  
      /**
@@ -190,7 +191,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<Marker> getMarkers(AgentBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -202,7 +203,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public void updateTitleCache(Class<? extends AgentBase> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<AgentBase> cacheStrategy, IProgressMonitor monitor) {
-        defaultAgentService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
+        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
      }
  
      /**
@@ -214,7 +215,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<Address> getAddresses(AgentBase agent, Integer pageSize, Integer pageNumber) {
-        return defaultAgentService.getAddresses(agent, pageSize, pageNumber);
+        return defaultService.getAddresses(agent, pageSize, pageNumber);
      }
  
      /**
@@ -224,7 +225,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AuditEventRecord<AgentBase> getPreviousAuditEvent(AgentBase t) {
-        return defaultAgentService.getPreviousAuditEvent(t);
+        return defaultService.getPreviousAuditEvent(t);
      }
  
      /**
@@ -234,7 +235,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public int count(Class<? extends AgentBase> clazz) {
-        return defaultAgentService.count(clazz);
+        return defaultService.count(clazz);
      }
  
      /**
@@ -249,7 +250,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<AgentBase> search(Class<? extends AgentBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -266,7 +267,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<AuditEventRecord<AgentBase>> pageAuditEvents(Class<? extends AgentBase> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultAgentService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
+        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
      }
  
      /**
@@ -276,7 +277,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AgentBase find(LSID lsid) {
-        return defaultAgentService.find(lsid);
+        return defaultService.find(lsid);
      }
  
      /**
@@ -286,7 +287,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public DeleteResult delete(AgentBase persistentObject) {
-        return defaultAgentService.delete(persistentObject);
+        return defaultService.delete(persistentObject);
      }
  
      /**
@@ -300,7 +301,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<Object[]> groupMarkers(Class<? extends AgentBase> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultAgentService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
+        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -310,7 +311,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public boolean exists(UUID uuid) {
-        return defaultAgentService.exists(uuid);
+        return defaultService.exists(uuid);
      }
  
      /**
@@ -321,7 +322,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AgentBase replace(AgentBase x, AgentBase y) {
-        return defaultAgentService.replace(x, y);
+        return defaultService.replace(x, y);
      }
  
      /**
@@ -331,7 +332,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<AgentBase> find(Set<UUID> uuidSet) {
-        return defaultAgentService.find(uuidSet);
+        return defaultService.find(uuidSet);
      }
  
      /**
@@ -344,7 +345,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<IdentifiableSource> getSources(AgentBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultAgentService.getSources(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -354,7 +355,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AgentBase find(UUID uuid) {
-        return defaultAgentService.find(uuid);
+        return defaultService.find(uuid);
      }
  
      /**
@@ -363,7 +364,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<UuidAndTitleCache<Person>> getPersonUuidAndTitleCache() {
-        return defaultAgentService.getPersonUuidAndTitleCache();
+        return defaultService.getPersonUuidAndTitleCache();
      }
  
      /**
@@ -372,7 +373,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<UuidAndTitleCache<Team>> getTeamUuidAndTitleCache() {
-        return defaultAgentService.getTeamUuidAndTitleCache();
+        return defaultService.getTeamUuidAndTitleCache();
      }
  
      /**
@@ -382,7 +383,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AgentBase find(int id) {
-        return defaultAgentService.find(id);
+        return defaultService.find(id);
      }
  
      /**
@@ -395,7 +396,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<Rights> getRights(AgentBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultAgentService.getRights(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -406,7 +407,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public int countMarkers(Class<? extends AgentBase> clazz, Boolean technical) {
-        return defaultAgentService.countMarkers(clazz, technical);
+        return defaultService.countMarkers(clazz, technical);
      }
  
      /**
@@ -415,7 +416,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<UuidAndTitleCache<Team>> getTeamUuidAndNomenclaturalTitle() {
-        return defaultAgentService.getTeamUuidAndNomenclaturalTitle();
+        return defaultService.getTeamUuidAndNomenclaturalTitle();
      }
  
      /**
@@ -425,7 +426,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<AgentBase> findById(Set<Integer> idSet) {
-        return defaultAgentService.findById(idSet);
+        return defaultService.findById(idSet);
      }
  
      /**
@@ -434,7 +435,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<UuidAndTitleCache<Institution>> getInstitutionUuidAndTitleCache() {
-        return defaultAgentService.getInstitutionUuidAndTitleCache();
+        return defaultService.getInstitutionUuidAndTitleCache();
      }
  
      /**
@@ -446,7 +447,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
-        return defaultAgentService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
+        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
      }
  
      /**
@@ -455,7 +456,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Session getSession() {
-        return defaultAgentService.getSession();
+        return defaultService.getSession();
      }
  
      /**
@@ -464,7 +465,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<UuidAndTitleCache<AgentBase>> getUuidAndTitleCache() {
-        return defaultAgentService.getUuidAndTitleCache();
+        return defaultService.getUuidAndTitleCache();
      }
  
      /**
@@ -478,7 +479,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<Object[]> group(Class<? extends AgentBase> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
-        return defaultAgentService.group(clazz, limit, start, groups, propertyPaths);
+        return defaultService.group(clazz, limit, start, groups, propertyPaths);
      }
  
      /**
@@ -495,7 +496,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<AgentBase> findByTitle(Class<? extends AgentBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -509,7 +510,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public <S extends AgentBase> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.list(type, limit, start, orderHints, propertyPaths);
+        return defaultService.list(type, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -519,7 +520,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<AgentBase> findByTitle(IIdentifiableEntityServiceConfigurator<AgentBase> configurator) {
-        return defaultAgentService.findByTitle(configurator);
+        return defaultService.findByTitle(configurator);
      }
  
      /**
@@ -532,7 +533,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Integer countByTitle(Class<? extends AgentBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
-        return defaultAgentService.countByTitle(clazz, queryString, matchmode, criteria);
+        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
      }
  
      /**
@@ -542,7 +543,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AgentBase load(UUID uuid) {
-        return defaultAgentService.load(uuid);
+        return defaultService.load(uuid);
      }
  
      /**
@@ -553,7 +554,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AgentBase load(UUID uuid, List<String> propertyPaths) {
-        return defaultAgentService.load(uuid, propertyPaths);
+        return defaultService.load(uuid, propertyPaths);
      }
  
      /**
@@ -563,7 +564,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Integer countByTitle(IIdentifiableEntityServiceConfigurator<AgentBase> configurator) {
-        return defaultAgentService.countByTitle(configurator);
+        return defaultService.countByTitle(configurator);
      }
  
      /**
@@ -573,7 +574,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public AgentBase merge(AgentBase transientObject) {
-        return defaultAgentService.merge(transientObject);
+        return defaultService.merge(transientObject);
      }
  
      /**
@@ -590,7 +591,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<AgentBase> listByTitle(Class<? extends AgentBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -604,7 +605,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public <S extends AgentBase>  Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -614,7 +615,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public UUID refresh(AgentBase persistentObject) {
-        return defaultAgentService.refresh(persistentObject);
+        return defaultService.refresh(persistentObject);
      }
  
      /**
@@ -631,7 +632,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<AgentBase> listByReferenceTitle(Class<? extends AgentBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -643,7 +644,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<AgentBase> rows(String tableName, int limit, int start) {
-        return defaultAgentService.rows(tableName, limit, start);
+        return defaultService.rows(tableName, limit, start);
      }
  
      /**
@@ -693,7 +694,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public UUID update(AgentBase transientObject) {
-        return defaultAgentService.update(transientObject);
+        return defaultService.update(transientObject);
      }
  
      /**
@@ -708,7 +709,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public List<AgentBase> list(AgentBase example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultAgentService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
+        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -720,7 +721,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public int deduplicate(Class<? extends AgentBase> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
-        return defaultAgentService.deduplicate(clazz, matchStrategy, mergeStrategy);
+        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
      }
  
      /**
@@ -735,7 +736,7 @@ public class TransientAgentService implements IAgentService {
       */
      @Override
      public Pager<AgentBase> findTitleCache(Class<? extends AgentBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
-        return defaultAgentService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
      }
  
         @Override
@@ -747,9 +748,12 @@ public class TransientAgentService implements IAgentService {
  
         @Override
         public AgentBase findWithoutFlush(UUID uuid) {
-               return defaultAgentService.findWithoutFlush(uuid);
+               return defaultService.findWithoutFlush(uuid);
         };
  
-
+       @Override
+       public <S extends AgentBase> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
+       }
  
  }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java

index 7752d1d814e70f6cdad320295fe8b891cfe4378d..5a29a76f394ac831906c0af054c859a8a1ea92b6 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
@@ -23,6 +23,8 @@ import eu.etaxonomy.cdm.api.service.ICollectionService;
  import eu.etaxonomy.cdm.api.service.ICommonService;
  import eu.etaxonomy.cdm.api.service.IDatabaseService;
  import eu.etaxonomy.cdm.api.service.IDescriptionService;
+import eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService;
+import eu.etaxonomy.cdm.api.service.IEntityValidationResultService;
  import eu.etaxonomy.cdm.api.service.IFeatureNodeService;
  import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
  import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;
@@ -350,10 +352,6 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
          return defaultApplicationConfiguration.getTransactionManager();
      }
  
-    /**
-     * @return
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getUserService()
-     */
      @Override
      public IUserService getUserService() {
          return defaultApplicationConfiguration.getUserService();
@@ -370,56 +368,45 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
  //        return new TransientVocabularyService(defaultApplicationConfiguration.getVocabularyService());
      }
  
-    /**
-     * @return
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getWorkingSetService()
-     */
      @Override
      public IWorkingSetService getWorkingSetService() {
          return defaultApplicationConfiguration.getWorkingSetService();
  //        return new TransientWorkingSetService(defaultApplicationConfiguration.getWorkingSetService());
      }
  
-    /**
-     * @return
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#startTransaction()
-     */
      @Override
      public TransactionStatus startTransaction() {
          return defaultApplicationConfiguration.startTransaction();
      }
  
-    /**
-     * @param arg0
-     * @return
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#startTransaction(java.lang.Boolean)
-     */
+
      @Override
      public TransactionStatus startTransaction(Boolean arg0) {
          return defaultApplicationConfiguration.startTransaction(arg0);
      }
  
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getPrimerService()
-     */
      @Override
      public IPrimerService getPrimerService() {
          return defaultApplicationConfiguration.getPrimerService();
      }
  
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getAmplificationService()
-     */
      @Override
      public IAmplificationService getAmplificationService() {
          return defaultApplicationConfiguration.getAmplificationService();
      }
  
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getSequenceService()
-     */
      @Override
      public ISequenceService getSequenceService() {
          return defaultApplicationConfiguration.getSequenceService();
      }
+
+       @Override
+       public IEntityConstraintViolationService getEntityConstraintViolationService() {
+               return defaultApplicationConfiguration.getEntityConstraintViolationService();
+       }
+
+       @Override
+       public IEntityValidationResultService getEntityValidationResultService() {
+               return defaultApplicationConfiguration.getEntityValidationResultService();
+       }
  }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java

index a5e586377cb149569505b3fa6e1facbd4a5d45d7..ff1e8f70241caa00852cf6dfb8fce2a9f6849943 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
@@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato
  import eu.etaxonomy.cdm.api.service.pager.Pager;
  import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
  import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
  import eu.etaxonomy.cdm.model.common.LSID;
@@ -57,13 +58,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
   */
  public class TransientClassificationService implements IClassificationService {
  
-    private final IClassificationService defaultClassificationService;
+    private final IClassificationService defaultService;
  
      /**
       * @param defaultClassificationService
       */
      public TransientClassificationService(IClassificationService defaultClassificationService) {
-        this.defaultClassificationService = defaultClassificationService;
+        this.defaultService = defaultClassificationService;
      }
  
      /**
@@ -77,7 +78,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<AuditEventRecord<Classification>> pageAuditEvents(Classification t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultClassificationService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
+        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
      }
  
      /**
@@ -92,7 +93,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<Annotation> getAnnotations(Classification annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -102,7 +103,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public TaxonNode getTaxonNodeByUuid(UUID uuid) {
-        return defaultClassificationService.getTaxonNodeByUuid(uuid);
+        return defaultService.getTaxonNodeByUuid(uuid);
      }
  
      /**
@@ -112,7 +113,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public ITaxonTreeNode getTreeNodeByUuid(UUID uuid) {
-        return defaultClassificationService.getTreeNodeByUuid(uuid);
+        return defaultService.getTreeNodeByUuid(uuid);
      }
  
      /**
@@ -121,7 +122,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public void clear() {
-        defaultClassificationService.clear();
+        defaultService.clear();
      }
  
      /**
@@ -134,7 +135,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Classification> listClassifications(Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.listClassifications(limit, start, orderHints, propertyPaths);
+        return defaultService.listClassifications(limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -144,7 +145,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public void lock(Classification t, LockOptions lockOptions) {
-        defaultClassificationService.lock(t, lockOptions);
+        defaultService.lock(t, lockOptions);
      }
  
      /**
@@ -155,7 +156,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public void refresh(Classification t, LockOptions lockOptions, List<String> propertyPaths) {
-        defaultClassificationService.refresh(t, lockOptions, propertyPaths);
+        defaultService.refresh(t, lockOptions, propertyPaths);
      }
  
      /**
@@ -169,7 +170,7 @@ public class TransientClassificationService implements IClassificationService {
      @Deprecated
      @Override
      public TaxonNode loadTaxonNodeByTaxon(Taxon taxon, UUID classificationUuid, List<String> propertyPaths) {
-        return defaultClassificationService.loadTaxonNodeByTaxon(taxon, classificationUuid, propertyPaths);
+        return defaultService.loadTaxonNodeByTaxon(taxon, classificationUuid, propertyPaths);
      }
  
      /**
@@ -178,7 +179,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public void updateTitleCache() {
-        defaultClassificationService.updateTitleCache();
+        defaultService.updateTitleCache();
      }
  
      /**
@@ -188,7 +189,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public AuditEventRecord<Classification> getNextAuditEvent(Classification t) {
-        return defaultClassificationService.getNextAuditEvent(t);
+        return defaultService.getNextAuditEvent(t);
      }
  
      /**
@@ -203,7 +204,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<Marker> getMarkers(Classification annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -215,7 +216,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public void updateTitleCache(Class<? extends Classification> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<Classification> cacheStrategy, IProgressMonitor monitor) {
-        defaultClassificationService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
+        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
      }
  
      /**
@@ -228,7 +229,7 @@ public class TransientClassificationService implements IClassificationService {
      @Deprecated
      @Override
      public TaxonNode loadTaxonNode(TaxonNode taxonNode, List<String> propertyPaths) {
-        return defaultClassificationService.loadTaxonNode(taxonNode, propertyPaths);
+        return defaultService.loadTaxonNode(taxonNode, propertyPaths);
      }
  
      /**
@@ -238,7 +239,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public AuditEventRecord<Classification> getPreviousAuditEvent(Classification t) {
-        return defaultClassificationService.getPreviousAuditEvent(t);
+        return defaultService.getPreviousAuditEvent(t);
      }
  
      /**
@@ -254,7 +255,7 @@ public class TransientClassificationService implements IClassificationService {
      @Deprecated
      @Override
      public List<TaxonNode> loadRankSpecificRootNodes(Classification classification, Rank rank, Integer limit, Integer start, List<String> propertyPaths) {
-        return defaultClassificationService.loadRankSpecificRootNodes(classification, rank, limit, start, propertyPaths);
+        return defaultService.loadRankSpecificRootNodes(classification, rank, limit, start, propertyPaths);
      }
  
      /**
@@ -264,7 +265,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public int count(Class<? extends Classification> clazz) {
-        return defaultClassificationService.count(clazz);
+        return defaultService.count(clazz);
      }
  
      /**
@@ -281,7 +282,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<AuditEventRecord<Classification>> pageAuditEvents(Class<? extends Classification> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultClassificationService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
+        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
      }
  
      /**
@@ -291,7 +292,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Classification find(LSID lsid) {
-        return defaultClassificationService.find(lsid);
+        return defaultService.find(lsid);
      }
  
      /**
@@ -301,7 +302,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public DeleteResult delete(Classification persistentObject) {
-        return defaultClassificationService.delete(persistentObject);
+        return defaultService.delete(persistentObject);
      }
  
      /**
@@ -315,7 +316,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Object[]> groupMarkers(Class<? extends Classification> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultClassificationService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
+        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -325,7 +326,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public boolean exists(UUID uuid) {
-        return defaultClassificationService.exists(uuid);
+        return defaultService.exists(uuid);
      }
  
      /**
@@ -336,7 +337,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Classification replace(Classification x, Classification y) {
-        return defaultClassificationService.replace(x, y);
+        return defaultService.replace(x, y);
      }
  
      /**
@@ -346,7 +347,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Classification> find(Set<UUID> uuidSet) {
-        return defaultClassificationService.find(uuidSet);
+        return defaultService.find(uuidSet);
      }
  
      /**
@@ -359,7 +360,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<IdentifiableSource> getSources(Classification t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultClassificationService.getSources(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -373,7 +374,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<TaxonNode> listRankSpecificRootNodes(Classification classification, Rank rank, Integer pageSize, Integer pageIndex, List<String> propertyPaths) {
-        return defaultClassificationService.listRankSpecificRootNodes(classification, rank, pageSize, pageIndex, propertyPaths);
+        return defaultService.listRankSpecificRootNodes(classification, rank, pageSize, pageIndex, propertyPaths);
      }
  
      /**
@@ -383,7 +384,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Classification find(UUID uuid) {
-        return defaultClassificationService.find(uuid);
+        return defaultService.find(uuid);
      }
  
      /**
@@ -393,7 +394,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Classification find(int id) {
-        return defaultClassificationService.find(id);
+        return defaultService.find(id);
      }
  
      /**
@@ -406,7 +407,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<Rights> getRights(Classification t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultClassificationService.getRights(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -417,7 +418,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public int countMarkers(Class<? extends Classification> clazz, Boolean technical) {
-        return defaultClassificationService.countMarkers(clazz, technical);
+        return defaultService.countMarkers(clazz, technical);
      }
  
      /**
@@ -427,7 +428,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Classification> findById(Set<Integer> idSet) {
-        return defaultClassificationService.findById(idSet);
+        return defaultService.findById(idSet);
      }
  
      /**
@@ -439,7 +440,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
-        return defaultClassificationService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
+        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
      }
  
      /**
@@ -453,7 +454,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<TaxonNode> pageRankSpecificRootNodes(Classification classification, Rank rank, Integer pageSize, Integer pageIndex, List<String> propertyPaths) {
-        return defaultClassificationService.pageRankSpecificRootNodes(classification, rank, pageSize, pageIndex, propertyPaths);
+        return defaultService.pageRankSpecificRootNodes(classification, rank, pageSize, pageIndex, propertyPaths);
      }
  
      /**
@@ -462,7 +463,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Session getSession() {
-        return defaultClassificationService.getSession();
+        return defaultService.getSession();
      }
  
      /**
@@ -471,7 +472,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<UuidAndTitleCache<Classification>> getUuidAndTitleCache() {
-        return defaultClassificationService.getUuidAndTitleCache();
+        return defaultService.getUuidAndTitleCache();
      }
  
      /**
@@ -485,7 +486,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Object[]> group(Class<? extends Classification> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
-        return defaultClassificationService.group(clazz, limit, start, groups, propertyPaths);
+        return defaultService.group(clazz, limit, start, groups, propertyPaths);
      }
  
      /**
@@ -502,7 +503,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<Classification> findByTitle(Class<? extends Classification> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -514,7 +515,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<TaxonNode> loadTreeBranch(TaxonNode taxonNode, Rank baseRank, List<String> propertyPaths) {
-        return defaultClassificationService.loadTreeBranch(taxonNode, baseRank, propertyPaths);
+        return defaultService.loadTreeBranch(taxonNode, baseRank, propertyPaths);
      }
  
      /**
@@ -528,7 +529,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public <S extends Classification> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.list(type, limit, start, orderHints, propertyPaths);
+        return defaultService.list(type, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -541,7 +542,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<TaxonNode> loadTreeBranchToTaxon(Taxon taxon, Classification classification, Rank baseRank, List<String> propertyPaths) {
-        return defaultClassificationService.loadTreeBranchToTaxon(taxon, classification, baseRank, propertyPaths);
+        return defaultService.loadTreeBranchToTaxon(taxon, classification, baseRank, propertyPaths);
      }
  
      /**
@@ -551,7 +552,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<Classification> findByTitle(IIdentifiableEntityServiceConfigurator<Classification> configurator) {
-        return defaultClassificationService.findByTitle(configurator);
+        return defaultService.findByTitle(configurator);
      }
  
      /**
@@ -564,7 +565,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Integer countByTitle(Class<? extends Classification> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
-        return defaultClassificationService.countByTitle(clazz, queryString, matchmode, criteria);
+        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
      }
  
      /**
@@ -574,7 +575,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Classification load(UUID uuid) {
-        return defaultClassificationService.load(uuid);
+        return defaultService.load(uuid);
      }
  
      /**
@@ -585,7 +586,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Classification load(UUID uuid, List<String> propertyPaths) {
-        return defaultClassificationService.load(uuid, propertyPaths);
+        return defaultService.load(uuid, propertyPaths);
      }
  
      /**
@@ -595,7 +596,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Integer countByTitle(IIdentifiableEntityServiceConfigurator<Classification> configurator) {
-        return defaultClassificationService.countByTitle(configurator);
+        return defaultService.countByTitle(configurator);
      }
  
      /**
@@ -605,7 +606,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Classification merge(Classification transientObject) {
-        return defaultClassificationService.merge(transientObject);
+        return defaultService.merge(transientObject);
      }
  
      /**
@@ -622,7 +623,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Classification> listByTitle(Class<? extends Classification> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -636,7 +637,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public <S extends Classification> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -649,7 +650,7 @@ public class TransientClassificationService implements IClassificationService {
      @Deprecated
      @Override
      public List<TaxonNode> loadChildNodesOfTaxonNode(TaxonNode taxonNode, List<String> propertyPaths) {
-        return defaultClassificationService.loadChildNodesOfTaxonNode(taxonNode, propertyPaths);
+        return defaultService.loadChildNodesOfTaxonNode(taxonNode, propertyPaths);
      }
  
      /**
@@ -659,7 +660,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(Classification classification) {
-        return defaultClassificationService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification);
+        return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification);
      }
  
      /**
@@ -677,7 +678,7 @@ public class TransientClassificationService implements IClassificationService {
      @Deprecated
      @Override
      public Map<UUID, List<MediaRepresentation>> getAllMediaForChildNodes(Taxon taxon, Classification taxTree, List<String> propertyPaths, int size, int height, int widthOrDuration, String[] mimeTypes) {
-        return defaultClassificationService.getAllMediaForChildNodes(taxon, taxTree, propertyPaths, size, height, widthOrDuration, mimeTypes);
+        return defaultService.getAllMediaForChildNodes(taxon, taxTree, propertyPaths, size, height, widthOrDuration, mimeTypes);
      }
  
      /**
@@ -687,7 +688,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public UUID refresh(Classification persistentObject) {
-        return defaultClassificationService.refresh(persistentObject);
+        return defaultService.refresh(persistentObject);
      }
  
      /**
@@ -704,7 +705,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Classification> listByReferenceTitle(Class<? extends Classification> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -719,7 +720,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Map<UUID, List<MediaRepresentation>> getAllMediaForChildNodes(TaxonNode taxonNode, List<String> propertyPaths, int size, int height, int widthOrDuration, String[] mimeTypes) {
-        return defaultClassificationService.getAllMediaForChildNodes(taxonNode, propertyPaths, size, height, widthOrDuration, mimeTypes);
+        return defaultService.getAllMediaForChildNodes(taxonNode, propertyPaths, size, height, widthOrDuration, mimeTypes);
      }
  
      /**
@@ -731,7 +732,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Classification> rows(String tableName, int limit, int start) {
-        return defaultClassificationService.rows(tableName, limit, start);
+        return defaultService.rows(tableName, limit, start);
      }
  
      /**
@@ -753,7 +754,7 @@ public class TransientClassificationService implements IClassificationService {
      @Deprecated
      @Override
      public UUID removeTaxonNode(TaxonNode taxonNode) {
-        return defaultClassificationService.removeTaxonNode(taxonNode);
+        return defaultService.removeTaxonNode(taxonNode);
      }
  
      /**
@@ -807,7 +808,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public UUID removeTreeNode(ITaxonTreeNode treeNode) {
-        return defaultClassificationService.removeTreeNode(treeNode);
+        return defaultService.removeTreeNode(treeNode);
      }
  
      /**
@@ -822,7 +823,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<Classification> search(Class<? extends Classification> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -851,7 +852,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<TaxonNode> getAllNodes() {
-        return defaultClassificationService.getAllNodes();
+        return defaultService.getAllNodes();
      }
  
      /**
@@ -861,7 +862,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public UUID update(Classification transientObject) {
-        return defaultClassificationService.update(transientObject);
+        return defaultService.update(transientObject);
      }
  
      /**
@@ -876,7 +877,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public List<Classification> list(Classification example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultClassificationService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
+        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -888,7 +889,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public int deduplicate(Class<? extends Classification> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
-        return defaultClassificationService.deduplicate(clazz, matchStrategy, mergeStrategy);
+        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
      }
  
      /**
@@ -903,7 +904,7 @@ public class TransientClassificationService implements IClassificationService {
       */
      @Override
      public Pager<Classification> findTitleCache(Class<? extends Classification> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
-        return defaultClassificationService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
      }
  
      /* (non-Javadoc)
@@ -912,7 +913,7 @@ public class TransientClassificationService implements IClassificationService {
      @Override
      public List<TaxonNode> listChildNodesOfTaxon(UUID taxonUuid, UUID classificationUuid, Integer pageSize,
              Integer pageIndex, List<String> propertyPaths) {
-        return defaultClassificationService.listChildNodesOfTaxon(taxonUuid, classificationUuid, pageSize, pageIndex, propertyPaths);
+        return defaultService.listChildNodesOfTaxon(taxonUuid, classificationUuid, pageSize, pageIndex, propertyPaths);
      }
  
         @Override
@@ -924,9 +925,12 @@ public class TransientClassificationService implements IClassificationService {
  
         @Override
         public Classification findWithoutFlush(UUID uuid) {
-               return defaultClassificationService.findWithoutFlush(uuid);
+               return defaultService.findWithoutFlush(uuid);
         }
  
-
+       @Override
+       public <S extends Classification> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
+       }
  
  }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java

index b5c5e6f17c3ee42f52776c2a9e08fae9e9523d6f..5a241ae82470b8b76532e5fa05268ca87a28dcca 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
@@ -26,6 +26,7 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato
  import eu.etaxonomy.cdm.api.service.pager.Pager;
  import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
  import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
  import eu.etaxonomy.cdm.model.common.LSID;
@@ -697,5 +698,8 @@ public class TransientCollectionService implements ICollectionService {
          return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
-
+       @Override
+       public <S extends Collection> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
+       }
  }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java

index f80c4cb8aaad702f9f2387f5b4125d2004dd9a19..0a9492765809b5657e2d83cd99665fdd31ca279c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
@@ -67,13 +67,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
   */
  public class TransientDescriptionService implements IDescriptionService {
  
-    private final IDescriptionService defaultDescriptionService;
+    private final IDescriptionService defaultService;
  
      /**
       * @param defaultDescriptionService
       */
      public TransientDescriptionService(IDescriptionService defaultDescriptionService) {
-        this.defaultDescriptionService = defaultDescriptionService;
+        this.defaultService = defaultDescriptionService;
      }
  
      /**
@@ -87,7 +87,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<AuditEventRecord<DescriptionBase>> pageAuditEvents(DescriptionBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultDescriptionService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
+        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
      }
  
      /**
@@ -102,7 +102,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<Annotation> getAnnotations(DescriptionBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -111,7 +111,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public void clear() {
-        defaultDescriptionService.clear();
+        defaultService.clear();
      }
  
      /**
@@ -121,7 +121,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public void lock(DescriptionBase t, LockOptions lockOptions) {
-        defaultDescriptionService.lock(t, lockOptions);
+        defaultService.lock(t, lockOptions);
      }
  
      /**
@@ -132,7 +132,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public void refresh(DescriptionBase t, LockOptions lockOptions, List<String> propertyPaths) {
-        defaultDescriptionService.refresh(t, lockOptions, propertyPaths);
+        defaultService.refresh(t, lockOptions, propertyPaths);
      }
  
      /**
@@ -141,7 +141,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public void updateTitleCache() {
-        defaultDescriptionService.updateTitleCache();
+        defaultService.updateTitleCache();
      }
  
      /**
@@ -151,7 +151,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public AuditEventRecord<DescriptionBase> getNextAuditEvent(DescriptionBase t) {
-        return defaultDescriptionService.getNextAuditEvent(t);
+        return defaultService.getNextAuditEvent(t);
      }
  
      /**
@@ -162,7 +162,7 @@ public class TransientDescriptionService implements IDescriptionService {
      @Deprecated
      @Override
      public TermVocabulary<Feature> getDefaultFeatureVocabulary() {
-        return defaultDescriptionService.getDefaultFeatureVocabulary();
+        return defaultService.getDefaultFeatureVocabulary();
      }
  
      /**
@@ -177,7 +177,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<Marker> getMarkers(DescriptionBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -189,7 +189,7 @@ public class TransientDescriptionService implements IDescriptionService {
      @Deprecated
      @Override
      public TermVocabulary<Feature> getFeatureVocabulary(UUID uuid) {
-        return defaultDescriptionService.getFeatureVocabulary(uuid);
+        return defaultService.getFeatureVocabulary(uuid);
      }
  
      /**
@@ -201,7 +201,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public void updateTitleCache(Class<? extends DescriptionBase> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<DescriptionBase> cacheStrategy, IProgressMonitor monitor) {
-        defaultDescriptionService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
+        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
      }
  
      /**
@@ -211,7 +211,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public AuditEventRecord<DescriptionBase> getPreviousAuditEvent(DescriptionBase t) {
-        return defaultDescriptionService.getPreviousAuditEvent(t);
+        return defaultService.getPreviousAuditEvent(t);
      }
  
      /**
@@ -221,7 +221,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionElementBase getDescriptionElementByUuid(UUID uuid) {
-        return defaultDescriptionService.getDescriptionElementByUuid(uuid);
+        return defaultService.getDescriptionElementByUuid(uuid);
      }
  
      /**
@@ -231,7 +231,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public int count(Class<? extends DescriptionBase> clazz) {
-        return defaultDescriptionService.count(clazz);
+        return defaultService.count(clazz);
      }
  
      /**
@@ -242,7 +242,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionElementBase loadDescriptionElement(UUID uuid, List<String> propertyPaths) {
-        return defaultDescriptionService.loadDescriptionElement(uuid, propertyPaths);
+        return defaultService.loadDescriptionElement(uuid, propertyPaths);
      }
  
      /**
@@ -259,7 +259,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<AuditEventRecord<DescriptionBase>> pageAuditEvents(Class<? extends DescriptionBase> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultDescriptionService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
+        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
      }
  
      /**
@@ -269,7 +269,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionBase find(LSID lsid) {
-        return defaultDescriptionService.find(lsid);
+        return defaultService.find(lsid);
      }
  
      /**
@@ -279,7 +279,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DeleteResult delete(DescriptionBase persistentObject) {
-        return defaultDescriptionService.delete(persistentObject);
+        return defaultService.delete(persistentObject);
      }
  
      /**
@@ -293,7 +293,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<Object[]> groupMarkers(Class<? extends DescriptionBase> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
+        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -303,7 +303,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public boolean exists(UUID uuid) {
-        return defaultDescriptionService.exists(uuid);
+        return defaultService.exists(uuid);
      }
  
      /**
@@ -314,7 +314,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionBase replace(DescriptionBase x, DescriptionBase y) {
-        return defaultDescriptionService.replace(x, y);
+        return defaultService.replace(x, y);
      }
  
      /**
@@ -334,7 +334,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<DescriptionBase> find(Set<UUID> uuidSet) {
-        return defaultDescriptionService.find(uuidSet);
+        return defaultService.find(uuidSet);
      }
  
      /**
@@ -357,7 +357,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<IdentifiableSource> getSources(DescriptionBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.getSources(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -367,7 +367,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public UUID deleteDescriptionElement(DescriptionElementBase descriptionElement) {
-        return defaultDescriptionService.deleteDescriptionElement(descriptionElement);
+        return defaultService.deleteDescriptionElement(descriptionElement);
      }
  
      /**
@@ -377,7 +377,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionBase find(UUID uuid) {
-        return defaultDescriptionService.find(uuid);
+        return defaultService.find(uuid);
      }
  
      /**
@@ -394,7 +394,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<DescriptionBase> page(Class<? extends DescriptionBase> type, Boolean hasMedia, Boolean hasText, Set<Feature> feature, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.page(type, hasMedia, hasText, feature, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.page(type, hasMedia, hasText, feature, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -404,7 +404,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionBase find(int id) {
-        return defaultDescriptionService.find(id);
+        return defaultService.find(id);
      }
  
      /**
@@ -417,7 +417,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<Rights> getRights(DescriptionBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.getRights(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -428,7 +428,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public int countMarkers(Class<? extends DescriptionBase> clazz, Boolean technical) {
-        return defaultDescriptionService.countMarkers(clazz, technical);
+        return defaultService.countMarkers(clazz, technical);
      }
  
      /**
@@ -438,7 +438,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<DescriptionBase> findById(Set<Integer> idSet) {
-        return defaultDescriptionService.findById(idSet);
+        return defaultService.findById(idSet);
      }
  
      /**
@@ -450,7 +450,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
-        return defaultDescriptionService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
+        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
      }
  
      /**
@@ -459,7 +459,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Session getSession() {
-        return defaultDescriptionService.getSession();
+        return defaultService.getSession();
      }
  
      /**
@@ -468,7 +468,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<UuidAndTitleCache<DescriptionBase>> getUuidAndTitleCache() {
-        return defaultDescriptionService.getUuidAndTitleCache();
+        return defaultService.getUuidAndTitleCache();
      }
  
      /**
@@ -482,7 +482,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<Object[]> group(Class<? extends DescriptionBase> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
-        return defaultDescriptionService.group(clazz, limit, start, groups, propertyPaths);
+        return defaultService.group(clazz, limit, start, groups, propertyPaths);
      }
  
      /**
@@ -495,7 +495,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public int count(Class<? extends DescriptionBase> type, Boolean hasImages, Boolean hasText, Set<Feature> feature) {
-        return defaultDescriptionService.count(type, hasImages, hasText, feature);
+        return defaultService.count(type, hasImages, hasText, feature);
      }
  
      /**
@@ -512,7 +512,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<DescriptionBase> findByTitle(Class<? extends DescriptionBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -526,7 +526,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public <S extends DescriptionBase> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.list(type, limit, start, orderHints, propertyPaths);
+        return defaultService.list(type, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -543,7 +543,7 @@ public class TransientDescriptionService implements IDescriptionService {
      @Deprecated
      @Override
      public Pager<DescriptionElementBase> getDescriptionElements(DescriptionBase description, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.getDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths);
+        return defaultService.getDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -553,7 +553,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<DescriptionBase> findByTitle(IIdentifiableEntityServiceConfigurator<DescriptionBase> configurator) {
-        return defaultDescriptionService.findByTitle(configurator);
+        return defaultService.findByTitle(configurator);
      }
  
      /**
@@ -566,7 +566,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Integer countByTitle(Class<? extends DescriptionBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
-        return defaultDescriptionService.countByTitle(clazz, queryString, matchmode, criteria);
+        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
      }
  
      /**
@@ -576,7 +576,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionBase load(UUID uuid) {
-        return defaultDescriptionService.load(uuid);
+        return defaultService.load(uuid);
      }
  
      /**
@@ -587,7 +587,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionBase load(UUID uuid, List<String> propertyPaths) {
-        return defaultDescriptionService.load(uuid, propertyPaths);
+        return defaultService.load(uuid, propertyPaths);
      }
  
      /**
@@ -597,7 +597,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Integer countByTitle(IIdentifiableEntityServiceConfigurator<DescriptionBase> configurator) {
-        return defaultDescriptionService.countByTitle(configurator);
+        return defaultService.countByTitle(configurator);
      }
  
      /**
@@ -607,7 +607,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DescriptionBase merge(DescriptionBase transientObject) {
-        return defaultDescriptionService.merge(transientObject);
+        return defaultService.merge(transientObject);
      }
  
      /**
@@ -623,7 +623,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<DescriptionElementBase> pageDescriptionElements(DescriptionBase description, Class<? extends DescriptionBase> descriptionType, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.pageDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths);
+        return defaultService.pageDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -640,7 +640,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<DescriptionBase> listByTitle(Class<? extends DescriptionBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -654,7 +654,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public <S extends DescriptionBase> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -664,7 +664,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public UUID refresh(DescriptionBase persistentObject) {
-        return defaultDescriptionService.refresh(persistentObject);
+        return defaultService.refresh(persistentObject);
      }
  
      /**
@@ -681,7 +681,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<DescriptionBase> listByReferenceTitle(Class<? extends DescriptionBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -698,7 +698,7 @@ public class TransientDescriptionService implements IDescriptionService {
      @Deprecated
      @Override
      public List<DescriptionElementBase> listDescriptionElements(DescriptionBase description, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.listDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths);
+        return defaultService.listDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -710,7 +710,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<DescriptionBase> rows(String tableName, int limit, int start) {
-        return defaultDescriptionService.rows(tableName, limit, start);
+        return defaultService.rows(tableName, limit, start);
      }
  
      /**
@@ -755,7 +755,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<DescriptionBase> search(Class<? extends DescriptionBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -775,7 +775,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public UUID update(DescriptionBase transientObject) {
-        return defaultDescriptionService.update(transientObject);
+        return defaultService.update(transientObject);
      }
  
      /**
@@ -791,7 +791,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<DescriptionElementBase> listDescriptionElements(DescriptionBase description, Class<? extends DescriptionBase> descriptionType, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.listDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths);
+        return defaultService.listDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -806,7 +806,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<DescriptionBase> list(DescriptionBase example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
+        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -818,7 +818,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public int deduplicate(Class<? extends DescriptionBase> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
-        return defaultDescriptionService.deduplicate(clazz, matchStrategy, mergeStrategy);
+        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
      }
  
      /**
@@ -833,7 +833,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<Annotation> getDescriptionElementAnnotations(DescriptionElementBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.getDescriptionElementAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getDescriptionElementAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -848,7 +848,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<DescriptionBase> findTitleCache(Class<? extends DescriptionBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
-        return defaultDescriptionService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
      }
  
      /**
@@ -863,7 +863,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<TaxonDescription> pageTaxonDescriptions(Taxon taxon, Set<DefinedTerm> scopes, Set<NamedArea> geographicalScope, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.pageTaxonDescriptions(taxon, scopes, geographicalScope, pageSize, pageNumber, propertyPaths);
+        return defaultService.pageTaxonDescriptions(taxon, scopes, geographicalScope, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -879,7 +879,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<TaxonDescription> pageTaxonDescriptions(Taxon taxon, Set<DefinedTerm> scopes, Set<NamedArea> geographicalScope, Set<MarkerType> markerTypes, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.pageTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths);
+        return defaultService.pageTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -894,7 +894,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<TaxonDescription> listTaxonDescriptions(Taxon taxon, Set<DefinedTerm> scopes, Set<NamedArea> geographicalScope, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.listTaxonDescriptions(taxon, scopes, geographicalScope, pageSize, pageNumber, propertyPaths);
+        return defaultService.listTaxonDescriptions(taxon, scopes, geographicalScope, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -910,7 +910,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<TaxonDescription> listTaxonDescriptions(Taxon taxon, Set<DefinedTerm> scopes, Set<NamedArea> geographicalScope, Set<MarkerType> markerTypes, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.listTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths);
+        return defaultService.listTaxonDescriptions(taxon, scopes, geographicalScope, markerTypes, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -925,7 +925,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public List<Media> listTaxonDescriptionMedia(UUID taxonUuid, boolean limitToGalleries, Set<MarkerType> markerTypes, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.listTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes, pageSize, pageNumber, propertyPaths);
+        return defaultService.listTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -937,7 +937,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public int countTaxonDescriptionMedia(UUID taxonUuid, boolean limitToGalleries, Set<MarkerType> markerTypes) {
-        return defaultDescriptionService.countTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes);
+        return defaultService.countTaxonDescriptionMedia(taxonUuid, limitToGalleries, markerTypes);
      }
  
      /**
@@ -950,7 +950,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<TaxonNameDescription> getTaxonNameDescriptions(TaxonNameBase name, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.getTaxonNameDescriptions(name, pageSize, pageNumber, propertyPaths);
+        return defaultService.getTaxonNameDescriptions(name, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -965,7 +965,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<TaxonDescription> searchDescriptionByDistribution(Set<NamedArea> namedAreas, PresenceAbsenceTerm presence, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.searchDescriptionByDistribution(namedAreas, presence, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.searchDescriptionByDistribution(namedAreas, presence, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -980,7 +980,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<DescriptionElementBase> searchElements(Class<? extends DescriptionElementBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultDescriptionService.searchElements(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.searchElements(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -993,7 +993,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<Media> getMedia(DescriptionElementBase descriptionElement, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.getMedia(descriptionElement, pageSize, pageNumber, propertyPaths);
+        return defaultService.getMedia(descriptionElement, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -1010,7 +1010,7 @@ public class TransientDescriptionService implements IDescriptionService {
      @Deprecated
      @Override
      public <T extends DescriptionElementBase> List<T> getDescriptionElementsForTaxon(Taxon taxon, Set<Feature> features, Class<T> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.getDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
+        return defaultService.getDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -1025,7 +1025,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public <T extends DescriptionElementBase> List<T> listDescriptionElementsForTaxon(Taxon taxon, Set<Feature> features, Class<T> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.listDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
+        return defaultService.listDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -1040,7 +1040,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public <T extends DescriptionElementBase> Pager<T> pageDescriptionElementsForTaxon(Taxon taxon, Set<Feature> features, Class<T> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.pageDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
+        return defaultService.pageDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -1053,7 +1053,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public String generateNaturalLanguageDescription(FeatureTree featureTree, TaxonDescription description, List<Language> preferredLanguages, String separator) {
-        return defaultDescriptionService.generateNaturalLanguageDescription(featureTree, description, preferredLanguages, separator);
+        return defaultService.generateNaturalLanguageDescription(featureTree, description, preferredLanguages, separator);
      }
  
      /**
@@ -1065,7 +1065,7 @@ public class TransientDescriptionService implements IDescriptionService {
      @Deprecated
      @Override
      public boolean hasStructuredData(DescriptionBase<?> description) {
-        return defaultDescriptionService.hasStructuredData(description);
+        return defaultService.hasStructuredData(description);
      }
  
      /**
@@ -1076,7 +1076,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public void moveDescriptionElementsToDescription(Collection<DescriptionElementBase> descriptionElements, DescriptionBase targetDescription, boolean isPaste) {
-        defaultDescriptionService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste);
+        defaultService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste);
      }
  
      /* (non-Javadoc)
@@ -1084,7 +1084,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public Pager<NamedArea> pageNamedAreasInUse(Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultDescriptionService.pageNamedAreasInUse(pageSize, pageNumber, propertyPaths);
+        return defaultService.pageNamedAreasInUse(pageSize, pageNumber, propertyPaths);
      }
  
      /* (non-Javadoc)
@@ -1092,7 +1092,7 @@ public class TransientDescriptionService implements IDescriptionService {
       */
      @Override
      public DistributionTree getOrderedDistributions(Set<TaxonDescription> taxonDescriptions, boolean subAreaPreference, boolean statusOrderPreference, Set<MarkerType> hideMarkedAreas, Set<NamedAreaLevel> omitLevels, List<String> propertyPaths) {
-        return defaultDescriptionService.getOrderedDistributions(taxonDescriptions, subAreaPreference, statusOrderPreference, hideMarkedAreas, omitLevels, propertyPaths);
+        return defaultService.getOrderedDistributions(taxonDescriptions, subAreaPreference, statusOrderPreference, hideMarkedAreas, omitLevels, propertyPaths);
      }
  
         @Override
@@ -1104,7 +1104,11 @@ public class TransientDescriptionService implements IDescriptionService {
  
         @Override
         public DescriptionBase findWithoutFlush(UUID uuid) {
-               return defaultDescriptionService.findWithoutFlush(uuid);
+               return defaultService.findWithoutFlush(uuid);
+       }
+       
+       @Override
+       public <S extends DescriptionBase> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
         }
-
  }
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 c676f03eeaf230290942e6a2bde124865611b488..ad053c68491f34bcc95c6f2348bc2b475659ec0f 100644 (file)
--- 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
@@ -35,6 +35,7 @@ import eu.etaxonomy.cdm.api.service.search.SearchResult;
  import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
  import eu.etaxonomy.cdm.model.common.Annotation;
  import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
  import eu.etaxonomy.cdm.model.common.LSID;
@@ -75,13 +76,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
   */
  public class TransientNameService implements INameService {
  
-    private INameService defaultNameService;
+    private INameService defaultService;
  
      /**
       *
       */
      public TransientNameService(INameService defaultNameService) {
-        this.defaultNameService = defaultNameService;
+        this.defaultService = defaultNameService;
      }
  
      /**
@@ -95,7 +96,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<AuditEventRecord<TaxonNameBase>> pageAuditEvents(TaxonNameBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultNameService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
+        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
      }
  
      /**
@@ -110,7 +111,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<Annotation> getAnnotations(TaxonNameBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -119,7 +120,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public void clear() {
-        defaultNameService.clear();
+        defaultService.clear();
      }
  
      /**
@@ -129,7 +130,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public void lock(TaxonNameBase t, LockOptions lockOptions) {
-        defaultNameService.lock(t, lockOptions);
+        defaultService.lock(t, lockOptions);
      }
  
      /**
@@ -140,7 +141,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public void refresh(TaxonNameBase t, LockOptions lockOptions, List<String> propertyPaths) {
-        defaultNameService.refresh(t, lockOptions, propertyPaths);
+        defaultService.refresh(t, lockOptions, propertyPaths);
      }
  
      /**
@@ -149,7 +150,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public void updateTitleCache() {
-        defaultNameService.updateTitleCache();
+        defaultService.updateTitleCache();
      }
  
      /**
@@ -159,7 +160,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public AuditEventRecord<TaxonNameBase> getNextAuditEvent(TaxonNameBase t) {
-        return defaultNameService.getNextAuditEvent(t);
+        return defaultService.getNextAuditEvent(t);
      }
  
      /**
@@ -174,7 +175,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<Marker> getMarkers(TaxonNameBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -186,7 +187,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public void updateTitleCache(Class<? extends TaxonNameBase> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<TaxonNameBase> cacheStrategy, IProgressMonitor monitor) {
-        defaultNameService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
+        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
      }
  
      /**
@@ -196,7 +197,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public AuditEventRecord<TaxonNameBase> getPreviousAuditEvent(TaxonNameBase t) {
-        return defaultNameService.getPreviousAuditEvent(t);
+        return defaultService.getPreviousAuditEvent(t);
      }
  
      /**
@@ -206,7 +207,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public int count(Class<? extends TaxonNameBase> clazz) {
-        return defaultNameService.count(clazz);
+        return defaultService.count(clazz);
      }
  
      /**
@@ -218,7 +219,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public DeleteResult delete(TaxonNameBase name, NameDeletionConfigurator config)  {
-        return defaultNameService.delete(name, config);
+        return defaultService.delete(name, config);
      }
  
      /**
@@ -235,7 +236,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<AuditEventRecord<TaxonNameBase>> pageAuditEvents(Class<? extends TaxonNameBase> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultNameService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
+        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
      }
  
      /**
@@ -245,7 +246,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public TaxonNameBase find(LSID lsid) {
-        return defaultNameService.find(lsid);
+        return defaultService.find(lsid);
      }
  
      /**
@@ -255,7 +256,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public DeleteResult delete(TaxonNameBase persistentObject) {
-        return defaultNameService.delete(persistentObject);
+        return defaultService.delete(persistentObject);
      }
  
      /**
@@ -269,7 +270,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<Object[]> groupMarkers(Class<? extends TaxonNameBase> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultNameService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
+        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -279,7 +280,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public boolean exists(UUID uuid) {
-        return defaultNameService.exists(uuid);
+        return defaultService.exists(uuid);
      }
  
      /**
@@ -289,7 +290,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public void deleteTypeDesignation(TaxonNameBase name, TypeDesignationBase typeDesignation) {
-        defaultNameService.deleteTypeDesignation(name, typeDesignation);
+        defaultService.deleteTypeDesignation(name, typeDesignation);
      }
  
      /**
@@ -300,7 +301,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public TaxonNameBase replace(TaxonNameBase x, TaxonNameBase y) {
-        return defaultNameService.replace(x, y);
+        return defaultService.replace(x, y);
      }
  
      /**
@@ -310,7 +311,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TaxonNameBase> find(Set<UUID> uuidSet) {
-        return defaultNameService.find(uuidSet);
+        return defaultService.find(uuidSet);
      }
  
      /**
@@ -323,7 +324,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<IdentifiableSource> getSources(TaxonNameBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultNameService.getSources(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -343,7 +344,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public TaxonNameBase find(UUID uuid) {
-        return defaultNameService.find(uuid);
+        return defaultService.find(uuid);
      }
  
      /**
@@ -373,7 +374,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public TaxonNameBase find(int id) {
-        return defaultNameService.find(id);
+        return defaultService.find(id);
      }
  
      /**
@@ -386,7 +387,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<Rights> getRights(TaxonNameBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultNameService.getRights(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -397,7 +398,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public int countMarkers(Class<? extends TaxonNameBase> clazz, Boolean technical) {
-        return defaultNameService.countMarkers(clazz, technical);
+        return defaultService.countMarkers(clazz, technical);
      }
  
      /**
@@ -408,7 +409,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<NomenclaturalStatus> getAllNomenclaturalStatus(int limit, int start) {
-        return defaultNameService.getAllNomenclaturalStatus(limit, start);
+        return defaultService.getAllNomenclaturalStatus(limit, start);
      }
  
      /**
@@ -419,7 +420,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TypeDesignationBase> getAllTypeDesignations(int limit, int start) {
-        return defaultNameService.getAllTypeDesignations(limit, start);
+        return defaultService.getAllTypeDesignations(limit, start);
      }
  
      /**
@@ -429,7 +430,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TaxonNameBase> findById(Set<Integer> idSet) {
-        return defaultNameService.findById(idSet);
+        return defaultService.findById(idSet);
      }
  
      /**
@@ -439,7 +440,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TaxonNameBase> getNamesByName(String name) {
-        return defaultNameService.getNamesByName(name);
+        return defaultService.getNamesByName(name);
      }
  
      /**
@@ -449,7 +450,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<NonViralName> getNamesByNameCache(String nameCache) {
-        return defaultNameService.getNamesByNameCache(nameCache);
+        return defaultService.getNamesByNameCache(nameCache);
      }
  
      /**
@@ -461,7 +462,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
-        return defaultNameService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
+        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
      }
  
      /**
@@ -470,7 +471,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Session getSession() {
-        return defaultNameService.getSession();
+        return defaultService.getSession();
      }
  
      /**
@@ -479,7 +480,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<UuidAndTitleCache<TaxonNameBase>> getUuidAndTitleCache() {
-        return defaultNameService.getUuidAndTitleCache();
+        return defaultService.getUuidAndTitleCache();
      }
  
      /**
@@ -493,7 +494,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<Object[]> group(Class<? extends TaxonNameBase> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
-        return defaultNameService.group(clazz, limit, start, groups, propertyPaths);
+        return defaultService.group(clazz, limit, start, groups, propertyPaths);
      }
  
      /**
@@ -505,7 +506,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<NonViralName> findNamesByTitleCache(String titleCache, MatchMode matchMode, List<String> propertyPaths) {
-        return defaultNameService.findNamesByTitleCache(titleCache, matchMode, propertyPaths);
+        return defaultService.findNamesByTitleCache(titleCache, matchMode, propertyPaths);
      }
  
      /**
@@ -517,7 +518,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<NonViralName> findNamesByNameCache(String nameCache, MatchMode matchMode, List<String> propertyPaths) {
-        return defaultNameService.findNamesByNameCache(nameCache, matchMode, propertyPaths);
+        return defaultService.findNamesByNameCache(nameCache, matchMode, propertyPaths);
      }
  
      /**
@@ -534,7 +535,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<TaxonNameBase> findByTitle(Class<? extends TaxonNameBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -545,7 +546,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public NonViralName findNameByUuid(UUID uuid, List<String> propertyPaths) {
-        return defaultNameService.findNameByUuid(uuid, propertyPaths);
+        return defaultService.findNameByUuid(uuid, propertyPaths);
      }
  
      /**
@@ -556,7 +557,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List getNamesByName(String name, CdmBase sessionObject) {
-        return defaultNameService.getNamesByName(name, sessionObject);
+        return defaultService.getNamesByName(name, sessionObject);
      }
  
      /**
@@ -574,7 +575,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<SearchResult<TaxonNameBase>> findByNameFuzzySearch(String name, float accuracy, List<Language> languages, boolean highlightFragments, List<String> propertyPaths, int maxNoOfResults) throws CorruptIndexException, IOException, ParseException {
-        return defaultNameService.findByNameFuzzySearch(name, accuracy, languages, highlightFragments, propertyPaths, maxNoOfResults);
+        return defaultService.findByNameFuzzySearch(name, accuracy, languages, highlightFragments, propertyPaths, maxNoOfResults);
      }
  
      /**
@@ -588,7 +589,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public <S extends TaxonNameBase> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.list(type, limit, start, orderHints, propertyPaths);
+        return defaultService.list(type, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -598,7 +599,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<TaxonNameBase> findByTitle(IIdentifiableEntityServiceConfigurator<TaxonNameBase> configurator) {
-        return defaultNameService.findByTitle(configurator);
+        return defaultService.findByTitle(configurator);
      }
  
      /**
@@ -611,7 +612,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Integer countByTitle(Class<? extends TaxonNameBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
-        return defaultNameService.countByTitle(clazz, queryString, matchmode, criteria);
+        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
      }
  
      /**
@@ -621,7 +622,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public TaxonNameBase load(UUID uuid) {
-        return defaultNameService.load(uuid);
+        return defaultService.load(uuid);
      }
  
      /**
@@ -638,7 +639,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<DocumentSearchResult> findByNameFuzzySearch(String name, float accuracy, List<Language> languages, boolean highlightFragments, int maxNoOfResults) throws CorruptIndexException, IOException, ParseException {
-        return defaultNameService.findByNameFuzzySearch(name, accuracy, languages, highlightFragments, maxNoOfResults);
+        return defaultService.findByNameFuzzySearch(name, accuracy, languages, highlightFragments, maxNoOfResults);
      }
  
      /**
@@ -649,7 +650,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public TaxonNameBase load(UUID uuid, List<String> propertyPaths) {
-        return defaultNameService.load(uuid, propertyPaths);
+        return defaultService.load(uuid, propertyPaths);
      }
  
      /**
@@ -659,7 +660,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Integer countByTitle(IIdentifiableEntityServiceConfigurator<TaxonNameBase> configurator) {
-        return defaultNameService.countByTitle(configurator);
+        return defaultService.countByTitle(configurator);
      }
  
      /**
@@ -669,7 +670,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public TaxonNameBase merge(TaxonNameBase transientObject) {
-        return defaultNameService.merge(transientObject);
+        return defaultService.merge(transientObject);
      }
  
      /**
@@ -686,7 +687,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TaxonNameBase> listByTitle(Class<? extends TaxonNameBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -700,7 +701,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public <S extends TaxonNameBase> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -717,7 +718,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<DocumentSearchResult> findByFuzzyNameCacheSearch(String name, float accuracy, List<Language> languages, boolean highlightFragments, int maxNoOfResults) throws CorruptIndexException, IOException, ParseException {
-        return defaultNameService.findByFuzzyNameCacheSearch(name, accuracy, languages, highlightFragments, maxNoOfResults);
+        return defaultService.findByFuzzyNameCacheSearch(name, accuracy, languages, highlightFragments, maxNoOfResults);
      }
  
      /**
@@ -734,7 +735,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<DocumentSearchResult> findByNameExactSearch(String name, boolean wildcard, List<Language> languages, boolean highlightFragments, int maxNoOfResults) throws CorruptIndexException, IOException, ParseException {
-        return defaultNameService.findByNameExactSearch(name, wildcard, languages, highlightFragments, maxNoOfResults);
+        return defaultService.findByNameExactSearch(name, wildcard, languages, highlightFragments, maxNoOfResults);
      }
  
      /**
@@ -744,7 +745,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public UUID refresh(TaxonNameBase persistentObject) {
-        return defaultNameService.refresh(persistentObject);
+        return defaultService.refresh(persistentObject);
      }
  
      /**
@@ -761,7 +762,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TaxonNameBase> listByReferenceTitle(Class<? extends TaxonNameBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -773,7 +774,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TaxonNameBase> rows(String tableName, int limit, int start) {
-        return defaultNameService.rows(tableName, limit, start);
+        return defaultService.rows(tableName, limit, start);
      }
  
      /**
@@ -803,7 +804,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List findNamesByTitle(String title) {
-        return defaultNameService.findNamesByTitle(title);
+        return defaultService.findNamesByTitle(title);
      }
  
      /**
@@ -814,7 +815,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List findNamesByTitle(String title, CdmBase sessionObject) {
-        return defaultNameService.findNamesByTitle(title, sessionObject);
+        return defaultService.findNamesByTitle(title, sessionObject);
      }
  
      /**
@@ -835,7 +836,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<HomotypicalGroup> getAllHomotypicalGroups(int limit, int start) {
-        return defaultNameService.getAllHomotypicalGroups(limit, start);
+        return defaultService.getAllHomotypicalGroups(limit, start);
      }
  
      /**
@@ -848,7 +849,7 @@ public class TransientNameService implements INameService {
      @Deprecated
      @Override
      public List<RelationshipBase> getAllRelationships(int limit, int start) {
-        return defaultNameService.getAllRelationships(limit, start);
+        return defaultService.getAllRelationships(limit, start);
      }
  
      /**
@@ -868,7 +869,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public UUID update(TaxonNameBase transientObject) {
-        return defaultNameService.update(transientObject);
+        return defaultService.update(transientObject);
      }
  
      /**
@@ -883,7 +884,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TaxonNameBase> list(TaxonNameBase example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
+        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -895,7 +896,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public int deduplicate(Class<? extends TaxonNameBase> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
-        return defaultNameService.deduplicate(clazz, matchStrategy, mergeStrategy);
+        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
      }
  
      /**
@@ -911,7 +912,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<NameRelationship> listNameRelationships(TaxonNameBase name, Direction direction, NameRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.listNameRelationships(name, direction, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listNameRelationships(name, direction, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -926,7 +927,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<TaxonNameBase> findTitleCache(Class<? extends TaxonNameBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
-        return defaultNameService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
      }
  
      /**
@@ -942,7 +943,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<NameRelationship> pageNameRelationships(TaxonNameBase name, Direction direction, NameRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.pageNameRelationships(name, direction, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.pageNameRelationships(name, direction, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -959,7 +960,7 @@ public class TransientNameService implements INameService {
      @Deprecated
      @Override
      public List<NameRelationship> listFromNameRelationships(TaxonNameBase name, NameRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.listFromNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listFromNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -976,7 +977,7 @@ public class TransientNameService implements INameService {
      @Deprecated
      @Override
      public Pager<NameRelationship> pageFromNameRelationships(TaxonNameBase name, NameRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.pageFromNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.pageFromNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -993,7 +994,7 @@ public class TransientNameService implements INameService {
      @Deprecated
      @Override
      public List<NameRelationship> listToNameRelationships(TaxonNameBase name, NameRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.listToNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listToNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1010,7 +1011,7 @@ public class TransientNameService implements INameService {
      @Deprecated
      @Override
      public Pager<NameRelationship> pageToNameRelationships(TaxonNameBase name, NameRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.pageToNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.pageToNameRelationships(name, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1025,7 +1026,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<HybridRelationship> getHybridNames(NonViralName name, HybridRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.getHybridNames(name, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getHybridNames(name, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1038,7 +1039,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber) {
-        return defaultNameService.getTypeDesignations(name, status, pageSize, pageNumber);
+        return defaultService.getTypeDesignations(name, status, pageSize, pageNumber);
      }
  
      /**
@@ -1052,7 +1053,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<TypeDesignationBase> getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultNameService.getTypeDesignations(name, status, pageSize, pageNumber, propertyPaths);
+        return defaultService.getTypeDesignations(name, status, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -1070,7 +1071,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<TaxonNameBase> searchNames(String uninomial, String infraGenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.searchNames(uninomial, infraGenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.searchNames(uninomial, infraGenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1085,7 +1086,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<TaxonNameBase> search(Class<? extends TaxonNameBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1094,7 +1095,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<UuidAndTitleCache> getUuidAndTitleCacheOfNames() {
-        return defaultNameService.getUuidAndTitleCacheOfNames();
+        return defaultService.getUuidAndTitleCacheOfNames();
      }
  
      /**
@@ -1111,7 +1112,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public Pager<TaxonNameBase> findByName(Class<? extends TaxonNameBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultNameService.findByName(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByName(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1121,7 +1122,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public HomotypicalGroup findHomotypicalGroup(UUID uuid) {
-        return defaultNameService.findHomotypicalGroup(uuid);
+        return defaultService.findHomotypicalGroup(uuid);
      }
  
      /**
@@ -1131,7 +1132,7 @@ public class TransientNameService implements INameService {
       */
      @Override
      public List<TaggedText> getTaggedName(UUID uuid) {
-        return defaultNameService.getTaggedName(uuid);
+        return defaultService.getTaggedName(uuid);
      }
  
         @Override
@@ -1143,7 +1144,12 @@ public class TransientNameService implements INameService {
  
         @Override
         public TaxonNameBase findWithoutFlush(UUID uuid) {
-               return defaultNameService.findWithoutFlush(uuid);
+               return defaultService.findWithoutFlush(uuid);
+       }
+       
+       @Override
+       public <S extends TaxonNameBase> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
         }
  
  
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 655dde9e5b9adf4a7c320e43a8e770276ac79306..2aa6a49b2180e4033b0f1867e4755a58099ad872 100644 (file)
--- 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
@@ -38,6 +38,8 @@ import eu.etaxonomy.cdm.api.service.search.SearchResult;
  import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
  import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
  import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
  import eu.etaxonomy.cdm.model.common.ICdmBase;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
@@ -949,7 +951,7 @@ public class TransientOccurenceService implements IOccurrenceService {
       * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#deleteDerivateHierarchy(eu.etaxonomy.cdm.model.common.ICdmBase)
       */
      @Override
-    public DeleteResult deleteDerivateHierarchy(ICdmBase from, SpecimenDeleteConfigurator config) {
+    public DeleteResult deleteDerivateHierarchy(CdmBase from, SpecimenDeleteConfigurator config) {
          return defaultService.deleteDerivateHierarchy(from, config);
      }
  
@@ -988,5 +990,10 @@ public class TransientOccurenceService implements IOccurrenceService {
              List<String> propertyPaths) {
          return defaultService.listDescriptionsWithDescriptionSpecimen(specimen, limit, start, orderHints, propertyPaths);
      }
+    
+       @Override
+       public <S extends SpecimenOrObservationBase> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
+       }
  
  }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java

index 9a8602bcdc16a5ca552f92e7a36df91ed869684e..4e43da1a5bc10aa2abe29ae9ef35b8ed3a502b8b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
@@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato
  import eu.etaxonomy.cdm.api.service.pager.Pager;
  import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
  import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
  import eu.etaxonomy.cdm.model.common.LSID;
@@ -53,13 +54,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
   */
  public class TransientReferenceService implements IReferenceService {
  
-    private IReferenceService defaultReferenceService;
+    private IReferenceService defaultService;
  
      /**
       * @param defaultReferenceService
       */
      public TransientReferenceService(IReferenceService defaultReferenceService) {
-        this.defaultReferenceService = defaultReferenceService;
+        this.defaultService = defaultReferenceService;
      }
  
      /**
@@ -74,7 +75,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<Reference> search(Class<? extends Reference> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -88,7 +89,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<AuditEventRecord<Reference>> pageAuditEvents(Reference t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultReferenceService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
+        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
      }
  
      /**
@@ -103,7 +104,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<Annotation> getAnnotations(Reference annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -112,7 +113,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public void clear() {
-        defaultReferenceService.clear();
+        defaultService.clear();
      }
  
      /**
@@ -122,7 +123,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public void lock(Reference t, LockOptions lockOptions) {
-        defaultReferenceService.lock(t, lockOptions);
+        defaultService.lock(t, lockOptions);
      }
  
      /**
@@ -133,7 +134,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public void refresh(Reference t, LockOptions lockOptions, List<String> propertyPaths) {
-        defaultReferenceService.refresh(t, lockOptions, propertyPaths);
+        defaultService.refresh(t, lockOptions, propertyPaths);
      }
  
      /**
@@ -142,7 +143,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public void updateTitleCache() {
-        defaultReferenceService.updateTitleCache();
+        defaultService.updateTitleCache();
      }
  
      /**
@@ -152,7 +153,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public AuditEventRecord<Reference> getNextAuditEvent(Reference t) {
-        return defaultReferenceService.getNextAuditEvent(t);
+        return defaultService.getNextAuditEvent(t);
      }
  
      /**
@@ -167,7 +168,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<Marker> getMarkers(Reference annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -176,7 +177,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<UuidAndTitleCache<Reference>> getUuidAndTitle() {
-        return defaultReferenceService.getUuidAndTitle();
+        return defaultService.getUuidAndTitle();
      }
  
      /**
@@ -188,7 +189,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public void updateTitleCache(Class<? extends Reference> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<Reference> cacheStrategy, IProgressMonitor monitor) {
-        defaultReferenceService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
+        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
      }
  
      /**
@@ -198,7 +199,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public AuditEventRecord<Reference> getPreviousAuditEvent(Reference t) {
-        return defaultReferenceService.getPreviousAuditEvent(t);
+        return defaultService.getPreviousAuditEvent(t);
      }
  
      /**
@@ -207,7 +208,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Reference> getAllReferencesForPublishing() {
-        return defaultReferenceService.getAllReferencesForPublishing();
+        return defaultService.getAllReferencesForPublishing();
      }
  
      /**
@@ -217,7 +218,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public int count(Class<? extends Reference> clazz) {
-        return defaultReferenceService.count(clazz);
+        return defaultService.count(clazz);
      }
  
      /**
@@ -226,7 +227,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Reference> getAllNomenclaturalReferences() {
-        return defaultReferenceService.getAllNomenclaturalReferences();
+        return defaultService.getAllNomenclaturalReferences();
      }
  
      /**
@@ -238,7 +239,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<TaxonBase> listCoveredTaxa(Reference reference, boolean includeSubordinateReferences, List<String> propertyPaths) {
-        return defaultReferenceService.listCoveredTaxa(reference, includeSubordinateReferences, propertyPaths);
+        return defaultService.listCoveredTaxa(reference, includeSubordinateReferences, propertyPaths);
      }
  
      /**
@@ -255,7 +256,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<AuditEventRecord<Reference>> pageAuditEvents(Class<? extends Reference> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultReferenceService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
+        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
      }
  
      /**
@@ -265,7 +266,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Reference find(LSID lsid) {
-        return defaultReferenceService.find(lsid);
+        return defaultService.find(lsid);
      }
  
      /**
@@ -275,7 +276,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public DeleteResult delete(Reference persistentObject) {
-        return defaultReferenceService.delete(persistentObject);
+        return defaultService.delete(persistentObject);
      }
  
      /**
@@ -289,7 +290,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Object[]> groupMarkers(Class<? extends Reference> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultReferenceService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
+        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -299,7 +300,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public boolean exists(UUID uuid) {
-        return defaultReferenceService.exists(uuid);
+        return defaultService.exists(uuid);
      }
  
      /**
@@ -310,7 +311,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Reference replace(Reference x, Reference y) {
-        return defaultReferenceService.replace(x, y);
+        return defaultService.replace(x, y);
      }
  
      /**
@@ -320,7 +321,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Reference> find(Set<UUID> uuidSet) {
-        return defaultReferenceService.find(uuidSet);
+        return defaultService.find(uuidSet);
      }
  
      /**
@@ -333,7 +334,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<IdentifiableSource> getSources(Reference t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultReferenceService.getSources(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -343,7 +344,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Reference find(UUID uuid) {
-        return defaultReferenceService.find(uuid);
+        return defaultService.find(uuid);
      }
  
      /**
@@ -353,7 +354,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Reference find(int id) {
-        return defaultReferenceService.find(id);
+        return defaultService.find(id);
      }
  
      /**
@@ -366,7 +367,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<Rights> getRights(Reference t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultReferenceService.getRights(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -377,7 +378,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public int countMarkers(Class<? extends Reference> clazz, Boolean technical) {
-        return defaultReferenceService.countMarkers(clazz, technical);
+        return defaultService.countMarkers(clazz, technical);
      }
  
      /**
@@ -387,7 +388,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Reference> findById(Set<Integer> idSet) {
-        return defaultReferenceService.findById(idSet);
+        return defaultService.findById(idSet);
      }
  
      /**
@@ -399,7 +400,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
-        return defaultReferenceService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
+        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
      }
  
      /**
@@ -408,7 +409,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Session getSession() {
-        return defaultReferenceService.getSession();
+        return defaultService.getSession();
      }
  
      /**
@@ -417,7 +418,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<UuidAndTitleCache<Reference>> getUuidAndTitleCache() {
-        return defaultReferenceService.getUuidAndTitleCache();
+        return defaultService.getUuidAndTitleCache();
      }
  
      /**
@@ -431,7 +432,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Object[]> group(Class<? extends Reference> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
-        return defaultReferenceService.group(clazz, limit, start, groups, propertyPaths);
+        return defaultService.group(clazz, limit, start, groups, propertyPaths);
      }
  
      /**
@@ -448,7 +449,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<Reference> findByTitle(Class<? extends Reference> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -462,7 +463,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public  <S extends Reference> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.list(type, limit, start, orderHints, propertyPaths);
+        return defaultService.list(type, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -472,7 +473,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<Reference> findByTitle(IIdentifiableEntityServiceConfigurator<Reference> configurator) {
-        return defaultReferenceService.findByTitle(configurator);
+        return defaultService.findByTitle(configurator);
      }
  
      /**
@@ -485,7 +486,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Integer countByTitle(Class<? extends Reference> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
-        return defaultReferenceService.countByTitle(clazz, queryString, matchmode, criteria);
+        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
      }
  
      /**
@@ -495,7 +496,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Reference load(UUID uuid) {
-        return defaultReferenceService.load(uuid);
+        return defaultService.load(uuid);
      }
  
      /**
@@ -506,7 +507,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Reference load(UUID uuid, List<String> propertyPaths) {
-        return defaultReferenceService.load(uuid, propertyPaths);
+        return defaultService.load(uuid, propertyPaths);
      }
  
      /**
@@ -516,7 +517,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Integer countByTitle(IIdentifiableEntityServiceConfigurator<Reference> configurator) {
-        return defaultReferenceService.countByTitle(configurator);
+        return defaultService.countByTitle(configurator);
      }
  
      /**
@@ -526,7 +527,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Reference merge(Reference transientObject) {
-        return defaultReferenceService.merge(transientObject);
+        return defaultService.merge(transientObject);
      }
  
      /**
@@ -543,7 +544,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Reference> listByTitle(Class<? extends Reference> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -557,7 +558,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public  <S extends Reference> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -567,7 +568,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public UUID refresh(Reference persistentObject) {
-        return defaultReferenceService.refresh(persistentObject);
+        return defaultService.refresh(persistentObject);
      }
  
      /**
@@ -584,7 +585,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Reference> listByReferenceTitle(Class<? extends Reference> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -596,7 +597,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Reference> rows(String tableName, int limit, int start) {
-        return defaultReferenceService.rows(tableName, limit, start);
+        return defaultService.rows(tableName, limit, start);
      }
  
      /**
@@ -646,7 +647,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public UUID update(Reference transientObject) {
-        return defaultReferenceService.update(transientObject);
+        return defaultService.update(transientObject);
      }
  
      /**
@@ -661,7 +662,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public List<Reference> list(Reference example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultReferenceService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
+        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -673,7 +674,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public int deduplicate(Class<? extends Reference> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
-        return defaultReferenceService.deduplicate(clazz, matchStrategy, mergeStrategy);
+        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
      }
  
      /**
@@ -688,7 +689,7 @@ public class TransientReferenceService implements IReferenceService {
       */
      @Override
      public Pager<Reference> findTitleCache(Class<? extends Reference> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
-        return defaultReferenceService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
      }
  
         @Override
@@ -700,8 +701,12 @@ public class TransientReferenceService implements IReferenceService {
  
         @Override
         public Reference findWithoutFlush(UUID uuid) {
-               return defaultReferenceService.findWithoutFlush(uuid);
+               return defaultService.findWithoutFlush(uuid);
+       }
+       
+       @Override
+       public <S extends Reference> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
         }
-
  
  }
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 477d713dd67cec81090f493c35ee6676c4321853..fe3c6cefc3351d05508fc3a6dd8c3e76d2d490c2 100644 (file)
--- 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
@@ -43,6 +43,7 @@ import eu.etaxonomy.cdm.api.service.search.SearchResult;
  import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
  import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
  import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
@@ -91,13 +92,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
   */
  public class TransientTaxonService implements ITaxonService {
  
-    private final ITaxonService defaultTaxonService;
+    private final ITaxonService defaultService;
  
      /**
       * @param defaultTaxonService
       */
      public TransientTaxonService(ITaxonService defaultTaxonService) {
-        this.defaultTaxonService = defaultTaxonService;
+        this.defaultService = defaultTaxonService;
      }
  
      /**
@@ -111,7 +112,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<AuditEventRecord<TaxonBase>> pageAuditEvents(TaxonBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultTaxonService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
+        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
      }
  
      /**
@@ -126,7 +127,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<Annotation> getAnnotations(TaxonBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -135,7 +136,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public void clear() {
-        defaultTaxonService.clear();
+        defaultService.clear();
      }
  
      /**
@@ -145,7 +146,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public void lock(TaxonBase t, LockOptions lockOptions) {
-        defaultTaxonService.lock(t, lockOptions);
+        defaultService.lock(t, lockOptions);
      }
  
      /**
@@ -156,7 +157,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public void refresh(TaxonBase t, LockOptions lockOptions, List<String> propertyPaths) {
-        defaultTaxonService.refresh(t, lockOptions, propertyPaths);
+        defaultService.refresh(t, lockOptions, propertyPaths);
      }
  
      /**
@@ -165,7 +166,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public void updateTitleCache() {
-        defaultTaxonService.updateTitleCache();
+        defaultService.updateTitleCache();
      }
  
      /**
@@ -175,7 +176,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public AuditEventRecord<TaxonBase> getNextAuditEvent(TaxonBase t) {
-        return defaultTaxonService.getNextAuditEvent(t);
+        return defaultService.getNextAuditEvent(t);
      }
  
      /**
@@ -190,7 +191,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<Marker> getMarkers(TaxonBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -202,7 +203,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public void updateTitleCache(Class<? extends TaxonBase> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<TaxonBase> cacheStrategy, IProgressMonitor monitor) {
-        defaultTaxonService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
+        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
      }
  
      /**
@@ -212,7 +213,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public AuditEventRecord<TaxonBase> getPreviousAuditEvent(TaxonBase t) {
-        return defaultTaxonService.getPreviousAuditEvent(t);
+        return defaultService.getPreviousAuditEvent(t);
      }
  
      /**
@@ -222,7 +223,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public int count(Class<? extends TaxonBase> clazz) {
-        return defaultTaxonService.count(clazz);
+        return defaultService.count(clazz);
      }
  
      /**
@@ -239,7 +240,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<AuditEventRecord<TaxonBase>> pageAuditEvents(Class<? extends TaxonBase> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultTaxonService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
+        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
      }
  
      /**
@@ -249,7 +250,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public TaxonBase find(LSID lsid) {
-        return defaultTaxonService.find(lsid);
+        return defaultService.find(lsid);
      }
  
      /**
@@ -259,7 +260,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public DeleteResult delete(TaxonBase persistentObject) {
-        return defaultTaxonService.delete(persistentObject);
+        return defaultService.delete(persistentObject);
      }
  
      /**
@@ -273,7 +274,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<Object[]> groupMarkers(Class<? extends TaxonBase> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTaxonService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
+        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -283,7 +284,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public boolean exists(UUID uuid) {
-        return defaultTaxonService.exists(uuid);
+        return defaultService.exists(uuid);
      }
  
  
@@ -295,7 +296,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public TaxonBase replace(TaxonBase x, TaxonBase y) {
-        return defaultTaxonService.replace(x, y);
+        return defaultService.replace(x, y);
      }
  
      /**
@@ -305,7 +306,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> find(Set<UUID> uuidSet) {
-        return defaultTaxonService.find(uuidSet);
+        return defaultService.find(uuidSet);
      }
  
      /**
@@ -318,7 +319,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<IdentifiableSource> getSources(TaxonBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTaxonService.getSources(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -332,7 +333,7 @@ public class TransientTaxonService implements ITaxonService {
      @Deprecated
      @Override
      public List<Taxon> getRootTaxa(Reference sec, CdmFetch cdmFetch, boolean onlyWithChildren) {
-        return defaultTaxonService.getRootTaxa(sec, cdmFetch, onlyWithChildren);
+        return defaultService.getRootTaxa(sec, cdmFetch, onlyWithChildren);
      }
  
      /**
@@ -342,7 +343,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public TaxonBase find(UUID uuid) {
-        return defaultTaxonService.find(uuid);
+        return defaultService.find(uuid);
      }
  
      /**
@@ -358,7 +359,7 @@ public class TransientTaxonService implements ITaxonService {
      @Deprecated
      @Override
      public List<Taxon> getRootTaxa(Rank rank, Reference sec, boolean onlyWithChildren, boolean withMisapplications, List<String> propertyPaths) {
-        return defaultTaxonService.getRootTaxa(rank, sec, onlyWithChildren, withMisapplications, propertyPaths);
+        return defaultService.getRootTaxa(rank, sec, onlyWithChildren, withMisapplications, propertyPaths);
      }
  
      /**
@@ -368,7 +369,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public TaxonBase find(int id) {
-        return defaultTaxonService.find(id);
+        return defaultService.find(id);
      }
  
      /**
@@ -381,7 +382,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<Rights> getRights(TaxonBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTaxonService.getRights(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -392,7 +393,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public int countMarkers(Class<? extends TaxonBase> clazz, Boolean technical) {
-        return defaultTaxonService.countMarkers(clazz, technical);
+        return defaultService.countMarkers(clazz, technical);
      }
  
      /**
@@ -402,7 +403,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> findById(Set<Integer> idSet) {
-        return defaultTaxonService.findById(idSet);
+        return defaultService.findById(idSet);
      }
  
      /**
@@ -414,7 +415,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
-        return defaultTaxonService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
+        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
      }
  
      /**
@@ -423,7 +424,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Session getSession() {
-        return defaultTaxonService.getSession();
+        return defaultService.getSession();
      }
  
      /**
@@ -432,7 +433,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCache() {
-        return defaultTaxonService.getUuidAndTitleCache();
+        return defaultService.getUuidAndTitleCache();
      }
  
      /**
@@ -446,7 +447,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<Object[]> group(Class<? extends TaxonBase> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
-        return defaultTaxonService.group(clazz, limit, start, groups, propertyPaths);
+        return defaultService.group(clazz, limit, start, groups, propertyPaths);
      }
  
      /**
@@ -457,7 +458,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<RelationshipBase> getAllRelationships(int limit, int start) {
-        return defaultTaxonService.getAllRelationships(limit, start);
+        return defaultService.getAllRelationships(limit, start);
      }
  
      /**
@@ -474,7 +475,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<TaxonBase> findByTitle(Class<? extends TaxonBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -485,7 +486,7 @@ public class TransientTaxonService implements ITaxonService {
      @Deprecated
      @Override
      public OrderedTermVocabulary<TaxonRelationshipType> getTaxonRelationshipTypeVocabulary() {
-        return defaultTaxonService.getTaxonRelationshipTypeVocabulary();
+        return defaultService.getTaxonRelationshipTypeVocabulary();
      }
  
      /**
@@ -496,7 +497,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> searchTaxaByName(String name, Reference sec) {
-        return defaultTaxonService.searchTaxaByName(name, sec);
+        return defaultService.searchTaxaByName(name, sec);
      }
  
      /**
@@ -506,7 +507,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public void swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) {
-        defaultTaxonService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
+        defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
      }
  
      /**
@@ -520,7 +521,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public <S extends TaxonBase> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.list(type, limit, start, orderHints, propertyPaths);
+        return defaultService.list(type, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -530,7 +531,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<TaxonBase> findByTitle(IIdentifiableEntityServiceConfigurator<TaxonBase> configurator) {
-        return defaultTaxonService.findByTitle(configurator);
+        return defaultService.findByTitle(configurator);
      }
  
      /**
@@ -546,7 +547,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Taxon changeSynonymToAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon, boolean deleteSynonym, boolean copyCitationInfo, Reference citation, String microCitation) throws HomotypicalGroupChangeException {
-        return defaultTaxonService.changeSynonymToAcceptedTaxon(synonym, acceptedTaxon, deleteSynonym, copyCitationInfo, citation, microCitation);
+        return defaultService.changeSynonymToAcceptedTaxon(synonym, acceptedTaxon, deleteSynonym, copyCitationInfo, citation, microCitation);
      }
  
      /**
@@ -559,7 +560,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Integer countByTitle(Class<? extends TaxonBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
-        return defaultTaxonService.countByTitle(clazz, queryString, matchmode, criteria);
+        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
      }
  
      /**
@@ -569,7 +570,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public TaxonBase load(UUID uuid) {
-        return defaultTaxonService.load(uuid);
+        return defaultService.load(uuid);
      }
  
      /**
@@ -580,7 +581,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public TaxonBase load(UUID uuid, List<String> propertyPaths) {
-        return defaultTaxonService.load(uuid, propertyPaths);
+        return defaultService.load(uuid, propertyPaths);
      }
  
      /**
@@ -590,7 +591,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Integer countByTitle(IIdentifiableEntityServiceConfigurator<TaxonBase> configurator) {
-        return defaultTaxonService.countByTitle(configurator);
+        return defaultService.countByTitle(configurator);
      }
  
      /**
@@ -600,7 +601,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public TaxonBase merge(TaxonBase transientObject) {
-        return defaultTaxonService.merge(transientObject);
+        return defaultService.merge(transientObject);
      }
  
      /**
@@ -617,7 +618,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> listByTitle(Class<? extends TaxonBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -631,7 +632,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public  <S extends TaxonBase> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -641,7 +642,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public UUID refresh(TaxonBase persistentObject) {
-        return defaultTaxonService.refresh(persistentObject);
+        return defaultService.refresh(persistentObject);
      }
  
      /**
@@ -655,7 +656,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Taxon changeSynonymToRelatedTaxon(Synonym synonym, Taxon toTaxon, TaxonRelationshipType taxonRelationshipType, Reference reference, String microReference) {
-        return defaultTaxonService.changeSynonymToRelatedTaxon(synonym, toTaxon, taxonRelationshipType, reference, microReference);
+        return defaultService.changeSynonymToRelatedTaxon(synonym, toTaxon, taxonRelationshipType, reference, microReference);
      }
  
      /**
@@ -672,7 +673,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> listByReferenceTitle(Class<? extends TaxonBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -684,7 +685,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> rows(String tableName, int limit, int start) {
-        return defaultTaxonService.rows(tableName, limit, start);
+        return defaultService.rows(tableName, limit, start);
      }
  
      /**
@@ -705,7 +706,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public long deleteSynonymRelationships(Synonym syn, Taxon taxon) {
-        return defaultTaxonService.deleteSynonymRelationships(syn, taxon);
+        return defaultService.deleteSynonymRelationships(syn, taxon);
      }
  
      /**
@@ -738,7 +739,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public void changeHomotypicalGroupOfSynonym(Synonym synonym, HomotypicalGroup newHomotypicalGroup, Taxon targetTaxon, boolean removeFromOtherTaxa, boolean setBasionymRelationIfApplicable) {
-        defaultTaxonService.changeHomotypicalGroupOfSynonym(synonym, newHomotypicalGroup, targetTaxon, removeFromOtherTaxa, setBasionymRelationIfApplicable);
+        defaultService.changeHomotypicalGroupOfSynonym(synonym, newHomotypicalGroup, targetTaxon, removeFromOtherTaxa, setBasionymRelationIfApplicable);
      }
  
      /**
@@ -758,7 +759,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public UUID update(TaxonBase transientObject) {
-        return defaultTaxonService.update(transientObject);
+        return defaultService.update(transientObject);
      }
  
      /**
@@ -773,7 +774,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> list(TaxonBase example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
+        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -790,7 +791,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public SynonymRelationship moveSynonymToAnotherTaxon(SynonymRelationship oldSynonymRelation, Taxon newTaxon, boolean moveHomotypicGroup, SynonymRelationshipType newSynonymRelationshipType, Reference newReference, String newReferenceDetail, boolean keepReference) throws HomotypicalGroupChangeException {
-        return defaultTaxonService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxon, moveHomotypicGroup, newSynonymRelationshipType, newReference, newReferenceDetail, keepReference);
+        return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxon, moveHomotypicGroup, newSynonymRelationshipType, newReference, newReferenceDetail, keepReference);
      }
  
      /**
@@ -802,7 +803,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public int deduplicate(Class<? extends TaxonBase> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
-        return defaultTaxonService.deduplicate(clazz, matchStrategy, mergeStrategy);
+        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
      }
  
      /**
@@ -817,7 +818,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<TaxonBase> findTitleCache(Class<? extends TaxonBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
-        return defaultTaxonService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
      }
  
      /**
@@ -832,7 +833,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonRelationship> listToTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.listToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -847,7 +848,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<TaxonRelationship> pageToTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.pageToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.pageToTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -862,7 +863,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonRelationship> listFromTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.listFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -877,7 +878,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<TaxonRelationship> pageFromTaxonRelationships(Taxon taxon, TaxonRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.pageFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.pageFromTaxonRelationships(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -892,7 +893,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Set<Taxon> listRelatedTaxa(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships, Integer maxDepth, Integer limit, Integer start, List<String> propertyPaths) {
-        return defaultTaxonService.listRelatedTaxa(taxon, includeRelationships, maxDepth, limit, start, propertyPaths);
+        return defaultService.listRelatedTaxa(taxon, includeRelationships, maxDepth, limit, start, propertyPaths);
      }
  
      /**
@@ -905,7 +906,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<Classification> listClassifications(TaxonBase taxonBase, Integer limit, Integer start, List<String> propertyPaths) {
-        return defaultTaxonService.listClassifications(taxonBase, limit, start, propertyPaths);
+        return defaultService.listClassifications(taxonBase, limit, start, propertyPaths);
      }
  
      /**
@@ -920,7 +921,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<SynonymRelationship> getSynonyms(Synonym synonym, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.getSynonyms(synonym, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getSynonyms(synonym, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -935,7 +936,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<SynonymRelationship> getSynonyms(Taxon taxon, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.getSynonyms(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getSynonyms(taxon, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -946,7 +947,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<Synonym> getHomotypicSynonymsByHomotypicGroup(Taxon taxon, List<String> propertyPaths) {
-        return defaultTaxonService.getHomotypicSynonymsByHomotypicGroup(taxon, propertyPaths);
+        return defaultService.getHomotypicSynonymsByHomotypicGroup(taxon, propertyPaths);
      }
  
      /**
@@ -957,7 +958,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<List<Synonym>> getHeterotypicSynonymyGroups(Taxon taxon, List<String> propertyPaths) {
-        return defaultTaxonService.getHeterotypicSynonymyGroups(taxon, propertyPaths);
+        return defaultService.getHeterotypicSynonymyGroups(taxon, propertyPaths);
      }
  
      /**
@@ -972,7 +973,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<TaxonBase> search(Class<? extends TaxonBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -989,7 +990,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<TaxonBase> findTaxaByName(Class<? extends TaxonBase> clazz, String uninomial, String infragenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber) {
-        return defaultTaxonService.findTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber);
+        return defaultService.findTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber);
      }
  
      /**
@@ -1006,7 +1007,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> listTaxaByName(Class<? extends TaxonBase> clazz, String uninomial, String infragenericEpithet, String specificEpithet, String infraspecificEpithet, Rank rank, Integer pageSize, Integer pageNumber) {
-        return defaultTaxonService.listTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber);
+        return defaultService.listTaxaByName(clazz, uninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, rank, pageSize, pageNumber);
      }
  
      /**
@@ -1016,7 +1017,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<IdentifiableEntity> findTaxaAndNames(IFindTaxaAndNamesConfigurator configurator) {
-        return defaultTaxonService.findTaxaAndNames(configurator);
+        return defaultService.findTaxaAndNames(configurator);
      }
  
      /**
@@ -1039,7 +1040,7 @@ public class TransientTaxonService implements ITaxonService {
      @Deprecated
      @Override
      public Pager<SearchResult<TaxonBase>> findByEverythingFullText(String queryString, Classification classification, List<Language> languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
-        return defaultTaxonService.findByEverythingFullText(queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByEverythingFullText(queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1060,7 +1061,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<SearchResult<TaxonBase>> findByFullText(Class<? extends TaxonBase> clazz, String queryString, Classification classification, List<Language> languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws CorruptIndexException, IOException, ParseException {
-        return defaultTaxonService.findByFullText(clazz, queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByFullText(clazz, queryString, classification, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
  
@@ -1072,7 +1073,7 @@ public class TransientTaxonService implements ITaxonService {
              List<PresenceAbsenceTerm> statusFilter, Classification classification, Integer pageSize,
              Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws IOException,
              ParseException {
-        return defaultTaxonService.findByDistribution(areaFilter, statusFilter, classification, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByDistribution(areaFilter, statusFilter, classification, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
  
@@ -1085,7 +1086,7 @@ public class TransientTaxonService implements ITaxonService {
              Set<PresenceAbsenceTerm> distributionStatus, List<Language> languages, boolean highlightFragments,
              Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths)
              throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
-        return defaultTaxonService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1107,7 +1108,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Pager<SearchResult<TaxonBase>> findByDescriptionElementFullText(Class<? extends DescriptionElementBase> clazz, String queryString, Classification classification, List<Feature> features, List<Language> languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws CorruptIndexException, IOException, ParseException {
-        return defaultTaxonService.findByDescriptionElementFullText(clazz, queryString, classification, features, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByDescriptionElementFullText(clazz, queryString, classification, features, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -1123,7 +1124,7 @@ public class TransientTaxonService implements ITaxonService {
      @Deprecated
      @Override
      public List<MediaRepresentation> getAllMedia(Taxon taxon, int size, int height, int widthOrDuration, String[] mimeTypes) {
-        return defaultTaxonService.getAllMedia(taxon, size, height, widthOrDuration, mimeTypes);
+        return defaultService.getAllMedia(taxon, size, height, widthOrDuration, mimeTypes);
      }
  
      /**
@@ -1138,7 +1139,7 @@ public class TransientTaxonService implements ITaxonService {
      @Deprecated
      @Override
      public List<Media> listTaxonDescriptionMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships, boolean limitToGalleries, List<String> propertyPath) {
-        return defaultTaxonService.listTaxonDescriptionMedia(taxon, includeRelationships, limitToGalleries, propertyPath);
+        return defaultService.listTaxonDescriptionMedia(taxon, includeRelationships, limitToGalleries, propertyPath);
      }
  
      /**
@@ -1154,7 +1155,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<Media> listMedia(Taxon taxon, Set<TaxonRelationshipEdge> includeRelationships, Boolean limitToGalleries, Boolean includeTaxonDescriptions, Boolean includeOccurrences, Boolean includeTaxonNameDescriptions, List<String> propertyPath) {
-        return defaultTaxonService.listMedia(taxon, includeRelationships, limitToGalleries, includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, propertyPath);
+        return defaultService.listMedia(taxon, includeRelationships, limitToGalleries, includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, propertyPath);
      }
  
      /**
@@ -1164,7 +1165,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> findTaxaByID(Set<Integer> listOfIDs) {
-        return defaultTaxonService.findTaxaByID(listOfIDs);
+        return defaultService.findTaxaByID(listOfIDs);
      }
  
      /**
@@ -1175,7 +1176,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public TaxonBase findTaxonByUuid(UUID uuid, List<String> propertyPaths) {
-        return defaultTaxonService.findTaxonByUuid(uuid, propertyPaths);
+        return defaultService.findTaxonByUuid(uuid, propertyPaths);
      }
  
      /**
@@ -1184,7 +1185,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public int countAllRelationships() {
-        return defaultTaxonService.countAllRelationships();
+        return defaultService.countAllRelationships();
      }
  
      /**
@@ -1194,7 +1195,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonNameBase> findIdenticalTaxonNames(List<String> propertyPath) {
-        return defaultTaxonService.findIdenticalTaxonNames(propertyPath);
+        return defaultService.findIdenticalTaxonNames(propertyPath);
      }
  
      /**
@@ -1204,7 +1205,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonNameBase> findIdenticalTaxonNameIds(List<String> propertyPath) {
-        return defaultTaxonService.findIdenticalTaxonNameIds(propertyPath);
+        return defaultService.findIdenticalTaxonNameIds(propertyPath);
      }
  
      /**
@@ -1214,7 +1215,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public String getPhylumName(TaxonNameBase name) {
-        return defaultTaxonService.getPhylumName(name);
+        return defaultService.getPhylumName(name);
      }
  
      /**
@@ -1224,7 +1225,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public long deleteSynonymRelationships(Synonym syn) {
-        return defaultTaxonService.deleteSynonymRelationships(syn);
+        return defaultService.deleteSynonymRelationships(syn);
      }
  
      /**
@@ -1240,7 +1241,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<SynonymRelationship> listSynonymRelationships(TaxonBase taxonBase, SynonymRelationshipType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths, Direction direction) {
-        return defaultTaxonService.listSynonymRelationships(taxonBase, type, pageSize, pageNumber, orderHints, propertyPaths, direction);
+        return defaultService.listSynonymRelationships(taxonBase, type, pageSize, pageNumber, orderHints, propertyPaths, direction);
      }
  
      /**
@@ -1250,7 +1251,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Taxon findBestMatchingTaxon(String taxonName) {
-        return defaultTaxonService.findBestMatchingTaxon(taxonName);
+        return defaultService.findBestMatchingTaxon(taxonName);
      }
  
      /**
@@ -1260,7 +1261,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Taxon findBestMatchingTaxon(MatchingTaxonConfigurator config) {
-        return defaultTaxonService.findBestMatchingTaxon(config);
+        return defaultService.findBestMatchingTaxon(config);
      }
  
      /**
@@ -1270,7 +1271,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public Synonym findBestMatchingSynonym(String taxonName) {
-        return defaultTaxonService.findBestMatchingSynonym(taxonName);
+        return defaultService.findBestMatchingSynonym(taxonName);
      }
  
      /**
@@ -1279,7 +1280,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheTaxon() {
-        return defaultTaxonService.getUuidAndTitleCacheTaxon();
+        return defaultService.getUuidAndTitleCacheTaxon();
      }
  
      /**
@@ -1288,7 +1289,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheSynonym() {
-        return defaultTaxonService.getUuidAndTitleCacheSynonym();
+        return defaultService.getUuidAndTitleCacheSynonym();
      }
  
      /**
@@ -1298,7 +1299,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<UuidAndTitleCache<IdentifiableEntity>> findTaxaAndNamesForEditor(IFindTaxaAndNamesConfigurator configurator) {
-        return defaultTaxonService.findTaxaAndNamesForEditor(configurator);
+        return defaultService.findTaxaAndNamesForEditor(configurator);
      }
  
      /**
@@ -1311,7 +1312,7 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<Synonym> createInferredSynonyms(Taxon taxon, Classification tree, SynonymRelationshipType type, boolean doWithMisappliedNames) {
-        return defaultTaxonService.createInferredSynonyms(taxon, tree, type, doWithMisappliedNames);
+        return defaultService.createInferredSynonyms(taxon, tree, type, doWithMisappliedNames);
      }
  
      /**
@@ -1323,27 +1324,27 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<Synonym> createAllInferredSynonyms(Taxon taxon, Classification tree, boolean doWithMisappliedNames) {
-        return defaultTaxonService.createAllInferredSynonyms(taxon, tree, doWithMisappliedNames);
+        return defaultService.createAllInferredSynonyms(taxon, tree, doWithMisappliedNames);
      }
  
      @Override
      public DeleteResult deleteSynonym(Synonym arg0, SynonymDeletionConfigurator arg1) {
-        return defaultTaxonService.deleteSynonym(arg0, arg1);
+        return defaultService.deleteSynonym(arg0, arg1);
      }
  
      @Override
      public DeleteResult deleteSynonym(Synonym arg0, Taxon arg1, SynonymDeletionConfigurator arg2) {
-        return defaultTaxonService.deleteSynonym(arg0, arg1, arg2);
+        return defaultService.deleteSynonym(arg0, arg1, arg2);
      }
  
      @Override
      public DeleteResult deleteTaxon(Taxon arg0, TaxonDeletionConfigurator arg1, Classification arg2) {
-        return defaultTaxonService.deleteTaxon(arg0, arg1, arg2);
+        return defaultService.deleteTaxon(arg0, arg1, arg2);
      }
  
      @Override
      public List<List<Synonym>> getSynonymsByHomotypicGroup(Taxon taxon, List<String> propertyPaths) {
-        return defaultTaxonService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
+        return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
      }
  
         @Override
@@ -1352,7 +1353,7 @@ public class TransientTaxonService implements ITaxonService {
                         SynonymRelationshipType synonymRelationshipType)
                         throws DataChangeNoRollbackException {
  
-               return defaultTaxonService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
+               return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
         }
  
      /* (non-Javadoc)
@@ -1361,7 +1362,7 @@ public class TransientTaxonService implements ITaxonService {
      @Override
      public Pager<Taxon> pageAcceptedTaxaFor(UUID synonymUuid, UUID classificationUuid, Integer pageSize,
              Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.pageAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.pageAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /* (non-Javadoc)
@@ -1370,7 +1371,7 @@ public class TransientTaxonService implements ITaxonService {
      @Override
      public List<Taxon> listAcceptedTaxaFor(UUID synonymUuid, UUID classificationUuid, Integer pageSize,
              Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTaxonService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
         @Override
@@ -1389,7 +1390,7 @@ public class TransientTaxonService implements ITaxonService {
  
         @Override
         public TaxonBase findWithoutFlush(UUID uuid) {
-               return defaultTaxonService.findWithoutFlush(uuid);
+               return defaultService.findWithoutFlush(uuid);
         }
  
      /* (non-Javadoc)
@@ -1397,10 +1398,14 @@ public class TransientTaxonService implements ITaxonService {
       */
      @Override
      public List<TaxonBase> findTaxaByName(MatchingTaxonConfigurator config) {
-        return defaultTaxonService.findTaxaByName(config);
+        return defaultService.findTaxaByName(config);
      }
  
-
+       
+       @Override
+       public <S extends TaxonBase> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
+       }
  
  
  
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java

index 4ef033f969f482b265dd7b29bb7eb763a7ac6c6e..73f46968fd6400b104f17abf62f7720f7fbcbbe5 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
@@ -31,6 +31,7 @@ import eu.etaxonomy.cdm.api.service.config.TermDeletionConfigurator;
  import eu.etaxonomy.cdm.api.service.pager.Pager;
  import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
  import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
  import eu.etaxonomy.cdm.model.common.DefinedTermBase;
  import eu.etaxonomy.cdm.model.common.ISourceable;
  import eu.etaxonomy.cdm.model.common.IdentifiableSource;
@@ -65,13 +66,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
   */
  public class TransientTermService implements ITermService {
  
-    private final ITermService defaultTermService;
+    private final ITermService defaultService;
  
      /**
       * @param defaultTermService
       */
      public TransientTermService(ITermService defaultTermService) {
-        this.defaultTermService = defaultTermService;
+        this.defaultService = defaultTermService;
      }
  
      /**
@@ -85,7 +86,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<AuditEventRecord<DefinedTermBase>> pageAuditEvents(DefinedTermBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultTermService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
+        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
      }
  
      /**
@@ -100,7 +101,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<Annotation> getAnnotations(DefinedTermBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -109,7 +110,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public void clear() {
-        defaultTermService.clear();
+        defaultService.clear();
      }
  
      /**
@@ -119,7 +120,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public void lock(DefinedTermBase t, LockOptions lockOptions) {
-        defaultTermService.lock(t, lockOptions);
+        defaultService.lock(t, lockOptions);
      }
  
      /**
@@ -129,7 +130,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DefinedTermBase getByUri(URI uri) {
-        return defaultTermService.getByUri(uri);
+        return defaultService.getByUri(uri);
      }
  
      /**
@@ -140,7 +141,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public void refresh(DefinedTermBase t, LockOptions lockOptions, List<String> propertyPaths) {
-        defaultTermService.refresh(t, lockOptions, propertyPaths);
+        defaultService.refresh(t, lockOptions, propertyPaths);
      }
  
      /**
@@ -161,7 +162,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<LanguageString> getAllLanguageStrings(int limit, int start) {
-        return defaultTermService.getAllLanguageStrings(limit, start);
+        return defaultService.getAllLanguageStrings(limit, start);
      }
  
      /**
@@ -172,7 +173,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<Representation> getAllRepresentations(int limit, int start) {
-        return defaultTermService.getAllRepresentations(limit, start);
+        return defaultService.getAllRepresentations(limit, start);
      }
  
      /**
@@ -181,7 +182,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public void updateTitleCache() {
-        defaultTermService.updateTitleCache();
+        defaultService.updateTitleCache();
      }
  
      /**
@@ -191,7 +192,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public AuditEventRecord<DefinedTermBase> getNextAuditEvent(DefinedTermBase t) {
-        return defaultTermService.getNextAuditEvent(t);
+        return defaultService.getNextAuditEvent(t);
      }
  
      /**
@@ -201,7 +202,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Language getLanguageByIso(String iso639) {
-        return defaultTermService.getLanguageByIso(iso639);
+        return defaultService.getLanguageByIso(iso639);
      }
  
      /**
@@ -211,7 +212,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<Language> getLanguagesByLocale(Enumeration<Locale> locales) {
-        return defaultTermService.getLanguagesByLocale(locales);
+        return defaultService.getLanguagesByLocale(locales);
      }
  
      /**
@@ -221,7 +222,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public NamedArea getAreaByTdwgAbbreviation(String tdwgAbbreviation) {
-        return defaultTermService.getAreaByTdwgAbbreviation(tdwgAbbreviation);
+        return defaultService.getAreaByTdwgAbbreviation(tdwgAbbreviation);
      }
  
      /**
@@ -236,7 +237,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<Marker> getMarkers(DefinedTermBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -248,7 +249,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<Media> getMedia(DefinedTermBase definedTerm, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.getMedia(definedTerm, pageSize, pageNumber);
+        return defaultService.getMedia(definedTerm, pageSize, pageNumber);
      }
  
      /**
@@ -260,7 +261,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public void updateTitleCache(Class<? extends DefinedTermBase> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<DefinedTermBase> cacheStrategy, IProgressMonitor monitor) {
-        defaultTermService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
+        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
      }
  
      /**
@@ -270,7 +271,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public AuditEventRecord<DefinedTermBase> getPreviousAuditEvent(DefinedTermBase t) {
-        return defaultTermService.getPreviousAuditEvent(t);
+        return defaultService.getPreviousAuditEvent(t);
      }
  
      /**
@@ -280,7 +281,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public int count(Class<? extends DefinedTermBase> clazz) {
-        return defaultTermService.count(clazz);
+        return defaultService.count(clazz);
      }
  
      /**
@@ -295,7 +296,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<NamedArea> list(NamedAreaLevel level, NamedAreaType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.list(level, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.list(level, type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -312,7 +313,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<AuditEventRecord<DefinedTermBase>> pageAuditEvents(Class<? extends DefinedTermBase> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultTermService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
+        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
      }
  
      /**
@@ -322,7 +323,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DefinedTermBase find(LSID lsid) {
-        return defaultTermService.find(lsid);
+        return defaultService.find(lsid);
      }
  
      /**
@@ -332,7 +333,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DeleteResult delete(DefinedTermBase persistentObject) {
-        return defaultTermService.delete(persistentObject);
+        return defaultService.delete(persistentObject);
      }
  
      /**
@@ -346,7 +347,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<Object[]> groupMarkers(Class<? extends DefinedTermBase> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
+        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -356,7 +357,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public boolean exists(UUID uuid) {
-        return defaultTermService.exists(uuid);
+        return defaultService.exists(uuid);
      }
  
      /**
@@ -367,7 +368,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DefinedTermBase replace(DefinedTermBase x, DefinedTermBase y) {
-        return defaultTermService.replace(x, y);
+        return defaultService.replace(x, y);
      }
  
      /**
@@ -379,7 +380,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public <T extends DefinedTermBase> Pager<T> getGeneralizationOf(T definedTerm, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.getGeneralizationOf(definedTerm, pageSize, pageNumber);
+        return defaultService.getGeneralizationOf(definedTerm, pageSize, pageNumber);
      }
  
      /**
@@ -389,7 +390,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<DefinedTermBase> find(Set<UUID> uuidSet) {
-        return defaultTermService.find(uuidSet);
+        return defaultService.find(uuidSet);
      }
  
      /**
@@ -402,7 +403,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<IdentifiableSource> getSources(DefinedTermBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.getSources(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -412,7 +413,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DefinedTermBase find(UUID uuid) {
-        return defaultTermService.find(uuid);
+        return defaultService.find(uuid);
      }
  
      /**
@@ -425,7 +426,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public <T extends DefinedTermBase> Pager<T> getPartOf(Set<T> definedTerms, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.getPartOf(definedTerms, pageSize, pageNumber, propertyPaths);
+        return defaultService.getPartOf(definedTerms, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -435,7 +436,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DefinedTermBase find(int id) {
-        return defaultTermService.find(id);
+        return defaultService.find(id);
      }
  
      /**
@@ -448,7 +449,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<Rights> getRights(DefinedTermBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.getRights(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -459,7 +460,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public int countMarkers(Class<? extends DefinedTermBase> clazz, Boolean technical) {
-        return defaultTermService.countMarkers(clazz, technical);
+        return defaultService.countMarkers(clazz, technical);
      }
  
      /**
@@ -469,7 +470,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<DefinedTermBase> findById(Set<Integer> idSet) {
-        return defaultTermService.findById(idSet);
+        return defaultService.findById(idSet);
      }
  
      /**
@@ -482,7 +483,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public <T extends DefinedTermBase> Pager<T> getIncludes(Collection<T> definedTerms, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.getIncludes(definedTerms, pageSize, pageNumber, propertyPaths);
+        return defaultService.getIncludes(definedTerms, pageSize, pageNumber, propertyPaths);
      }
  
      /**
@@ -494,7 +495,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
-        return defaultTermService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
+        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
      }
  
      /**
@@ -503,7 +504,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Session getSession() {
-        return defaultTermService.getSession();
+        return defaultService.getSession();
      }
  
      /**
@@ -512,7 +513,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<UuidAndTitleCache<DefinedTermBase>> getUuidAndTitleCache() {
-        return defaultTermService.getUuidAndTitleCache();
+        return defaultService.getUuidAndTitleCache();
      }
  
      /**
@@ -526,7 +527,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<Object[]> group(Class<? extends DefinedTermBase> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
-        return defaultTermService.group(clazz, limit, start, groups, propertyPaths);
+        return defaultService.group(clazz, limit, start, groups, propertyPaths);
      }
  
      /**
@@ -539,7 +540,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public <T extends DefinedTermBase> Pager<T> findByRepresentationText(String label, Class<T> clazz, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.findByRepresentationText(label, clazz, pageSize, pageNumber);
+        return defaultService.findByRepresentationText(label, clazz, pageSize, pageNumber);
      }
  
      /**
@@ -556,7 +557,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<DefinedTermBase> findByTitle(Class<? extends DefinedTermBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -569,7 +570,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public <T extends DefinedTermBase> Pager<T> findByRepresentationAbbreviation(String abbrev, Class<T> clazz, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.findByRepresentationAbbreviation(abbrev, clazz, pageSize, pageNumber);
+        return defaultService.findByRepresentationAbbreviation(abbrev, clazz, pageSize, pageNumber);
      }
  
      /**
@@ -583,7 +584,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public <S extends DefinedTermBase> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.list(type, limit, start, orderHints, propertyPaths);
+        return defaultService.list(type, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -594,7 +595,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DeleteResult delete(DefinedTermBase term, TermDeletionConfigurator config) {
-        return defaultTermService.delete(term, config);
+        return defaultService.delete(term, config);
      }
  
      /**
@@ -604,7 +605,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<DefinedTermBase> findByTitle(IIdentifiableEntityServiceConfigurator<DefinedTermBase> configurator) {
-        return defaultTermService.findByTitle(configurator);
+        return defaultService.findByTitle(configurator);
      }
  
      /**
@@ -617,7 +618,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Integer countByTitle(Class<? extends DefinedTermBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
-        return defaultTermService.countByTitle(clazz, queryString, matchmode, criteria);
+        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
      }
  
      /**
@@ -627,7 +628,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DefinedTermBase load(UUID uuid) {
-        return defaultTermService.load(uuid);
+        return defaultService.load(uuid);
      }
  
      /**
@@ -638,7 +639,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DefinedTermBase load(UUID uuid, List<String> propertyPaths) {
-        return defaultTermService.load(uuid, propertyPaths);
+        return defaultService.load(uuid, propertyPaths);
      }
  
      /**
@@ -648,7 +649,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Integer countByTitle(IIdentifiableEntityServiceConfigurator<DefinedTermBase> configurator) {
-        return defaultTermService.countByTitle(configurator);
+        return defaultService.countByTitle(configurator);
      }
  
      /**
@@ -658,7 +659,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public DefinedTermBase merge(DefinedTermBase transientObject) {
-        return defaultTermService.merge(transientObject);
+        return defaultService.merge(transientObject);
      }
  
      /**
@@ -675,7 +676,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<DefinedTermBase> listByTitle(Class<? extends DefinedTermBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -689,7 +690,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public <S extends DefinedTermBase> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -699,7 +700,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public UUID refresh(DefinedTermBase persistentObject) {
-        return defaultTermService.refresh(persistentObject);
+        return defaultService.refresh(persistentObject);
      }
  
      /**
@@ -716,7 +717,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<DefinedTermBase> listByReferenceTitle(Class<? extends DefinedTermBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -728,7 +729,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<DefinedTermBase> rows(String tableName, int limit, int start) {
-        return defaultTermService.rows(tableName, limit, start);
+        return defaultService.rows(tableName, limit, start);
      }
  
      /**
@@ -773,7 +774,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<DefinedTermBase> search(Class<? extends DefinedTermBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
      /**
@@ -793,7 +794,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public UUID update(DefinedTermBase transientObject) {
-        return defaultTermService.update(transientObject);
+        return defaultService.update(transientObject);
      }
  
      /**
@@ -808,7 +809,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public List<DefinedTermBase> list(DefinedTermBase example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
+        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
      }
  
      /**
@@ -820,7 +821,7 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public int deduplicate(Class<? extends DefinedTermBase> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
-        return defaultTermService.deduplicate(clazz, matchStrategy, mergeStrategy);
+        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
      }
  
      /**
@@ -835,19 +836,19 @@ public class TransientTermService implements ITermService {
       */
      @Override
      public Pager<DefinedTermBase> findTitleCache(Class<? extends DefinedTermBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
-        return defaultTermService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
      }
  
      @Override
      public <TERM extends DefinedTermBase> TERM findByIdInVocabulary(String id, UUID vocabularyUuid,
              Class<TERM> clazz) {
-        return defaultTermService.findByIdInVocabulary(id, vocabularyUuid, clazz);
+        return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz);
      }
  
         @Override
         public DeleteResult isDeletable(DefinedTermBase object,
                         DeleteConfiguratorBase config) {
-               return defaultTermService.isDeletable(object, config);
+               return defaultService.isDeletable(object, config);
         }
  
      /* (non-Javadoc)
@@ -856,12 +857,18 @@ public class TransientTermService implements ITermService {
      @Override
      public List<DefinedTermBase<?>> listByTermType(TermType termType, Integer limit, Integer start,
              List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.listByTermType(termType, limit, start, orderHints, propertyPaths);
+        return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
      }
  
         @Override
         public DefinedTermBase findWithoutFlush(UUID uuid) {
-               return defaultTermService.findWithoutFlush(uuid);
+               return defaultService.findWithoutFlush(uuid);
+       }
+       
+       
+       @Override
+       public <S extends DefinedTermBase> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
         }
  
  }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java

index 0d677cd096f6738ac89c2d2b26d8428aacd90a06..7050078e1a47d191c10a4bd35d679ad14c9dd265 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
@@ -40,7 +40,7 @@ public class DerivateViewEditorInput implements IEditorInput{
      /**
       * The selected derivate {@link UUID}s
       */
-    private Set<UUID> derivateUUIDs;
+    private final Set<UUID> derivateUUIDs;
      /**
       * List of the {@link UUID}s of the root elements of the hierarchy (may be the same objects as the derivates)
       */
@@ -153,10 +153,11 @@ public class DerivateViewEditorInput implements IEditorInput{
          return derivateUUIDs;
      }
  
-    public void setRootAsDerivate(){
-        this.derivateUUIDs = this.rootUUIDs;
+    public void addRootUuid(UUID root){
+        rootUUIDs.add(root);
      }
  
+
      public ConversationHolder getConversationHolder() {
          return conversationHolder;
      }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java

index a98bbb423d7eb80a89332bdc8835b50477f03daa..2a74174c3c463ecc4d7b39ea2e53241a577082a2 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
@@ -9,7 +9,6 @@ import org.eclipse.swt.events.SelectionAdapter;
  import org.eclipse.swt.events.SelectionEvent;
  import org.eclipse.swt.widgets.Menu;
  import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IWorkbenchPart;
  import org.eclipse.ui.IWorkbenchWindow;
  import org.eclipse.ui.PlatformUI;
  import org.eclipse.ui.actions.CompoundContributionItem;
@@ -29,6 +28,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
  import eu.etaxonomy.taxeditor.editor.EditorUtil;
  import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
  import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
  
  /**
   * Context menu for the creation of derivates in the derivate hierarchy.
@@ -127,6 +127,18 @@ public class CreateDerivateContextMenu extends CompoundContributionItem {
           */
          @Override
          public void widgetSelected(SelectionEvent e) {
+            DerivateView derivateView = null;
+            if(AbstractUtility.getActivePart() instanceof DerivateView){
+                derivateView = (DerivateView) AbstractUtility.getActivePart();
+            }
+            if(derivateView!=null){
+                if(derivateView.isDirty()){
+                    e.doit = false;
+                    MessagingUtils.warningDialog("View has unsaved changes", this, "You need to save before performing this action");
+                    return;
+                }
+            }
+
              Object createdElement = null;
              Object selectedDerivate = selectedNode.getValue();
              if(selectedDerivate instanceof DnaSample && ((DnaSample) selectedDerivate).getRecordBasis()==SpecimenOrObservationType.DnaSample){
@@ -168,10 +180,8 @@ public class CreateDerivateContextMenu extends CompoundContributionItem {
              }
  
              //refresh view
-            IWorkbenchPart activePart = AbstractUtility.getActivePart();
-            if(activePart instanceof DerivateView){
-                DerivateView derivateView = (DerivateView)activePart;
-                derivateView.changed(null);
+            if(derivateView!=null){
+                derivateView.getConversationHolder().commit();
                  derivateView.refreshTree(createdElement);
              }
          }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java

new file mode 100644 (file)

index 0000000..da8c8db
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java
@@ -0,0 +1,35 @@
+package eu.etaxonomy.taxeditor.editor.view.derivate.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
+import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
+import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+public class CreateFieldUnitHandler extends AbstractHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        if(AbstractUtility.getActivePart() instanceof DerivateView){
+            DerivateView derivateView = (DerivateView)AbstractUtility.getActivePart();
+            if(derivateView.isDirty()){
+                MessagingUtils.warningDialog("View has unsaved changes", this, "You need to save before performing this action");
+                return null;
+            }
+            FieldUnit fieldUnit = FieldUnit.NewInstance();
+            CdmStore.getService(IOccurrenceService.class).save(fieldUnit);
+            derivateView.getConversationHolder().commit();
+            DerivateViewEditorInput input = (DerivateViewEditorInput) derivateView.getEditorInput();
+            input.addRootUuid(fieldUnit.getUuid());
+            derivateView.refreshTree();
+        }
+        return null;
+    }
+
+}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/DeleteDerivateHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/DeleteDerivateHandler.java

index 69b9b20d54d9973673faedf942bc29d8c82d53bd..70de10d2d8028ae54ca6bb3178e4265d39da7734 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/DeleteDerivateHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/DeleteDerivateHandler.java
@@ -69,7 +69,9 @@ public class DeleteDerivateHandler extends AbstractHandler {
                              label += " "+DerivateLabelProvider.getDerivateText(value, conversationHolder);
                          }
                          SpecimenDeleteConfigurator config = new SpecimenDeleteConfigurator();
-                        config.setDeleteChildren(false);
+                        boolean deepDelete = event.getCommand().getId().equals("eu.etaxonomy.taxeditor.editor.derivate.deepDelete");
+                        config.setDeleteChildren(deepDelete);
+                        config.setDeleteMolecularData(deepDelete);
                          DeleteDerivateOperation deleteDerivateOperation = new DeleteDerivateOperation(label, undoContext, (CdmBase) value, postOperationEnabled, config);
                          AbstractUtility.executeOperation(deleteDerivateOperation);
                      }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java

index 678b43e4089603b4e7453f52ef5abb1e6562b858..8f65f7c9620e01427beecf157e935708b51b7d8e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
@@ -22,6 +22,7 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService;
  import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator;
  import eu.etaxonomy.cdm.model.common.CdmBase;
  import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
  import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
@@ -60,7 +61,12 @@ public class DeleteDerivateOperation extends AbstractPostOperation<CdmBase> {
      @Override
      public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
          if(getPostOperationEnabled() instanceof ISaveablePart){
-            if(!MessagingUtils.confirmDialog("Confirm deletion", "Do you really want to delete the selected element?")){
+            String confirmationQuestion = "Do you really want to delete the selected element";
+            if(deleteConfigurator.isDeleteChildren()){
+                confirmationQuestion += " and its children";
+            }
+            confirmationQuestion += "?";
+            if(!MessagingUtils.confirmDialog("Confirm deletion", confirmationQuestion)){
                  return Status.CANCEL_STATUS;
              }
              if(((ISaveablePart) getPostOperationEnabled()).isDirty()){
@@ -74,7 +80,12 @@ public class DeleteDerivateOperation extends AbstractPostOperation<CdmBase> {
                  DerivateView derivateView = (DerivateView) getPostOperationEnabled();
                  //update DerivateView
                  derivateView.getConversationHolder().commit();
-                return postExecute(null);
+                IStatus returnStatus = postExecute(null);
+                //close if no more items left
+                if(derivateView.getViewer().getTree().getItemCount()<1){
+                    AbstractUtility.close(derivateView);
+                }
+                return returnStatus;
              }
          }
          else{
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java

index 844f0a1f039734cdcb25965245617cc438029896..efde026daacd3a517dc76cf54d3a707256d20aa4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
@@ -26,17 +26,18 @@ import org.eclipse.ui.handlers.HandlerUtil;
  
  import eu.etaxonomy.cdm.model.description.DescriptionBase;
  import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.SpecimenDescription;
  import eu.etaxonomy.cdm.model.description.TaxonDescription;
  import eu.etaxonomy.cdm.model.media.Media;
  import eu.etaxonomy.taxeditor.editor.EditorUtil;
  import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptionElementOperation;
+import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteSpecimenDescriptionOperation;
  import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteTaxonDescriptionOperation;
  import eu.etaxonomy.taxeditor.editor.view.media.operation.DeleteMediaOperation;
  import eu.etaxonomy.taxeditor.model.AbstractUtility;
  import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
-import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
  import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  
  /**
@@ -64,16 +65,17 @@ public class DeleteHandler extends AbstractHandler {
  
                         IUndoContext undoContext = EditorUtil.getUndoContext();
  
-                       List<AbstractPostTaxonOperation> operations = new ArrayList<AbstractPostTaxonOperation>();
+                       List<AbstractPostOperation<?>> operations = new ArrayList<AbstractPostOperation<?>>();
  
                         for(Object object : selection.toArray()){
  
-                               AbstractPostOperation operation = null;
-
                                 // TaxonDescription
                                 if(object instanceof TaxonDescription){
                                         operations.add(new DeleteTaxonDescriptionOperation(label, undoContext, (TaxonDescription) object, postOperationEnabled));
                                 }
+                               if(object instanceof SpecimenDescription){
+                                   operations.add(new DeleteSpecimenDescriptionOperation(label, undoContext, (SpecimenDescription) object, postOperationEnabled));
+                               }
                                 // DescriptionElementBase
                                 else if(object instanceof DescriptionElementBase){
                                         operations.add(new DeleteDescriptionElementOperation(label, undoContext, (DescriptionElementBase) object, postOperationEnabled));
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java

new file mode 100644 (file)

index 0000000..dcb01fd
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java
@@ -0,0 +1,76 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.editor.view.descriptive.operation;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+
+import eu.etaxonomy.cdm.model.description.SpecimenDescription;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+
+/**
+ *
+ * @author pplitzner
+ * @date Jan 15, 2015
+ *
+ */
+public class DeleteSpecimenDescriptionOperation extends AbstractPostOperation<SpecimenOrObservationBase<?>> {
+
+       private final SpecimenDescription description;
+
+       public DeleteSpecimenDescriptionOperation(String label, IUndoContext undoContext,
+               SpecimenDescription description, IPostOperationEnabled postOperationEnabled) {
+               super(label, undoContext, description.getDescribedSpecimenOrObservation(), postOperationEnabled);
+               this.description = description;
+       }
+
+       /* (non-Javadoc)
+        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+        */
+       /** {@inheritDoc} */
+       @Override
+       public IStatus execute(IProgressMonitor monitor, IAdaptable info)
+                       throws ExecutionException {
+
+               monitor.worked(20);
+               element.removeDescription(description);
+               monitor.worked(40);
+
+               return postExecute(description);
+       }
+
+       /* (non-Javadoc)
+        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+        */
+       /** {@inheritDoc} */
+       @Override
+       public IStatus redo(IProgressMonitor monitor, IAdaptable info)
+                       throws ExecutionException {
+               return execute(monitor, info);
+       }
+
+       /* (non-Javadoc)
+        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+        */
+       /** {@inheritDoc} */
+       @Override
+       public IStatus undo(IProgressMonitor monitor, IAdaptable info)
+                       throws ExecutionException {
+
+           element.addDescription(description);
+
+               return postExecute(null);
+       }
+}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityClassMarkerField.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityClassMarkerField.java

new file mode 100644 (file)

index 0000000..6a13ceb
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityClassMarkerField.java
@@ -0,0 +1,22 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.ui.views.markers.MarkerField;\r
+import org.eclipse.ui.views.markers.MarkerItem;\r
+\r
+import eu.etaxonomy.taxeditor.editor.validation.MarkerManager;\r
+\r
+public class EntityClassMarkerField extends MarkerField {\r
+\r
+       @Override\r
+       public String getValue(MarkerItem item)\r
+       {\r
+               try {\r
+                       Object value = item.getMarker().getAttribute(MarkerManager.ATTRIB_ENTITY_CLASS);\r
+                       return value == null ? "" : value.toString();\r
+               }\r
+               catch (CoreException e) {\r
+                       throw new RuntimeException("Error while retrieving value for " + MarkerManager.ATTRIB_ENTITY_CLASS);\r
+               }\r
+       }\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityIdMarkerField.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityIdMarkerField.java

new file mode 100644 (file)

index 0000000..40ec33c
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityIdMarkerField.java
@@ -0,0 +1,22 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.ui.views.markers.MarkerField;\r
+import org.eclipse.ui.views.markers.MarkerItem;\r
+\r
+import eu.etaxonomy.taxeditor.editor.validation.MarkerManager;\r
+\r
+public class EntityIdMarkerField extends MarkerField {\r
+\r
+       @Override\r
+       public String getValue(MarkerItem item)\r
+       {\r
+               try {\r
+                       Object value = item.getMarker().getAttribute(MarkerManager.ATTRIB_ENTITY_ID);\r
+                       return value == null ? "" : value.toString();\r
+               }\r
+               catch (CoreException e) {\r
+                       throw new RuntimeException("Error while retrieving value for " + MarkerManager.ATTRIB_ENTITY_ID);\r
+               }\r
+       }\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/InvalidValueMarkerField.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/InvalidValueMarkerField.java

new file mode 100644 (file)

index 0000000..b82324f
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/InvalidValueMarkerField.java
@@ -0,0 +1,22 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.ui.views.markers.MarkerField;\r
+import org.eclipse.ui.views.markers.MarkerItem;\r
+\r
+import eu.etaxonomy.taxeditor.editor.validation.MarkerManager;\r
+\r
+public class InvalidValueMarkerField extends MarkerField {\r
+\r
+       @Override\r
+       public String getValue(MarkerItem item)\r
+       {\r
+               try {\r
+                       Object value = item.getMarker().getAttribute(MarkerManager.ATTRIB_INVALID_VALUE);\r
+                       return value == null ? "" : value.toString();\r
+               }\r
+               catch (CoreException e) {\r
+                       throw new RuntimeException("Error while retrieving value for " + MarkerManager.ATTRIB_INVALID_VALUE);\r
+               }\r
+       }\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyDescriptionMarkerField.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyDescriptionMarkerField.java

new file mode 100644 (file)

index 0000000..0744a06
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyDescriptionMarkerField.java
@@ -0,0 +1,23 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.ui.views.markers.MarkerField;\r
+import org.eclipse.ui.views.markers.MarkerItem;\r
+\r
+import eu.etaxonomy.taxeditor.editor.validation.MarkerManager;\r
+\r
+public class UserFriendlyDescriptionMarkerField extends MarkerField {\r
+\r
+       @Override\r
+       public String getValue(MarkerItem item)\r
+       {\r
+               try {\r
+                       Object value = item.getMarker().getAttribute(MarkerManager.ATTRIB_USER_FRIENDLY_DESCRIPTION);\r
+                       return value == null ? "" : value.toString();\r
+               }\r
+               catch (CoreException e) {\r
+                       throw new RuntimeException("Error while retrieving value for " + MarkerManager.ATTRIB_USER_FRIENDLY_DESCRIPTION);\r
+               }\r
+       }\r
+\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyFieldNameMarkerField.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyFieldNameMarkerField.java

new file mode 100644 (file)

index 0000000..97d3db5
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyFieldNameMarkerField.java
@@ -0,0 +1,22 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.ui.views.markers.MarkerField;\r
+import org.eclipse.ui.views.markers.MarkerItem;\r
+\r
+import eu.etaxonomy.taxeditor.editor.validation.MarkerManager;\r
+\r
+public class UserFriendlyFieldNameMarkerField extends MarkerField {\r
+\r
+       @Override\r
+       public String getValue(MarkerItem item)\r
+       {\r
+               try {\r
+                       Object value = item.getMarker().getAttribute(MarkerManager.ATTRIB_USER_FRIENDLY_FIELD_NAME);\r
+                       return value == null ? "" : value.toString();\r
+               }\r
+               catch (CoreException e) {\r
+                       throw new RuntimeException("Error while retrieving value for " + MarkerManager.ATTRIB_USER_FRIENDLY_FIELD_NAME);\r
+               }\r
+       }\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyTypeNameMarkerField.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyTypeNameMarkerField.java

new file mode 100644 (file)

index 0000000..38419dc
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyTypeNameMarkerField.java
@@ -0,0 +1,22 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.ui.views.markers.MarkerField;\r
+import org.eclipse.ui.views.markers.MarkerItem;\r
+\r
+import eu.etaxonomy.taxeditor.editor.validation.MarkerManager;\r
+\r
+public class UserFriendlyTypeNameMarkerField extends MarkerField {\r
+\r
+       @Override\r
+       public String getValue(MarkerItem item)\r
+       {\r
+               try {\r
+                       Object value = item.getMarker().getAttribute(MarkerManager.ATTRIB_USER_FRIENDLY_TYPE_NAME);\r
+                       return value == null ? "" : value.toString();\r
+               }\r
+               catch (CoreException e) {\r
+                       throw new RuntimeException("Error while retrieving value for " + MarkerManager.ATTRIB_USER_FRIENDLY_TYPE_NAME);\r
+               }\r
+       }\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidationProblemsView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidationProblemsView.java

new file mode 100644 (file)

index 0000000..d81f97b
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidationProblemsView.java
@@ -0,0 +1,13 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.ui.views.markers.MarkerSupportView;\r
+\r
+public class ValidationProblemsView extends MarkerSupportView {\r
+\r
+       public ValidationProblemsView()\r
+       {\r
+               super("eu.etaxonomy.taxeditor.editor.validation.ValidationProblemsMarkerGenerator");\r
+       }\r
+\r
+       \r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorClassMarkerField.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorClassMarkerField.java

new file mode 100644 (file)

index 0000000..9b8aa12
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorClassMarkerField.java
@@ -0,0 +1,23 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.ui.views.markers.MarkerField;\r
+import org.eclipse.ui.views.markers.MarkerItem;\r
+\r
+import eu.etaxonomy.taxeditor.editor.validation.MarkerManager;\r
+\r
+public class ValidatorClassMarkerField extends MarkerField {\r
+\r
+       @Override\r
+       public String getValue(MarkerItem item)\r
+       {\r
+               try {\r
+                       Object value = item.getMarker().getAttribute(MarkerManager.ATTRIB_VALIDATOR_CLASS);\r
+                       return value == null ? "" : value.toString();\r
+               }\r
+               catch (CoreException e) {\r
+                       throw new RuntimeException("Error while retrieving value for " + MarkerManager.ATTRIB_VALIDATOR_CLASS);\r
+               }\r
+       }\r
+\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorMessageMarkerField.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorMessageMarkerField.java

new file mode 100644 (file)

index 0000000..970f337
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorMessageMarkerField.java
@@ -0,0 +1,23 @@
+package eu.etaxonomy.taxeditor.editor.view.validation;\r
+\r
+import org.eclipse.core.runtime.CoreException;\r
+import org.eclipse.ui.views.markers.MarkerField;\r
+import org.eclipse.ui.views.markers.MarkerItem;\r
+\r
+import eu.etaxonomy.taxeditor.editor.validation.MarkerManager;\r
+\r
+public class ValidatorMessageMarkerField extends MarkerField {\r
+\r
+       @Override\r
+       public String getValue(MarkerItem item)\r
+       {\r
+               try {\r
+                       Object value = item.getMarker().getAttribute(MarkerManager.ATTRIB_VALIDATOR_MESSAGE);\r
+                       return value == null ? "" : value.toString();\r
+               }\r
+               catch (CoreException e) {\r
+                       throw new RuntimeException("Error while retrieving value for " + MarkerManager.ATTRIB_VALIDATOR_MESSAGE);\r
+               }\r
+       }\r
+\r
+}\r
diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml

index 79596d803cae8b712484510a082650a04108ede2..e5bdcc9dd51baec814674fa64f8129c2cc61e180 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -2,7 +2,7 @@
  <feature
        id="eu.etaxonomy.taxeditor.feature.platform"
        label="Taxeditor Dependencies"
-      version="3.4.0.qualifier"
+      version="3.4.1.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 d7e0536d4226d8700b8ea8a7babc4c1ddbbd0039..8cf8942ce2d5f65d025fd2fc6ef3134b9d579b8e 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
@@ -3,7 +3,7 @@
         <parent>
                 <groupId>eu.etaxonomy</groupId>
                 <artifactId>taxeditor-parent</artifactId>
-               <version>3.4.0-SNAPSHOT</version>
+               <version>3.4.1-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 df501596241cb7adca55d5d4fa705bdef4692091..fddde21d23f7e0b2d6fb8bd21d06b11af6309fcf 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -2,7 +2,7 @@
  <feature
        id="eu.etaxonomy.taxeditor.feature"
        label="Taxonomic Editor"
-      version="3.4.0.qualifier"
+      version="3.4.1.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 d553aec651a999eb45752257d101155d75466219..ffa131cd2c1f67a7c42a6aa52d77bbcc749ed8b5 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -3,7 +3,7 @@
         <parent>
                 <groupId>eu.etaxonomy</groupId>
                 <artifactId>taxeditor-parent</artifactId>
-               <version>3.4.0-SNAPSHOT</version>
+               <version>3.4.1-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 9af1f6d9c2abec616084ccf4c992c33de9bfcc19..dd7490da21d54faad4a16fe651f1034f85f94dca 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: Help
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.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 be078cd807b17934d07a6c351953d59202178476..9c535e4fc5f5d4311d197e53359ac5e4f7c006f1 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/pom.xml
+++ b/eu.etaxonomy.taxeditor.help/pom.xml
@@ -4,7 +4,7 @@
         <parent>
                 <groupId>eu.etaxonomy</groupId>
                 <artifactId>taxeditor-parent</artifactId>
-               <version>3.4.0-SNAPSHOT</version>
+               <version>3.4.1-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 0c596eaf6ed7f8c0009e30663ecf54ac6041d3b9..7934335c5226f3f1bdafa97be2c51b9c8d1aaa35 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: Navigation Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.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 0667e56f6cf3546c2a982bf4a3dacceccf4ef053..8b061b761c113e8558ee20d8cccc25c126f281d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -98,6 +98,12 @@
                    label="%command.label.3"
                    style="push">
              </command>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
           </menu>
           <command
                 commandId="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler"
@@ -147,9 +153,14 @@
                 style="push">
                 <visibleWhen
                    checkEnabled="true">
-               <reference
-                     definitionId="isTaxonNode">
-               </reference>
+                  <and>
+                     <reference
+                           definitionId="isCdmStoreConnected">
+                     </reference>
+                     <reference
+                           definitionId="isTaxonNode">
+                     </reference>
+                  </and>
              </visibleWhen>
           </command>
           <command
@@ -181,11 +192,23 @@
                 commandId="org.eclipse.ui.file.import"
                 label="%command.label.8"
                 style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
           </command>
           <command
                 commandId="org.eclipse.ui.file.export"
                 label="%command.label.9"
                 style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
           </command>
           <separator
                 name="taxeditor-navigation.separator4"
@@ -195,12 +218,18 @@
                 commandId="org.eclipse.ui.edit.delete"
                 label="%command.label.10"
                 style="push">
-            <visibleWhen>
-               <not>
+            <visibleWhen
+                  checkEnabled="true">
+               <and>
                    <reference
-                        definitionId="isSynonymNode">
+                        definitionId="isCdmStoreConnected">
                    </reference>
-               </not>
+                  <not>
+                     <reference
+                           definitionId="isSynonymNode">
+                     </reference>
+                  </not>
+               </and>
              </visibleWhen>
           </command>
           <separator
@@ -211,11 +240,23 @@
                 commandId="org.eclipse.ui.file.refresh"
                 label="%command.label.11"
                 style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
           </command>
           <command
                 commandId="eu.etaxonomy.taxeditor.navigation.command.copyTaxonName"
                 label="%command.label.12"
                 style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
           </command>
        </menuContribution>
        <menuContribution
@@ -601,6 +642,13 @@
           properties="isChecklistEditorEnabled"
           type="org.eclipse.jface.viewers.IStructuredSelection">
     </propertyTester>
+   <propertyTester
+         class="eu.etaxonomy.taxeditor.preference.PreferencePropertyTester"
+         id="eu.etaxonomy.taxeditor.preferences.propertyTester"
+         namespace="eu.etaxonomy.taxeditor.preferences.propertyTester"
+         properties="isCdmStoreConnected"
+         type="org.eclipse.jface.viewers.IStructuredSelection">
+   </propertyTester>
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">
@@ -649,5 +697,14 @@
              </test>
           </with>
        </definition>
+      <definition
+            id="isCdmStoreConnected">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.preferences.propertyTester.isCdmStoreConnected">
+            </test>
+         </with>
+      </definition>
     </extension>
  </plugin>
diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml

index 67c35d572774424ab4cbbbe485c8dd12ccaee1af..1e08059be538b4190645add7d4b8bd0fc2109166 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -4,7 +4,7 @@
         <parent>
                 <groupId>eu.etaxonomy</groupId>
                 <artifactId>taxeditor-parent</artifactId>
-               <version>3.4.0-SNAPSHOT</version>
+               <version>3.4.1-SNAPSHOT</version>
         </parent>
  
         <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java

index 09c3f22daecbca943431234d7f3589eeca165cd8..cf7ae81e43ed3c6cb6cc7142e22445a6a697f0d5 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
@@ -28,10 +28,13 @@ import org.eclipse.ui.PartInitException;
  import org.eclipse.ui.handlers.HandlerUtil;
  
  import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
+import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator;
+import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator.ChildHandling;
  import eu.etaxonomy.cdm.model.common.ITreeNode;
  import eu.etaxonomy.cdm.model.taxon.Classification;
  import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
  import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonNodeDaoHibernateImpl;
  import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
@@ -87,9 +90,10 @@ public class DeleteHandler extends AbstractHandler implements IHandler{
                                 
                                 ITaxonTreeNode treeNode = treeNodes.iterator().next();
                                 ITaxonTreeNode taxonNode =treeNode;
-                               
+                               TaxonNodeDeletionConfigurator configNodes = new TaxonNodeDeletionConfigurator();
+                               TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
                                 if (taxonNode instanceof Classification && taxonNode.hasChildNodes()){
-                                       if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Do you really want to delete the classification? The tree has children, they will be deleted, too")){
+                                       if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Do you really want to delete the classification? The tree has children, they will be deleted, too.")){
                                                 return null;
                                         }
                                 } else if (taxonNode instanceof Classification && !taxonNode.hasChildNodes()){
@@ -97,8 +101,29 @@ public class DeleteHandler extends AbstractHandler implements IHandler{
                                                 return null;
                                         }
                                 } else {
-                                       if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Do you really want to delete the selected node?")){
-                                               return null;
+                                       if (taxonNode.hasChildNodes()){
+                                               MessageDialog dialog = new MessageDialog(HandlerUtil.getActiveShell(event), "Confirm Deletion", null,
+                                                           "Do you really want to delete the selected node? It has childnodes, they will be deleted, too.", MessageDialog.WARNING, new String[] { "Delete all children",
+                                                         "Move children to parent node", "Skip" }, 0);
+                                               int result = dialog.open();
+                                               
+                                               if (result == 0){
+                                                       //delete all children
+                                                       configNodes.setChildHandling(ChildHandling.DELETE);
+                                                       config.setTaxonNodeConfig(configNodes);
+                                               } else if (result == 1){
+                                                       //move children
+                                                       configNodes.setChildHandling(ChildHandling.MOVE_TO_PARENT);
+                                                       config.setTaxonNodeConfig(configNodes);
+                                               } else if (result == 2){
+                                                       //skip
+                                                       return null;
+                                                       
+                                               }
+                                       }else{
+                                               if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Do you really want to delete the selected node?")){
+                                                       return null;
+                                               }
                                         }
                                 }
         
@@ -108,7 +133,7 @@ public class DeleteHandler extends AbstractHandler implements IHandler{
                                         }*/
                                                 operation = new DeleteOperation(
                                                                 event.getCommand().getName(), NavigationUtil.getUndoContext(),
-                                                               taxonNode, new TaxonDeletionConfigurator(), taxonNavigator, taxonNavigator);
+                                                               taxonNode, config, taxonNavigator, taxonNavigator);
                         
                                                 NavigationUtil.executeOperation(operation);
                                                 //}
diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF

index 2b4b2ade6f166a2da787877be7bc7ccb268e6b41..c21dab12c54b558d966349f476c5dcf3733af7c3 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: Printpublisher Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.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 6aaf4e7fcdb68fbe6d895282a06f041d6543e7b0..4184183b4d720b347f504a85cd011b14dfec7498 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -4,7 +4,7 @@
         <parent>
                 <artifactId>taxeditor-parent</artifactId>
                 <groupId>eu.etaxonomy</groupId>
-               <version>3.4.0-SNAPSHOT</version>
+               <version>3.4.1-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 9b30b76b8d26907629b46460ec24e243daa10ba1..7fdf17bb22ab5f7d475d89f445354e432e111400 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
  Bundle-ManifestVersion: 2
  Bundle-Name: DataStore Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
  Bundle-Vendor: EDIT
  Export-Package: eu.etaxonomy.cdm,
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties

index 760c9e30a4d476ba6b3d69afd87ca973c92958a2..860efe827b4a47a29a2cc01dedde3d075fa92e0d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -23,7 +23,7 @@ page.name.19 = Stage
  page.name.20 = Preservation Method\r
  page.name.21 = Feature Tree\r
  page.name.22 = Default Feature Trees\r
-page.name.23 = Language\r
+page.name.23 = Representation\r
  page.name.24 = Mobot Open Url\r
  page.name.25 = Type Designations\r
  view.name = Datasource\r
@@ -128,4 +128,4 @@ page.name.26 = Specimens and FieldUnits
  page.name.27 = Media\r
  page.name.28 = Checklist Editor\r
  page.name.29 = Editor Profile\r
-page.name.30 = Default Language
-\ No newline at end of file
+page.name.30 = Language
+\ 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 2923d539fc6d78e2b3b8b050691864492c1a598c..4f79394c0c4c3f6c43693bffd7edb08f38cefaa3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -23,7 +23,7 @@ page.name.19 = Stufe (Stage)
  page.name.20 = Erhaltungs-(Preservation) Methode
  page.name.21 = Merkmalsbaum
  page.name.22 = Standard Merkmalsbaum
-page.name.23 = Sprache
+page.name.23 = Repr\u00e4sentation
  page.name.24 = Mobot Open Url
  page.name.25 = Typ Bezeichnungen
  view.name = Datenquelle
@@ -38,7 +38,7 @@ editor.name = Editor f\u00fcr definierte Begriffe
  menu.label = Zeige Ansicht
  command.label = Derivatsuche
  command.label.0 = Details
-command.label.1 = Zusatz
+command.label.1 = Zusatzdaten
  command.label.2 = Datenquelle
  command.label.3 = Fehlermeldungen
  command.label.4 = Berichte
@@ -128,4 +128,4 @@ page.name.26 = Specimens und FieldUnits
  page.name.27 = Media
  page.name.28 = Checklist Editor
  page.name.29 = Editor Profil
-page.name.30 = Standardsprache
-\ No newline at end of file
+page.name.30 = Sprache
+\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_en.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_en.properties

index 760c9e30a4d476ba6b3d69afd87ca973c92958a2..860efe827b4a47a29a2cc01dedde3d075fa92e0d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_en.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_en.properties
@@ -23,7 +23,7 @@ page.name.19 = Stage
  page.name.20 = Preservation Method\r
  page.name.21 = Feature Tree\r
  page.name.22 = Default Feature Trees\r
-page.name.23 = Language\r
+page.name.23 = Representation\r
  page.name.24 = Mobot Open Url\r
  page.name.25 = Type Designations\r
  view.name = Datasource\r
@@ -128,4 +128,4 @@ page.name.26 = Specimens and FieldUnits
  page.name.27 = Media\r
  page.name.28 = Checklist Editor\r
  page.name.29 = Editor Profile\r
-page.name.30 = Default Language
-\ No newline at end of file
+page.name.30 = Language
+\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml

index 44d489e5a759533a2f63881b7fa8d69902a4d258..9a68e2ec1c858bbedad3833bbcfaa01e1dbe75da 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -158,8 +158,8 @@
              name="%page.name.22">
        </page>
        <page
-            category="eu.etaxonomy.taxeditor.preferences.general"
-            class="eu.etaxonomy.taxeditor.preference.LanguagePreferencePage"
+            category="eu.etaxonomy.taxeditor.preference.defaultlanguagepditorpreferencePage"
+            class="eu.etaxonomy.taxeditor.preference.LanguageRepresentationPreferencePage"
              id="eu.etaxonomy.taxeditor.preferences.language"
              name="%page.name.23">
        </page>
@@ -201,7 +201,7 @@
        </page>
        <page
              category="eu.etaxonomy.taxeditor.preferences.general"
-            class="eu.etaxonomy.taxeditor.preference.DefaultLanguageEditorPreferencePage"
+            class="eu.etaxonomy.taxeditor.preference.LanguageEditorPreferencePage"
              id="eu.etaxonomy.taxeditor.preference.defaultlanguagepditorpreferencePage"
              name="%page.name.30">
        </page>
@@ -305,13 +305,25 @@
              </command>
              <command
                    commandId="org.eclipse.ui.views.showView"
-                  label="%command.label.1"
+                  id="org.eclipse.ui.views.showView.supplemental"
+                     label="%command.label.1"
                    style="push">
                 <parameter
                       name="org.eclipse.ui.views.showView.viewId"
                       value="eu.etaxonomy.taxeditor.view.supplementalData">
                 </parameter>
              </command>
+            <!-- Originally used by validation framework, currently not in use -->
+       <!--        <command
+                        id="org.eclipse.ui.views.showView.problems"
+                    commandId="org.eclipse.ui.views.showView"
+                    label="Problems"
+                    style="push">
+                 <parameter
+                       name="org.eclipse.ui.views.showView.viewId"
+                       value="org.eclipse.ui.views.ProblemView">
+                 </parameter>
+              </command>  -->
              <separator
                    name="eu.etaxonomy.taxeditor.store.showViewMenu.internal"
                    visible="true">
@@ -521,6 +533,15 @@
                 commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
                 label="Open in Derivate Editor"
                 style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <with
+                     variable="selection">
+                  <count
+                        value="+">
+                  </count>
+               </with>
+            </visibleWhen>
           </command>
        </menuContribution>
     </extension>
diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml

index 5273219f82e4586152b33e882360b484391a96a4..b18da903ef0b6429ee1ef38aff53110fb27aaf60 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -4,7 +4,7 @@
    <parent>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>taxeditor-parent</artifactId>
-       <version>3.4.0-SNAPSHOT</version>
+       <version>3.4.1-SNAPSHOT</version>
    </parent>
  
    <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java

index c2975144f35b7012631f9300aacc0a7890a0ac6b..275c39d3d7164c6759db1be286d543471b6ab26f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
@@ -36,6 +36,7 @@ public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigur
  
         private Abcd206ImportConfigurator configurator;
         private ImportFromFileDataSourceWizardPage dataSourcePage;
+       private ClassificationChooserWizardPage classificationChooserWizardPage;
  
         /* (non-Javadoc)
          * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
@@ -61,6 +62,10 @@ public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigur
          }
                 configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
  
+               if(classificationChooserWizardPage.getClassification()!=null){
+                   configurator.setClassificationUuid(classificationChooserWizardPage.getClassification().getUuid());
+               }
+
                 CdmStore.getImportManager().run(configurator);
                 return true;
  
@@ -84,7 +89,9 @@ public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigur
         public void addPages() {
                 super.addPages();
  
+               classificationChooserWizardPage = ClassificationChooserWizardPage.createPage();
                 dataSourcePage = ImportFromFileDataSourceWizardPage.XML();
+               addPage(classificationChooserWizardPage);
                 addPage(dataSourcePage);
         }
  }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ClassificationChooserWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ClassificationChooserWizardPage.java

new file mode 100644 (file)

index 0000000..716481a
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ClassificationChooserWizardPage.java
@@ -0,0 +1,123 @@
+// $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.io.wizard;
+
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wb.swt.ResourceManager;
+
+import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;
+
+/**
+ * <p>ImportFromFileDataSourceWizardPage class.</p>
+ *
+ * @author n.hoffmann
+ * @created 04.08.2009
+ * @version 1.0
+ */
+public class ClassificationChooserWizardPage extends WizardPage implements Listener{
+
+       public static final String PAGE_NAME = "ClassificationChooserWizardPage";
+
+    private Text textClassification;
+    private Classification classification;
+    private Button btnBrowseClassification;
+
+    private Button btnClear;
+
+       /**
+        * <p>Constructor for ImportFromFileDataSourceWizardPage.</p>
+        *
+        * @param title a {@link java.lang.String} object.
+        * @param description a {@link java.lang.String} object.
+        * @param extensions an array of {@link java.lang.String} objects.
+        */
+       protected ClassificationChooserWizardPage(String title, String description) {
+               super(PAGE_NAME);
+
+               setTitle(title);
+
+               setDescription(description);
+
+       }
+
+       /**
+        * <p>XML</p>
+        *
+        * @return a {@link eu.etaxonomy.taxeditor.io.wizard.ClassificationChooserWizardPage} object.
+        */
+       protected static ClassificationChooserWizardPage createPage(){
+               return new ClassificationChooserWizardPage("Choose Classification", "Note: Selecting no classification will create a default one.");
+       }
+
+
+
+       /* (non-Javadoc)
+        * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+        */
+       /** {@inheritDoc} */
+       @Override
+    public void createControl(Composite parent) {
+               final Composite composite = new Composite(parent, SWT.NULL);
+
+               GridLayout gridLayout = new GridLayout();
+               gridLayout.numColumns = 4;
+               composite.setLayout(gridLayout);
+
+               Label label = new Label(composite, SWT.NONE);
+               label.setText("Classification");
+               textClassification = new Text(composite, SWT.NONE);
+               textClassification.setEnabled(false);
+               textClassification.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+               btnBrowseClassification = new Button(composite, SWT.NONE);
+               btnBrowseClassification.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/open.gif"));
+               btnBrowseClassification.addListener(SWT.Selection, this);
+               btnClear = new Button(composite, SWT.NONE);
+               btnClear.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/trash.gif"));
+               btnClear.addListener(SWT.Selection, this);
+
+               setControl(composite);
+       }
+
+       /* (non-Javadoc)
+        * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
+        */
+       @Override
+       public void handleEvent(Event event) {
+           if(event.widget==btnBrowseClassification){
+               classification = SelectionDialogFactory.getSelectionFromDialog(Classification.class, getShell(), null, null);
+               if(classification!=null){
+                   textClassification.setText(classification.getTitleCache());
+               }
+           }
+           else if(event.widget==btnClear){
+               classification = null;
+               textClassification.setText("");
+           }
+       }
+
+
+    /**
+     * @return the classification
+     */
+    public Classification getClassification() {
+        return classification;
+    }
+}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java

index fec238815d0f770d2353a1c274d0a9bdeb0be151..744044a2b4efeaa97acf39a7f06121d62e10a2d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java
@@ -76,7 +76,7 @@ public class ExcelNormalExplicitTaxaImportWizard extends AbstractImportWizard<No
                 super.addPages();
  
                 dataSourcePage = new ImportFromFileDataSourceWizardPage("Choose NormalExplicit",
-                               "Please choose an xls file in the NormalExplicit format.", new String[]{"*.xls" ,"*.xlsx", "*.*"});
+                               "Please choose an xls file in the NormalExplicit format.", new String[]{"*.xlsx", "*.xls", "*.*"});
                 addPage(dataSourcePage);
         }
  }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/NomenclaturalCodeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/NomenclaturalCodeWizardPage.java

index 361fcaf63392554d60bfd09c452964bd0d4812d1..af287cab18238f968d32a0a9cba03a6c98b44cea 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/NomenclaturalCodeWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/NomenclaturalCodeWizardPage.java
@@ -1,9 +1,9 @@
  // $Id$
  /**
  * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
  */
@@ -34,17 +34,19 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
   * @version 1.0
   */
  public class NomenclaturalCodeWizardPage extends WizardPage {
-       
-       private IImportConfigurator configurator;
+
+    private static final Logger logger = Logger.getLogger(NomenclaturalCodeWizardPage.class);
+
+    private IImportConfigurator configurator;
  
         /**
          * <p>Constructor for NomenclaturalCodeWizardPage.</p>
          */
         public NomenclaturalCodeWizardPage() {
                 super("Choose nomenclatural code");
-               
+
                 this.setTitle("Choose nomenclatural code");
-               
+
                 this.setDescription("Choose which code to use for imported names.");
         }
  
@@ -58,37 +60,40 @@ public class NomenclaturalCodeWizardPage extends WizardPage {
                 this.configurator = configurator;
         }
  
-       private static final Logger logger = Logger
-                       .getLogger(NomenclaturalCodeWizardPage.class);
  
         /* (non-Javadoc)
          * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
          */
         /** {@inheritDoc} */
-       public void createControl(Composite parent) {
+       @Override
+    public void createControl(Composite parent) {
                 Composite container = new Composite(parent, SWT.NULL);
                 container.setLayout(new FillLayout());
-                               
+
                 final Group group = new Group(container, SWT.NONE);
                 group.setLayout(new GridLayout());
-               
+
                 NomenclaturalCode preferredCode = PreferencesUtil.getPreferredNomenclaturalCode();
-               
+
                 // set preferred code as default
                 configurator.setNomenclaturalCode(preferredCode);
-               
+
                 for (final NomenclaturalCode code : NomenclaturalCodeHelper.getSupportedCodes()) {
                         Button button = new Button(group, SWT.RADIO);
                         button.setText(NomenclaturalCodeHelper.getDescription(code));
                         button.setData(code);
                         button.setSelection(preferredCode.equals(code));
                         button.addSelectionListener(new SelectionAdapter() {
-                               public void widgetSelected(SelectionEvent e) {
+                               @Override
+                public void widgetSelected(SelectionEvent e) {
                                         configurator.setNomenclaturalCode((NomenclaturalCode) e.widget.getData());
                                 }
                         });
-               }               
-               
+               }
+
+
                 setControl(container);
         }
+
+
  }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SpecimenCdmExcelImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SpecimenCdmExcelImportWizard.java

index 028225f0ab50c9a65d96d3ac316a112e008bb804..3b8a6e7564cee68f363f7681bd4e66e70677f26e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SpecimenCdmExcelImportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SpecimenCdmExcelImportWizard.java
@@ -63,7 +63,7 @@ public class SpecimenCdmExcelImportWizard extends AbstractImportWizard<SpecimenC
                 super.addPages();
  
                 dataSourcePage = new ImportFromFileDataSourceWizardPage("Choose Specimen CDM Excel",
-                               "Please choose an xls file in the SpecimenCdmExcel format.", new String[]{"*.xls" ,"*.xlsx", "*.*"});
+                               "Please choose an xls file in the SpecimenCdmExcel format.", new String[]{"*.xlsx", "*.xls", "*.*"});
                 addPage(dataSourcePage);
         }
  
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java

index a85d94b6c6d5f39793a07522f9730c64ff145195..c5363d6e3212107a389f16d9dea51a08a1b5ca60 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
@@ -1,9 +1,9 @@
  // $Id$
  /**
  * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
  */
@@ -31,6 +31,7 @@ import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
  import eu.etaxonomy.cdm.model.description.FeatureTree;
  import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
  import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.store.CdmStore;
  
  /**
@@ -44,7 +45,7 @@ public class DefaultFeatureTreePreferenecs extends PreferencePage implements IWo
  
         private FeatureTree defaultFeatureTreeForTextualDescription;
         private FeatureTree defaultFeatureTreeForStructuredDescription;
-       
+
         /* (non-Javadoc)
          * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
          */
@@ -53,70 +54,73 @@ public class DefaultFeatureTreePreferenecs extends PreferencePage implements IWo
         protected Control createContents(Composite parent) {
                 defaultFeatureTreeForTextualDescription = PreferencesUtil.getDefaultFeatureTreeForTextualDescription();
                 defaultFeatureTreeForStructuredDescription = PreferencesUtil.getDefaultFeatureTreeForStructuredDescription();
-               
+
                 Composite composite = new Composite(parent, SWT.NULL);
                 composite.setLayout(new GridLayout());
-               
-               createTextTreeSelection(composite);
-               createStructureTreeSelection(composite);
-               
+               if(!CdmStore.isActive()) {
+            MessagingUtils.noDataSourceWarningDialog(null);
+               }else{
+                   createTextTreeSelection(composite);
+                   createStructureTreeSelection(composite);
+               }
+
                 return composite;
         }
-       
+
         private void createTextTreeSelection(Composite parent){
                 final CLabel label = new CLabel(parent, SWT.NONE);
                 label.setText("Deafult Feature Tree to be used for textual descriptions");
-               
+
                 final ListViewer viewer = new ListViewer(parent);
                 viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-               
+
                 viewer.setContentProvider(new FeatureTreeContentProvider());
                 viewer.setLabelProvider(new FeatureTreeLabelProvider());
-               
+
                 viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-                       
+
                         @Override
                         public void selectionChanged(SelectionChangedEvent arg0) {
                                 IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
-                               
+
                                 defaultFeatureTreeForTextualDescription = (FeatureTree) selection.getFirstElement();
                         }
                 });
-               
+
                 List<FeatureTree> input = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null);
-                               
+
                 viewer.setInput(input);
-               
+
                 if(defaultFeatureTreeForTextualDescription != null){
                         IStructuredSelection selection = new StructuredSelection(defaultFeatureTreeForTextualDescription);
                         viewer.setSelection(selection, true);
                 }
         }
-       
+
         private void createStructureTreeSelection(Composite parent){
                 final CLabel label = new CLabel(parent, SWT.NONE);
                 label.setText("Deafult Feature Tree to be used for structured descriptions");
-               
+
                 final ListViewer viewer = new ListViewer(parent);
                 viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-               
+
                 viewer.setContentProvider(new FeatureTreeContentProvider());
                 viewer.setLabelProvider(new FeatureTreeLabelProvider());
-               
+
                 viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-                       
+
                         @Override
                         public void selectionChanged(SelectionChangedEvent arg0) {
                                 IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
-                               
+
                                 defaultFeatureTreeForStructuredDescription = (FeatureTree) selection.getFirstElement();
                         }
                 });
-               
+
                 List<FeatureTree> input = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null);
-                               
+
                 viewer.setInput(input);
-               
+
                 if(defaultFeatureTreeForStructuredDescription != null){
                         IStructuredSelection selection = new StructuredSelection(defaultFeatureTreeForStructuredDescription);
                         viewer.setSelection(selection, true);
@@ -128,23 +132,23 @@ public class DefaultFeatureTreePreferenecs extends PreferencePage implements IWo
         public void init(IWorkbench workbench) {
                 setPreferenceStore(PreferencesUtil.getPreferenceStore());
         }
-       
+
         /** {@inheritDoc} */
         @Override
         public boolean performOk() {
                 String defaultFeatureTreeForTextualDescriptionUuid = "";
                 String defaultFeatureTreeForStructuredDescriptionUuid = "";
-               
+
                 if(defaultFeatureTreeForTextualDescription != null){
                         defaultFeatureTreeForTextualDescriptionUuid = defaultFeatureTreeForTextualDescription.getUuid().toString();
                 }
                 if(defaultFeatureTreeForStructuredDescription != null){
                         defaultFeatureTreeForStructuredDescriptionUuid = defaultFeatureTreeForStructuredDescription.getUuid().toString();
                 }
-               
+
                 getPreferenceStore().setValue(IPreferenceKeys.FEATURE_TREE_DEFAULT_TEXT, defaultFeatureTreeForTextualDescriptionUuid);
                 getPreferenceStore().setValue(IPreferenceKeys.FEATURE_TREE_DEFAULT_STRUCTURE, defaultFeatureTreeForStructuredDescriptionUuid);
-               
+
                 return super.performOk();
         }
  }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultLanguageEditorPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageEditorPreferencePage.java

similarity index 95%

rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultLanguageEditorPreferencePage.java

rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageEditorPreferencePage.java

index de20ab626987e528d9b0b1119db1838ebb9791ce..9732a344102177dc284c7d69882ff6f7a16f6645 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultLanguageEditorPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageEditorPreferencePage.java
@@ -31,7 +31,7 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
   * @created Dec 3, 2010
   * @version 1.0
   */
-public class DefaultLanguageEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage{
+public class LanguageEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage{
  
      private CCombo combo;
      PreferencesUtil preferencesUtil = new PreferencesUtil();
@@ -57,7 +57,7 @@ public class DefaultLanguageEditorPreferencePage extends PreferencePage implemen
          description.setText("After changing the default language, a restart is required,\nin order for the new settings to take effect.");
  
          final Label label = new Label(container, SWT.NONE);
-        label.setText("Please choose your default language: ");
+        label.setText("Please choose your default language for the editor: ");
  
          GridData oneLine = new GridData();
          oneLine.grabExcessHorizontalSpace = true;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java

similarity index 97%

rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java

rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java

index b816fd4956165bfa33a117209acc581b45f8ba25..901a5b91f01cc02d650e8755f00086126abc6102 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java
@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
   * @created Dec 3, 2010
   * @version 1.0
   */
-public class LanguagePreferencePage extends PreferencePage implements IWorkbenchPreferencePage{
+public class LanguageRepresentationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage{
  
         private boolean isMultilanguageTextEditingCapability;
         private Language globalLanguage;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java

index 8a00f1ff73be6da4e71414d9ede15a3b238b7dab..62c31c9195624eb7e7c40e22556024c6f86155d1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java
@@ -12,6 +12,8 @@ package eu.etaxonomy.taxeditor.preference;
  
  import org.eclipse.core.expressions.PropertyTester;
  
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
  /**
   * @author n.hoffmann
   * @created Jan 26, 2011
@@ -22,7 +24,9 @@ public class PreferencePropertyTester extends PropertyTester {
  
         private static final String SHOW_EXPERIMENTAL_FEATURES = "isShowExperimentalFeatures";
  
-       private static final String SHOW_CHECKLIST_EDITOR = "isChecklistEditorEnabled";
+    private static final String SHOW_CHECKLIST_EDITOR = "isChecklistEditorEnabled";
+
+       private static final String EDITOR_IS_CONNECTED_TO_DB = "isCdmStoreConnected";
  
         /* (non-Javadoc)
          * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
@@ -37,6 +41,9 @@ public class PreferencePropertyTester extends PropertyTester {
             if(SHOW_CHECKLIST_EDITOR.equals(property)){
                 return isChecklistEditorEnabled();
             }
+           if(EDITOR_IS_CONNECTED_TO_DB.equals(property)){
+               return isCdmStoreConnected();
+           }
  
                 return false;
         }
@@ -51,4 +58,9 @@ public class PreferencePropertyTester extends PropertyTester {
         private boolean isChecklistEditorEnabled() {
          return PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
      }
+
+       private boolean isCdmStoreConnected(){
+           boolean active = CdmStore.isActive();
+           return active;
+       }
  }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java

index 7e2c95d4d9af211c924667b207f1bdc2ba262a5f..62414dcfd669bdc1906a5783521a81625ae3bd38 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -393,7 +393,7 @@ public class PreferencesUtil implements IPreferenceKeys {
                                 "http://www.biodiversitylibrary.org/openurl");
                 getPreferenceStore().setDefault(OPENURL_IMAGE_MAX_WIDTH, "1000");
                 getPreferenceStore().setDefault(OPENURL_IMAGE_MAX_HEIGHT, "1000");
-               getPreferenceStore().setDefault(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE, true);
+               getPreferenceStore().setDefault(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE, false);
         }
  
         /**
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java

index 79ac53cd873793fc34eafad7b99b25f225d79dd7..e09625ccecdfd2c3703a481ef9be111123a26838 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java
@@ -1,9 +1,9 @@
  // $Id$
  /**
  * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
  */
@@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.strategy.match.MatchException;
  import eu.etaxonomy.cdm.strategy.match.MatchMode;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator;
+import eu.etaxonomy.taxeditor.store.CdmStore;
  
  /**
   * <p>Abstract AbstractMatchingPreferences class.</p>
@@ -52,13 +53,13 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
                                 "|parsingProblem|problemStarts|problemEnds|PROTECTED|NOT_PROTECTED|propertyChangeSupport";
  
         protected IMatchStrategy matchStrategy;
-       
+
         protected Class<T> clazz;
  
         private List<MatchMode> matchModeList;
-       
+
         protected Map<String, Combo> matchModeCombos = new HashMap<String, Combo>();
-       
+
         /* (non-Javadoc)
          * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
          */
@@ -69,70 +70,72 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
                 GridLayout gridLayout = new GridLayout();
                 gridLayout.numColumns = 2;
                 composite.setLayout(gridLayout);
-               
-               
-               for(String fieldName : getFieldNames()){
-                       createFieldWidget(composite, fieldName);
-               }
-               
+
+               if(!CdmStore.isActive()) {
+            MessagingUtils.noDataSourceWarningDialog(null);
+        }else{
+            for(String fieldName : getFieldNames()){
+                createFieldWidget(composite, fieldName);
+            }
+        }
+
                 return composite;
         }
-       
+
         /**
          * Creates a widget for a field consisting of the label and a combo
-        * 
+        *
          * @see {@link #createMatchModeCombo(Composite, String, MatchMode)}
          * @param composite
          * @param fieldName
          */
         private void createFieldWidget(Composite parent, String fieldName) {
-               CLabel label = new CLabel(parent, SWT.NONE);
-               label.setText(fieldName);
-               
-               MatchMode matchMode = matchStrategy.getMatchMode(fieldName);
-               
-               createMatchModeCombo(parent, fieldName, matchMode);             
-       }       
-       
+           CLabel label = new CLabel(parent, SWT.NONE);
+           label.setText(fieldName);
+           MatchMode matchMode = matchStrategy.getMatchMode(fieldName);
+
+           createMatchModeCombo(parent, fieldName, matchMode);
+       }
+
         /**
          * Creates a combo for a field with the currently selected match mode for that field preselected
-        * 
+        *
          * @param parent
          * @param matchMode
          */
         private void createMatchModeCombo(Composite parent, String fieldName, MatchMode selectedMatchMode) {
                 Combo matchModeCombo = new Combo(parent, SWT.NULL);
-               
+
                 for (MatchMode matchMode : getMatchModeList()) {
                         matchModeCombo.add(matchMode.name());
                 }
-               
+
                 int index = getMatchModeList().indexOf(selectedMatchMode);
-               
+
                 matchModeCombo.select(index);
-               
+
                 matchModeCombo.addSelectionListener(new MatchModeComboSelectionListener(matchModeCombo, fieldName));
-               
+
                 matchModeCombos.put(fieldName, matchModeCombo);
         }
-       
+
         /**
          * This listener updates the cache strategy when a value was changed in one of the combos
-        * 
+        *
          * @author n.hoffmann
          * @created Jan 28, 2010
          * @version 1.0
          */
         private class MatchModeComboSelectionListener extends SelectionAdapter{
-               
-               private Combo matchModeCombo;
-               private String fieldName;
+
+               private final Combo matchModeCombo;
+               private final String fieldName;
  
                 MatchModeComboSelectionListener(Combo matchModeCombo, String fieldName){
                         this.matchModeCombo = matchModeCombo;
                         this.fieldName = fieldName;
                 }
-               
+
                 /* (non-Javadoc)
                  * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
                  */
@@ -151,7 +154,7 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
  
         /**
          * Transforms the MatchMode enum into a list.
-        * 
+        *
          * @return
          */
         private List<MatchMode> getMatchModeList(){
@@ -163,25 +166,25 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
  
         /**
          * Get names of all declared fields
-        * 
+        *
          * @return
          */
-       private List<String> getFieldNames(){                           
+       private List<String> getFieldNames(){
                 List<Field> fields = new ArrayList<Field>();
-               
+
                 fields = getAllFields(fields, clazz);
                 List<String> fieldNames = new ArrayList<String>();
-               
+
                 for(Field field : fields){
                         String fieldName = field.getName();
                         if(! fieldName.matches(ExcludePattern)){
                                 fieldNames.add(fieldName);
                         }
                 }
-               
+
                 return fieldNames;
         }
-       
+
         /**
          * Get all declared fields including fields of the superclasses.
          *
@@ -198,7 +201,7 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
  
             return fields;
         }
-       
+
         /* (non-Javadoc)
          * @see org.eclipse.jface.preference.PreferencePage#performApply()
          */
@@ -208,7 +211,7 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
                 MatchStrategyConfigurator.setMatchStrategy(matchStrategy);
                 super.performApply();
         }
-       
+
         /* (non-Javadoc)
          * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
          */
@@ -218,21 +221,21 @@ public abstract class AbstractMatchingPreferences<T extends IdentifiableEntity>
                 try {
                         // set match strategy to default
                         matchStrategy = getDefaultMatchStrategy();
-                       
+
                         // set combos to their default values
                         for(String fieldName : matchModeCombos.keySet()){
                                 Combo combo = matchModeCombos.get(fieldName);
                                 MatchMode matchMode = matchStrategy.getMatchMode(fieldName);
                                 combo.select(matchModeList.indexOf(matchMode));
                         }
-                       
+
                 } catch (MatchException e) {
                         MessagingUtils.error(this.getClass(), e);
                         throw new RuntimeException(e);
                 }
                 super.performDefaults();
         }
-       
+
         /**
          * Returns the default match strategy for the respective class
          *
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java

index 8f8af98791929443405592973c49f9abf6f608d0..d6a35ccc57be621b42f2b4d45c4f26ad1b91fe75 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
@@ -61,7 +61,7 @@ AbstractFilteredCdmResourceSelectionDialog<Amplification> {
      /** {@inheritDoc} */
      @Override
      protected void initModel() {
-        model = CdmStore.getService(IAmplificationService.class).getAmplificationUuidAndDescription();
+        model = CdmStore.getService(IAmplificationService.class).getAmplificationUuidAndLabelCache();
      }
  
      /* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java

index d97c62333cf7472f5ff7820bf1803aa3f3336ada..a4aca0cdea6031c80fa91da4dda52329cd7096d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java
@@ -70,15 +70,10 @@ public class MediaDetailsSection extends AbstractCdmDetailSection<Media> {
      protected Control createToolbar() {
          ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
  
-        final String label;
-        if(element_media.isAdvancedMediaView()){
-            label = "Use simple media view";
-        }
-        else{
-            label = "Use advanced media view";
-        }
-
-        Action addAction = new Action("Use advanced media view", IAction.AS_PUSH_BUTTON) {
+        //FIXME: duplicate code (see #4598)
+        final String label = "Change View Type";
+
+        Action addAction = new Action(label, IAction.AS_PUSH_BUTTON) {
              /* (non-Javadoc)
               * @see org.eclipse.jface.action.Action#run()
               */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java

index 0f19002fe4a251f20587af23880f9f45deaff0cd..6a7b2f2832d701b872558711e02d2e0971b49922 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java
@@ -17,11 +17,11 @@ import java.util.Collection;
  import org.apache.http.HttpException;
  import org.eclipse.swt.events.SelectionListener;
  
+import eu.etaxonomy.cdm.common.UriUtils;
  import eu.etaxonomy.cdm.common.media.ImageInfo;
  import eu.etaxonomy.cdm.model.media.ImageFile;
  import eu.etaxonomy.cdm.model.media.MediaRepresentation;
  import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
  import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
  import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -109,7 +109,7 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement<
                         ImageFile imageFile = (ImageFile) mediaRepresentationPart;
  
                         URI uri = imageFile.getUri();
-                       if(uri == null){
+                       if(!UriUtils.isServiceAvailable(uri)){
                                 return;
                         }
                         try {
@@ -119,10 +119,14 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement<
                                 getEntity().setMimeType(mimeType);
                                 text_suffix.setText(imageInfo.getSuffix());
                                 getEntity().setSuffix(imageInfo.getSuffix());
-                       } catch (IOException e) {
-                               MessagingUtils.error(getClass(), e);
-                       } catch (HttpException e) {
-                               MessagingUtils.error(getClass(), e);
+                       }
+                       //theses exceptions do not need to be logged
+                       //especially because this happens with every key stroke
+                       catch (IOException e) {
+//                             MessagingUtils.error(getClass(), e);
+                       }
+                       catch (HttpException e) {
+//                             MessagingUtils.error(getClass(), e);
                         }
                 }
         }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java

index 942842f21c991f99fd989e5ce7dd3110a0b713fa..57c02c415c9c3177ddb1ce8487381d38246ff99a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
@@ -60,6 +60,7 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
      protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
          textDesignation = formFactory.createTextWithLabelElement(formElement, "Designation", entity.getLabelCache(), style);
          textDesignation.setEnabled(false);
+        textDesignation.setBackground(getPersistentBackground());
          selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", entity.getInstitution(), EntitySelectionElement.ALL, style);
          selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
          dateAmplification = formFactory.createTimePeriodElement(formElement, "Date", entity.getTimeperiod(), style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationTextDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationTextDetailElement.java

index ef54fb2daf9bdde72fd0b045ce9b015bb14f65a9..90d754c8864e3890ce601bc5b51eb17b2eb20de6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationTextDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationTextDetailElement.java
@@ -65,7 +65,11 @@ public class SampleDesignationTextDetailElement extends
      @Override
      public void handleEvent(Object eventSource) {
          if(eventSource==text_description){
-            this.entity.setIdentifier(text_description.getText());
+            String identifier = null;
+            if(!text_description.getText().isEmpty()){
+                identifier = text_description.getText();
+            }
+            this.entity.setIdentifier(identifier);
          }
      }
  
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java

index e4ac9865c715f234b0ac01e570261d92d2d84045..b6d5775dbeb533802fe582525aab5252d08a2099 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java
@@ -22,7 +22,6 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
  import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
  import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
  import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
  import eu.etaxonomy.taxeditor.ui.element.UriWithLabelElement;
  import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -36,7 +35,6 @@ public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Seque
  
      private TermComboElement<DefinedTerm> comboMarker;
      private TextWithLabelElement textConsensusSequence;
-    private NumberWithLabelElement textConsensusSequenceLength;
      private TextWithLabelElement textGeneticAccessNo;
      private UriWithLabelElement textNCBIUri;
      private UriWithLabelElement textENAUri;
@@ -109,7 +107,6 @@ public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Seque
              }
              consensusSequence.setString(textConsensusSequence.getText());
              getEntity().setConsensusSequence(consensusSequence);
-            textConsensusSequenceLength.setNumber(consensusSequence.getLength());
          }
          else if(eventSource==textGeneticAccessNo){
              textGeneticAccessNo.setBackground(getPersistentBackground());
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java

index 9b64fec66f2a7c9a18926719bce241d61c3b35c4..f8b342089b0a42e220ad1dd690da910bf2a678fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java
@@ -87,7 +87,7 @@ public class MediaSpecimenGeneralDetailSection  extends AbstractCdmDetailSection
      protected Control createToolbar() {
          ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
  
-        String actionLabel = "Use advanced media view";
+        String actionLabel = "Change View Type";
          Action addAction = new Action(actionLabel, IAction.AS_PUSH_BUTTON) {
              /* (non-Javadoc)
               * @see org.eclipse.jface.action.Action#run()
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java

index 8f2ad3b6c523ea638f5d36994c45fca694add23e..0b0f89b2c13c9d93d4053110713f79a791161a8d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
@@ -338,7 +338,7 @@ public class EntitySelectionElement<T extends ICdmBase> extends
              } else if (entity instanceof Primer){
                  return ((Primer) entity).getLabel();
              } else if (entity instanceof Amplification){
-                return ((Amplification) entity).getDescription();
+                return ((Amplification) entity).getLabelCache();
              }
  
                 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java

index 7cb308c7da84be0cd97811004c592dabb3eff473..76bed186ea4ad880456db650e01541a817c41182 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
@@ -202,7 +202,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                  }
              }
              else if(((DnaSample) derivate).getRecordBasis()==SpecimenOrObservationType.TissueSample){
-                label += dnaSample.getKindOfUnit()+separator;
+                if(dnaSample.getKindOfUnit()!=null){
+                    label += dnaSample.getKindOfUnit()+separator;
+                }
                  Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(dnaSample);
                  if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
                      label += currentSampleDesignation.getIdentifier()+separator;
diff --git a/eu.etaxonomy.taxeditor.test/.classpath b/eu.etaxonomy.taxeditor.test/.classpath

index 78ab4c1826af3d858691ca5c0a26b28e1c0e7527..b825db51225c03ac02ad2aa8963c0e50dfc85502 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/.classpath
+++ b/eu.etaxonomy.taxeditor.test/.classpath
@@ -4,5 +4,6 @@
         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
         <classpathentry including="**/*.java" kind="src" path="src/test/java"/>
         <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+       <classpathentry exported="true" kind="lib" path="lib/byte-buddy-0.5.1.jar"/>
         <classpathentry kind="output" path="target/classes"/>
  </classpath>
diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF

index 558ef96d5ed6338ca5d2f5e031b2aebbafdc9dfd..a9bdd4a281354075b5ecfa53f4407fe06c64b175 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -21,3 +21,5 @@ Require-Bundle: org.eclipse.ui,
   eu.etaxonomy.taxeditor.printpublisher,
   eu.etaxonomy.taxeditor.store
  Eclipse-RegisterBuddy: org.apache.log4j
+Bundle-ClassPath: .,
+ lib/byte-buddy-0.5.1.jar
diff --git a/eu.etaxonomy.taxeditor.test/build.properties b/eu.etaxonomy.taxeditor.test/build.properties

index 137d6a59ccc7ed4073b31469643cef499bfe3f0a..95673643b973fda719644a0ef136baad59dbf72d 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/build.properties
+++ b/eu.etaxonomy.taxeditor.test/build.properties
@@ -1,3 +1,4 @@
  source.. = src/test/java/
  bin.includes = META-INF/,\
-               .
+               .,\
+               lib/byte-buddy-0.5.1.jar
diff --git a/eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.h2.db b/eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.h2.db

index 6e736ee6c6d45d40fa62886fc44844b7abc73150..bb3414534821e2a3346be4f7e9c62b133a093016 100644 (file)

Binary files a/eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.h2.db and b/eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.h2.db differ
diff --git a/eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.trace.db b/eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.trace.db

index 67817576d0bcd3f0f3c7ef57c7cc9fac03b26987..fbe7de9b57d6b0bdeec29ca438407ef1c9d5a4d4 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.trace.db
+++ b/eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.trace.db
@@ -1,28 +1,140 @@
-12-10 11:44:44 jdbc[3]: exception
+12-11 17:14:24 jdbc[3]: exception
  org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
  SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 11:45:16 jdbc[5]: exception
+12-11 17:14:27 jdbc[6]: exception
  org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
  SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 11:45:33 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
-SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 11:46:04 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
-SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 11:49:02 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
-SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 12:04:17 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
-SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 15:13:58 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
-SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 15:19:24 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
-SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 15:19:27 jdbc[4]: null
+12-11 17:14:52 jdbc[7]: null
+org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.get(DbException.java:169)
+       at org.h2.message.DbException.get(DbException.java:146)
+       at org.h2.message.DbException.get(DbException.java:135)
+       at org.h2.jdbc.JdbcConnection.closeOld(JdbcConnection.java:175)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
+       at org.h2.Driver.connect(Driver.java:72)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
+org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.get(DbException.java:169)
+       at org.h2.message.DbException.get(DbException.java:146)
+       at org.h2.message.DbException.get(DbException.java:135)
+       at org.h2.jdbc.JdbcConnection.closeOld(JdbcConnection.java:175)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
+       at org.h2.Driver.connect(Driver.java:72)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -31,51 +143,323 @@ org.h2.message.DbException: The connection was not closed by the application and
         at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
         at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
         at org.h2.Driver.connect(Driver.java:72)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.testConnection(CdmDataSourceBase.java:94)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.testConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.checkConnection(CdmDataSourceBase.java:111)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.checkConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.taxeditor.view.datasource.handler.ChangeConnectionHandler.execute(ChangeConnectionHandler.java:49)
-       at org.eclipse.ui.internal.handlers.HandlerProxy.execute(HandlerProxy.java:293)
-       at org.eclipse.core.commands.Command.executeWithChecks(Command.java:476)
-       at org.eclipse.core.commands.ParameterizedCommand.executeWithChecks(ParameterizedCommand.java:508)
-       at org.eclipse.ui.internal.handlers.HandlerService.executeCommand(HandlerService.java:169)
-       at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
-       at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
-       at org.eclipse.ui.menus.CommandContributionItem.handleWidgetSelection(CommandContributionItem.java:829)
-       at org.eclipse.ui.menus.CommandContributionItem.access$19(CommandContributionItem.java:815)
-       at org.eclipse.ui.menus.CommandContributionItem$5.handleEvent(CommandContributionItem.java:805)
-       at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84)
-       at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1258)
-       at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3588)
-       at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3209)
-       at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2701)
-       at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2665)
-       at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2499)
-       at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:679)
-       at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
-       at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:668)
-       at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149)
-       at eu.etaxonomy.taxeditor.Application.start(Application.java:24)
-       at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196)
-       at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
-       at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
-       at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:344)
-       at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
-       at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-       at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
-       at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
-       at java.lang.reflect.Method.invoke(Unknown Source)
-       at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:622)
-       at org.eclipse.equinox.launcher.Main.basicRun(Main.java:577)
-       at org.eclipse.equinox.launcher.Main.run(Main.java:1410)
-       at org.eclipse.equinox.launcher.Main.main(Main.java:1386)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
+org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.get(DbException.java:169)
+       at org.h2.message.DbException.get(DbException.java:146)
+       at org.h2.message.DbException.get(DbException.java:135)
+       at org.h2.jdbc.JdbcConnection.closeOld(JdbcConnection.java:175)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
+       at org.h2.Driver.connect(Driver.java:72)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
+org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.get(DbException.java:169)
+       at org.h2.message.DbException.get(DbException.java:146)
+       at org.h2.message.DbException.get(DbException.java:135)
+       at org.h2.jdbc.JdbcConnection.closeOld(JdbcConnection.java:175)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
+       at org.h2.Driver.connect(Driver.java:72)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
+org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.get(DbException.java:169)
+       at org.h2.message.DbException.get(DbException.java:146)
+       at org.h2.message.DbException.get(DbException.java:135)
+       at org.h2.jdbc.JdbcConnection.closeOld(JdbcConnection.java:175)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
+       at org.h2.Driver.connect(Driver.java:72)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
+org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
+       at org.h2.message.DbException.get(DbException.java:169)
+       at org.h2.message.DbException.get(DbException.java:146)
+       at org.h2.message.DbException.get(DbException.java:135)
+       at org.h2.jdbc.JdbcConnection.closeOld(JdbcConnection.java:175)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
+       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
+       at org.h2.Driver.connect(Driver.java:72)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
-       ... 48 more
-12-10 15:19:28 jdbc[4]: null
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -84,51 +468,63 @@ org.h2.message.DbException: The connection was not closed by the application and
         at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
         at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
         at org.h2.Driver.connect(Driver.java:72)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.testConnection(CdmDataSourceBase.java:94)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.testConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.checkConnection(CdmDataSourceBase.java:111)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.checkConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.taxeditor.view.datasource.handler.ChangeConnectionHandler.execute(ChangeConnectionHandler.java:49)
-       at org.eclipse.ui.internal.handlers.HandlerProxy.execute(HandlerProxy.java:293)
-       at org.eclipse.core.commands.Command.executeWithChecks(Command.java:476)
-       at org.eclipse.core.commands.ParameterizedCommand.executeWithChecks(ParameterizedCommand.java:508)
-       at org.eclipse.ui.internal.handlers.HandlerService.executeCommand(HandlerService.java:169)
-       at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
-       at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
-       at org.eclipse.ui.menus.CommandContributionItem.handleWidgetSelection(CommandContributionItem.java:829)
-       at org.eclipse.ui.menus.CommandContributionItem.access$19(CommandContributionItem.java:815)
-       at org.eclipse.ui.menus.CommandContributionItem$5.handleEvent(CommandContributionItem.java:805)
-       at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84)
-       at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1258)
-       at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3588)
-       at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3209)
-       at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2701)
-       at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2665)
-       at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2499)
-       at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:679)
-       at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
-       at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:668)
-       at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149)
-       at eu.etaxonomy.taxeditor.Application.start(Application.java:24)
-       at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196)
-       at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
-       at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
-       at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:344)
-       at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
-       at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-       at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
-       at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
-       at java.lang.reflect.Method.invoke(Unknown Source)
-       at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:622)
-       at org.eclipse.equinox.launcher.Main.basicRun(Main.java:577)
-       at org.eclipse.equinox.launcher.Main.run(Main.java:1410)
-       at org.eclipse.equinox.launcher.Main.main(Main.java:1386)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
-       ... 48 more
-12-10 15:19:28 jdbc[4]: null
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -137,76 +533,63 @@ org.h2.message.DbException: The connection was not closed by the application and
         at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
         at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
         at org.h2.Driver.connect(Driver.java:72)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.testConnection(CdmDataSourceBase.java:94)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.testConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.checkConnection(CdmDataSourceBase.java:111)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.checkConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.taxeditor.view.datasource.handler.ChangeConnectionHandler.execute(ChangeConnectionHandler.java:49)
-       at org.eclipse.ui.internal.handlers.HandlerProxy.execute(HandlerProxy.java:293)
-       at org.eclipse.core.commands.Command.executeWithChecks(Command.java:476)
-       at org.eclipse.core.commands.ParameterizedCommand.executeWithChecks(ParameterizedCommand.java:508)
-       at org.eclipse.ui.internal.handlers.HandlerService.executeCommand(HandlerService.java:169)
-       at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
-       at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
-       at org.eclipse.ui.menus.CommandContributionItem.handleWidgetSelection(CommandContributionItem.java:829)
-       at org.eclipse.ui.menus.CommandContributionItem.access$19(CommandContributionItem.java:815)
-       at org.eclipse.ui.menus.CommandContributionItem$5.handleEvent(CommandContributionItem.java:805)
-       at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84)
-       at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1258)
-       at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3588)
-       at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3209)
-       at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2701)
-       at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2665)
-       at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2499)
-       at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:679)
-       at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
-       at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:668)
-       at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149)
-       at eu.etaxonomy.taxeditor.Application.start(Application.java:24)
-       at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196)
-       at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
-       at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
-       at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:344)
-       at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
-       at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-       at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
-       at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
-       at java.lang.reflect.Method.invoke(Unknown Source)
-       at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:622)
-       at org.eclipse.equinox.launcher.Main.basicRun(Main.java:577)
-       at org.eclipse.equinox.launcher.Main.run(Main.java:1410)
-       at org.eclipse.equinox.launcher.Main.main(Main.java:1386)
+       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
+       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
+       at org.apache.commons.dbcp.BasicDataSource.validateConnectionFactory(BasicDataSource.java:1556)
+       at org.apache.commons.dbcp.BasicDataSource.createPoolableConnectionFactory(BasicDataSource.java:1545)
+       at org.apache.commons.dbcp.BasicDataSource.createDataSource(BasicDataSource.java:1388)
+       at eu.etaxonomy.cdm.database.LocalH2.createDataSource(LocalH2.java:88)
+       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
+       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl$ConnectionProviderJdbcConnectionAccess.obtainConnection(JdbcServicesImpl.java:242)
+       at org.hibernate.engine.jdbc.internal.JdbcServicesImpl.configure(JdbcServicesImpl.java:117)
+       at org.hibernate.service.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:75)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:159)
+       at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:131)
+       at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:77)
+       at org.hibernate.cfg.Configuration.buildSettingsInternal(Configuration.java:2276)
+       at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:2272)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1741)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
-       ... 48 more
-12-10 15:19:28 jdbc[6]: exception
-org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
-SELECT value FROM CdmMetaData WHERE propertyname=0 [42102-170]
-12-10 15:19:55 jdbc[7]: java.lang.Exception: Open Stack Trace
-       at org.h2.util.CloseWatcher.register(CloseWatcher.java:99)
-       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:121)
-       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
-       at org.h2.Driver.connect(Driver.java:72)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.getConnection(CdmDataSourceBase.java:68)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.getConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.getConnection(CdmDataSourceBase.java:46)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.getConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.executeQuery(CdmDataSourceBase.java:185)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.executeQuery(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.getSingleValue(CdmDataSourceBase.java:138)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.getSingleValue(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.getDbSchemaVersion(CdmDataSourceBase.java:158)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.getDbSchemaVersion(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.isDbEmpty(CdmDataSourceBase.java:167)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.isDbEmpty(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.checkIsNonEmptyCdmDatabase(CdmStoreConnector.java:225)
-       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:77)
-       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-
+       ... 60 more
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -271,7 +654,7 @@ org.h2.message.DbException: The connection was not closed by the application and
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         ... 60 more
-12-10 15:19:55 jdbc[7]: null
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -336,7 +719,7 @@ org.h2.message.DbException: The connection was not closed by the application and
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         ... 60 more
-12-10 15:19:55 jdbc[7]: null
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -401,53 +784,7 @@ org.h2.message.DbException: The connection was not closed by the application and
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         ... 60 more
-12-10 15:19:55 jdbc[7]: java.lang.Exception: Open Stack Trace
-       at org.h2.util.CloseWatcher.register(CloseWatcher.java:99)
-       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:121)
-       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
-       at org.h2.Driver.connect(Driver.java:72)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.testConnection(CdmDataSourceBase.java:94)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.testConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.checkConnection(CdmDataSourceBase.java:111)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.checkConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.taxeditor.view.datasource.handler.ChangeConnectionHandler.execute(ChangeConnectionHandler.java:49)
-       at org.eclipse.ui.internal.handlers.HandlerProxy.execute(HandlerProxy.java:293)
-       at org.eclipse.core.commands.Command.executeWithChecks(Command.java:476)
-       at org.eclipse.core.commands.ParameterizedCommand.executeWithChecks(ParameterizedCommand.java:508)
-       at org.eclipse.ui.internal.handlers.HandlerService.executeCommand(HandlerService.java:169)
-       at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
-       at org.eclipse.ui.internal.handlers.SlaveHandlerService.executeCommand(SlaveHandlerService.java:241)
-       at org.eclipse.ui.menus.CommandContributionItem.handleWidgetSelection(CommandContributionItem.java:829)
-       at org.eclipse.ui.menus.CommandContributionItem.access$19(CommandContributionItem.java:815)
-       at org.eclipse.ui.menus.CommandContributionItem$5.handleEvent(CommandContributionItem.java:805)
-       at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84)
-       at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1258)
-       at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:3588)
-       at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3209)
-       at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2701)
-       at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2665)
-       at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2499)
-       at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:679)
-       at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
-       at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:668)
-       at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149)
-       at eu.etaxonomy.taxeditor.Application.start(Application.java:24)
-       at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196)
-       at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
-       at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
-       at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:344)
-       at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
-       at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-       at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
-       at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
-       at java.lang.reflect.Method.invoke(Unknown Source)
-       at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:622)
-       at org.eclipse.equinox.launcher.Main.basicRun(Main.java:577)
-       at org.eclipse.equinox.launcher.Main.run(Main.java:1410)
-       at org.eclipse.equinox.launcher.Main.main(Main.java:1386)
-
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -512,21 +849,7 @@ org.h2.message.DbException: The connection was not closed by the application and
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         ... 60 more
-12-10 15:19:55 jdbc[7]: java.lang.Exception: Open Stack Trace
-       at org.h2.util.CloseWatcher.register(CloseWatcher.java:99)
-       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:121)
-       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
-       at org.h2.Driver.connect(Driver.java:72)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at java.sql.DriverManager.getConnection(Unknown Source)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.testConnection(CdmDataSourceBase.java:94)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.testConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.cdm.database.CdmDataSourceBase.checkConnection(CdmDataSourceBase.java:111)
-       at eu.etaxonomy.cdm.database.CdmPersistentDataSource.checkConnection(CdmPersistentDataSource.java:51)
-       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.checkDatabaseReachable(CdmStoreConnector.java:247)
-       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:73)
-       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -591,7 +914,7 @@ org.h2.message.DbException: The connection was not closed by the application and
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         ... 60 more
-12-10 15:19:55 jdbc[7]: null
+12-11 17:14:52 jdbc[7]: null
  org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -656,2851 +979,2893 @@ org.h2.message.DbException: The connection was not closed by the application and
  Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         ... 60 more
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ADDRESS" not found; SQL statement:
  alter table Address drop constraint FK1ED033D44FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ADDRESS" not found; SQL statement:
  alter table Address drop constraint FK1ED033D4BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ADDRESS" not found; SQL statement:
  alter table Address drop constraint FK1ED033D4CDD3C17E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ADDRESS" not found; SQL statement:
  alter table Address drop constraint FK1ED033D4132A2FE8 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ADDRESS_AUD" not found; SQL statement:
  alter table Address_AUD drop constraint FK115657A534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE" not found; SQL statement:
  alter table AgentBase drop constraint FK1205D3564FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE" not found; SQL statement:
  alter table AgentBase drop constraint FK1205D356BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE" not found; SQL statement:
  alter table AgentBase drop constraint FK1205D356A830578 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_AUD" not found; SQL statement:
  alter table AgentBase_AUD drop constraint FK29CC662734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ADDRESS" not found; SQL statement:
  alter table AgentBase_Address drop constraint FK1EDFF7EB50751EC5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ADDRESS" not found; SQL statement:
  alter table AgentBase_Address drop constraint FK1EDFF7EB86EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ADDRESS_AUD" not found; SQL statement:
  alter table AgentBase_Address_AUD drop constraint FK3D28383C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_AGENTBASE" not found; SQL statement:
  alter table AgentBase_AgentBase drop constraint FK4D34EDADE9E535F9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_AGENTBASE" not found; SQL statement:
  alter table AgentBase_AgentBase drop constraint FK4D34EDAD1C0E9907 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_AGENTBASE_AUD" not found; SQL statement:
  alter table AgentBase_AgentBase_AUD drop constraint FKA8A87CFE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ANNOTATION" not found; SQL statement:
  alter table AgentBase_Annotation drop constraint FK44D5F7D81E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ANNOTATION" not found; SQL statement:
  alter table AgentBase_Annotation drop constraint FK44D5F7D886EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table AgentBase_Annotation_AUD drop constraint FK771279A934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CREDIT" not found; SQL statement:
  alter table AgentBase_Credit drop constraint FK2636742232D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CREDIT" not found; SQL statement:
  alter table AgentBase_Credit drop constraint FK2636742286EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CREDIT_AUD" not found; SQL statement:
  alter table AgentBase_Credit_AUD drop constraint FK7FE7C0F334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_DEFINEDTERMBASE" not found; SQL statement:
  alter table AgentBase_DefinedTermBase drop constraint FK6665C77DF116FEB0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_DEFINEDTERMBASE" not found; SQL statement:
  alter table AgentBase_DefinedTermBase drop constraint FK6665C77D8D9AB196 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_DEFINEDTERMBASE_AUD" not found; SQL statement:
  alter table AgentBase_DefinedTermBase_AUD drop constraint FKA737EECE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_EXTENSION" not found; SQL statement:
  alter table AgentBase_Extension drop constraint FK8E1E5676927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_EXTENSION" not found; SQL statement:
  alter table AgentBase_Extension drop constraint FK8E1E567686EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_EXTENSION_AUD" not found; SQL statement:
  alter table AgentBase_Extension_AUD drop constraint FK11AE594734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_IDENTIFIER" not found; SQL statement:
  alter table AgentBase_Identifier drop constraint FK410EB952E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_IDENTIFIER" not found; SQL statement:
  alter table AgentBase_Identifier drop constraint FK410EB95286EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_IDENTIFIER_AUD" not found; SQL statement:
  alter table AgentBase_Identifier_AUD drop constraint FK3DB9EE2334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_MARKER" not found; SQL statement:
  alter table AgentBase_Marker drop constraint FK365D5D63777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_MARKER" not found; SQL statement:
  alter table AgentBase_Marker drop constraint FK365D5D6386EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_MARKER_AUD" not found; SQL statement:
  alter table AgentBase_Marker_AUD drop constraint FKE40621B434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_MEDIA" not found; SQL statement:
  alter table AgentBase_Media drop constraint FKE8FC5D9BC2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_MEDIA" not found; SQL statement:
  alter table AgentBase_Media drop constraint FKE8FC5D9B86EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_MEDIA_AUD" not found; SQL statement:
  alter table AgentBase_Media_AUD drop constraint FK323A45EC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table AgentBase_OriginalSourceBase drop constraint FKB482C5E63A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table AgentBase_OriginalSourceBase drop constraint FKB482C5E686EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table AgentBase_OriginalSourceBase_AUD drop constraint FK886D90B734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_RIGHTSINFO" not found; SQL statement:
  alter table AgentBase_RightsInfo drop constraint FK4FD6A3CEC13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_RIGHTSINFO" not found; SQL statement:
  alter table AgentBase_RightsInfo drop constraint FK4FD6A3CE86EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_RIGHTSINFO_AUD" not found; SQL statement:
  alter table AgentBase_RightsInfo_AUD drop constraint FK79503A9F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CONTACT_EMAILADDRESSES" not found; SQL statement:
  alter table AgentBase_contact_emailaddresses drop constraint FK4BD2B08E86EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CONTACT_EMAILADDRESSES_AUD" not found; SQL statement:
  alter table AgentBase_contact_emailaddresses_AUD drop constraint FKCAF7E75F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CONTACT_FAXNUMBERS" not found; SQL statement:
  alter table AgentBase_contact_faxnumbers drop constraint FK52E1AD9586EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CONTACT_FAXNUMBERS_AUD" not found; SQL statement:
  alter table AgentBase_contact_faxnumbers_AUD drop constraint FK88A308E634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CONTACT_PHONENUMBERS" not found; SQL statement:
  alter table AgentBase_contact_phonenumbers drop constraint FKC171CC2486EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CONTACT_PHONENUMBERS_AUD" not found; SQL statement:
  alter table AgentBase_contact_phonenumbers_AUD drop constraint FKDDD347F534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CONTACT_URLS" not found; SQL statement:
  alter table AgentBase_contact_urls drop constraint FK9A9643EC86EFC5D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AGENTBASE_CONTACT_URLS_AUD" not found; SQL statement:
  alter table AgentBase_contact_urls_AUD drop constraint FK1CE69BBD34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
  alter table Amplification drop constraint FK9DA6B4164FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
  alter table Amplification drop constraint FK9DA6B416BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
  alter table Amplification drop constraint FK9DA6B4163DA462D5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
-org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
-alter table Amplification drop constraint FK9DA6B416DEC4385F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
  alter table Amplification drop constraint FK9DA6B4166D2CE418 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
-org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
-alter table Amplification drop constraint FK9DA6B416E671A9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
  alter table Amplification drop constraint FK9DA6B4163781DA30 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
-alter table Amplification drop constraint FK9DA6B416825BDDD3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+alter table Amplification drop constraint FK9DA6B416403E17F4 [42102-170]
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
  alter table Amplification drop constraint FK9DA6B416AFCA96F8 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION" not found; SQL statement:
  alter table Amplification drop constraint FK9DA6B4161600EAB3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT" not found; SQL statement:
+alter table AmplificationResult drop constraint FK484B7FD34FF2DB2C [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT" not found; SQL statement:
+alter table AmplificationResult drop constraint FK484B7FD3BC5DA539 [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT" not found; SQL statement:
+alter table AmplificationResult drop constraint FK484B7FD3614CEB1F [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT" not found; SQL statement:
+alter table AmplificationResult drop constraint FK484B7FD3DEC4385F [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT" not found; SQL statement:
+alter table AmplificationResult drop constraint FK484B7FD3E671A9DF [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT" not found; SQL statement:
+alter table AmplificationResult drop constraint FK484B7FD3825BDDD3 [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT_AUD" not found; SQL statement:
+alter table AmplificationResult_AUD drop constraint FK343D8C2434869AAE [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT_ANNOTATION" not found; SQL statement:
+alter table AmplificationResult_Annotation drop constraint FKFE4A8B3B1E403E0B [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT_ANNOTATION" not found; SQL statement:
+alter table AmplificationResult_Annotation drop constraint FKFE4A8B3BD320A65F [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT_ANNOTATION_AUD" not found; SQL statement:
+alter table AmplificationResult_Annotation_AUD drop constraint FK7378A38C34869AAE [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT_MARKER" not found; SQL statement:
+alter table AmplificationResult_Marker drop constraint FK5B911A46777265A1 [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT_MARKER" not found; SQL statement:
+alter table AmplificationResult_Marker drop constraint FK5B911A46D320A65F [42102-170]
+12-11 17:15:11 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATIONRESULT_MARKER_AUD" not found; SQL statement:
+alter table AmplificationResult_Marker_AUD drop constraint FK9D7AB51734869AAE [42102-170]
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_AUD" not found; SQL statement:
  alter table Amplification_AUD drop constraint FK448EE6E734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_ANNOTATION" not found; SQL statement:
  alter table Amplification_Annotation drop constraint FK6B251F181E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_ANNOTATION" not found; SQL statement:
  alter table Amplification_Annotation drop constraint FK6B251F18614CEB1F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_ANNOTATION_AUD" not found; SQL statement:
  alter table Amplification_Annotation_AUD drop constraint FK6FC00E934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_MARKER" not found; SQL statement:
  alter table Amplification_Marker drop constraint FK46E224A3777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_MARKER" not found; SQL statement:
  alter table Amplification_Marker drop constraint FK46E224A3614CEB1F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_MARKER_AUD" not found; SQL statement:
  alter table Amplification_Marker_AUD drop constraint FKA5548F434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
-org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_SINGLEREAD" not found; SQL statement:
-alter table Amplification_SingleRead drop constraint FKFE4921E7BBC12E3E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
-org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_SINGLEREAD" not found; SQL statement:
-alter table Amplification_SingleRead drop constraint FKFE4921E7614CEB1F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
-org.h2.jdbc.JdbcSQLException: Table "AMPLIFICATION_SINGLEREAD_AUD" not found; SQL statement:
-alter table Amplification_SingleRead_AUD drop constraint FK8FB4043834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION" not found; SQL statement:
  alter table Annotation drop constraint FK1A21C74F4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION" not found; SQL statement:
  alter table Annotation drop constraint FK1A21C74FBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION" not found; SQL statement:
  alter table Annotation drop constraint FK1A21C74FE8D36B00 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION" not found; SQL statement:
  alter table Annotation drop constraint FK1A21C74FDF299D00 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION" not found; SQL statement:
  alter table Annotation drop constraint FK1A21C74FE7692740 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION_AUD" not found; SQL statement:
  alter table Annotation_AUD drop constraint FK1A6BB5A034869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION_ANNOTATION" not found; SQL statement:
  alter table Annotation_Annotation drop constraint FKC99DFE3F1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION_ANNOTATION" not found; SQL statement:
  alter table Annotation_Annotation drop constraint FKC99DFE3F994CCE20 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION_ANNOTATION_AUD" not found; SQL statement:
  alter table Annotation_Annotation_AUD drop constraint FKB212F49034869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION_MARKER" not found; SQL statement:
  alter table Annotation_Marker drop constraint FKB17EAF4A777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION_MARKER" not found; SQL statement:
  alter table Annotation_Marker drop constraint FKB17EAF4A994CCE20 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ANNOTATION_MARKER_AUD" not found; SQL statement:
  alter table Annotation_Marker_AUD drop constraint FK68CE281B34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CDMMETADATA" not found; SQL statement:
  alter table CdmMetaData drop constraint FK6EA78F7B4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION" not found; SQL statement:
  alter table Classification drop constraint FKDB1100064FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION" not found; SQL statement:
  alter table Classification drop constraint FKDB110006BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION" not found; SQL statement:
  alter table Classification drop constraint FKDB11000677E2F09E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION" not found; SQL statement:
  alter table Classification drop constraint FKDB1100068D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION" not found; SQL statement:
  alter table Classification drop constraint FKDB110006D1E08681 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_AUD" not found; SQL statement:
  alter table Classification_AUD drop constraint FKEB11BAD734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_ANNOTATION" not found; SQL statement:
  alter table Classification_Annotation drop constraint FKC978FD281E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_ANNOTATION" not found; SQL statement:
  alter table Classification_Annotation drop constraint FKC978FD2884A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_ANNOTATION_AUD" not found; SQL statement:
  alter table Classification_Annotation_AUD drop constraint FK3D1256F934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_CREDIT" not found; SQL statement:
  alter table Classification_Credit drop constraint FK4950A17232D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_CREDIT" not found; SQL statement:
  alter table Classification_Credit drop constraint FK4950A17284A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_CREDIT_AUD" not found; SQL statement:
  alter table Classification_Credit_AUD drop constraint FK48AC64334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_DESCRIPTION" not found; SQL statement:
  alter table Classification_Description drop constraint FK382EB1232BEBA58D [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_DESCRIPTION" not found; SQL statement:
  alter table Classification_Description drop constraint FK382EB12328459272 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_DESCRIPTION" not found; SQL statement:
  alter table Classification_Description drop constraint FK382EB12384A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_DESCRIPTION_AUD" not found; SQL statement:
  alter table Classification_Description_AUD drop constraint FK3187957434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_EXTENSION" not found; SQL statement:
  alter table Classification_Extension drop constraint FK715D6726927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_EXTENSION" not found; SQL statement:
  alter table Classification_Extension drop constraint FK715D672684A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_EXTENSION_AUD" not found; SQL statement:
  alter table Classification_Extension_AUD drop constraint FK289591F734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_GEOSCOPE" not found; SQL statement:
  alter table Classification_GeoScope drop constraint FK379FE5BC86D04E74 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_GEOSCOPE" not found; SQL statement:
  alter table Classification_GeoScope drop constraint FK379FE5BC84A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_GEOSCOPE_AUD" not found; SQL statement:
  alter table Classification_GeoScope_AUD drop constraint FKF5AAD58D34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_IDENTIFIER" not found; SQL statement:
  alter table Classification_Identifier drop constraint FKC5B1BEA2E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_IDENTIFIER" not found; SQL statement:
  alter table Classification_Identifier drop constraint FKC5B1BEA284A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_IDENTIFIER_AUD" not found; SQL statement:
  alter table Classification_Identifier_AUD drop constraint FK3B9CB7334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_MARKER" not found; SQL statement:
  alter table Classification_Marker drop constraint FK59778AB3777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_MARKER" not found; SQL statement:
  alter table Classification_Marker drop constraint FK59778AB384A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_MARKER_AUD" not found; SQL statement:
  alter table Classification_Marker_AUD drop constraint FK68A9270434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table Classification_OriginalSourceBase drop constraint FK91B37B363A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table Classification_OriginalSourceBase drop constraint FK91B37B3684A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table Classification_OriginalSourceBase_AUD drop constraint FK48A31E0734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_RIGHTSINFO" not found; SQL statement:
  alter table Classification_RightsInfo drop constraint FKD479A91EC13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_RIGHTSINFO" not found; SQL statement:
  alter table Classification_RightsInfo drop constraint FKD479A91E84A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CLASSIFICATION_RIGHTSINFO_AUD" not found; SQL statement:
  alter table Classification_RightsInfo_AUD drop constraint FK3F5017EF34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION" not found; SQL statement:
  alter table Collection drop constraint FKF078ABE4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION" not found; SQL statement:
  alter table Collection drop constraint FKF078ABEBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION" not found; SQL statement:
  alter table Collection drop constraint FKF078ABE16B9CA77 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION" not found; SQL statement:
  alter table Collection drop constraint FKF078ABECEB38EFF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_AUD" not found; SQL statement:
  alter table Collection_AUD drop constraint FKD6D4298F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_ANNOTATION" not found; SQL statement:
  alter table Collection_Annotation drop constraint FKEA970F701E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_ANNOTATION" not found; SQL statement:
  alter table Collection_Annotation drop constraint FKEA970F70EB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_ANNOTATION_AUD" not found; SQL statement:
  alter table Collection_Annotation_AUD drop constraint FKA0CE054134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_CREDIT" not found; SQL statement:
  alter table Collection_Credit drop constraint FKE0A317BA32D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_CREDIT" not found; SQL statement:
  alter table Collection_Credit drop constraint FKE0A317BAEB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_CREDIT_AUD" not found; SQL statement:
  alter table Collection_Credit_AUD drop constraint FK25A8D88B34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_EXTENSION" not found; SQL statement:
  alter table Collection_Extension drop constraint FKF68FEBDE927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_EXTENSION" not found; SQL statement:
  alter table Collection_Extension drop constraint FKF68FEBDEEB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_EXTENSION_AUD" not found; SQL statement:
  alter table Collection_Extension_AUD drop constraint FK1306FAAF34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_IDENTIFIER" not found; SQL statement:
  alter table Collection_Identifier drop constraint FKE6CFD0EAE12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_IDENTIFIER" not found; SQL statement:
  alter table Collection_Identifier drop constraint FKE6CFD0EAEB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_IDENTIFIER_AUD" not found; SQL statement:
  alter table Collection_Identifier_AUD drop constraint FK677579BB34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_MARKER" not found; SQL statement:
  alter table Collection_Marker drop constraint FKF0CA00FB777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_MARKER" not found; SQL statement:
  alter table Collection_Marker drop constraint FKF0CA00FBEB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_MARKER_AUD" not found; SQL statement:
  alter table Collection_Marker_AUD drop constraint FK89C7394C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_MEDIA" not found; SQL statement:
  alter table Collection_Media drop constraint FK7320E703C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_MEDIA" not found; SQL statement:
  alter table Collection_Media drop constraint FK7320E703EB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_MEDIA_AUD" not found; SQL statement:
  alter table Collection_Media_AUD drop constraint FK9AABDB5434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table Collection_OriginalSourceBase drop constraint FK37DEC57E3A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table Collection_OriginalSourceBase drop constraint FK37DEC57EEB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table Collection_OriginalSourceBase_AUD drop constraint FKF810044F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_RIGHTSINFO" not found; SQL statement:
  alter table Collection_RightsInfo drop constraint FKF597BB66C13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_RIGHTSINFO" not found; SQL statement:
  alter table Collection_RightsInfo drop constraint FKF597BB66EB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "COLLECTION_RIGHTSINFO_AUD" not found; SQL statement:
  alter table Collection_RightsInfo_AUD drop constraint FKA30BC63734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT" not found; SQL statement:
  alter table Credit drop constraint FK78CA97194FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT" not found; SQL statement:
  alter table Credit drop constraint FK78CA9719BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT" not found; SQL statement:
  alter table Credit drop constraint FK78CA9719E8D36B00 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT" not found; SQL statement:
  alter table Credit drop constraint FK78CA9719F7976FC5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT_AUD" not found; SQL statement:
  alter table Credit_AUD drop constraint FK5533906A34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT_ANNOTATION" not found; SQL statement:
  alter table Credit_Annotation drop constraint FKE8DA4C351E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT_ANNOTATION" not found; SQL statement:
  alter table Credit_Annotation drop constraint FKE8DA4C354CF694E0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT_ANNOTATION_AUD" not found; SQL statement:
  alter table Credit_Annotation_AUD drop constraint FK1DEB578634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT_MARKER" not found; SQL statement:
  alter table Credit_Marker drop constraint FK10CC6840777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT_MARKER" not found; SQL statement:
  alter table Credit_Marker drop constraint FK10CC68404CF694E0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "CREDIT_MARKER_AUD" not found; SQL statement:
  alter table Credit_Marker_AUD drop constraint FK880A761134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A664FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A66BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A663B0DA0EF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A66D040DBF0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A6647AF954C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A6624AF3F70 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A6636C6F6F6 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A66CC0240B6 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE" not found; SQL statement:
  alter table DefinedTermBase drop constraint FK2E340A6688206484 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_AUD" not found; SQL statement:
  alter table DefinedTermBase_AUD drop constraint FK86E8953734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_ANNOTATION" not found; SQL statement:
  alter table DefinedTermBase_Annotation drop constraint FK589B6C81E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_ANNOTATION" not found; SQL statement:
  alter table DefinedTermBase_Annotation drop constraint FK589B6C8C0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table DefinedTermBase_Annotation_AUD drop constraint FK28ED409934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_CONTINENT" not found; SQL statement:
  alter table DefinedTermBase_Continent drop constraint FK45F60AFB9AEE7205 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_CONTINENT" not found; SQL statement:
  alter table DefinedTermBase_Continent drop constraint FK45F60AFB901A60CE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_CONTINENT_AUD" not found; SQL statement:
  alter table DefinedTermBase_Continent_AUD drop constraint FKF5DE434C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_COUNTRY" not found; SQL statement:
  alter table DefinedTermBase_Country drop constraint FKA2ADDA9D47CE41A0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_COUNTRY" not found; SQL statement:
  alter table DefinedTermBase_Country drop constraint FKA2ADDA9DCE5C0F9E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_COUNTRY_AUD" not found; SQL statement:
  alter table DefinedTermBase_Country_AUD drop constraint FK8D0171EE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_CREDIT" not found; SQL statement:
  alter table DefinedTermBase_Credit drop constraint FK78FF2B1232D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_CREDIT" not found; SQL statement:
  alter table DefinedTermBase_Credit drop constraint FK78FF2B12C0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_CREDIT_AUD" not found; SQL statement:
  alter table DefinedTermBase_Credit_AUD drop constraint FK409B7FE334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:11 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_EXTENSION" not found; SQL statement:
  alter table DefinedTermBase_Extension drop constraint FK397EF986927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_EXTENSION" not found; SQL statement:
  alter table DefinedTermBase_Extension drop constraint FK397EF986C0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_EXTENSION_AUD" not found; SQL statement:
  alter table DefinedTermBase_Extension_AUD drop constraint FK6E6F45734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_IDENTIFIER" not found; SQL statement:
  alter table DefinedTermBase_Identifier drop constraint FK1C27842E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_IDENTIFIER" not found; SQL statement:
  alter table DefinedTermBase_Identifier drop constraint FK1C27842C0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_IDENTIFIER_AUD" not found; SQL statement:
  alter table DefinedTermBase_Identifier_AUD drop constraint FKEF94B51334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MARKER" not found; SQL statement:
  alter table DefinedTermBase_Marker drop constraint FK89261453777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MARKER" not found; SQL statement:
  alter table DefinedTermBase_Marker drop constraint FK89261453C0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MARKER_AUD" not found; SQL statement:
  alter table DefinedTermBase_Marker_AUD drop constraint FKA4B9E0A434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MEASUREMENTUNIT" not found; SQL statement:
  alter table DefinedTermBase_MeasurementUnit drop constraint FKE9D17767F3BB39BD [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MEASUREMENTUNIT" not found; SQL statement:
  alter table DefinedTermBase_MeasurementUnit drop constraint FKE9D17767D0BDAE9B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MEASUREMENTUNIT_AUD" not found; SQL statement:
  alter table DefinedTermBase_MeasurementUnit_AUD drop constraint FK2C1599B834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MEDIA" not found; SQL statement:
  alter table DefinedTermBase_Media drop constraint FK6FC908ABC2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MEDIA" not found; SQL statement:
  alter table DefinedTermBase_Media drop constraint FK6FC908ABC0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_MEDIA_AUD" not found; SQL statement:
  alter table DefinedTermBase_Media_AUD drop constraint FKDD9AE8FC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table DefinedTermBase_OriginalSourceBase drop constraint FKDCC094D63A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table DefinedTermBase_OriginalSourceBase drop constraint FKDCC094D6C0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table DefinedTermBase_OriginalSourceBase_AUD drop constraint FKAE4A67A734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_RECOMMENDEDMODIFIERENUMERATION" not found; SQL statement:
  alter table DefinedTermBase_RecommendedModifierEnumeration drop constraint FKA72FB5AE5255EAFD [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_RECOMMENDEDMODIFIERENUMERATION" not found; SQL statement:
  alter table DefinedTermBase_RecommendedModifierEnumeration drop constraint FKA72FB5AED0BDAE9B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_RECOMMENDEDMODIFIERENUMERATION_AUD" not found; SQL statement:
  alter table DefinedTermBase_RecommendedModifierEnumeration_AUD drop constraint FK780D5C7F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_REPRESENTATION" not found; SQL statement:
  alter table DefinedTermBase_Representation drop constraint FKAAC8AFE6B31C4747 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_REPRESENTATION" not found; SQL statement:
  alter table DefinedTermBase_Representation drop constraint FKAAC8AFE6C0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_REPRESENTATION_AUD" not found; SQL statement:
  alter table DefinedTermBase_Representation_AUD drop constraint FKB5AE7AB734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_RIGHTSINFO" not found; SQL statement:
  alter table DefinedTermBase_RightsInfo drop constraint FK108A62BEC13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_RIGHTSINFO" not found; SQL statement:
  alter table DefinedTermBase_RightsInfo drop constraint FK108A62BEC0DB4934 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_RIGHTSINFO_AUD" not found; SQL statement:
  alter table DefinedTermBase_RightsInfo_AUD drop constraint FK2B2B018F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_STATISTICALMEASURE" not found; SQL statement:
  alter table DefinedTermBase_StatisticalMeasure drop constraint FK6FF15DFCC9CD5B57 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_STATISTICALMEASURE" not found; SQL statement:
  alter table DefinedTermBase_StatisticalMeasure drop constraint FK6FF15DFCD0BDAE9B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_STATISTICALMEASURE_AUD" not found; SQL statement:
  alter table DefinedTermBase_StatisticalMeasure_AUD drop constraint FK3C062DCD34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION" not found; SQL statement:
  alter table DefinedTermBase_SupportedCategoricalEnumeration drop constraint FK2170B25C5AF2C74 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION" not found; SQL statement:
  alter table DefinedTermBase_SupportedCategoricalEnumeration drop constraint FK2170B25CD0BDAE9B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION_AUD" not found; SQL statement:
  alter table DefinedTermBase_SupportedCategoricalEnumeration_AUD drop constraint FKBB04522D34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT" not found; SQL statement:
  alter table DerivationEvent drop constraint FK426BC034FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT" not found; SQL statement:
  alter table DerivationEvent drop constraint FK426BC03BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT" not found; SQL statement:
  alter table DerivationEvent drop constraint FK426BC033DA462D5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT" not found; SQL statement:
+alter table DerivationEvent drop constraint FK426BC03403E17F4 [42102-170]
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT" not found; SQL statement:
  alter table DerivationEvent drop constraint FK426BC038524B89D [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT_AUD" not found; SQL statement:
  alter table DerivationEvent_AUD drop constraint FKDABF305434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT_ANNOTATION" not found; SQL statement:
  alter table DerivationEvent_Annotation drop constraint FKEFA0D10B1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT_ANNOTATION" not found; SQL statement:
  alter table DerivationEvent_Annotation drop constraint FKEFA0D10B4AAB411A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT_ANNOTATION_AUD" not found; SQL statement:
  alter table DerivationEvent_Annotation_AUD drop constraint FKA197815C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT_MARKER" not found; SQL statement:
  alter table DerivationEvent_Marker drop constraint FKE412C816777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT_MARKER" not found; SQL statement:
  alter table DerivationEvent_Marker drop constraint FKE412C8164AAB411A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DERIVATIONEVENT_MARKER_AUD" not found; SQL statement:
  alter table DerivationEvent_Marker_AUD drop constraint FK8ED0FAE734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE" not found; SQL statement:
  alter table DescriptionBase drop constraint FKFF4D58CD4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE" not found; SQL statement:
  alter table DescriptionBase drop constraint FKFF4D58CDBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE" not found; SQL statement:
  alter table DescriptionBase drop constraint FKFF4D58CDB56856A4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE" not found; SQL statement:
  alter table DescriptionBase drop constraint FKFF4D58CDDE9A3E39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE" not found; SQL statement:
  alter table DescriptionBase drop constraint FKFF4D58CDDA935185 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_AUD" not found; SQL statement:
  alter table DescriptionBase_AUD drop constraint FK7456581E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_ANNOTATION" not found; SQL statement:
  alter table DescriptionBase_Annotation drop constraint FKF3AD32011E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_ANNOTATION" not found; SQL statement:
  alter table DescriptionBase_Annotation drop constraint FKF3AD3201F1DDBFAB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table DescriptionBase_Annotation_AUD drop constraint FK15FE775234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_CREDIT" not found; SQL statement:
  alter table DescriptionBase_Credit drop constraint FK510B2ACB32D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_CREDIT" not found; SQL statement:
  alter table DescriptionBase_Credit drop constraint FK510B2ACBF1DDBFAB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_CREDIT_AUD" not found; SQL statement:
  alter table DescriptionBase_Credit_AUD drop constraint FK2EBEFB1C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_EXTENSION" not found; SQL statement:
  alter table DescriptionBase_Extension drop constraint FKD5D2B32D927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_EXTENSION" not found; SQL statement:
  alter table DescriptionBase_Extension drop constraint FKD5D2B32DF1DDBFAB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_EXTENSION_AUD" not found; SQL statement:
  alter table DescriptionBase_Extension_AUD drop constraint FK79E7827E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_GEOSCOPE" not found; SQL statement:
  alter table DescriptionBase_GeoScope drop constraint FK3ADD7CD586D04E74 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_GEOSCOPE" not found; SQL statement:
  alter table DescriptionBase_GeoScope drop constraint FK3ADD7CD5D86445CE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_GEOSCOPE_AUD" not found; SQL statement:
  alter table DescriptionBase_GeoScope_AUD drop constraint FK63A5382634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_IDENTIFIER" not found; SQL statement:
  alter table DescriptionBase_Identifier drop constraint FKEFE5F37BE12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_IDENTIFIER" not found; SQL statement:
  alter table DescriptionBase_Identifier drop constraint FKEFE5F37BF1DDBFAB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_IDENTIFIER_AUD" not found; SQL statement:
  alter table DescriptionBase_Identifier_AUD drop constraint FKDCA5EBCC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_MARKER" not found; SQL statement:
  alter table DescriptionBase_Marker drop constraint FK6132140C777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_MARKER" not found; SQL statement:
  alter table DescriptionBase_Marker drop constraint FK6132140CF1DDBFAB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_MARKER_AUD" not found; SQL statement:
  alter table DescriptionBase_Marker_AUD drop constraint FK92DD5BDD34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table DescriptionBase_OriginalSourceBase drop constraint FKDC75C70F3A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table DescriptionBase_OriginalSourceBase drop constraint FKDC75C70FF1DDBFAB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table DescriptionBase_OriginalSourceBase_AUD drop constraint FK8F39D56034869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_REFERENCE" not found; SQL statement:
  alter table DescriptionBase_Reference drop constraint FKC330D6395C601E49 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_REFERENCE" not found; SQL statement:
  alter table DescriptionBase_Reference drop constraint FKC330D639F1DDBFAB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_REFERENCE_AUD" not found; SQL statement:
  alter table DescriptionBase_Reference_AUD drop constraint FK76253F8A34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_RIGHTSINFO" not found; SQL statement:
  alter table DescriptionBase_RightsInfo drop constraint FKFEADDDF7C13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_RIGHTSINFO" not found; SQL statement:
  alter table DescriptionBase_RightsInfo drop constraint FKFEADDDF7F1DDBFAB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_RIGHTSINFO_AUD" not found; SQL statement:
  alter table DescriptionBase_RightsInfo_AUD drop constraint FK183C384834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_SCOPE" not found; SQL statement:
  alter table DescriptionBase_Scope drop constraint FKB9257C4294E290CA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_SCOPE" not found; SQL statement:
  alter table DescriptionBase_Scope drop constraint FKB9257C42D86445CE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONBASE_SCOPE_AUD" not found; SQL statement:
  alter table DescriptionBase_Scope_AUD drop constraint FK75D5B91334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE76714FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE7671BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE76714220AFEB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE767134AF0E81 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE76711C3C3FF7 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE7671E8D36B00 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
-alter table DescriptionElementBase drop constraint FK38FE76715E9914B8 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+alter table DescriptionElementBase drop constraint FK38FE7671693C1147 [42102-170]
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE76716561D9B1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE767110A80E07 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE76719108D9B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE" not found; SQL statement:
  alter table DescriptionElementBase drop constraint FK38FE76716D0D7A56 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_AUD" not found; SQL statement:
  alter table DescriptionElementBase_AUD drop constraint FKF3803C234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_ANNOTATION" not found; SQL statement:
  alter table DescriptionElementBase_Annotation drop constraint FK7EE5E5DD1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_ANNOTATION" not found; SQL statement:
  alter table DescriptionElementBase_Annotation drop constraint FK7EE5E5DD3B8BB609 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table DescriptionElementBase_Annotation_AUD drop constraint FK2BC1DD2E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_LANGUAGESTRING" not found; SQL statement:
  alter table DescriptionElementBase_LanguageString drop constraint FKC753F137ACF5F60B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_LANGUAGESTRING" not found; SQL statement:
  alter table DescriptionElementBase_LanguageString drop constraint FKC753F137C6D55834 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_LANGUAGESTRING" not found; SQL statement:
  alter table DescriptionElementBase_LanguageString drop constraint FKC753F137C086B46F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_LANGUAGESTRING_AUD" not found; SQL statement:
  alter table DescriptionElementBase_LanguageString_AUD drop constraint FK2D26AB8834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MARKER" not found; SQL statement:
  alter table DescriptionElementBase_Marker drop constraint FK1CB715E8777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MARKER" not found; SQL statement:
  alter table DescriptionElementBase_Marker drop constraint FK1CB715E83B8BB609 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MARKER_AUD" not found; SQL statement:
  alter table DescriptionElementBase_Marker_AUD drop constraint FK1E160FB934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MEDIA" not found; SQL statement:
  alter table DescriptionElementBase_Media drop constraint FK21F70076C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MEDIA" not found; SQL statement:
  alter table DescriptionElementBase_Media drop constraint FK21F700763B8BB609 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MEDIA_AUD" not found; SQL statement:
  alter table DescriptionElementBase_Media_AUD drop constraint FK5522034734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MODIFIER" not found; SQL statement:
  alter table DescriptionElementBase_Modifier drop constraint FK97E0D105F4E35BCD [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MODIFIER" not found; SQL statement:
  alter table DescriptionElementBase_Modifier drop constraint FK97E0D1053B8BB609 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MODIFIER_AUD" not found; SQL statement:
  alter table DescriptionElementBase_Modifier_AUD drop constraint FK2982F45634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MODIFYINGTEXT" not found; SQL statement:
  alter table DescriptionElementBase_ModifyingText drop constraint FK522D90C7F05D08D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MODIFYINGTEXT" not found; SQL statement:
  alter table DescriptionElementBase_ModifyingText drop constraint FK522D90C79682414B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MODIFYINGTEXT" not found; SQL statement:
  alter table DescriptionElementBase_ModifyingText drop constraint FK522D90C73B8BB609 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_MODIFYINGTEXT_AUD" not found; SQL statement:
  alter table DescriptionElementBase_ModifyingText_AUD drop constraint FK6C06031834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table DescriptionElementBase_OriginalSourceBase drop constraint FKF41ADEEBA6473CCC [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table DescriptionElementBase_OriginalSourceBase drop constraint FKF41ADEEB3B8BB609 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table DescriptionElementBase_OriginalSourceBase_AUD drop constraint FK9C979F3C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_STATEDATA" not found; SQL statement:
  alter table DescriptionElementBase_StateData drop constraint FK592D6F6D8E7BF9AB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_STATEDATA" not found; SQL statement:
  alter table DescriptionElementBase_StateData drop constraint FK592D6F6D987CC6A4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_STATEDATA_AUD" not found; SQL statement:
  alter table DescriptionElementBase_StateData_AUD drop constraint FK1D0A1EBE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_STATISTICALMEASUREMENTVALUE" not found; SQL statement:
  alter table DescriptionElementBase_StatisticalMeasurementValue drop constraint FK8AF511C2D883945E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_STATISTICALMEASUREMENTVALUE" not found; SQL statement:
  alter table DescriptionElementBase_StatisticalMeasurementValue drop constraint FK8AF511C28F213219 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DESCRIPTIONELEMENTBASE_STATISTICALMEASUREMENTVALUE_AUD" not found; SQL statement:
  alter table DescriptionElementBase_StatisticalMeasurementValue_AUD drop constraint FK2DE8E9334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT" not found; SQL statement:
  alter table DeterminationEvent drop constraint FK1DB24974FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT" not found; SQL statement:
  alter table DeterminationEvent drop constraint FK1DB2497BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT" not found; SQL statement:
  alter table DeterminationEvent drop constraint FK1DB24973DA462D5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT" not found; SQL statement:
  alter table DeterminationEvent drop constraint FK1DB24974B251DAD [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT" not found; SQL statement:
  alter table DeterminationEvent drop constraint FK1DB2497BD54CF92 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT" not found; SQL statement:
  alter table DeterminationEvent drop constraint FK1DB2497AEC8CCAA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT" not found; SQL statement:
+alter table DeterminationEvent drop constraint FK1DB2497DA935185 [42102-170]
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_AUD" not found; SQL statement:
  alter table DeterminationEvent_AUD drop constraint FKA0252EE834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_ANNOTATION" not found; SQL statement:
  alter table DeterminationEvent_Annotation drop constraint FKB74F03F71E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_ANNOTATION" not found; SQL statement:
  alter table DeterminationEvent_Annotation drop constraint FKB74F03F76BE0BFDA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_ANNOTATION_AUD" not found; SQL statement:
  alter table DeterminationEvent_Annotation_AUD drop constraint FKAFDA5E4834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_MARKER" not found; SQL statement:
  alter table DeterminationEvent_Marker drop constraint FK5C475102777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_MARKER" not found; SQL statement:
  alter table DeterminationEvent_Marker drop constraint FK5C4751026BE0BFDA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_MARKER_AUD" not found; SQL statement:
  alter table DeterminationEvent_Marker_AUD drop constraint FK567F2DD334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_REFERENCE" not found; SQL statement:
  alter table DeterminationEvent_Reference drop constraint FK8FB1ED8355A53F64 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_REFERENCE" not found; SQL statement:
  alter table DeterminationEvent_Reference drop constraint FK8FB1ED836BE0BFDA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DETERMINATIONEVENT_REFERENCE_AUD" not found; SQL statement:
  alter table DeterminationEvent_Reference_AUD drop constraint FK6255A1D434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DNAQUALITY" not found; SQL statement:
  alter table DnaQuality drop constraint FK7F4518084FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DNAQUALITY" not found; SQL statement:
  alter table DnaQuality drop constraint FK7F451808BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DNAQUALITY" not found; SQL statement:
  alter table DnaQuality drop constraint FK7F45180823A844FA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DNAQUALITY" not found; SQL statement:
  alter table DnaQuality drop constraint FK7F45180887BB6462 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "DNAQUALITY" not found; SQL statement:
+alter table DnaQuality drop constraint FK7F451808632EAD0D [42102-170]
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "DNAQUALITY_AUD" not found; SQL statement:
  alter table DnaQuality_AUD drop constraint FKA79601D934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ENTITYCONSTRAINTVIOLATION" not found; SQL statement:
  alter table EntityConstraintViolation drop constraint FK8970AEC54FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ENTITYCONSTRAINTVIOLATION" not found; SQL statement:
  alter table EntityConstraintViolation drop constraint FK8970AEC5403EC952 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ENTITYVALIDATIONRESULT" not found; SQL statement:
  alter table EntityValidationResult drop constraint FK637AAC194FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "EXTENSION" not found; SQL statement:
  alter table Extension drop constraint FK52EF3C1F4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "EXTENSION" not found; SQL statement:
  alter table Extension drop constraint FK52EF3C1FBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "EXTENSION" not found; SQL statement:
  alter table Extension drop constraint FK52EF3C1FAD392BD3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "EXTENSION_AUD" not found; SQL statement:
  alter table Extension_AUD drop constraint FK92D2427034869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE" not found; SQL statement:
  alter table FeatureNode drop constraint FK4CEED9F84FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE" not found; SQL statement:
  alter table FeatureNode drop constraint FK4CEED9F8BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE" not found; SQL statement:
  alter table FeatureNode drop constraint FK4CEED9F84220AFEB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE" not found; SQL statement:
  alter table FeatureNode drop constraint FK4CEED9F847C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE" not found; SQL statement:
  alter table FeatureNode drop constraint FK4CEED9F8E0AD2C59 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE_AUD" not found; SQL statement:
  alter table FeatureNode_AUD drop constraint FK25AD4BC934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF" not found; SQL statement:
  alter table FeatureNode_DefinedTermBase_InapplicableIf drop constraint FK56833D011128E63B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF" not found; SQL statement:
  alter table FeatureNode_DefinedTermBase_InapplicableIf drop constraint FK56833D0152FCC4B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF_AUD" not found; SQL statement:
  alter table FeatureNode_DefinedTermBase_InapplicableIf_AUD drop constraint FKB8D7025234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE" not found; SQL statement:
  alter table FeatureNode_DefinedTermBase_OnlyApplicable drop constraint FK6AE876AB57FA94D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE" not found; SQL statement:
  alter table FeatureNode_DefinedTermBase_OnlyApplicable drop constraint FK6AE876AB52FCC4B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURENODE_DEFINEDTERMBASE_ONLYAPPLICABLE_AUD" not found; SQL statement:
  alter table FeatureNode_DefinedTermBase_OnlyApplicable_AUD drop constraint FK3F5356FC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE" not found; SQL statement:
  alter table FeatureTree drop constraint FK4CF19F944FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE" not found; SQL statement:
  alter table FeatureTree drop constraint FK4CF19F94BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE" not found; SQL statement:
  alter table FeatureTree drop constraint FK4CF19F94B7892921 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_AUD" not found; SQL statement:
  alter table FeatureTree_AUD drop constraint FK355BE36534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_ANNOTATION" not found; SQL statement:
  alter table FeatureTree_Annotation drop constraint FK5D8B8DA1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_ANNOTATION" not found; SQL statement:
  alter table FeatureTree_Annotation drop constraint FK5D8B8DA47C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_ANNOTATION_AUD" not found; SQL statement:
  alter table FeatureTree_Annotation_AUD drop constraint FK86E8E9AB34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_CREDIT" not found; SQL statement:
  alter table FeatureTree_Credit drop constraint FK7536062432D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_CREDIT" not found; SQL statement:
  alter table FeatureTree_Credit drop constraint FK7536062447C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_CREDIT_AUD" not found; SQL statement:
  alter table FeatureTree_Credit_AUD drop constraint FK40EA81F534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_EXTENSION" not found; SQL statement:
  alter table FeatureTree_Extension drop constraint FKAD1E6D34927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_EXTENSION" not found; SQL statement:
  alter table FeatureTree_Extension drop constraint FKAD1E6D3447C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_EXTENSION_AUD" not found; SQL statement:
  alter table FeatureTree_Extension_AUD drop constraint FKF128E10534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_IDENTIFIER" not found; SQL statement:
  alter table FeatureTree_Identifier drop constraint FK2117A54E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_IDENTIFIER" not found; SQL statement:
  alter table FeatureTree_Identifier drop constraint FK2117A5447C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_IDENTIFIER_AUD" not found; SQL statement:
  alter table FeatureTree_Identifier_AUD drop constraint FK4D905E2534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_MARKER" not found; SQL statement:
  alter table FeatureTree_Marker drop constraint FK855CEF65777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_MARKER" not found; SQL statement:
  alter table FeatureTree_Marker drop constraint FK855CEF6547C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_MARKER_AUD" not found; SQL statement:
  alter table FeatureTree_Marker_AUD drop constraint FKA508E2B634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table FeatureTree_OriginalSourceBase drop constraint FK13BD64E83A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table FeatureTree_OriginalSourceBase drop constraint FK13BD64E847C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table FeatureTree_OriginalSourceBase_AUD drop constraint FK7B5CDEB934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_REPRESENTATION" not found; SQL statement:
  alter table FeatureTree_Representation drop constraint FK8C458F8B31C4747 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_REPRESENTATION" not found; SQL statement:
  alter table FeatureTree_Representation drop constraint FK8C458F847C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_REPRESENTATION_AUD" not found; SQL statement:
  alter table FeatureTree_Representation_AUD drop constraint FKECAB4AC934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_RIGHTSINFO" not found; SQL statement:
  alter table FeatureTree_RightsInfo drop constraint FK10D964D0C13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_RIGHTSINFO" not found; SQL statement:
  alter table FeatureTree_RightsInfo drop constraint FK10D964D047C496CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "FEATURETREE_RIGHTSINFO_AUD" not found; SQL statement:
  alter table FeatureTree_RightsInfo_AUD drop constraint FK8926AAA134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT" not found; SQL statement:
  alter table GatheringEvent drop constraint FK6F1286F34FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT" not found; SQL statement:
  alter table GatheringEvent drop constraint FK6F1286F3BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT" not found; SQL statement:
  alter table GatheringEvent drop constraint FK6F1286F33DA462D5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT" not found; SQL statement:
  alter table GatheringEvent drop constraint FK6F1286F3C15704E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT" not found; SQL statement:
  alter table GatheringEvent drop constraint FK6F1286F3F55AFD89 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT" not found; SQL statement:
  alter table GatheringEvent drop constraint FK6F1286F38B455EC6 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_AUD" not found; SQL statement:
  alter table GatheringEvent_AUD drop constraint FK3EC034434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_ANNOTATION" not found; SQL statement:
  alter table GatheringEvent_Annotation drop constraint FK76DDD01B1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_ANNOTATION" not found; SQL statement:
  alter table GatheringEvent_Annotation drop constraint FK76DDD01BF95F225A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_ANNOTATION_AUD" not found; SQL statement:
  alter table GatheringEvent_Annotation_AUD drop constraint FK351E786C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_DEFINEDTERMBASE" not found; SQL statement:
  alter table GatheringEvent_DefinedTermBase drop constraint FK69D9A11A7C34B6D6 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_DEFINEDTERMBASE" not found; SQL statement:
  alter table GatheringEvent_DefinedTermBase drop constraint FK69D9A11AF95F225A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_DEFINEDTERMBASE_AUD" not found; SQL statement:
  alter table GatheringEvent_DefinedTermBase_AUD drop constraint FKB3BBB1EB34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_MARKER" not found; SQL statement:
  alter table GatheringEvent_Marker drop constraint FK7B49CF26777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_MARKER" not found; SQL statement:
  alter table GatheringEvent_Marker drop constraint FK7B49CF26F95F225A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GATHERINGEVENT_MARKER_AUD" not found; SQL statement:
  alter table GatheringEvent_Marker_AUD drop constraint FK160DF9F734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "GRANTEDAUTHORITYIMPL" not found; SQL statement:
  alter table GrantedAuthorityImpl drop constraint FKB05CF9284FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP" not found; SQL statement:
  alter table HomotypicalGroup drop constraint FK7DECCC184FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP" not found; SQL statement:
  alter table HomotypicalGroup drop constraint FK7DECCC18BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP_AUD" not found; SQL statement:
  alter table HomotypicalGroup_AUD drop constraint FKE4252DE934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP_ANNOTATION" not found; SQL statement:
  alter table HomotypicalGroup_Annotation drop constraint FK7A0351D61E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP_ANNOTATION" not found; SQL statement:
  alter table HomotypicalGroup_Annotation drop constraint FK7A0351D6BFEAE500 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP_ANNOTATION_AUD" not found; SQL statement:
  alter table HomotypicalGroup_Annotation_AUD drop constraint FK41E6A4A734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP_MARKER" not found; SQL statement:
  alter table HomotypicalGroup_Marker drop constraint FK97D36661777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP_MARKER" not found; SQL statement:
  alter table HomotypicalGroup_Marker drop constraint FK97D36661BFEAE500 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HOMOTYPICALGROUP_MARKER_AUD" not found; SQL statement:
  alter table HomotypicalGroup_Marker_AUD drop constraint FK19337BB234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP" not found; SQL statement:
  alter table HybridRelationship drop constraint FK9033CE744FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP" not found; SQL statement:
  alter table HybridRelationship drop constraint FK9033CE74BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP" not found; SQL statement:
  alter table HybridRelationship drop constraint FK9033CE74AEB7F3BE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP" not found; SQL statement:
  alter table HybridRelationship drop constraint FK9033CE749DD57A93 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP" not found; SQL statement:
  alter table HybridRelationship drop constraint FK9033CE74AF4F9F62 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP" not found; SQL statement:
  alter table HybridRelationship drop constraint FK9033CE7455F241D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP_AUD" not found; SQL statement:
  alter table HybridRelationship_AUD drop constraint FK9C2BA24534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP_ANNOTATION" not found; SQL statement:
  alter table HybridRelationship_Annotation drop constraint FK2C7E7DFA1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP_ANNOTATION" not found; SQL statement:
  alter table HybridRelationship_Annotation drop constraint FK2C7E7DFA59832240 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP_ANNOTATION_AUD" not found; SQL statement:
  alter table HybridRelationship_Annotation_AUD drop constraint FKACE71ECB34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP_MARKER" not found; SQL statement:
  alter table HybridRelationship_Marker drop constraint FKCEF24485777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP_MARKER" not found; SQL statement:
  alter table HybridRelationship_Marker drop constraint FKCEF2448559832240 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "HYBRIDRELATIONSHIP_MARKER_AUD" not found; SQL statement:
  alter table HybridRelationship_Marker_AUD drop constraint FKCBAEA7D634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "IDENTIFIER" not found; SQL statement:
  alter table Identifier drop constraint FK165A88C94FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "IDENTIFIER" not found; SQL statement:
  alter table Identifier drop constraint FK165A88C9BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "IDENTIFIER" not found; SQL statement:
  alter table Identifier drop constraint FK165A88C9E67FC44F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "IDENTIFIER_AUD" not found; SQL statement:
  alter table Identifier_AUD drop constraint FKE1132A1A34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INDIVIDUALASSOCIATION_LANGUAGESTRING" not found; SQL statement:
  alter table IndividualAssociation_LanguageString drop constraint FKB5C75EC02BEBA58D [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INDIVIDUALASSOCIATION_LANGUAGESTRING" not found; SQL statement:
  alter table IndividualAssociation_LanguageString drop constraint FKB5C75EC028459272 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INDIVIDUALASSOCIATION_LANGUAGESTRING" not found; SQL statement:
  alter table IndividualAssociation_LanguageString drop constraint FKB5C75EC084FF3EDF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INDIVIDUALASSOCIATION_LANGUAGESTRING_AUD" not found; SQL statement:
  alter table IndividualAssociation_LanguageString_AUD drop constraint FKB1A62C9134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INSTITUTIONALMEMBERSHIP" not found; SQL statement:
  alter table InstitutionalMembership drop constraint FK3C8E1FF94FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INSTITUTIONALMEMBERSHIP" not found; SQL statement:
  alter table InstitutionalMembership drop constraint FK3C8E1FF9BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INSTITUTIONALMEMBERSHIP" not found; SQL statement:
  alter table InstitutionalMembership drop constraint FK3C8E1FF916B9CA77 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INSTITUTIONALMEMBERSHIP" not found; SQL statement:
  alter table InstitutionalMembership drop constraint FK3C8E1FF9AAC1B820 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "INSTITUTIONALMEMBERSHIP_AUD" not found; SQL statement:
  alter table InstitutionalMembership_AUD drop constraint FK847A94A34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "KEYSTATEMENT" not found; SQL statement:
  alter table KeyStatement drop constraint FK7125B9F04FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "KEYSTATEMENT" not found; SQL statement:
  alter table KeyStatement drop constraint FK7125B9F0BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "KEYSTATEMENT_AUD" not found; SQL statement:
  alter table KeyStatement_AUD drop constraint FK93036FC134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "KEYSTATEMENT_LANGUAGESTRING" not found; SQL statement:
  alter table KeyStatement_LanguageString drop constraint FK70BB5FD89C782795 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "KEYSTATEMENT_LANGUAGESTRING" not found; SQL statement:
  alter table KeyStatement_LanguageString drop constraint FK70BB5FD8DA0C376A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "KEYSTATEMENT_LANGUAGESTRING" not found; SQL statement:
  alter table KeyStatement_LanguageString drop constraint FK70BB5FD8AAA67049 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "KEYSTATEMENT_LANGUAGESTRING_AUD" not found; SQL statement:
  alter table KeyStatement_LanguageString_AUD drop constraint FKE203E1A934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LSIDAUTHORITY" not found; SQL statement:
  alter table LSIDAuthority drop constraint FK759DB8814FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LSIDAUTHORITY_NAMESPACES" not found; SQL statement:
  alter table LSIDAuthority_namespaces drop constraint FKB04948F64FFCFD94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING" not found; SQL statement:
  alter table LanguageString drop constraint FKB5FDC9A94FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING" not found; SQL statement:
  alter table LanguageString drop constraint FKB5FDC9A9BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING" not found; SQL statement:
  alter table LanguageString drop constraint FKB5FDC9A9E8D36B00 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING_AUD" not found; SQL statement:
  alter table LanguageString_AUD drop constraint FK896AFAFA34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING_ANNOTATION" not found; SQL statement:
  alter table LanguageString_Annotation drop constraint FK8400DFA51E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING_ANNOTATION" not found; SQL statement:
  alter table LanguageString_Annotation drop constraint FK8400DFA537998500 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING_ANNOTATION_AUD" not found; SQL statement:
  alter table LanguageString_Annotation_AUD drop constraint FKD3BAB2F634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING_MARKER" not found; SQL statement:
  alter table LanguageString_Marker drop constraint FK8DA633B0777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING_MARKER" not found; SQL statement:
  alter table LanguageString_Marker drop constraint FK8DA633B037998500 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "LANGUAGESTRING_MARKER_AUD" not found; SQL statement:
  alter table LanguageString_Marker_AUD drop constraint FK2331098134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MARKER" not found; SQL statement:
  alter table Marker drop constraint FK88F1805A4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MARKER" not found; SQL statement:
  alter table Marker drop constraint FK88F1805ABC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MARKER" not found; SQL statement:
  alter table Marker drop constraint FK88F1805AD64DC020 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MARKER_AUD" not found; SQL statement:
  alter table Marker_AUD drop constraint FKB951F12B34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT" not found; SQL statement:
  alter table MaterialOrMethodEvent drop constraint FK458A264F4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT" not found; SQL statement:
  alter table MaterialOrMethodEvent drop constraint FK458A264FBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT" not found; SQL statement:
  alter table MaterialOrMethodEvent drop constraint FK458A264F3DA462D5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT" not found; SQL statement:
  alter table MaterialOrMethodEvent drop constraint FK458A264F14D2C695 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT" not found; SQL statement:
  alter table MaterialOrMethodEvent drop constraint FK458A264F3781DA30 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT" not found; SQL statement:
  alter table MaterialOrMethodEvent drop constraint FK458A264F1600EAB3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT" not found; SQL statement:
  alter table MaterialOrMethodEvent drop constraint FK458A264F9A129634 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT_AUD" not found; SQL statement:
  alter table MaterialOrMethodEvent_AUD drop constraint FK8C8C94A034869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT_ANNOTATION" not found; SQL statement:
  alter table MaterialOrMethodEvent_Annotation drop constraint FKD9943F3F1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT_ANNOTATION" not found; SQL statement:
  alter table MaterialOrMethodEvent_Annotation drop constraint FKD9943F3F2F50355A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT_ANNOTATION_AUD" not found; SQL statement:
  alter table MaterialOrMethodEvent_Annotation_AUD drop constraint FK6B00B59034869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT_MARKER" not found; SQL statement:
  alter table MaterialOrMethodEvent_Marker drop constraint FKF0BD704A777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT_MARKER" not found; SQL statement:
  alter table MaterialOrMethodEvent_Marker drop constraint FKF0BD704A2F50355A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MATERIALORMETHODEVENT_MARKER_AUD" not found; SQL statement:
  alter table MaterialOrMethodEvent_Marker_AUD drop constraint FK78C4691B34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA" not found; SQL statement:
  alter table Media drop constraint FK46C7FC44FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA" not found; SQL statement:
  alter table Media drop constraint FK46C7FC4BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA" not found; SQL statement:
  alter table Media drop constraint FK46C7FC4C2445443 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_NAMEDAREA" not found; SQL statement:
  alter table MediaKey_NamedArea drop constraint FK31E7D4023FF8E7B2 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_NAMEDAREA" not found; SQL statement:
  alter table MediaKey_NamedArea drop constraint FK31E7D402BE59D760 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_NAMEDAREA_AUD" not found; SQL statement:
  alter table MediaKey_NamedArea_AUD drop constraint FK922630D334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_SCOPE" not found; SQL statement:
  alter table MediaKey_Scope drop constraint FKBFFEE8F05431B96E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_SCOPE" not found; SQL statement:
  alter table MediaKey_Scope drop constraint FKBFFEE8F0BE59D760 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_SCOPE_AUD" not found; SQL statement:
  alter table MediaKey_Scope_AUD drop constraint FK63AD1EC134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_TAXON" not found; SQL statement:
  alter table MediaKey_Taxon drop constraint FKC00C3966DE9A3E39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_TAXON" not found; SQL statement:
  alter table MediaKey_Taxon drop constraint FKC00C3966815C7E9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAKEY_TAXON_AUD" not found; SQL statement:
  alter table MediaKey_Taxon_AUD drop constraint FK311443734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATION" not found; SQL statement:
  alter table MediaRepresentation drop constraint FK1966BDB14FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATION" not found; SQL statement:
  alter table MediaRepresentation drop constraint FK1966BDB1BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATION" not found; SQL statement:
  alter table MediaRepresentation drop constraint FK1966BDB1C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATIONPART" not found; SQL statement:
  alter table MediaRepresentationPart drop constraint FK67A455444FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATIONPART" not found; SQL statement:
  alter table MediaRepresentationPart drop constraint FK67A45544BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATIONPART" not found; SQL statement:
  alter table MediaRepresentationPart drop constraint FK67A45544E3818E37 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATIONPART_AUD" not found; SQL statement:
  alter table MediaRepresentationPart_AUD drop constraint FKA75C411534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATION_AUD" not found; SQL statement:
  alter table MediaRepresentation_AUD drop constraint FK67AAAB0234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIAREPRESENTATION_MEDIAREPRESENTATIONPART_AUD" not found; SQL statement:
  alter table MediaRepresentation_MediaRepresentationPart_AUD drop constraint FK3544378734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_AUD" not found; SQL statement:
  alter table Media_AUD drop constraint FKF70B2B9534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_ANNOTATION" not found; SQL statement:
  alter table Media_Annotation drop constraint FKA020DAAA1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_ANNOTATION" not found; SQL statement:
  alter table Media_Annotation drop constraint FKA020DAAAC2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_ANNOTATION_AUD" not found; SQL statement:
  alter table Media_Annotation_AUD drop constraint FK99ABA37B34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_CREDIT" not found; SQL statement:
  alter table Media_Credit drop constraint FKC1F78FF432D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_CREDIT" not found; SQL statement:
  alter table Media_Credit drop constraint FKC1F78FF4C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_CREDIT_AUD" not found; SQL statement:
  alter table Media_Credit_AUD drop constraint FKDB32A3C534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_DESCRIPTION" not found; SQL statement:
  alter table Media_Description drop constraint FK368283E12BEBA58D [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_DESCRIPTION" not found; SQL statement:
  alter table Media_Description drop constraint FK368283E128459272 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_DESCRIPTION" not found; SQL statement:
  alter table Media_Description drop constraint FK368283E1C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_DESCRIPTION_AUD" not found; SQL statement:
  alter table Media_Description_AUD drop constraint FK6817D93234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_EXTENSION" not found; SQL statement:
  alter table Media_Extension drop constraint FKDB62D164927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_EXTENSION" not found; SQL statement:
  alter table Media_Extension drop constraint FKDB62D164C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_EXTENSION_AUD" not found; SQL statement:
  alter table Media_Extension_AUD drop constraint FKE13FAD3534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_IDENTIFIER" not found; SQL statement:
  alter table Media_Identifier drop constraint FK9C599C24E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_IDENTIFIER" not found; SQL statement:
  alter table Media_Identifier drop constraint FK9C599C24C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_IDENTIFIER_AUD" not found; SQL statement:
  alter table Media_Identifier_AUD drop constraint FK605317F534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_LANGUAGESTRING" not found; SQL statement:
  alter table Media_LanguageString drop constraint FK353DB784A1CA19B1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_LANGUAGESTRING" not found; SQL statement:
  alter table Media_LanguageString drop constraint FK353DB784A0A6EDCE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_LANGUAGESTRING" not found; SQL statement:
  alter table Media_LanguageString drop constraint FK353DB784C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_LANGUAGESTRING_AUD" not found; SQL statement:
  alter table Media_LanguageString_AUD drop constraint FK68FA835534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_MARKER" not found; SQL statement:
  alter table Media_Marker drop constraint FKD21E7935777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_MARKER" not found; SQL statement:
  alter table Media_Marker drop constraint FKD21E7935C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_MARKER_AUD" not found; SQL statement:
  alter table Media_Marker_AUD drop constraint FK3F51048634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table Media_OriginalSourceBase drop constraint FK2FEEB6B83A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table Media_OriginalSourceBase drop constraint FK2FEEB6B8C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table Media_OriginalSourceBase_AUD drop constraint FK97F0C88934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_REPRESENTATION" not found; SQL statement:
  alter table Media_Representation drop constraint FK1B8712C88F6CABE6 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_REPRESENTATION" not found; SQL statement:
  alter table Media_Representation drop constraint FK1B8712C8BE59D760 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_REPRESENTATION_AUD" not found; SQL statement:
  alter table Media_Representation_AUD drop constraint FK8DC9C9934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_RIGHTSINFO" not found; SQL statement:
  alter table Media_RightsInfo drop constraint FKAB2186A0C13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_RIGHTSINFO" not found; SQL statement:
  alter table Media_RightsInfo drop constraint FKAB2186A0C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_RIGHTSINFO_AUD" not found; SQL statement:
  alter table Media_RightsInfo_AUD drop constraint FK9BE9647134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_SEQUENCE" not found; SQL statement:
  alter table Media_Sequence drop constraint FK61D09FCF29B4761 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_SEQUENCE" not found; SQL statement:
  alter table Media_Sequence drop constraint FK61D09FC3282B64 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_SEQUENCE_AUD" not found; SQL statement:
  alter table Media_Sequence_AUD drop constraint FK3C7BD9CD34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_TAXONBASE" not found; SQL statement:
  alter table Media_TaxonBase drop constraint FK1ABD49E07C3D0017 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_TAXONBASE" not found; SQL statement:
  alter table Media_TaxonBase drop constraint FK1ABD49E0BE59D760 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MEDIA_TAXONBASE_AUD" not found; SQL statement:
  alter table Media_TaxonBase_AUD drop constraint FK857187B134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_NAMEDAREA" not found; SQL statement:
  alter table MultiAccessKey_NamedArea drop constraint FK1F5A74893FF8E7B2 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_NAMEDAREA" not found; SQL statement:
  alter table MultiAccessKey_NamedArea drop constraint FK1F5A7489B4555A9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_NAMEDAREA_AUD" not found; SQL statement:
  alter table MultiAccessKey_NamedArea_AUD drop constraint FK4CB735DA34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_SCOPE" not found; SQL statement:
  alter table MultiAccessKey_Scope drop constraint FKCC6CE4F75431B96E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_SCOPE" not found; SQL statement:
  alter table MultiAccessKey_Scope drop constraint FKCC6CE4F7B4555A9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_SCOPE_AUD" not found; SQL statement:
  alter table MultiAccessKey_Scope_AUD drop constraint FK511FBF4834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_TAXON" not found; SQL statement:
  alter table MultiAccessKey_Taxon drop constraint FKCC7A356DDE9A3E39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_TAXON" not found; SQL statement:
  alter table MultiAccessKey_Taxon drop constraint FKCC7A356DB64A7B29 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "MULTIACCESSKEY_TAXON_AUD" not found; SQL statement:
  alter table MultiAccessKey_Taxon_AUD drop constraint FKF083E4BE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP" not found; SQL statement:
  alter table NameRelationship drop constraint FK5E510834FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP" not found; SQL statement:
  alter table NameRelationship drop constraint FK5E51083BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP" not found; SQL statement:
  alter table NameRelationship drop constraint FK5E51083AEB7F3BE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP" not found; SQL statement:
  alter table NameRelationship drop constraint FK5E5108316CDFF85 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP" not found; SQL statement:
  alter table NameRelationship drop constraint FK5E5108328482454 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP" not found; SQL statement:
  alter table NameRelationship drop constraint FK5E51083AF619DE3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP_AUD" not found; SQL statement:
  alter table NameRelationship_AUD drop constraint FK743F44D434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP_ANNOTATION" not found; SQL statement:
  alter table NameRelationship_Annotation drop constraint FK2E38AC8B1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP_ANNOTATION" not found; SQL statement:
  alter table NameRelationship_Annotation drop constraint FK2E38AC8B7B4CB560 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP_ANNOTATION_AUD" not found; SQL statement:
  alter table NameRelationship_Annotation_AUD drop constraint FKD1D59CDC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP_MARKER" not found; SQL statement:
  alter table NameRelationship_Marker drop constraint FKE3E46396777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP_MARKER" not found; SQL statement:
  alter table NameRelationship_Marker drop constraint FKE3E463967B4CB560 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NAMERELATIONSHIP_MARKER_AUD" not found; SQL statement:
  alter table NameRelationship_Marker_AUD drop constraint FKCD68D66734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS" not found; SQL statement:
  alter table NomenclaturalStatus drop constraint FK1FFEC88B4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS" not found; SQL statement:
  alter table NomenclaturalStatus drop constraint FK1FFEC88BBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS" not found; SQL statement:
  alter table NomenclaturalStatus drop constraint FK1FFEC88BAEB7F3BE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS" not found; SQL statement:
  alter table NomenclaturalStatus drop constraint FK1FFEC88B7029BD9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS_AUD" not found; SQL statement:
  alter table NomenclaturalStatus_AUD drop constraint FKFB2DB8DC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS_ANNOTATION" not found; SQL statement:
  alter table NomenclaturalStatus_Annotation drop constraint FKE6E91F831E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS_ANNOTATION" not found; SQL statement:
  alter table NomenclaturalStatus_Annotation drop constraint FKE6E91F838D2CB1D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS_ANNOTATION_AUD" not found; SQL statement:
  alter table NomenclaturalStatus_Annotation_AUD drop constraint FK6A3D3D434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS_MARKER" not found; SQL statement:
  alter table NomenclaturalStatus_Marker drop constraint FK2F5128E777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS_MARKER" not found; SQL statement:
  alter table NomenclaturalStatus_Marker drop constraint FK2F5128E8D2CB1D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "NOMENCLATURALSTATUS_MARKER_AUD" not found; SQL statement:
  alter table NomenclaturalStatus_Marker_AUD drop constraint FK8619495F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE" not found; SQL statement:
  alter table OriginalSourceBase drop constraint FK505F2E5D4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE" not found; SQL statement:
  alter table OriginalSourceBase drop constraint FK505F2E5DBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE" not found; SQL statement:
  alter table OriginalSourceBase drop constraint FK505F2E5DAEB7F3BE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE" not found; SQL statement:
  alter table OriginalSourceBase drop constraint FK505F2E5D966B96B2 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table OriginalSourceBase_AUD drop constraint FK9662E5AE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE_ANNOTATION" not found; SQL statement:
  alter table OriginalSourceBase_Annotation drop constraint FK208142711E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE_ANNOTATION" not found; SQL statement:
  alter table OriginalSourceBase_Annotation drop constraint FK20814271B029DDA0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table OriginalSourceBase_Annotation_AUD drop constraint FKA074CFC234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE_MARKER" not found; SQL statement:
  alter table OriginalSourceBase_Marker drop constraint FKB3FFDC7C777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE_MARKER" not found; SQL statement:
  alter table OriginalSourceBase_Marker drop constraint FKB3FFDC7CB029DDA0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "ORIGINALSOURCEBASE_MARKER_AUD" not found; SQL statement:
  alter table OriginalSourceBase_Marker_AUD drop constraint FKBFB16C4D34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PERMISSIONGROUP" not found; SQL statement:
  alter table PermissionGroup drop constraint FK629941D04FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PERMISSIONGROUP_GRANTEDAUTHORITYIMPL" not found; SQL statement:
  alter table PermissionGroup_GrantedAuthorityImpl drop constraint FK53114371857F6C2 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PERMISSIONGROUP_GRANTEDAUTHORITYIMPL" not found; SQL statement:
  alter table PermissionGroup_GrantedAuthorityImpl drop constraint FK5311437CA0971A3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY" not found; SQL statement:
  alter table PolytomousKey drop constraint FKA9E6B1384FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY" not found; SQL statement:
  alter table PolytomousKey drop constraint FKA9E6B138BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY" not found; SQL statement:
  alter table PolytomousKey drop constraint FKA9E6B138576595C3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775A4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775ABC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775A4220AFEB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775AC73A7584 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775A4FEE4393 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775A808998FB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775A9D3C2E93 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775A4382686A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775A1C0483C4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE" not found; SQL statement:
  alter table PolytomousKeyNode drop constraint FK860775ADE9A3E39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE_AUD" not found; SQL statement:
  alter table PolytomousKeyNode_AUD drop constraint FK6A6D682B34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE_LANGUAGESTRING" not found; SQL statement:
  alter table PolytomousKeyNode_LanguageString drop constraint FK5574E12EF05D08D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE_LANGUAGESTRING" not found; SQL statement:
  alter table PolytomousKeyNode_LanguageString drop constraint FK5574E12E9682414B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE_LANGUAGESTRING" not found; SQL statement:
  alter table PolytomousKeyNode_LanguageString drop constraint FK5574E12EF135C42B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEYNODE_LANGUAGESTRING_AUD" not found; SQL statement:
  alter table PolytomousKeyNode_LanguageString_AUD drop constraint FKE0D0C7FF34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_AUD" not found; SQL statement:
  alter table PolytomousKey_AUD drop constraint FK867830934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_ANNOTATION" not found; SQL statement:
  alter table PolytomousKey_Annotation drop constraint FK278CF8B61E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_ANNOTATION" not found; SQL statement:
  alter table PolytomousKey_Annotation drop constraint FK278CF8B689D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_ANNOTATION_AUD" not found; SQL statement:
  alter table PolytomousKey_Annotation_AUD drop constraint FK3281DB8734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_CREDIT" not found; SQL statement:
  alter table PolytomousKey_Credit drop constraint FKADC940032D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_CREDIT" not found; SQL statement:
  alter table PolytomousKey_Credit drop constraint FKADC940089D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_CREDIT_AUD" not found; SQL statement:
  alter table PolytomousKey_Credit_AUD drop constraint FK629EC1D134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_EXTENSION" not found; SQL statement:
  alter table PolytomousKey_Extension drop constraint FKAE34C1D8927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_EXTENSION" not found; SQL statement:
  alter table PolytomousKey_Extension drop constraint FKAE34C1D889D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_EXTENSION_AUD" not found; SQL statement:
  alter table PolytomousKey_Extension_AUD drop constraint FK1FFC43A934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_IDENTIFIER" not found; SQL statement:
  alter table PolytomousKey_Identifier drop constraint FK23C5BA30E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_IDENTIFIER" not found; SQL statement:
  alter table PolytomousKey_Identifier drop constraint FK23C5BA3089D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_IDENTIFIER_AUD" not found; SQL statement:
  alter table PolytomousKey_Identifier_AUD drop constraint FKF929500134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_MARKER" not found; SQL statement:
  alter table PolytomousKey_Marker drop constraint FK1B037D41777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_MARKER" not found; SQL statement:
  alter table PolytomousKey_Marker drop constraint FK1B037D4189D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_MARKER_AUD" not found; SQL statement:
  alter table PolytomousKey_Marker_AUD drop constraint FKC6BD229234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_NAMEDAREA" not found; SQL statement:
  alter table PolytomousKey_NamedArea drop constraint FK1C727CFF3FF8E7B2 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_NAMEDAREA" not found; SQL statement:
  alter table PolytomousKey_NamedArea drop constraint FK1C727CFF89D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_NAMEDAREA_AUD" not found; SQL statement:
  alter table PolytomousKey_NamedArea_AUD drop constraint FK750A135034869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table PolytomousKey_OriginalSourceBase drop constraint FK839208C43A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table PolytomousKey_OriginalSourceBase drop constraint FK839208C489D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table PolytomousKey_OriginalSourceBase_AUD drop constraint FKE644349534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_RIGHTSINFO" not found; SQL statement:
  alter table PolytomousKey_RightsInfo drop constraint FK328DA4ACC13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_RIGHTSINFO" not found; SQL statement:
  alter table PolytomousKey_RightsInfo drop constraint FK328DA4AC89D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_RIGHTSINFO_AUD" not found; SQL statement:
  alter table PolytomousKey_RightsInfo_AUD drop constraint FK34BF9C7D34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_SCOPE" not found; SQL statement:
  alter table PolytomousKey_Scope drop constraint FK8D97986D5431B96E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_SCOPE" not found; SQL statement:
  alter table PolytomousKey_Scope drop constraint FK8D97986D89D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_SCOPE_AUD" not found; SQL statement:
  alter table PolytomousKey_Scope_AUD drop constraint FK4E37C7BE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_TAXON" not found; SQL statement:
  alter table PolytomousKey_Taxon drop constraint FK8DA4E8E3DE9A3E39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_TAXON" not found; SQL statement:
  alter table PolytomousKey_Taxon drop constraint FK8DA4E8E389D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_TAXONBASE" not found; SQL statement:
  alter table PolytomousKey_TaxonBase drop constraint FKED8F3A547C3D0017 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_TAXONBASE" not found; SQL statement:
  alter table PolytomousKey_TaxonBase drop constraint FKED8F3A5489D97CB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_TAXONBASE_AUD" not found; SQL statement:
  alter table PolytomousKey_TaxonBase_AUD drop constraint FKC42E1E2534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "POLYTOMOUSKEY_TAXON_AUD" not found; SQL statement:
  alter table PolytomousKey_Taxon_AUD drop constraint FKED9BED3434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER" not found; SQL statement:
  alter table Primer drop constraint FK8EFB89F34FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER" not found; SQL statement:
  alter table Primer drop constraint FK8EFB89F3BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "PRIMER" not found; SQL statement:
+alter table Primer drop constraint FK8EFB89F36D2CE418 [42102-170]
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER" not found; SQL statement:
  alter table Primer drop constraint FK8EFB89F3D0374392 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER_AUD" not found; SQL statement:
  alter table Primer_AUD drop constraint FK319B864434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER_ANNOTATION" not found; SQL statement:
  alter table Primer_Annotation drop constraint FK9044ED1B1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER_ANNOTATION" not found; SQL statement:
  alter table Primer_Annotation drop constraint FK9044ED1B48BD1F55 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER_ANNOTATION_AUD" not found; SQL statement:
  alter table Primer_Annotation_AUD drop constraint FKDBAF156C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER_MARKER" not found; SQL statement:
  alter table Primer_Marker drop constraint FKF6C76C26777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER_MARKER" not found; SQL statement:
  alter table Primer_Marker drop constraint FKF6C76C2648BD1F55 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "PRIMER_MARKER_AUD" not found; SQL statement:
  alter table Primer_Marker_AUD drop constraint FK2F7516F734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE" not found; SQL statement:
  alter table Reference drop constraint FK404D5F2B4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE" not found; SQL statement:
  alter table Reference drop constraint FK404D5F2BBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE" not found; SQL statement:
  alter table Reference drop constraint FK404D5F2BD741CE1F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE" not found; SQL statement:
  alter table Reference drop constraint FK404D5F2BAD54327F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE" not found; SQL statement:
  alter table Reference drop constraint FK404D5F2B403E17F4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE" not found; SQL statement:
  alter table Reference drop constraint FK404D5F2BAEC3B8B8 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_AUD" not found; SQL statement:
  alter table Reference_AUD drop constraint FK8F0FFF7C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_ANNOTATION" not found; SQL statement:
  alter table Reference_Annotation drop constraint FKFC824E31E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_ANNOTATION" not found; SQL statement:
  alter table Reference_Annotation drop constraint FKFC824E38D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_ANNOTATION_AUD" not found; SQL statement:
  alter table Reference_Annotation_AUD drop constraint FKF3C1293434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_CREDIT" not found; SQL statement:
  alter table Reference_Credit drop constraint FK5BC6DEAD32D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_CREDIT" not found; SQL statement:
  alter table Reference_Credit drop constraint FK5BC6DEAD8D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_CREDIT_AUD" not found; SQL statement:
  alter table Reference_Credit_AUD drop constraint FK4AD9EDFE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_EXTENSION" not found; SQL statement:
  alter table Reference_Extension drop constraint FKDEFCDC0B927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_EXTENSION" not found; SQL statement:
  alter table Reference_Extension drop constraint FKDEFCDC0B8D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_EXTENSION_AUD" not found; SQL statement:
  alter table Reference_Extension_AUD drop constraint FK1DF60C5C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_IDENTIFIER" not found; SQL statement:
  alter table Reference_Identifier drop constraint FKC00E65DE12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_IDENTIFIER" not found; SQL statement:
  alter table Reference_Identifier drop constraint FKC00E65D8D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_IDENTIFIER_AUD" not found; SQL statement:
  alter table Reference_Identifier_AUD drop constraint FKBA689DAE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_MARKER" not found; SQL statement:
  alter table Reference_Marker drop constraint FK6BEDC7EE777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_MARKER" not found; SQL statement:
  alter table Reference_Marker drop constraint FK6BEDC7EE8D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_MARKER_AUD" not found; SQL statement:
  alter table Reference_Marker_AUD drop constraint FKAEF84EBF34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_MEDIA" not found; SQL statement:
  alter table Reference_Media drop constraint FKBBEF5B0C2C29593 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_MEDIA" not found; SQL statement:
  alter table Reference_Media drop constraint FKBBEF5B08D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_MEDIA_AUD" not found; SQL statement:
  alter table Reference_Media_AUD drop constraint FK8318CB8134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table Reference_OriginalSourceBase drop constraint FKD3E8B7F13A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table Reference_OriginalSourceBase drop constraint FKD3E8B7F18D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table Reference_OriginalSourceBase_AUD drop constraint FKC025854234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_RIGHTSINFO" not found; SQL statement:
  alter table Reference_RightsInfo drop constraint FK1AC8D0D9C13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_RIGHTSINFO" not found; SQL statement:
  alter table Reference_RightsInfo drop constraint FK1AC8D0D98D0FB4DA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REFERENCE_RIGHTSINFO_AUD" not found; SQL statement:
  alter table Reference_RightsInfo_AUD drop constraint FKF5FEEA2A34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RELATIONSHIPTERMBASE_INVERSEREPRESENTATION" not found; SQL statement:
  alter table RelationshipTermBase_inverseRepresentation drop constraint FK98592F33473FB677 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RELATIONSHIPTERMBASE_INVERSEREPRESENTATION" not found; SQL statement:
  alter table RelationshipTermBase_inverseRepresentation drop constraint FK98592F33ECEEF4AF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RELATIONSHIPTERMBASE_INVERSEREPRESENTATION_AUD" not found; SQL statement:
  alter table RelationshipTermBase_inverseRepresentation_AUD drop constraint FK5D248B8434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION" not found; SQL statement:
  alter table Representation drop constraint FK9C4724ED4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION" not found; SQL statement:
  alter table Representation drop constraint FK9C4724EDBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION" not found; SQL statement:
  alter table Representation drop constraint FK9C4724EDE8D36B00 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION_AUD" not found; SQL statement:
  alter table Representation_AUD drop constraint FK294D143E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION_ANNOTATION" not found; SQL statement:
  alter table Representation_Annotation drop constraint FK371091E11E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION_ANNOTATION" not found; SQL statement:
  alter table Representation_Annotation drop constraint FK371091E147E8AE60 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION_ANNOTATION_AUD" not found; SQL statement:
  alter table Representation_Annotation_AUD drop constraint FK36EEE73234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION_MARKER" not found; SQL statement:
  alter table Representation_Marker drop constraint FK560063EC777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION_MARKER" not found; SQL statement:
  alter table Representation_Marker drop constraint FK560063EC47E8AE60 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "REPRESENTATION_MARKER_AUD" not found; SQL statement:
  alter table Representation_Marker_AUD drop constraint FKD640BBBD34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO" not found; SQL statement:
  alter table RightsInfo drop constraint FK252273454FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO" not found; SQL statement:
  alter table RightsInfo drop constraint FK25227345BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO" not found; SQL statement:
  alter table RightsInfo drop constraint FK25227345E8D36B00 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO" not found; SQL statement:
  alter table RightsInfo drop constraint FK25227345F7976FC5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO" not found; SQL statement:
  alter table RightsInfo drop constraint FK25227345E6D2D338 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO_AUD" not found; SQL statement:
  alter table RightsInfo_AUD drop constraint FK1CA9769634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO_ANNOTATION" not found; SQL statement:
  alter table RightsInfo_Annotation drop constraint FKECC95C891E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO_ANNOTATION" not found; SQL statement:
  alter table RightsInfo_Annotation drop constraint FKECC95C89EFE62333 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO_ANNOTATION_AUD" not found; SQL statement:
  alter table RightsInfo_Annotation_AUD drop constraint FK78721DDA34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO_MARKER" not found; SQL statement:
  alter table RightsInfo_Marker drop constraint FK81D8C294777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO_MARKER" not found; SQL statement:
  alter table RightsInfo_Marker drop constraint FK81D8C294EFE62333 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "RIGHTSINFO_MARKER_AUD" not found; SQL statement:
  alter table RightsInfo_Marker_AUD drop constraint FK8BF9866534869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE" not found; SQL statement:
  alter table Sequence drop constraint FK544ADBE14FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE" not found; SQL statement:
  alter table Sequence drop constraint FK544ADBE1BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE" not found; SQL statement:
  alter table Sequence drop constraint FK544ADBE19F65E72B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE" not found; SQL statement:
  alter table Sequence drop constraint FK544ADBE16D2CE418 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE" not found; SQL statement:
  alter table Sequence drop constraint FK544ADBE1E671A9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_AUD" not found; SQL statement:
  alter table Sequence_AUD drop constraint FK39F4313234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_ANNOTATION" not found; SQL statement:
  alter table Sequence_Annotation drop constraint FK1010BA6D1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_ANNOTATION" not found; SQL statement:
  alter table Sequence_Annotation drop constraint FK1010BA6DD57FFDD5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_ANNOTATION_AUD" not found; SQL statement:
  alter table Sequence_Annotation_AUD drop constraint FKCB4FE9BE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_MARKER" not found; SQL statement:
  alter table Sequence_Marker drop constraint FK3D22B278777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_MARKER" not found; SQL statement:
  alter table Sequence_Marker drop constraint FK3D22B278D57FFDD5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_MARKER_AUD" not found; SQL statement:
  alter table Sequence_Marker_AUD drop constraint FKAF40E44934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_REFERENCE" not found; SQL statement:
  alter table Sequence_Reference drop constraint FK6944904D1DDDC219 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_REFERENCE" not found; SQL statement:
  alter table Sequence_Reference drop constraint FK6944904DD57FFDD5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_REFERENCE_AUD" not found; SQL statement:
  alter table Sequence_Reference_AUD drop constraint FK18E5CF9E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
-org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_SINGLEREAD" not found; SQL statement:
-alter table Sequence_SingleRead drop constraint FKA334BD3CBBC12E3E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
-org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_SINGLEREAD" not found; SQL statement:
-alter table Sequence_SingleRead drop constraint FKA334BD3CD57FFDD5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
-org.h2.jdbc.JdbcSQLException: Table "SEQUENCE_SINGLEREAD_AUD" not found; SQL statement:
-alter table Sequence_SingleRead_AUD drop constraint FK5407ED0D34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD" not found; SQL statement:
  alter table SingleRead drop constraint FKAD45CA1E4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD" not found; SQL statement:
  alter table SingleRead drop constraint FKAD45CA1EBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD" not found; SQL statement:
  alter table SingleRead drop constraint FKAD45CA1E3DA462D5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD" not found; SQL statement:
-alter table SingleRead drop constraint FKAD45CA1E614CEB1F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+alter table SingleRead drop constraint FKAD45CA1ED320A65F [42102-170]
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD" not found; SQL statement:
  alter table SingleRead drop constraint FKAD45CA1EE0EBCFFE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD" not found; SQL statement:
  alter table SingleRead drop constraint FKAD45CA1E55DDFE96 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD" not found; SQL statement:
  alter table SingleRead drop constraint FKAD45CA1E48BD1F55 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "SINGLEREADALIGNMENT" not found; SQL statement:
+alter table SingleReadAlignment drop constraint FKE50A79654FF2DB2C [42102-170]
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "SINGLEREADALIGNMENT" not found; SQL statement:
+alter table SingleReadAlignment drop constraint FKE50A7965BC5DA539 [42102-170]
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "SINGLEREADALIGNMENT" not found; SQL statement:
+alter table SingleReadAlignment drop constraint FKE50A7965ECE53A6A [42102-170]
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "SINGLEREADALIGNMENT" not found; SQL statement:
+alter table SingleReadAlignment drop constraint FKE50A79653A5A5E15 [42102-170]
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Table "SINGLEREADALIGNMENT_AUD" not found; SQL statement:
+alter table SingleReadAlignment_AUD drop constraint FKFEE16CB634869AAE [42102-170]
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD_AUD" not found; SQL statement:
  alter table SingleRead_AUD drop constraint FKA323B8EF34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD_ANNOTATION" not found; SQL statement:
  alter table SingleRead_Annotation drop constraint FK33E974101E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD_ANNOTATION" not found; SQL statement:
  alter table SingleRead_Annotation drop constraint FK33E974103A5A5E15 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD_ANNOTATION_AUD" not found; SQL statement:
  alter table SingleRead_Annotation_AUD drop constraint FK7B1D19E134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD_MARKER" not found; SQL statement:
  alter table SingleRead_Marker drop constraint FKCF47B59B777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD_MARKER" not found; SQL statement:
  alter table SingleRead_Marker drop constraint FKCF47B59B3A5A5E15 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SINGLEREAD_MARKER_AUD" not found; SQL statement:
  alter table SingleRead_Marker_AUD drop constraint FKD3199DEC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA32724FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA3272BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA3272F53E6AFA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA32728C35BD07 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA3272E35D77A3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA3272EB62BE9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA3272156CF96 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA3272C8505DB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA32727CC340C5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA327295CC5995 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA32724FF2F98B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA3272F95F225A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase drop constraint FK21CA3272DADF76EA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_AUD drop constraint FKF3D3D74334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_ANNOTATION" not found; SQL statement:
  alter table SpecimenOrObservationBase_Annotation drop constraint FK365E4F3C1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_ANNOTATION" not found; SQL statement:
  alter table SpecimenOrObservationBase_Annotation drop constraint FK365E4F3C3B8A5ABA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_Annotation_AUD drop constraint FK34187F0D34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_CREDIT" not found; SQL statement:
  alter table SpecimenOrObservationBase_Credit drop constraint FK7E3A1D8632D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_CREDIT" not found; SQL statement:
  alter table SpecimenOrObservationBase_Credit drop constraint FK7E3A1D863B8A5ABA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_CREDIT_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_Credit_AUD drop constraint FK7170185734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT" not found; SQL statement:
  alter table SpecimenOrObservationBase_DerivationEvent drop constraint FK20132036BD59A1AD [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT" not found; SQL statement:
  alter table SpecimenOrObservationBase_DerivationEvent drop constraint FK2013203654C216AA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_DERIVATIONEVENT_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_DerivationEvent_AUD drop constraint FKA4A8430734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_EXTENSION" not found; SQL statement:
  alter table SpecimenOrObservationBase_Extension drop constraint FKE03B8292927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_EXTENSION" not found; SQL statement:
  alter table SpecimenOrObservationBase_Extension drop constraint FKE03B82923B8A5ABA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_EXTENSION_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_Extension_AUD drop constraint FK7AE0176334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_IDENTIFIER" not found; SQL statement:
  alter table SpecimenOrObservationBase_Identifier drop constraint FK329710B6E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_IDENTIFIER" not found; SQL statement:
  alter table SpecimenOrObservationBase_Identifier drop constraint FK329710B63B8A5ABA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_IDENTIFIER_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_Identifier_AUD drop constraint FKFABFF38734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_LANGUAGESTRING" not found; SQL statement:
  alter table SpecimenOrObservationBase_LanguageString drop constraint FKCFAA9316CD55E0D6 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_LANGUAGESTRING" not found; SQL statement:
  alter table SpecimenOrObservationBase_LanguageString drop constraint FKCFAA93168028C309 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_LANGUAGESTRING" not found; SQL statement:
  alter table SpecimenOrObservationBase_LanguageString drop constraint FKCFAA93163B8A5ABA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_LANGUAGESTRING_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_LanguageString_AUD drop constraint FK38B45E734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_MARKER" not found; SQL statement:
  alter table SpecimenOrObservationBase_Marker drop constraint FK8E6106C7777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_MARKER" not found; SQL statement:
  alter table SpecimenOrObservationBase_Marker drop constraint FK8E6106C73B8A5ABA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_MARKER_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_Marker_AUD drop constraint FKD58E791834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase_OriginalSourceBase drop constraint FKCA7F794A3A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table SpecimenOrObservationBase_OriginalSourceBase drop constraint FKCA7F794A3B8A5ABA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_OriginalSourceBase_AUD drop constraint FK2059F21B34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_RIGHTSINFO" not found; SQL statement:
  alter table SpecimenOrObservationBase_RightsInfo drop constraint FK415EFB32C13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_RIGHTSINFO" not found; SQL statement:
  alter table SpecimenOrObservationBase_RightsInfo drop constraint FK415EFB323B8A5ABA [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SPECIMENOROBSERVATIONBASE_RIGHTSINFO_AUD" not found; SQL statement:
  alter table SpecimenOrObservationBase_RightsInfo_AUD drop constraint FK3656400334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA" not found; SQL statement:
  alter table StateData drop constraint FKFB1697BB4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA" not found; SQL statement:
  alter table StateData drop constraint FKFB1697BBBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA" not found; SQL statement:
  alter table StateData drop constraint FKFB1697BB682A4E4B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA_AUD" not found; SQL statement:
  alter table StateData_AUD drop constraint FKDA6A700C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA_DEFINEDTERMBASE" not found; SQL statement:
  alter table StateData_DefinedTermBase drop constraint FK107321E2F4E35BCD [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA_DEFINEDTERMBASE" not found; SQL statement:
  alter table StateData_DefinedTermBase drop constraint FK107321E28E7BF9AB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA_DEFINEDTERMBASE_AUD" not found; SQL statement:
  alter table StateData_DefinedTermBase_AUD drop constraint FK7C978EB334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA_LANGUAGESTRING" not found; SQL statement:
  alter table StateData_LanguageString drop constraint FK93FFD2ADF05D08D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA_LANGUAGESTRING" not found; SQL statement:
  alter table StateData_LanguageString drop constraint FK93FFD2AD9682414B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA_LANGUAGESTRING" not found; SQL statement:
  alter table StateData_LanguageString drop constraint FK93FFD2AD8E7BF9AB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATEDATA_LANGUAGESTRING_AUD" not found; SQL statement:
  alter table StateData_LanguageString_AUD drop constraint FK1578E1FE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATISTICALMEASUREMENTVALUE" not found; SQL statement:
  alter table StatisticalMeasurementValue drop constraint FK2DCE02904FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATISTICALMEASUREMENTVALUE" not found; SQL statement:
  alter table StatisticalMeasurementValue drop constraint FK2DCE0290BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATISTICALMEASUREMENTVALUE" not found; SQL statement:
  alter table StatisticalMeasurementValue drop constraint FK2DCE02904C428112 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATISTICALMEASUREMENTVALUE_AUD" not found; SQL statement:
  alter table StatisticalMeasurementValue_AUD drop constraint FKBB16686134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATISTICALMEASUREMENTVALUE_DEFINEDTERMBASE" not found; SQL statement:
  alter table StatisticalMeasurementValue_DefinedTermBase drop constraint FK686C42B7F4E35BCD [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATISTICALMEASUREMENTVALUE_DEFINEDTERMBASE" not found; SQL statement:
  alter table StatisticalMeasurementValue_DefinedTermBase drop constraint FK686C42B75C9F4F2B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "STATISTICALMEASUREMENTVALUE_DEFINEDTERMBASE_AUD" not found; SQL statement:
  alter table StatisticalMeasurementValue_DefinedTermBase_AUD drop constraint FKFEBA3D0834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP" not found; SQL statement:
  alter table SynonymRelationship drop constraint FKF483ADB34FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP" not found; SQL statement:
  alter table SynonymRelationship drop constraint FKF483ADB3BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP" not found; SQL statement:
  alter table SynonymRelationship drop constraint FKF483ADB3AEB7F3BE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP" not found; SQL statement:
  alter table SynonymRelationship drop constraint FKF483ADB34BAC703F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP" not found; SQL statement:
  alter table SynonymRelationship drop constraint FKF483ADB3F8991B9D [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP" not found; SQL statement:
  alter table SynonymRelationship drop constraint FKF483ADB380924EEC [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP_AUD" not found; SQL statement:
  alter table SynonymRelationship_AUD drop constraint FK8AEBCA0434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP_ANNOTATION" not found; SQL statement:
  alter table SynonymRelationship_Annotation drop constraint FKF494F15B1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP_ANNOTATION" not found; SQL statement:
  alter table SynonymRelationship_Annotation drop constraint FKF494F15B260A8379 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP_ANNOTATION_AUD" not found; SQL statement:
  alter table SynonymRelationship_Annotation_AUD drop constraint FKD3E2F9AC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP_MARKER" not found; SQL statement:
  alter table SynonymRelationship_Marker drop constraint FK7A439066777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP_MARKER" not found; SQL statement:
  alter table SynonymRelationship_Marker drop constraint FK7A439066260A8379 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "SYNONYMRELATIONSHIP_MARKER_AUD" not found; SQL statement:
  alter table SynonymRelationship_Marker_AUD drop constraint FK93C51B3734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE" not found; SQL statement:
  alter table TaxonBase drop constraint FK9249B49B4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE" not found; SQL statement:
  alter table TaxonBase drop constraint FK9249B49BBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE" not found; SQL statement:
  alter table TaxonBase drop constraint FK9249B49B8492378F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE" not found; SQL statement:
  alter table TaxonBase drop constraint FK9249B49B74FED214 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE" not found; SQL statement:
  alter table TaxonBase drop constraint FK9249B49B7C7B5AED [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_AUD" not found; SQL statement:
  alter table TaxonBase_AUD drop constraint FK37041CEC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_ANNOTATION" not found; SQL statement:
  alter table TaxonBase_Annotation drop constraint FK41ED09731E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_ANNOTATION" not found; SQL statement:
  alter table TaxonBase_Annotation drop constraint FK41ED09739C9D39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table TaxonBase_Annotation_AUD drop constraint FK8C145C434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_CREDIT" not found; SQL statement:
  alter table TaxonBase_Credit drop constraint FK4CB48B3D32D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_CREDIT" not found; SQL statement:
  alter table TaxonBase_Credit drop constraint FK4CB48B3D9C9D39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_CREDIT_AUD" not found; SQL statement:
  alter table TaxonBase_Credit_AUD drop constraint FK7CFED28E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_EXTENSION" not found; SQL statement:
  alter table TaxonBase_Extension drop constraint FKF961257B927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_EXTENSION" not found; SQL statement:
  alter table TaxonBase_Extension drop constraint FKF961257B9C9D39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_EXTENSION_AUD" not found; SQL statement:
  alter table TaxonBase_Extension_AUD drop constraint FK71381DCC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_IDENTIFIER" not found; SQL statement:
  alter table TaxonBase_Identifier drop constraint FK3E25CAEDE12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_IDENTIFIER" not found; SQL statement:
  alter table TaxonBase_Identifier drop constraint FK3E25CAED9C9D39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_IDENTIFIER_AUD" not found; SQL statement:
  alter table TaxonBase_Identifier_AUD drop constraint FKCF68BA3E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_MARKER" not found; SQL statement:
  alter table TaxonBase_Marker drop constraint FK5CDB747E777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_MARKER" not found; SQL statement:
  alter table TaxonBase_Marker drop constraint FK5CDB747E9C9D39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_MARKER_AUD" not found; SQL statement:
  alter table TaxonBase_Marker_AUD drop constraint FKE11D334F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table TaxonBase_OriginalSourceBase drop constraint FKFB680C813A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table TaxonBase_OriginalSourceBase drop constraint FKFB680C819C9D39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table TaxonBase_OriginalSourceBase_AUD drop constraint FKB7C811D234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_RIGHTSINFO" not found; SQL statement:
  alter table TaxonBase_RightsInfo drop constraint FK4CEDB569C13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_RIGHTSINFO" not found; SQL statement:
  alter table TaxonBase_RightsInfo drop constraint FK4CEDB5699C9D39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONBASE_RIGHTSINFO_AUD" not found; SQL statement:
  alter table TaxonBase_RightsInfo_AUD drop constraint FKAFF06BA34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONINTERACTION_LANGUAGESTRING" not found; SQL statement:
  alter table TaxonInteraction_LanguageString drop constraint FK579A1DC02BEBA58D [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONINTERACTION_LANGUAGESTRING" not found; SQL statement:
  alter table TaxonInteraction_LanguageString drop constraint FK579A1DC028459272 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONINTERACTION_LANGUAGESTRING" not found; SQL statement:
  alter table TaxonInteraction_LanguageString drop constraint FK579A1DC086C86FE0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONINTERACTION_LANGUAGESTRING_AUD" not found; SQL statement:
  alter table TaxonInteraction_LanguageString_AUD drop constraint FK9E016B9134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C64FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C6BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C6BFEAE500 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C6617E62B3 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C6D7BE55A0 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C62B4FEDD6 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C6B14B73EF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C67F90DF03 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE" not found; SQL statement:
  alter table TaxonNameBase drop constraint FKB4870C662AD57A2 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_AUD" not found; SQL statement:
  alter table TaxonNameBase_AUD drop constraint FK5CA2CB9734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_ANNOTATION" not found; SQL statement:
  alter table TaxonNameBase_Annotation drop constraint FK9E7794681E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_ANNOTATION" not found; SQL statement:
  alter table TaxonNameBase_Annotation drop constraint FK9E7794688C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table TaxonNameBase_Annotation_AUD drop constraint FKB6734E3934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_CREDIT" not found; SQL statement:
  alter table TaxonNameBase_Credit drop constraint FK29BCD8B232D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_CREDIT" not found; SQL statement:
  alter table TaxonNameBase_Credit drop constraint FK29BCD8B28C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_CREDIT_AUD" not found; SQL statement:
  alter table TaxonNameBase_Credit_AUD drop constraint FKD9895D8334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_EXTENSION" not found; SQL statement:
  alter table TaxonNameBase_Extension drop constraint FKC28EE7E6927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_EXTENSION" not found; SQL statement:
  alter table TaxonNameBase_Extension drop constraint FKC28EE7E68C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_EXTENSION_AUD" not found; SQL statement:
  alter table TaxonNameBase_Extension_AUD drop constraint FK8F98B2B734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_IDENTIFIER" not found; SQL statement:
  alter table TaxonNameBase_Identifier drop constraint FK9AB055E2E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_IDENTIFIER" not found; SQL statement:
  alter table TaxonNameBase_Identifier drop constraint FK9AB055E28C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_IDENTIFIER_AUD" not found; SQL statement:
  alter table TaxonNameBase_Identifier_AUD drop constraint FK7D1AC2B334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_MARKER" not found; SQL statement:
  alter table TaxonNameBase_Marker drop constraint FK39E3C1F3777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_MARKER" not found; SQL statement:
  alter table TaxonNameBase_Marker drop constraint FK39E3C1F38C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_MARKER_AUD" not found; SQL statement:
  alter table TaxonNameBase_Marker_AUD drop constraint FK3DA7BE4434869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_NOMENCLATURALSTATUS" not found; SQL statement:
  alter table TaxonNameBase_NomenclaturalStatus drop constraint FK560BA7926615E90D [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_NOMENCLATURALSTATUS" not found; SQL statement:
  alter table TaxonNameBase_NomenclaturalStatus drop constraint FK560BA7928C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_NOMENCLATURALSTATUS_AUD" not found; SQL statement:
  alter table TaxonNameBase_NomenclaturalStatus_AUD drop constraint FK9215BC6334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table TaxonNameBase_OriginalSourceBase drop constraint FKF746D2763A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table TaxonNameBase_OriginalSourceBase drop constraint FKF746D2768C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table TaxonNameBase_OriginalSourceBase_AUD drop constraint FK7A38D54734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_RIGHTSINFO" not found; SQL statement:
  alter table TaxonNameBase_RightsInfo drop constraint FKA978405EC13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_RIGHTSINFO" not found; SQL statement:
  alter table TaxonNameBase_RightsInfo drop constraint FKA978405E8C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_RIGHTSINFO_AUD" not found; SQL statement:
  alter table TaxonNameBase_RightsInfo_AUD drop constraint FKB8B10F2F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_TYPEDESIGNATIONBASE" not found; SQL statement:
  alter table TaxonNameBase_TypeDesignationBase drop constraint FKC0D6BBB5C7DF530C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_TYPEDESIGNATIONBASE" not found; SQL statement:
  alter table TaxonNameBase_TypeDesignationBase drop constraint FKC0D6BBB58C85CF94 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNAMEBASE_TYPEDESIGNATIONBASE_AUD" not found; SQL statement:
  alter table TaxonNameBase_TypeDesignationBase_AUD drop constraint FKBB24070634869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE" not found; SQL statement:
  alter table TaxonNode drop constraint FK924F5BCC4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE" not found; SQL statement:
  alter table TaxonNode drop constraint FK924F5BCCBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE" not found; SQL statement:
  alter table TaxonNode drop constraint FK924F5BCC84A3CE1B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE" not found; SQL statement:
  alter table TaxonNode drop constraint FK924F5BCC39DB2DFB [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE" not found; SQL statement:
  alter table TaxonNode drop constraint FK924F5BCC381381B5 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE" not found; SQL statement:
  alter table TaxonNode drop constraint FK924F5BCCCC05993E [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE" not found; SQL statement:
  alter table TaxonNode drop constraint FK924F5BCCDE9A3E39 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE_AUD" not found; SQL statement:
  alter table TaxonNode_AUD drop constraint FKE090C39D34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE_ANNOTATION" not found; SQL statement:
  alter table TaxonNode_Annotation drop constraint FKD8A9A9A21E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE_ANNOTATION" not found; SQL statement:
  alter table TaxonNode_Annotation drop constraint FKD8A9A9A2927D8399 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE_ANNOTATION_AUD" not found; SQL statement:
  alter table TaxonNode_Annotation_AUD drop constraint FKB2C4367334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE_MARKER" not found; SQL statement:
  alter table TaxonNode_Marker drop constraint FK395842D777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE_MARKER" not found; SQL statement:
  alter table TaxonNode_Marker drop constraint FK395842D927D8399 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONNODE_MARKER_AUD" not found; SQL statement:
  alter table TaxonNode_Marker_AUD drop constraint FK77D9D37E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP" not found; SQL statement:
  alter table TaxonRelationship drop constraint FK7482BA024FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP" not found; SQL statement:
  alter table TaxonRelationship drop constraint FK7482BA02BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP" not found; SQL statement:
  alter table TaxonRelationship drop constraint FK7482BA02AEB7F3BE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP" not found; SQL statement:
  alter table TaxonRelationship drop constraint FK7482BA02E71EF6CE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP" not found; SQL statement:
  alter table TaxonRelationship drop constraint FK7482BA02F8991B9D [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP" not found; SQL statement:
  alter table TaxonRelationship drop constraint FK7482BA02F11BD77B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP_AUD" not found; SQL statement:
  alter table TaxonRelationship_AUD drop constraint FKA0DE16D334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP_ANNOTATION" not found; SQL statement:
  alter table TaxonRelationship_Annotation drop constraint FK82C86DAC1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP_ANNOTATION" not found; SQL statement:
  alter table TaxonRelationship_Annotation drop constraint FK82C86DAC2BD180D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP_ANNOTATION_AUD" not found; SQL statement:
  alter table TaxonRelationship_Annotation_AUD drop constraint FKE86DE57D34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP_MARKER" not found; SQL statement:
  alter table TaxonRelationship_Marker drop constraint FK69FBDD37777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP_MARKER" not found; SQL statement:
  alter table TaxonRelationship_Marker drop constraint FK69FBDD372BD180D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TAXONRELATIONSHIP_MARKER_AUD" not found; SQL statement:
  alter table TaxonRelationship_Marker_AUD drop constraint FK21F8978834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY" not found; SQL statement:
  alter table TermVocabulary drop constraint FK487AA6924FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY" not found; SQL statement:
  alter table TermVocabulary drop constraint FK487AA692BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_AUD" not found; SQL statement:
  alter table TermVocabulary_AUD drop constraint FKA6ED3B6334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_ANNOTATION" not found; SQL statement:
  alter table TermVocabulary_Annotation drop constraint FK76D2071C1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_ANNOTATION" not found; SQL statement:
  alter table TermVocabulary_Annotation drop constraint FK76D2071C258E060 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_ANNOTATION_AUD" not found; SQL statement:
  alter table TermVocabulary_Annotation_AUD drop constraint FK222D46ED34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_CREDIT" not found; SQL statement:
  alter table TermVocabulary_Credit drop constraint FK7604C56632D1B9F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_CREDIT" not found; SQL statement:
  alter table TermVocabulary_Credit drop constraint FK7604C566258E060 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_CREDIT_AUD" not found; SQL statement:
  alter table TermVocabulary_Credit_AUD drop constraint FKB1E3D03734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_EXTENSION" not found; SQL statement:
  alter table TermVocabulary_Extension drop constraint FKA8814EB2927DE9DF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_EXTENSION" not found; SQL statement:
  alter table TermVocabulary_Extension drop constraint FKA8814EB2258E060 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_EXTENSION_AUD" not found; SQL statement:
  alter table TermVocabulary_Extension_AUD drop constraint FKD522D38334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_IDENTIFIER" not found; SQL statement:
  alter table TermVocabulary_Identifier drop constraint FK730AC896E12073FF [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_IDENTIFIER" not found; SQL statement:
  alter table TermVocabulary_Identifier drop constraint FK730AC896258E060 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_IDENTIFIER_AUD" not found; SQL statement:
  alter table TermVocabulary_Identifier_AUD drop constraint FKE8D4BB6734869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_MARKER" not found; SQL statement:
  alter table TermVocabulary_Marker drop constraint FK862BAEA7777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_MARKER" not found; SQL statement:
  alter table TermVocabulary_Marker drop constraint FK862BAEA7258E060 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_MARKER_AUD" not found; SQL statement:
  alter table TermVocabulary_Marker_AUD drop constraint FK160230F834869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table TermVocabulary_OriginalSourceBase drop constraint FK8F2D512A3A6735D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_ORIGINALSOURCEBASE" not found; SQL statement:
  alter table TermVocabulary_OriginalSourceBase drop constraint FK8F2D512A258E060 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_ORIGINALSOURCEBASE_AUD" not found; SQL statement:
  alter table TermVocabulary_OriginalSourceBase_AUD drop constraint FKA898D9FB34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_REPRESENTATION" not found; SQL statement:
  alter table TermVocabulary_Representation drop constraint FKA408B63AB31C4747 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_REPRESENTATION" not found; SQL statement:
  alter table TermVocabulary_Representation drop constraint FKA408B63A258E060 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_REPRESENTATION_AUD" not found; SQL statement:
  alter table TermVocabulary_Representation_AUD drop constraint FK681B370B34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_RIGHTSINFO" not found; SQL statement:
  alter table TermVocabulary_RightsInfo drop constraint FK81D2B312C13F7B21 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_RIGHTSINFO" not found; SQL statement:
  alter table TermVocabulary_RightsInfo drop constraint FK81D2B312258E060 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TERMVOCABULARY_RIGHTSINFO_AUD" not found; SQL statement:
  alter table TermVocabulary_RightsInfo_AUD drop constraint FK246B07E334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE" not found; SQL statement:
  alter table TypeDesignationBase drop constraint FK8AC9DCAE4FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE" not found; SQL statement:
  alter table TypeDesignationBase drop constraint FK8AC9DCAEBC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE" not found; SQL statement:
  alter table TypeDesignationBase drop constraint FK8AC9DCAEAEB7F3BE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE" not found; SQL statement:
  alter table TypeDesignationBase drop constraint FK8AC9DCAE9E3ED08 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE" not found; SQL statement:
  alter table TypeDesignationBase drop constraint FK8AC9DCAE4CB0F315 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE" not found; SQL statement:
  alter table TypeDesignationBase drop constraint FK8AC9DCAEFBFA41D9 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE_AUD" not found; SQL statement:
  alter table TypeDesignationBase_AUD drop constraint FK243C037F34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE_ANNOTATION" not found; SQL statement:
  alter table TypeDesignationBase_Annotation drop constraint FK4D7327801E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE_ANNOTATION" not found; SQL statement:
  alter table TypeDesignationBase_Annotation drop constraint FK4D73278044E9E6D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE_ANNOTATION_AUD" not found; SQL statement:
  alter table TypeDesignationBase_Annotation_AUD drop constraint FK88BF955134869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE_MARKER" not found; SQL statement:
  alter table TypeDesignationBase_Marker drop constraint FKB914A10B777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE_MARKER" not found; SQL statement:
  alter table TypeDesignationBase_Marker drop constraint FKB914A10B44E9E6D4 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "TYPEDESIGNATIONBASE_MARKER_AUD" not found; SQL statement:
  alter table TypeDesignationBase_Marker_AUD drop constraint FKECA3515C34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "USERACCOUNT" not found; SQL statement:
  alter table UserAccount drop constraint FKB3F13C24FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "USERACCOUNT" not found; SQL statement:
  alter table UserAccount drop constraint FKB3F13C2AAC1B820 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "USERACCOUNT_AUD" not found; SQL statement:
  alter table UserAccount_AUD drop constraint FK6A57909334869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "USERACCOUNT_GRANTEDAUTHORITYIMPL" not found; SQL statement:
  alter table UserAccount_GrantedAuthorityImpl drop constraint FKFD724D851857F6C2 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "USERACCOUNT_GRANTEDAUTHORITYIMPL" not found; SQL statement:
  alter table UserAccount_GrantedAuthorityImpl drop constraint FKFD724D855EA5DD89 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "USERACCOUNT_PERMISSIONGROUP" not found; SQL statement:
  alter table UserAccount_PermissionGroup drop constraint FK812DE753DA9DCB5F [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "USERACCOUNT_PERMISSIONGROUP" not found; SQL statement:
  alter table UserAccount_PermissionGroup drop constraint FK812DE753887E3D12 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET" not found; SQL statement:
  alter table WorkingSet drop constraint FK668D5B914FF2DB2C [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET" not found; SQL statement:
  alter table WorkingSet drop constraint FK668D5B91BC5DA539 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET" not found; SQL statement:
  alter table WorkingSet drop constraint FK668D5B9123DB7F04 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_AUD" not found; SQL statement:
  alter table WorkingSet_AUD drop constraint FK628F58E234869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_ANNOTATION" not found; SQL statement:
  alter table WorkingSet_Annotation drop constraint FKCBBA8CBD1E403E0B [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_ANNOTATION" not found; SQL statement:
  alter table WorkingSet_Annotation drop constraint FKCBBA8CBDBBD2C869 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_ANNOTATION_AUD" not found; SQL statement:
  alter table WorkingSet_Annotation_AUD drop constraint FK1E28140E34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_DESCRIPTIONBASE" not found; SQL statement:
  alter table WorkingSet_DescriptionBase drop constraint FK731CC81F33B8A841 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_DESCRIPTIONBASE" not found; SQL statement:
  alter table WorkingSet_DescriptionBase drop constraint FK731CC81FBBD2C869 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_DESCRIPTIONBASE_AUD" not found; SQL statement:
  alter table WorkingSet_DescriptionBase_AUD drop constraint FK8959CE7034869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_MARKER" not found; SQL statement:
  alter table WorkingSet_Marker drop constraint FK9CB22CC8777265A1 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_MARKER" not found; SQL statement:
  alter table WorkingSet_Marker drop constraint FK9CB22CC8BBD2C869 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_MARKER_AUD" not found; SQL statement:
  alter table WorkingSet_Marker_AUD drop constraint FK6AEAB69934869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_REPRESENTATION" not found; SQL statement:
  alter table WorkingSet_Representation drop constraint FKA003835BB31C4747 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_REPRESENTATION" not found; SQL statement:
  alter table WorkingSet_Representation drop constraint FKA003835BBBD2C869 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_REPRESENTATION_AUD" not found; SQL statement:
  alter table WorkingSet_Representation_AUD drop constraint FK21B88BAC34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_TAXONBASE" not found; SQL statement:
  alter table WorkingSet_TaxonBase drop constraint FK34EB896D7C3D0017 [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_TAXONBASE" not found; SQL statement:
  alter table WorkingSet_TaxonBase drop constraint FK34EB896DB4555A9A [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Table "WORKINGSET_TAXONBASE_AUD" not found; SQL statement:
  alter table WorkingSet_TaxonBase_AUD drop constraint FK582B38BE34869AAE [42102-170]
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table AgentBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -3557,7 +3922,7 @@ alter table AgentBase add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Amplification add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -3614,7 +3979,64 @@ alter table Amplification add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
+alter table AmplificationResult add constraint _UniqueKey unique (uuid) [90045-170]
+       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
+       at org.h2.message.DbException.get(DbException.java:169)
+       at org.h2.message.DbException.get(DbException.java:146)
+       at org.h2.command.ddl.AlterTableAddConstraint.tryUpdate(AlterTableAddConstraint.java:89)
+       at org.h2.command.ddl.AlterTableAddConstraint.update(AlterTableAddConstraint.java:68)
+       at org.h2.command.CommandContainer.update(CommandContainer.java:75)
+       at org.h2.command.Command.executeUpdate(Command.java:230)
+       at org.h2.jdbc.JdbcStatement.executeUpdateInternal(JdbcStatement.java:125)
+       at org.h2.jdbc.JdbcStatement.executeUpdate(JdbcStatement.java:110)
+       at org.apache.commons.dbcp.DelegatingStatement.executeUpdate(DelegatingStatement.java:228)
+       at org.apache.commons.dbcp.DelegatingStatement.executeUpdate(DelegatingStatement.java:228)
+       at org.hibernate.tool.hbm2ddl.DatabaseExporter.export(DatabaseExporter.java:64)
+       at org.hibernate.tool.hbm2ddl.SchemaExport.perform(SchemaExport.java:418)
+       at org.hibernate.tool.hbm2ddl.SchemaExport.execute(SchemaExport.java:375)
+       at org.hibernate.tool.hbm2ddl.SchemaExport.create(SchemaExport.java:304)
+       at org.hibernate.tool.hbm2ddl.SchemaExport.create(SchemaExport.java:293)
+       at org.hibernate.internal.SessionFactoryImpl.<init>(SessionFactoryImpl.java:498)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1743)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
+       at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.finishBeanFactoryInitialization(MonitoredGenericApplicationContext.java:74)
+       at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:479)
+       at eu.etaxonomy.cdm.api.application.MonitoredGenericApplicationContext.refresh(MonitoredGenericApplicationContext.java:102)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.setNewDataSource(CdmApplicationController.java:248)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.<init>(CdmApplicationController.java:191)
+       at eu.etaxonomy.cdm.api.application.CdmApplicationController.NewInstance(CdmApplicationController.java:141)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
+       at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
+       at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Annotation add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -3671,7 +4093,7 @@ alter table Annotation add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table CdmMetaData add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -3728,7 +4150,7 @@ alter table CdmMetaData add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Classification add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -3785,7 +4207,7 @@ alter table Classification add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Collection add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -3842,7 +4264,7 @@ alter table Collection add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Credit add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -3899,7 +4321,7 @@ alter table Credit add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table DefinedTermBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -3956,7 +4378,7 @@ alter table DefinedTermBase add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table DerivationEvent add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4013,7 +4435,7 @@ alter table DerivationEvent add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:14 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table DescriptionBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4070,7 +4492,7 @@ alter table DescriptionBase add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table DescriptionElementBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4127,7 +4549,7 @@ alter table DescriptionElementBase add constraint _UniqueKey unique (uuid) [9004
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table DeterminationEvent add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4184,7 +4606,7 @@ alter table DeterminationEvent add constraint _UniqueKey unique (uuid) [90045-17
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table DnaQuality add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4241,7 +4663,7 @@ alter table DnaQuality add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table EntityConstraintViolation add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4298,7 +4720,7 @@ alter table EntityConstraintViolation add constraint _UniqueKey unique (uuid) [9
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:12 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table EntityValidationResult add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4355,7 +4777,7 @@ alter table EntityValidationResult add constraint _UniqueKey unique (uuid) [9004
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Extension add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4412,7 +4834,7 @@ alter table Extension add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table FeatureNode add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4469,7 +4891,7 @@ alter table FeatureNode add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table FeatureTree add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4526,7 +4948,7 @@ alter table FeatureTree add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table GatheringEvent add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4583,7 +5005,7 @@ alter table GatheringEvent add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table GrantedAuthorityImpl add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4640,7 +5062,7 @@ alter table GrantedAuthorityImpl add constraint _UniqueKey unique (uuid) [90045-
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table HomotypicalGroup add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4697,7 +5119,7 @@ alter table HomotypicalGroup add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table HybridRelationship add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4754,7 +5176,7 @@ alter table HybridRelationship add constraint _UniqueKey unique (uuid) [90045-17
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Identifier add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4811,7 +5233,7 @@ alter table Identifier add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table InstitutionalMembership add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4868,7 +5290,7 @@ alter table InstitutionalMembership add constraint _UniqueKey unique (uuid) [900
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table KeyStatement add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4925,7 +5347,7 @@ alter table KeyStatement add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table LSIDAuthority add constraint _UniqueKey unique (uuid, authority) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -4982,7 +5404,7 @@ alter table LSIDAuthority add constraint _UniqueKey unique (uuid, authority) [90
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table LanguageString add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5039,7 +5461,7 @@ alter table LanguageString add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Marker add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5096,7 +5518,7 @@ alter table Marker add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table MaterialOrMethodEvent add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5153,7 +5575,7 @@ alter table MaterialOrMethodEvent add constraint _UniqueKey unique (uuid) [90045
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Media add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5210,7 +5632,7 @@ alter table Media add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table MediaRepresentation add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5267,7 +5689,7 @@ alter table MediaRepresentation add constraint _UniqueKey unique (uuid) [90045-1
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table MediaRepresentationPart add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5324,7 +5746,7 @@ alter table MediaRepresentationPart add constraint _UniqueKey unique (uuid) [900
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table NameRelationship add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5381,7 +5803,7 @@ alter table NameRelationship add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table NomenclaturalStatus add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5438,7 +5860,7 @@ alter table NomenclaturalStatus add constraint _UniqueKey unique (uuid) [90045-1
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table OriginalSourceBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5495,7 +5917,7 @@ alter table OriginalSourceBase add constraint _UniqueKey unique (uuid) [90045-17
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table PermissionGroup add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5552,7 +5974,7 @@ alter table PermissionGroup add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table PolytomousKey add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5609,7 +6031,7 @@ alter table PolytomousKey add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table PolytomousKeyNode add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5666,7 +6088,7 @@ alter table PolytomousKeyNode add constraint _UniqueKey unique (uuid) [90045-170
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Primer add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5723,7 +6145,7 @@ alter table Primer add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Reference add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5780,7 +6202,7 @@ alter table Reference add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Representation add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5837,7 +6259,7 @@ alter table Representation add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table RightsInfo add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5894,7 +6316,7 @@ alter table RightsInfo add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table Sequence add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -5951,7 +6373,7 @@ alter table Sequence add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
  alter table SingleRead add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
@@ -6008,9 +6430,9 @@ alter table SingleRead add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table SpecimenOrObservationBase add constraint _UniqueKey unique (uuid) [90045-170]
+alter table SingleReadAlignment add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6065,9 +6487,9 @@ alter table SpecimenOrObservationBase add constraint _UniqueKey unique (uuid) [9
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table StateData add constraint _UniqueKey unique (uuid) [90045-170]
+alter table SpecimenOrObservationBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6122,9 +6544,9 @@ alter table StateData add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table StatisticalMeasurementValue add constraint _UniqueKey unique (uuid) [90045-170]
+alter table StateData add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6179,9 +6601,9 @@ alter table StatisticalMeasurementValue add constraint _UniqueKey unique (uuid)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table SynonymRelationship add constraint _UniqueKey unique (uuid) [90045-170]
+alter table StatisticalMeasurementValue add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6236,9 +6658,9 @@ alter table SynonymRelationship add constraint _UniqueKey unique (uuid) [90045-1
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table TaxonBase add constraint _UniqueKey unique (uuid) [90045-170]
+alter table SynonymRelationship add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6293,9 +6715,9 @@ alter table TaxonBase add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table TaxonNameBase add constraint _UniqueKey unique (uuid) [90045-170]
+alter table TaxonBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6350,9 +6772,9 @@ alter table TaxonNameBase add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table TaxonNode add constraint _UniqueKey unique (uuid) [90045-170]
+alter table TaxonNameBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6407,9 +6829,9 @@ alter table TaxonNode add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table TaxonRelationship add constraint _UniqueKey unique (uuid) [90045-170]
+alter table TaxonNode add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6464,9 +6886,9 @@ alter table TaxonRelationship add constraint _UniqueKey unique (uuid) [90045-170
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table TermVocabulary add constraint _UniqueKey unique (uuid) [90045-170]
+alter table TaxonRelationship add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6521,9 +6943,9 @@ alter table TermVocabulary add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:13 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table TypeDesignationBase add constraint _UniqueKey unique (uuid) [90045-170]
+alter table TermVocabulary add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6578,9 +7000,9 @@ alter table TypeDesignationBase add constraint _UniqueKey unique (uuid) [90045-1
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:14 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table UserAccount add constraint _UniqueKey unique (uuid) [90045-170]
+alter table TypeDesignationBase add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6635,9 +7057,9 @@ alter table UserAccount add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:15 jdbc[2]: exception
+12-11 17:15:14 jdbc[2]: exception
  org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
-alter table WorkingSet add constraint _UniqueKey unique (uuid) [90045-170]
+alter table UserAccount add constraint _UniqueKey unique (uuid) [90045-170]
         at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
@@ -6692,48 +7114,33 @@ alter table WorkingSet add constraint _UniqueKey unique (uuid) [90045-170]
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-12-10 15:20:30 jdbc[3]: null
-org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-170]
+12-11 17:15:14 jdbc[2]: exception
+org.h2.jdbc.JdbcSQLException: Constraint "_UNIQUEKEY" already exists; SQL statement:
+alter table WorkingSet add constraint _UniqueKey unique (uuid) [90045-170]
+       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
         at org.h2.message.DbException.get(DbException.java:169)
         at org.h2.message.DbException.get(DbException.java:146)
-       at org.h2.message.DbException.get(DbException.java:135)
-       at org.h2.jdbc.JdbcConnection.closeOld(JdbcConnection.java:175)
-       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:120)
-       at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:93)
-       at org.h2.Driver.connect(Driver.java:72)
-       at org.apache.commons.dbcp.DriverConnectionFactory.createConnection(DriverConnectionFactory.java:38)
-       at org.apache.commons.dbcp.PoolableConnectionFactory.makeObject(PoolableConnectionFactory.java:582)
-       at org.apache.commons.pool.impl.GenericObjectPool.borrowObject(GenericObjectPool.java:1148)
-       at org.apache.commons.dbcp.PoolingDataSource.getConnection(PoolingDataSource.java:106)
-       at org.apache.commons.dbcp.BasicDataSource.getConnection(BasicDataSource.java:1044)
-       at org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl.getConnection(DatasourceConnectionProviderImpl.java:141)
-       at org.hibernate.internal.AbstractSessionImpl$NonContextualJdbcConnectionAccess.obtainConnection(AbstractSessionImpl.java:292)
-       at org.hibernate.engine.transaction.internal.jdbc.JdbcIsolationDelegate.delegateWork(JdbcIsolationDelegate.java:68)
-       at org.hibernate.id.enhanced.TableGenerator$1.getNextValue(TableGenerator.java:471)
-       at org.hibernate.id.enhanced.OptimizerFactory$PooledOptimizer.generate(OptimizerFactory.java:453)
-       at org.hibernate.id.enhanced.TableGenerator.generate(TableGenerator.java:467)
-       at org.hibernate.event.internal.AbstractSaveEventListener.saveWithGeneratedId(AbstractSaveEventListener.java:117)
-       at org.hibernate.event.internal.DefaultSaveOrUpdateEventListener.saveWithGeneratedOrRequestedId(DefaultSaveOrUpdateEventListener.java:204)
-       at org.hibernate.event.internal.DefaultSaveEventListener.saveWithGeneratedOrRequestedId(DefaultSaveEventListener.java:55)
-       at org.hibernate.event.internal.DefaultSaveOrUpdateEventListener.entityIsTransient(DefaultSaveOrUpdateEventListener.java:189)
-       at org.hibernate.event.internal.DefaultSaveEventListener.performSaveOrUpdate(DefaultSaveEventListener.java:49)
-       at org.hibernate.event.internal.DefaultSaveOrUpdateEventListener.onSaveOrUpdate(DefaultSaveOrUpdateEventListener.java:90)
-       at org.hibernate.internal.SessionImpl.fireSave(SessionImpl.java:756)
-       at org.hibernate.internal.SessionImpl.save(SessionImpl.java:748)
-       at org.hibernate.internal.SessionImpl.save(SessionImpl.java:744)
-       at eu.etaxonomy.cdm.persistence.dao.hibernate.common.CdmEntityDaoBase.save(CdmEntityDaoBase.java:301)
-       at eu.etaxonomy.cdm.database.PersistentTermInitializer.doInitialize(PersistentTermInitializer.java:139)
-       at eu.etaxonomy.cdm.model.common.DefaultTermInitializer.initialize(DefaultTermInitializer.java:35)
-       at eu.etaxonomy.cdm.database.PersistentTermInitializer.initialize(PersistentTermInitializer.java:92)
-       at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-       at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
-       at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
-       at java.lang.reflect.Method.invoke(Unknown Source)
-       at org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor$LifecycleElement.invoke(InitDestroyAnnotationBeanPostProcessor.java:344)
-       at org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor$LifecycleMetadata.invokeInitMethods(InitDestroyAnnotationBeanPostProcessor.java:295)
-       at org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor.postProcessBeforeInitialization(InitDestroyAnnotationBeanPostProcessor.java:130)
-       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyBeanPostProcessorsBeforeInitialization(AbstractAutowireCapableBeanFactory.java:399)
-       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1481)
+       at org.h2.command.ddl.AlterTableAddConstraint.tryUpdate(AlterTableAddConstraint.java:89)
+       at org.h2.command.ddl.AlterTableAddConstraint.update(AlterTableAddConstraint.java:68)
+       at org.h2.command.CommandContainer.update(CommandContainer.java:75)
+       at org.h2.command.Command.executeUpdate(Command.java:230)
+       at org.h2.jdbc.JdbcStatement.executeUpdateInternal(JdbcStatement.java:125)
+       at org.h2.jdbc.JdbcStatement.executeUpdate(JdbcStatement.java:110)
+       at org.apache.commons.dbcp.DelegatingStatement.executeUpdate(DelegatingStatement.java:228)
+       at org.apache.commons.dbcp.DelegatingStatement.executeUpdate(DelegatingStatement.java:228)
+       at org.hibernate.tool.hbm2ddl.DatabaseExporter.export(DatabaseExporter.java:64)
+       at org.hibernate.tool.hbm2ddl.SchemaExport.perform(SchemaExport.java:418)
+       at org.hibernate.tool.hbm2ddl.SchemaExport.execute(SchemaExport.java:375)
+       at org.hibernate.tool.hbm2ddl.SchemaExport.create(SchemaExport.java:304)
+       at org.hibernate.tool.hbm2ddl.SchemaExport.create(SchemaExport.java:293)
+       at org.hibernate.internal.SessionFactoryImpl.<init>(SessionFactoryImpl.java:498)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1743)
+       at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1781)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBuilder.buildSessionFactory(LocalSessionFactoryBuilder.java:247)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.buildSessionFactory(LocalSessionFactoryBean.java:373)
+       at org.springframework.orm.hibernate4.LocalSessionFactoryBean.afterPropertiesSet(LocalSessionFactoryBean.java:358)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1547)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1485)
         at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:524)
         at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
         at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
@@ -6741,6 +7148,17 @@ org.h2.message.DbException: The connection was not closed by the application and
         at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
         at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
         at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveReference(BeanDefinitionValueResolver.java:323)
+       at org.springframework.beans.factory.support.BeanDefinitionValueResolver.resolveValueIfNecessary(BeanDefinitionValueResolver.java:107)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.applyPropertyValues(AbstractAutowireCapableBeanFactory.java:1393)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1134)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:522)
+       at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:461)
+       at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.createBean(MonitoredListableBeanFactory.java:106)
+       at org.springframework.beans.factory.support.AbstractBeanFactory$1.getObject(AbstractBeanFactory.java:295)
+       at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:223)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:292)
+       at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:194)
         at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:626)
         at eu.etaxonomy.cdm.api.application.MonitoredListableBeanFactory.preInstantiateSingletons(MonitoredListableBeanFactory.java:70)
         at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:932)
@@ -6753,6 +7171,3 @@ org.h2.message.DbException: The connection was not closed by the application and
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.getApplicationController(CdmStoreConnector.java:154)
         at eu.etaxonomy.taxeditor.store.CdmStoreConnector.run(CdmStoreConnector.java:102)
         at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-Caused by: org.h2.jdbc.JdbcSQLException: The connection was not closed by the application and is garbage collected [90018-170]
-       at org.h2.message.DbException.getJdbcSQLException(DbException.java:329)
-       ... 59 more
diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java

index 584c2660351e5ea3ab60ff1f92a189f3cc20a0fb..84b0b8d39085d041fc0772fe777a537e296f7691 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
@@ -10,6 +10,7 @@ package eu.etaxonomy.taxeditor.httpinvoker;
  
  import java.io.IOException;
  import java.lang.reflect.Field;
+import java.util.Map;
  
  import org.junit.AfterClass;
  import org.junit.Assert;
@@ -31,6 +32,7 @@ import eu.etaxonomy.taxeditor.remoting.source.CdmPersistentRemoteSource;
  import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;
  import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSourceException;
  import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
+import eu.etaxonomy.taxeditor.session.CdmEntitySession;
  import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
  import eu.etaxonomy.taxeditor.session.ISessionEventListener;
  
@@ -43,7 +45,7 @@ import eu.etaxonomy.taxeditor.session.ISessionEventListener;
   *
   */
  @Transactional(TransactionMode.DISABLED)
-@SpringApplicationContext("file:./target/test-classes/eu/etaxonomy/cdm/testRemotingApplicationContext.xml")
+@SpringApplicationContext("file:./target/classes/eu/etaxonomy/cdm/testRemotingApplicationContext.xml")
  public class BaseRemotingTest extends UnitilsJUnit4 {
      //private static final Logger logger = Logger.getLogger(BaseRemotingTest.class);
  
@@ -132,8 +134,19 @@ public class BaseRemotingTest extends UnitilsJUnit4 {
         return cdmEntitySessionManager;
      }
      
+    
+    protected static CdmEntitySession getSession(ISessionEventListener sessionOwner) {
+       Map<ISessionEventListener, CdmEntitySession> ownerSessionMap = 
+                       (Map<ISessionEventListener, CdmEntitySession>) getFieldValueViaReflection(cdmEntitySessionManager, "ownerSessionMap");
+       return ownerSessionMap.get(sessionOwner);
+    }
+    
+    protected static CdmTransientEntityCacher getActiveSession() {
+       return (CdmTransientEntityCacher) getFieldValueViaReflection(cdmEntitySessionManager, "activeSession");
+    }
+    
      protected static CdmTransientEntityCacher getCacher(ISessionEventListener sessionOwner) {
-       return (CdmTransientEntityCacher) getFieldValueViaReflection(cdmEntitySessionManager.getSession(sessionOwner), "cdmTransientEntityCacher");
+       return (CdmTransientEntityCacher) getFieldValueViaReflection(getSession(sessionOwner), "cdmTransientEntityCacher");
      }
  
      @AfterClass
diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.java

index 01b64311a13a7b8c75154112c4e4e05b91ddbc83..87a9bce090e6fa2527fed2bcfb83338ff3d98d84 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.java
@@ -51,15 +51,15 @@ public class CdmEntitySessionManagerTest extends BaseRemotingTest {
                 cdmEntitySessionManager.bind(null);
                 PolytomousKey pKeyLoaded = cdmEntitySessionManager.load(pKey);
                 Assert.assertSame(pKeyLoaded, pKey);
-               Assert.assertNull(cdmEntitySessionManager.getActiveSession());
+               Assert.assertNull(getActiveSession());
         }
         
         @Test
         public void manageSessionWithObjectTest() {
                 PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
                 pKey = cdmEntitySessionManager.load(sessionOwner, pKey);
-               Assert.assertNotNull(cdmEntitySessionManager.getActiveSession());
-               List<CdmBase> rootEntities = (List<CdmBase>)getFieldValueViaReflection(cdmEntitySessionManager.getActiveSession(), "rootEntities");
+               Assert.assertNotNull(getActiveSession());
+               List<CdmBase> rootEntities = (List<CdmBase>)getFieldValueViaReflection(getActiveSession(), "rootEntities");
  
                 Assert.assertEquals(rootEntities.size(),1);
                 Assert.assertSame(rootEntities.get(0), pKey);
@@ -83,8 +83,8 @@ public class CdmEntitySessionManagerTest extends BaseRemotingTest {
         public void manageSessionWithListTest() {
                 List<PolytomousKey> pKeys = polytomousKeyService.list(PolytomousKey.class, null, null, null, null);
                 pKeys = (List<PolytomousKey>) cdmEntitySessionManager.load(sessionOwner, pKeys);
-               Assert.assertNotNull(cdmEntitySessionManager.getActiveSession());
-               List<CdmBase> rootEntities = (List<CdmBase>)getFieldValueViaReflection(cdmEntitySessionManager.getActiveSession(), "rootEntities");
+               Assert.assertNotNull(getActiveSession());
+               List<CdmBase> rootEntities = (List<CdmBase>)getFieldValueViaReflection(getActiveSession(), "rootEntities");
  
                 Assert.assertEquals(rootEntities.size(),2);
                 Assert.assertSame(rootEntities.get(0),pKeys.get(0));
diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product

index 8d1923a5b0723554cb9d3ab31fd34935df20b31a..121b693c0d684317891bafae15e8583296ebdb3f 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -1,55 +1,36 @@
  <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.4.0.qualifier" useFeatures="true" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
-      <text>
+<?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.4.1.SNAPSHOT">
+  <aboutInfo>
+    <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
+    <text>
           %productBlurb
        </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080</programArgs>
-      <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
-
-   <splash
-      location="eu.etaxonomy.taxeditor.application"
-      startupProgressRect="5,447,366,15"
-      startupMessageRect="7,432,360,20"
-      startupForegroundColor="000000" />
-   <launcher name="TaxonomicEditor">
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="eu.etaxonomy.taxeditor.feature"/>
-   </features>
-
-   <configurations>
-      <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="5" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.transport.ecf" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-   </configurations>
-
+  </aboutInfo>
+  <configIni use="default"></configIni>
+  <launcherArgs>
+    <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080</programArgs>
+    <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow</vmArgs>
+    <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+  </launcherArgs>
+  <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
+  <splash location="eu.etaxonomy.taxeditor.application" startupForegroundColor="000000" startupMessageRect="7,432,360,20" startupProgressRect="5,447,366,15"/>
+  <launcher name="TaxonomicEditor">
+    <solaris/>
+    <win useIco="false">
+      <bmp/>
+    </win>
+  </launcher>
+  <vm></vm>
+  <plugins></plugins>
+  <features>
+    <feature id="eu.etaxonomy.taxeditor.feature"/>
+  </features>
+  <configurations>
+    <plugin autoStart="true" id="eu.etaxonomy.taxeditor.application" startLevel="5"/>
+    <plugin autoStart="true" id="org.eclipse.core.runtime" startLevel="4"/>
+    <plugin autoStart="true" id="org.eclipse.equinox.common" startLevel="2"/>
+    <plugin autoStart="true" id="org.eclipse.equinox.ds" startLevel="2"/>
+    <plugin autoStart="true" id="org.eclipse.equinox.p2.transport.ecf" startLevel="4"/>
+    <plugin autoStart="true" id="org.eclipse.equinox.simpleconfigurator" startLevel="1"/>
+  </configurations>
  </product>
diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml

index d767dac9d594704c6ad67304616fad55dc311a17..8402df69e656f362a7bee6d5b613c9371169789d 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -3,7 +3,7 @@
    <parent>
      <groupId>eu.etaxonomy</groupId>
      <artifactId>taxeditor-parent</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
    </parent>
  
    <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml

index fa6f9ffa10d1a5030592ca982d5c351ac93a1098..4f816be18018001a875e3f5d7093b5221b7d1fad 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,12 @@
  <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <prerequisites>
      <maven>3.0</maven>
    </prerequisites>
    <groupId>eu.etaxonomy</groupId>
    <artifactId>taxeditor-parent</artifactId>
-  <version>3.4.0-SNAPSHOT</version>
+  <version>3.4.1-SNAPSHOT</version>
    <name>EDIT Taxonomic Editor</name>
    <description>The Taxonomic Editor for EDIT's platform for
      cybertaxonomy</description>
@@ -17,10 +16,10 @@
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.4.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.4.1-SNAPSHOT</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.4.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.4.1-SNAPSHOT</taxeditor.version>
      <update.dir>snapshot</update.dir>
    </properties>
    <modules>
@@ -35,7 +34,6 @@
      <module>eu.etaxonomy.taxeditor.feature.platform</module>
      <module>eu.etaxonomy.taxeditor.feature</module>
      <module>eu.etaxonomy.taxeditor</module>
-
    </modules>
    <scm>
      <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/taxeditor/</connection>
@@ -79,7 +77,7 @@
          <role>Java Developer</role>
          <role>Architect</role>
        </roles>
-      <url />
+      <url/>
      </developer>
      <developer>
        <!-- your SVN account id please! -->
@@ -97,7 +95,7 @@
          <role>Java Developer</role>
          <role>Architect</role>
        </roles>
-      <url />
+      <url/>
      </developer>
    </developers>
    <issueManagement>
@@ -320,7 +318,6 @@
            <tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
          </configuration>
        </plugin>
-
      </plugins>
      <extensions>
        <extension>
@@ -416,5 +413,4 @@
        <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
      </repository>
    </distributionManagement>
-
  </project>
author	Cherian Mathew <c.mathew@bgbm.org>
	Tue, 20 Jan 2015 11:20:50 +0000 (11:20 +0000)
committer	Cherian Mathew <c.mathew@bgbm.org>
	Tue, 20 Jan 2015 11:20:50 +0000 (11:20 +0000)
.gitattributes		patch \| blob \| history
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.application/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.bulkeditor/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java		patch \| blob \| history
eu.etaxonomy.taxeditor.cdmlib/.classpath		patch \| blob \| history
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.cdmlib/build.properties		patch \| blob \| history
eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar	[moved from eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar with 54% similarity]	patch \| blob \| history
eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.cdmlib/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/plugin.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/MarkerManager.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationContextListener.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationDaemon.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/DeleteDerivateHandler.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java		patch \| blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityClassMarkerField.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityIdMarkerField.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/InvalidValueMarkerField.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyDescriptionMarkerField.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyFieldNameMarkerField.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyTypeNameMarkerField.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidationProblemsView.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorClassMarkerField.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorMessageMarkerField.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.feature.platform/feature.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.feature.platform/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.feature/feature.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.feature/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.help/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.navigation/plugin.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.navigation/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java		patch \| blob \| history
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.printpublisher/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties		patch \| blob \| history
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties		patch \| blob \| history
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_en.properties		patch \| blob \| history
eu.etaxonomy.taxeditor.store/plugin.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.store/pom.xml		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ClassificationChooserWizardPage.java	[new file with mode: 0644]	patch \| blob
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/NomenclaturalCodeWizardPage.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SpecimenCdmExcelImportWizard.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageEditorPreferencePage.java	[moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultLanguageEditorPreferencePage.java with 95% similarity]	patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java	[moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java with 97% similarity]	patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationTextDetailElement.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java		patch \| blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java		patch \| blob \| history
eu.etaxonomy.taxeditor.test/.classpath		patch \| blob \| history
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF		patch \| blob \| history
eu.etaxonomy.taxeditor.test/build.properties		patch \| blob \| history
eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.h2.db		patch \| blob \| history
eu.etaxonomy.taxeditor.test/src/main/resources/h2/cdmTest.trace.db		patch \| blob \| history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java		patch \| blob \| history
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.java		patch \| blob \| history
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product		patch \| blob \| history
eu.etaxonomy.taxeditor/pom.xml		patch \| blob \| history
pom.xml		patch \| blob \| history