BGBM BDI Projects / cdmlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aee1c6c)
(no commit message)
authorAlexander Oppermann <a.oppermann@bgbm.org>
Fri, 19 Oct 2012 12:50:46 +0000 (12:50 +0000)
committerAlexander Oppermann <a.oppermann@bgbm.org>
Fri, 19 Oct 2012 12:50:46 +0000 (12:50 +0000)
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java patch | blob | history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java patch | blob | history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java patch | blob | history
cdmlib-remote-webapp/ide/eclipse/cdmserver - profile.launch patch | blob | history
cdmlib-remote-webapp/ide/eclipse/cdmserver - run.launch patch | blob | history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java patch | blob | history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/PUBLIC.xsd patch | blob | history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/dataset.xsd patch | blob | history

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java
index 7044c803f678dd2e98be30c4f2949868054422a3..fc89df1f0572d8a641515751994e7939346090ce 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java
@@ -140,7 +140,20 @@ public class JaxbImport extends CdmIoBase<JaxbImportState> implements ICdmIO<Jax
                // For example, if taxa are saved all other data referenced by those taxa, such as synonyms, \r
                // are automatically saved as well.\r
 \r
+       \r
                \r
+               try {\r
+                       if (jaxbImpConfig.isDoUser() == true) {\r
+                               if ((users = dataSet.getUsers()).size() > 0) {\r
+                                       logger.info("Users: " + users.size());\r
+                                       getUserService().save(users);\r
+                                       \r
+                               }\r
+                       }\r
+               } catch (Exception ex) {\r
+                       logger.error("Error saving users");\r
+                       success = false;\r
+               }\r
                \r
                if ((jaxbImpConfig.isDoTerms() == true)\r
                                && (terms = dataSet.getTerms()).size() > 0) {\r
@@ -171,18 +184,7 @@ public class JaxbImport extends CdmIoBase<JaxbImportState> implements ICdmIO<Jax
 //                     ret = false;\r
 //             }\r
 //             commitTransaction(txStatus);\r
-               try {\r
-                       if (jaxbImpConfig.isDoUser() == true) {\r
-                               if ((users = dataSet.getUsers()).size() > 0) {\r
-                                       logger.info("Users: " + users.size());\r
-                                       getUserService().save(users);\r
-                                       \r
-                               }\r
-                       }\r
-               } catch (Exception ex) {\r
-                       logger.error("Error saving users");\r
-                       success = false;\r
-               }\r
+\r
                \r
                //txStatus = startTransaction();\r
                try {\r
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
index 8a6558900dff866f8c4abaa32febf388ad071911..b335b42b83cc96b44182fe0d2a1d54da0d264666 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
@@ -11,6 +11,7 @@ package eu.etaxonomy.cdm.model.common;
 
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -44,6 +45,8 @@ import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
 import org.hibernate.validator.constraints.Length;
 
+import eu.etaxonomy.cdm.model.location.NamedArea;
+
 
 /**
  * A single enumeration must only contain DefinedTerm instances of one kind
@@ -137,7 +140,7 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
                return termSourceUri;
        }
        public void setTermSourceUri(URI vocabularyUri) {
-               this.termSourceUri = vocabularyUri;
+               this.termSourceUri = vocabularyUri;             
        }
        
        
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java
index d455b37e3a9170f27342325aee5dabbb4b423346..7103be9878dcf53463d47673eb073a0ccf420d98 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java
@@ -43,7 +43,8 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 @Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
 @Audited
 public class ReferenceSystem extends DefinedTermBase<ReferenceSystem> {
-       private static final long serialVersionUID = 2704455299046749175L;
+       private static final long serialVersionUID = -9060720949197749047L;
+
        @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(ReferenceSystem.class);
 
diff --git a/cdmlib-remote-webapp/ide/eclipse/cdmserver - profile.launch b/cdmlib-remote-webapp/ide/eclipse/cdmserver - profile.launch
index a508a0a77708e9b16c44635aef01cc1d7a46d6d2..334c4f4fd261c8b7250c0d7768a6cc0d789130cd 100644 (file)
--- a/cdmlib-remote-webapp/ide/eclipse/cdmserver - profile.launch
+++ b/cdmlib-remote-webapp/ide/eclipse/cdmserver - profile.launch
@@ -1,30 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="RunJettyRunWebApp">
-<stringAttribute key="bad_container_name" value="\cdmlib-remote\ide\eclipse\c"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;D:\_lib\java\jdk1.6_b3.src\j2se\src\share\classes&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;D:\_lib\java\jdk1.6_b3.src\j2se\src\windows\classes&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="RunJettyRunWebAppClassPathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="runjettyrun.Bootstrap"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M&#13;&#10;-Dlog4j.configDebug=true&#13;&#10;-agentlib:yjpagent&#13;&#10;-Dcdm.datasource=cyprus"/>
-<stringAttribute key="run_jetty_run.CONTEXT_ATTR" value="/"/>
-<booleanAttribute key="run_jetty_run.ENABLE_JNDI_ATTR" value="false"/>
-<booleanAttribute key="run_jetty_run.ENABLE_NEED_CLIENT_AUTH_ATTR" value="false"/>
-<booleanAttribute key="run_jetty_run.ENABLE_PARENT_LOADER_PRIORITY_ATTR" value="true"/>
-<booleanAttribute key="run_jetty_run.ENABLE_SCANNER_ATTR" value="true"/>
-<booleanAttribute key="run_jetty_run.ENABLE_SCANNER_SCAN_WEBINF_ATTR" value="true"/>
-<booleanAttribute key="run_jetty_run.ENABLE_SSL_ATTR" value="false"/>
-<stringAttribute key="run_jetty_run.EXCLUDE_CLASSPATH_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.KEYSTORE_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.KEY_PWD_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.PORT_ATTR" value="8080"/>
-<stringAttribute key="run_jetty_run.PWD_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.SCANINTERVALSECONDS_ATTR" value=""/>
-<booleanAttribute key="run_jetty_run.SHOW_ADVANCE_ATTR" value="false"/>
-<stringAttribute key="run_jetty_run.SSL_PORT_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.WEBAPPDIR_ATTR" value="src/main/webapp"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<launchConfiguration type="RunJettyRunWebApp">\r
+<stringAttribute key="bad_container_name" value="\cdmlib-remote\ide\eclipse\c"/>\r
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>\r
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;D:\_lib\java\jdk1.6_b3.src\j2se\src\share\classes&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;D:\_lib\java\jdk1.6_b3.src\j2se\src\windows\classes&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>\r
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>\r
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+</listAttribute>\r
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="RunJettyRunWebAppClassPathProvider"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="runjettyrun.Bootstrap"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M&#13;&#10;-Dlog4j.configDebug=true&#13;&#10;-agentlib:yjpagent&#13;&#10;-Dcdm.datasource=cyprus"/>\r
+<stringAttribute key="run_jetty_run.CONTEXT_ATTR" value="/"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_JNDI_ATTR" value="false"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_NEED_CLIENT_AUTH_ATTR" value="false"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_PARENT_LOADER_PRIORITY_ATTR" value="true"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_SCANNER_ATTR" value="true"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_SCANNER_SCAN_WEBINF_ATTR" value="true"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_SSL_ATTR" value="false"/>\r
+<stringAttribute key="run_jetty_run.EXCLUDE_CLASSPATH_ATTR" value=""/>\r
+<booleanAttribute key="run_jetty_run.IGNORE_SCAN_CLASS_WHEN_DEBUG_MODE" value="true"/>\r
+<stringAttribute key="run_jetty_run.JETTY_XML_PATH" value=""/>\r
+<stringAttribute key="run_jetty_run.KEYSTORE_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.KEY_PWD_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.PORT_ATTR" value="8080"/>\r
+<stringAttribute key="run_jetty_run.PWD_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.SCANINTERVALSECONDS_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.SELECTED_JETTY_VERSION_ATTR" value="Jetty 6.1.26"/>\r
+<booleanAttribute key="run_jetty_run.SHOW_ADVANCE_ATTR" value="false"/>\r
+<stringAttribute key="run_jetty_run.SSL_PORT_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.WEBAPPDIR_ATTR" value="src/main/webapp"/>\r
+</launchConfiguration>\r
diff --git a/cdmlib-remote-webapp/ide/eclipse/cdmserver - run.launch b/cdmlib-remote-webapp/ide/eclipse/cdmserver - run.launch
index 7908c078fc8982c0b2658e760f062b9f5e04c50b..967184b6cf3de4af197bf37eee9adae472eba828 100644 (file)
--- a/cdmlib-remote-webapp/ide/eclipse/cdmserver - run.launch
+++ b/cdmlib-remote-webapp/ide/eclipse/cdmserver - run.launch
@@ -1,31 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="RunJettyRunWebApp">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;archive detectRoot=&amp;quot;true&amp;quot; path=&amp;quot;C:\Programme\Java\jdk1.6.0_11\src.zip&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.externalArchive&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;/Applications/eclipse-helios/Eclipse.app/Contents/MacOS/D:\_lib\java\jdk1.6_b3.src\j2se\src\share\classes&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;/Applications/eclipse-helios/Eclipse.app/Contents/MacOS/D:\_lib\java\jdk1.6_b3.src\j2se\src\windows\classes&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathVariable path=&amp;quot;M2_REPO/org/mortbay/jetty/jetty/6.1.16/jetty-6.1.16-sources.jar&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathVariable&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="RunJettyRunWebAppClassPathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="runjettyrun.Bootstrap"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M&#13;&#10;-Dlog4j.configDebug=false&#13;&#10;-Dcdm.datasource=cichorieae&#10;-Dorg.mortbay.jetty.webapp.parentLoaderPriority=true"/>
-<stringAttribute key="run_jetty_run.CONTEXT_ATTR" value="/"/>
-<booleanAttribute key="run_jetty_run.ENABLE_JNDI_ATTR" value="false"/>
-<booleanAttribute key="run_jetty_run.ENABLE_MAVEN_TEST_CLASSES_ATTR" value="true"/>
-<booleanAttribute key="run_jetty_run.ENABLE_NEED_CLIENT_AUTH_ATTR" value="false"/>
-<booleanAttribute key="run_jetty_run.ENABLE_PARENT_LOADER_PRIORITY_ATTR" value="true"/>
-<booleanAttribute key="run_jetty_run.ENABLE_SCANNER_ATTR" value="false"/>
-<booleanAttribute key="run_jetty_run.ENABLE_SCANNER_SCAN_WEBINF_ATTR" value="true"/>
-<booleanAttribute key="run_jetty_run.ENABLE_SSL_ATTR" value="false"/>
-<stringAttribute key="run_jetty_run.EXCLUDE_CLASSPATH_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.KEYSTORE_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.KEY_PWD_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.PORT_ATTR" value="8080"/>
-<stringAttribute key="run_jetty_run.PWD_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.SCANINTERVALSECONDS_ATTR" value=""/>
-<booleanAttribute key="run_jetty_run.SHOW_ADVANCE_ATTR" value="false"/>
-<stringAttribute key="run_jetty_run.SSL_PORT_ATTR" value=""/>
-<stringAttribute key="run_jetty_run.WEBAPPDIR_ATTR" value="src/main/webapp"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<launchConfiguration type="RunJettyRunWebApp">\r
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>\r
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>\r
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;archive detectRoot=&amp;quot;true&amp;quot; path=&amp;quot;C:\Programme\Java\jdk1.6.0_11\src.zip&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.externalArchive&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;/Applications/eclipse-helios/Eclipse.app/Contents/MacOS/D:\_lib\java\jdk1.6_b3.src\j2se\src\share\classes&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;directory nest=&amp;quot;false&amp;quot; path=&amp;quot;/Applications/eclipse-helios/Eclipse.app/Contents/MacOS/D:\_lib\java\jdk1.6_b3.src\j2se\src\windows\classes&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;classpathVariable path=&amp;quot;M2_REPO/org/mortbay/jetty/jetty/6.1.16/jetty-6.1.16-sources.jar&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathVariable&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>\r
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>\r
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+</listAttribute>\r
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="RunJettyRunWebAppClassPathProvider"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="runjettyrun.Bootstrap"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M&#13;&#10;-Dlog4j.configDebug=false&#13;&#10;-Dcdm.datasource=redlistOnline&#13;&#10;-Dorg.mortbay.jetty.webapp.parentLoaderPriority=true"/>\r
+<stringAttribute key="run_jetty_run.CONTEXT_ATTR" value="/"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_JNDI_ATTR" value="false"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_MAVEN_TEST_CLASSES_ATTR" value="true"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_NEED_CLIENT_AUTH_ATTR" value="false"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_PARENT_LOADER_PRIORITY_ATTR" value="true"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_SCANNER_ATTR" value="false"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_SCANNER_SCAN_WEBINF_ATTR" value="true"/>\r
+<booleanAttribute key="run_jetty_run.ENABLE_SSL_ATTR" value="false"/>\r
+<stringAttribute key="run_jetty_run.EXCLUDE_CLASSPATH_ATTR" value=""/>\r
+<booleanAttribute key="run_jetty_run.IGNORE_SCAN_CLASS_WHEN_DEBUG_MODE" value="true"/>\r
+<stringAttribute key="run_jetty_run.JETTY_XML_PATH" value=""/>\r
+<stringAttribute key="run_jetty_run.KEYSTORE_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.KEY_PWD_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.PORT_ATTR" value="8080"/>\r
+<stringAttribute key="run_jetty_run.PWD_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.SCANINTERVALSECONDS_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.SELECTED_JETTY_VERSION_ATTR" value="Jetty 6.1.26"/>\r
+<booleanAttribute key="run_jetty_run.SHOW_ADVANCE_ATTR" value="false"/>\r
+<stringAttribute key="run_jetty_run.SSL_PORT_ATTR" value=""/>\r
+<stringAttribute key="run_jetty_run.WEBAPPDIR_ATTR" value="src/main/webapp"/>\r
+</launchConfiguration>\r
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
index fdf4ae35cd39a86948224debdc4a19f867ed2524..242db05dbb73b5623fcb1e97ed2c56247ed6a3a1 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java
@@ -55,80 +55,79 @@ public interface IService<T extends ICdmBase>{
      * Refreshes a given object t using the specified lockmode\r
      *\r
      * All bean properties given in the <code>propertyPaths</code> parameter are recursively initialized.\r
-     * <p>\r
-     * For detailed description and examples <b>please refer to:</b>\r
-     * {@link BeanInitializer#initialize(Object, List)}\r
-     *\r
-     * NOTE: in the case of lockmodes that hit the database (e.g. LockMode.READ), you will need to re-initialize\r
-     * child propertiesto avoid a HibernateLazyInitializationException (even if the properties of the child\r
-     * were initialized prior to the refresh).\r
-     *\r
-     * @param t\r
-     * @param lockMode\r
-     */\r
-    public void refresh(T t, LockMode lockMode, List<String> propertyPaths);\r
-\r
-    /**\r
-     * Returns a count of all entities of type <T>  optionally restricted\r
-     * to objects belonging to a class that that extends <T>\r
-     *\r
-     * @param clazz the class of entities to be counted (can be null to count all entities of type <T>)\r
-     * @return a count of entities\r
-     */\r
-    public int count(Class<? extends T> clazz);\r
-\r
-    /**\r
-     * Delete an existing persistent object\r
-     *\r
-     * @param persistentObject the object to be deleted\r
-     * @return the unique identifier of the deleted entity\r
-     */\r
-    public UUID delete(T persistentObject);\r
-\r
-    /**\r
-     * Returns true if an entity of type <T> with a unique identifier matching the\r
-     * identifier supplied exists in the database, or false if no such entity can be\r
-     * found.\r
-     * @param uuid the unique identifier of the entity required\r
-     * @return an entity of type <T> matching the uuid, or null if that entity does not exist\r
-     */\r
-    public boolean exists(UUID uuid);\r
-\r
-    /**\r
-     * Return a list of persisted entities that match the unique identifier\r
-     * set supplied as an argument\r
-     *\r
-     * @param uuidSet the set of unique identifiers of the entities required\r
-     * @return a list of entities of type <T>\r
-     */\r
-    public List<T> find(Set<UUID> uuidSet);\r
-\r
-    /**\r
-     * Return a persisted entity that matches the unique identifier\r
-     * supplied as an argument, or null if the entity does not exist\r
-     *\r
-     * @param uuid the unique identifier of the entity required\r
-     * @return an entity of type <T>, or null if the entity does not exist\r
-     */\r
-    public T find(UUID uuid);\r
-\r
-    /**\r
-     * Return a persisted entity that matches the database identifier\r
-     * supplied as an argument, or null if the entity does not exist\r
-     *\r
-     * @param id the database identifier of the entity required\r
-     * @return an entity of type <T>, or null if the entity does not exist\r
-     */\r
-    public T find(int id);\r
-\r
-    /**\r
-     * Returns a set of persisted entities that match the database identifiers.\r
-     * Returns an empty list if no identifier matches.\r
-     * @param idSet\r
-     * @return\r
-     */\r
-    public List<T> findById(Set<Integer> idSet);  //can't be called find(Set<Integer>) as this conflicts with find(Set<UUID)\r
-\r
+        * <p>\r
+        * For detailed description and examples <b>please refer to:</b> \r
+        * {@link BeanInitializer#initialize(Object, List)}\r
+        * \r
+        * NOTE: in the case of lockmodes that hit the database (e.g. LockMode.READ), you will need to re-initialize\r
+        * child properties to avoid a HibernateLazyInitializationException (even if the properties of the child \r
+        * were initialized prior to the refresh).\r
+        * \r
+        * @param t\r
+        * @param lockMode\r
+        */\r
+       public void refresh(T t, LockMode lockMode, List<String> propertyPaths);\r
+       \r
+       /**\r
+        * Returns a count of all entities of type <T>  optionally restricted\r
+        * to objects belonging to a class that that extends <T>\r
+        * \r
+        * @param clazz the class of entities to be counted (can be null to count all entities of type <T>)\r
+        * @return a count of entities\r
+        */\r
+       public int count(Class<? extends T> clazz);\r
+       \r
+       /**\r
+        * Delete an existing persistent object\r
+        * \r
+        * @param persistentObject the object to be deleted\r
+        * @return the unique identifier of the deleted entity\r
+        */\r
+       public UUID delete(T persistentObject);\r
+       \r
+       /**\r
+        * Returns true if an entity of type <T> with a unique identifier matching the \r
+        * identifier supplied exists in the database, or false if no such entity can be \r
+        * found. \r
+        * @param uuid the unique identifier of the entity required\r
+        * @return an entity of type <T> matching the uuid, or null if that entity does not exist\r
+        */\r
+       public boolean exists(UUID uuid);\r
+       \r
+       /**\r
+        * Return a list of persisted entities that match the unique identifier\r
+        * set supplied as an argument\r
+        * \r
+        * @param uuidSet the set of unique identifiers of the entities required\r
+        * @return a list of entities of type <T>\r
+        */\r
+       public List<T> find(Set<UUID> uuidSet);\r
+       \r
+       /**\r
+        * Return a persisted entity that matches the unique identifier\r
+        * supplied as an argument, or null if the entity does not exist\r
+        * \r
+        * @param uuid the unique identifier of the entity required\r
+        * @return an entity of type <T>, or null if the entity does not exist\r
+        */\r
+       public T find(UUID uuid);\r
+       \r
+       /**\r
+        * Return a persisted entity that matches the database identifier\r
+        * supplied as an argument, or null if the entity does not exist\r
+        * \r
+        * @param id the database identifier of the entity required\r
+        * @return an entity of type <T>, or null if the entity does not exist\r
+        */\r
+       public T find(int id);\r
+       \r
+       /**\r
+        * Returns a set of persisted entities that match the database identifiers.\r
+        * Returns an empty list if no identifier matches.\r
+        * @param idSet\r
+        * @return\r
+        */\r
+       public List<T> findById(Set<Integer> idSet);  //can't be called find(Set<Integer>) as this conflicts with find(Set<UUID)\r
 \r
     // FIXME should we expose this method?\r
     public Session getSession();\r
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/PUBLIC.xsd b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/PUBLIC.xsd
index 5c1b389e22ce967211f70d58b475dd9cf712e833..5b4e070ca33d8fbd001d4664fc14269ae3e7d212 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/PUBLIC.xsd
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/PUBLIC.xsd
@@ -47,8 +47,8 @@
        <xsd:element name="REFERENCE_MARKER_AUD" type="REFERENCE_MARKER_AUD__type" />
        <xsd:element name="PERMISSIONGROUP" type="PERMISSIONGROUP__type" />
        <xsd:element name="TAXONINTERACTION_LANGUAGESTRING_AUD" type="TAXONINTERACTION_LANGUAGESTRING_AUD__type" />
-       <xsd:element name="ORIGINALSOURCEBASE_ANNOTATION" type="ORIGINALSOURCEBASE_ANNOTATION__type" />
        <xsd:element name="HOMOTYPICALGROUP_MARKER_AUD" type="HOMOTYPICALGROUP_MARKER_AUD__type" />
+       <xsd:element name="ORIGINALSOURCEBASE_ANNOTATION" type="ORIGINALSOURCEBASE_ANNOTATION__type" />
        <xsd:element name="COLLECTION_ANNOTATION" type="COLLECTION_ANNOTATION__type" />
        <xsd:element name="MEDIAREPRESENTATION" type="MEDIAREPRESENTATION__type" />
        <xsd:element name="MEDIA_RIGHTS" type="MEDIA_RIGHTS__type" />
@@ -383,8 +383,8 @@
        <xsd:element name="POLYTOMOUSKEYNODE_AUD" type="POLYTOMOUSKEYNODE_AUD__type" />
        <xsd:element name="SEQUENCE_ANNOTATION" type="SEQUENCE_ANNOTATION__type" />
        <xsd:element name="FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF_AUD" type="FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF_AUD__type" />
-       <xsd:element name="AGENTBASE_MEDIA_AUD" type="AGENTBASE_MEDIA_AUD__type" />
        <xsd:element name="ORIGINALSOURCEBASE_MARKER" type="ORIGINALSOURCEBASE_MARKER__type" />
+       <xsd:element name="AGENTBASE_MEDIA_AUD" type="AGENTBASE_MEDIA_AUD__type" />
        <xsd:element name="REPRESENTATION_ANNOTATION_AUD" type="REPRESENTATION_ANNOTATION_AUD__type" />
        <xsd:element name="POLYTOMOUSKEY_RIGHTS_AUD" type="POLYTOMOUSKEY_RIGHTS_AUD__type" />
        <xsd:element name="GATHERINGEVENT_ANNOTATION" type="GATHERINGEVENT_ANNOTATION__type" />
@@ -442,8 +442,8 @@
        <xsd:element name="DERIVATIONEVENT_MARKER" type="DERIVATIONEVENT_MARKER__type" />
        <xsd:element name="SPECIMENOROBSERVATIONBASE_RIGHTS" type="SPECIMENOROBSERVATIONBASE_RIGHTS__type" />
        <xsd:element name="DBMAINTAIN_SCRIPTS" type="DBMAINTAIN_SCRIPTS__type" />
-       <xsd:element name="DEFINEDTERMBASE_MEDIA_AUD" type="DEFINEDTERMBASE_MEDIA_AUD__type" />
        <xsd:element name="COLLECTION_EXTENSION_AUD" type="COLLECTION_EXTENSION_AUD__type" />
+       <xsd:element name="DEFINEDTERMBASE_MEDIA_AUD" type="DEFINEDTERMBASE_MEDIA_AUD__type" />
        <xsd:element name="MEDIAKEY_SCOPE" type="MEDIAKEY_SCOPE__type" />
        <xsd:element name="DETERMINATIONEVENT_REFERENCE_AUD" type="DETERMINATIONEVENT_REFERENCE_AUD__type" />
        <xsd:element name="KEYSTATEMENT" type="KEYSTATEMENT__type" />
@@ -581,32 +581,32 @@
                <xsd:attribute name="KEYREPRESENTATIONS_ID" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="AGENTBASE__type">
-               <xsd:attribute name="NOMENCLATURALTITLE" use="optional" />
-               <xsd:attribute name="PREFIX" use="optional" />
-               <xsd:attribute name="ISPARTOF_ID" use="optional" />
-               <xsd:attribute name="UUID" use="optional" />
-               <xsd:attribute name="LIFESPAN_START" use="optional" />
-               <xsd:attribute name="LSID_REVISION" use="optional" />
-               <xsd:attribute name="PROTECTEDNOMENCLATURALTITLECACHE" use="optional" />
-               <xsd:attribute name="FIRSTNAME" use="optional" />
-               <xsd:attribute name="LSID_LSID" use="optional" />
-               <xsd:attribute name="ID" use="optional" />
-               <xsd:attribute name="LIFESPAN_END" use="optional" />
-               <xsd:attribute name="DTYPE" use="optional" />
-               <xsd:attribute name="LSID_AUTHORITY" use="optional" />
-               <xsd:attribute name="CODE" use="optional" />
                <xsd:attribute name="LSID_NAMESPACE" use="optional" />
+               <xsd:attribute name="PREFIX" use="optional" />
+               <xsd:attribute name="NOMENCLATURALTITLE" use="optional" />
                <xsd:attribute name="NAME" use="optional" />
                <xsd:attribute name="LIFESPAN_FREETEXT" use="optional" />
                <xsd:attribute name="SUFFIX" use="optional" />
+               <xsd:attribute name="ISPARTOF_ID" use="optional" />
+               <xsd:attribute name="LIFESPAN_START" use="optional" />
+               <xsd:attribute name="UUID" use="optional" />
+               <xsd:attribute name="PROTECTEDNOMENCLATURALTITLECACHE" use="optional" />
+               <xsd:attribute name="LSID_REVISION" use="optional" />
                <xsd:attribute name="CREATED" use="optional" />
                <xsd:attribute name="UPDATEDBY_ID" use="optional" />
+               <xsd:attribute name="FIRSTNAME" use="optional" />
                <xsd:attribute name="TITLECACHE" use="optional" />
                <xsd:attribute name="UPDATED" use="optional" />
+               <xsd:attribute name="LSID_LSID" use="optional" />
+               <xsd:attribute name="LIFESPAN_END" use="optional" />
+               <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="CREATEDBY_ID" use="optional" />
+               <xsd:attribute name="DTYPE" use="optional" />
                <xsd:attribute name="LSID_OBJECT" use="optional" />
-               <xsd:attribute name="PROTECTEDTITLECACHE" use="optional" />
+               <xsd:attribute name="LSID_AUTHORITY" use="optional" />
                <xsd:attribute name="LASTNAME" use="optional" />
+               <xsd:attribute name="CODE" use="optional" />
+               <xsd:attribute name="PROTECTEDTITLECACHE" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="CLASSIFICATION_TAXONNODE__type">
                <xsd:attribute name="ROOTNODES_ID" use="optional" />
@@ -752,8 +752,8 @@
                <xsd:attribute name="CREATED" use="optional" />
                <xsd:attribute name="NOMENCLATURALMICROREFERENCE" use="optional" />
                <xsd:attribute name="PUBLICATIONYEAR" use="optional" />
-               <xsd:attribute name="COMBINATIONAUTHORTEAM_ID" use="optional" />
                <xsd:attribute name="NAMEAPPROBATION" use="optional" />
+               <xsd:attribute name="COMBINATIONAUTHORTEAM_ID" use="optional" />
                <xsd:attribute name="TITLECACHE" use="optional" />
                <xsd:attribute name="PROTECTEDFULLTITLECACHE" use="optional" />
                <xsd:attribute name="MONOMHYBRID" use="optional" />
@@ -881,16 +881,16 @@
                <xsd:attribute name="DESCRIPTIONELEMENTBASE_ID" use="optional" />
                <xsd:attribute name="REVTYPE" use="optional" />
        </xsd:complexType>
-       <xsd:complexType name="ORIGINALSOURCEBASE_ANNOTATION__type">
-               <xsd:attribute name="ANNOTATIONS_ID" use="optional" />
-               <xsd:attribute name="ORIGINALSOURCEBASE_ID" use="optional" />
-       </xsd:complexType>
        <xsd:complexType name="HOMOTYPICALGROUP_MARKER_AUD__type">
                <xsd:attribute name="REV" use="optional" />
                <xsd:attribute name="MARKERS_ID" use="optional" />
                <xsd:attribute name="HOMOTYPICALGROUP_ID" use="optional" />
                <xsd:attribute name="REVTYPE" use="optional" />
        </xsd:complexType>
+       <xsd:complexType name="ORIGINALSOURCEBASE_ANNOTATION__type">
+               <xsd:attribute name="ANNOTATIONS_ID" use="optional" />
+               <xsd:attribute name="ORIGINALSOURCEBASE_ID" use="optional" />
+       </xsd:complexType>
        <xsd:complexType name="COLLECTION_ANNOTATION__type">
                <xsd:attribute name="ANNOTATIONS_ID" use="optional" />
                <xsd:attribute name="COLLECTION_ID" use="optional" />
@@ -984,9 +984,9 @@
                <xsd:attribute name="SUPPORTSQUANTITATIVEDATA" use="optional" />
                <xsd:attribute name="SUPPORTSDISTRIBUTION" use="optional" />
                <xsd:attribute name="DTYPE" use="optional" />
+               <xsd:attribute name="SUPPORTSCOMMONTAXONNAME" use="optional" />
                <xsd:attribute name="LSID_AUTHORITY" use="optional" />
                <xsd:attribute name="ISO639_2" use="optional" />
-               <xsd:attribute name="SUPPORTSCOMMONTAXONNAME" use="optional" />
                <xsd:attribute name="ISO639_1" use="optional" />
                <xsd:attribute name="URI" use="optional" />
                <xsd:attribute name="LSID_NAMESPACE" use="optional" />
@@ -1105,19 +1105,19 @@
                <xsd:attribute name="CREATEDBY_ID" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="TAXONNODE__type">
-               <xsd:attribute name="UUID" use="optional" />
-               <xsd:attribute name="TAXON_ID" use="optional" />
-               <xsd:attribute name="CLASSIFICATION_ID" use="optional" />
-               <xsd:attribute name="CREATED" use="optional" />
-               <xsd:attribute name="COUNTCHILDREN" use="optional" />
-               <xsd:attribute name="UPDATEDBY_ID" use="optional" />
                <xsd:attribute name="MICROREFERENCEFORPARENTCHILDRELATION" use="optional" />
                <xsd:attribute name="UPDATED" use="optional" />
-               <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="SYNONYMTOBEUSED_ID" use="optional" />
+               <xsd:attribute name="UUID" use="optional" />
+               <xsd:attribute name="ID" use="optional" />
+               <xsd:attribute name="TAXON_ID" use="optional" />
+               <xsd:attribute name="CLASSIFICATION_ID" use="optional" />
                <xsd:attribute name="CREATEDBY_ID" use="optional" />
+               <xsd:attribute name="CREATED" use="optional" />
                <xsd:attribute name="PARENT_ID" use="optional" />
+               <xsd:attribute name="COUNTCHILDREN" use="optional" />
                <xsd:attribute name="REFERENCEFORPARENTCHILDRELATION_ID" use="optional" />
+               <xsd:attribute name="UPDATEDBY_ID" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="FEATURETREE_ORIGINALSOURCEBASE_AUD__type">
                <xsd:attribute name="REV" use="optional" />
@@ -1291,9 +1291,9 @@
                <xsd:attribute name="LSID_LSID" use="optional" />
                <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="DEFAULTCOLOR" use="optional" />
+               <xsd:attribute name="SUPPORTSQUANTITATIVEDATA" use="optional" />
                <xsd:attribute name="DTYPE" use="optional" />
                <xsd:attribute name="SUPPORTSDISTRIBUTION" use="optional" />
-               <xsd:attribute name="SUPPORTSQUANTITATIVEDATA" use="optional" />
                <xsd:attribute name="LSID_AUTHORITY" use="optional" />
                <xsd:attribute name="ISO639_2" use="optional" />
                <xsd:attribute name="SUPPORTSCOMMONTAXONNAME" use="optional" />
@@ -2072,8 +2072,8 @@
                <xsd:attribute name="DOUBTFUL" use="optional" />
                <xsd:attribute name="UPDATED" use="optional" />
                <xsd:attribute name="ORIGINALNAMESTRING" use="optional" />
-               <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="TYPE_ID" use="optional" />
+               <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="CREATEDBY_ID" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="HOMOTYPICALGROUP_MARKER__type">
@@ -2109,8 +2109,8 @@
        <xsd:complexType name="SPECIMENOROBSERVATIONBASE__type">
                <xsd:attribute name="COLLECTION_ID" use="optional" />
                <xsd:attribute name="UUID" use="optional" />
-               <xsd:attribute name="INDIVIDUALCOUNT" use="optional" />
                <xsd:attribute name="LSID_REVISION" use="optional" />
+               <xsd:attribute name="INDIVIDUALCOUNT" use="optional" />
                <xsd:attribute name="PRIMARYCOLLECTOR_ID" use="optional" />
                <xsd:attribute name="EXSICCATUM" use="optional" />
                <xsd:attribute name="DERIVEDFROM_ID" use="optional" />
@@ -2188,21 +2188,21 @@
                <xsd:attribute name="REVTYPE" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="ORIGINALSOURCEBASE__type">
-               <xsd:attribute name="CITATIONMICROREFERENCE" use="optional" />
-               <xsd:attribute name="UUID" use="optional" />
-               <xsd:attribute name="NAMEUSEDINSOURCE_ID" use="optional" />
-               <xsd:attribute name="CREATED" use="optional" />
-               <xsd:attribute name="IDINSOURCE" use="optional" />
-               <xsd:attribute name="UPDATEDBY_ID" use="optional" />
                <xsd:attribute name="CITATION_ID" use="optional" />
+               <xsd:attribute name="CITATIONMICROREFERENCE" use="optional" />
                <xsd:attribute name="IDNAMESPACE" use="optional" />
-               <xsd:attribute name="UPDATED" use="optional" />
-               <xsd:attribute name="ORIGINALNAMESTRING" use="optional" />
                <xsd:attribute name="SOURCEDOBJ_ID" use="optional" />
+               <xsd:attribute name="ORIGINALNAMESTRING" use="optional" />
+               <xsd:attribute name="UPDATED" use="optional" />
+               <xsd:attribute name="UUID" use="optional" />
                <xsd:attribute name="ID" use="optional" />
-               <xsd:attribute name="DTYPE" use="optional" />
+               <xsd:attribute name="NAMEUSEDINSOURCE_ID" use="optional" />
                <xsd:attribute name="CREATEDBY_ID" use="optional" />
+               <xsd:attribute name="DTYPE" use="optional" />
+               <xsd:attribute name="IDINSOURCE" use="optional" />
+               <xsd:attribute name="CREATED" use="optional" />
                <xsd:attribute name="SOURCEDOBJ_TYPE" use="optional" />
+               <xsd:attribute name="UPDATEDBY_ID" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="HYBRIDRELATIONSHIP_ANNOTATION_AUD__type">
                <xsd:attribute name="ANNOTATIONS_ID" use="optional" />
@@ -2269,30 +2269,30 @@
                <xsd:attribute name="WORKINGSET_ID" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="TAXONBASE_AUD__type">
+               <xsd:attribute name="REV" use="optional" />
+               <xsd:attribute name="LSID_NAMESPACE" use="optional" />
+               <xsd:attribute name="USENAMECACHE" use="optional" />
                <xsd:attribute name="TAXONSTATUSUNKNOWN" use="optional" />
                <xsd:attribute name="UUID" use="optional" />
                <xsd:attribute name="LSID_REVISION" use="optional" />
+               <xsd:attribute name="CREATED" use="optional" />
                <xsd:attribute name="REVTYPE" use="optional" />
                <xsd:attribute name="UNPLACED" use="optional" />
+               <xsd:attribute name="UPDATEDBY_ID" use="optional" />
+               <xsd:attribute name="TITLECACHE" use="optional" />
+               <xsd:attribute name="SEC_ID" use="optional" />
                <xsd:attribute name="APPENDEDPHRASE" use="optional" />
-               <xsd:attribute name="DOUBTFUL" use="optional" />
                <xsd:attribute name="NAME_ID" use="optional" />
+               <xsd:attribute name="DOUBTFUL" use="optional" />
+               <xsd:attribute name="UPDATED" use="optional" />
                <xsd:attribute name="LSID_LSID" use="optional" />
-               <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="EXCLUDED" use="optional" />
+               <xsd:attribute name="ID" use="optional" />
+               <xsd:attribute name="CREATEDBY_ID" use="optional" />
                <xsd:attribute name="DTYPE" use="optional" />
                <xsd:attribute name="TAXONOMICCHILDRENCOUNT" use="optional" />
-               <xsd:attribute name="LSID_AUTHORITY" use="optional" />
-               <xsd:attribute name="LSID_NAMESPACE" use="optional" />
-               <xsd:attribute name="REV" use="optional" />
-               <xsd:attribute name="USENAMECACHE" use="optional" />
-               <xsd:attribute name="CREATED" use="optional" />
-               <xsd:attribute name="UPDATEDBY_ID" use="optional" />
-               <xsd:attribute name="TITLECACHE" use="optional" />
-               <xsd:attribute name="SEC_ID" use="optional" />
-               <xsd:attribute name="UPDATED" use="optional" />
-               <xsd:attribute name="CREATEDBY_ID" use="optional" />
                <xsd:attribute name="LSID_OBJECT" use="optional" />
+               <xsd:attribute name="LSID_AUTHORITY" use="optional" />
                <xsd:attribute name="TAXONOMICPARENTCACHE_ID" use="optional" />
                <xsd:attribute name="PROTECTEDTITLECACHE" use="optional" />
        </xsd:complexType>
@@ -2405,8 +2405,8 @@
                <xsd:attribute name="DTYPE" use="optional" />
                <xsd:attribute name="LSID_OBJECT" use="optional" />
                <xsd:attribute name="LSID_AUTHORITY" use="optional" />
-               <xsd:attribute name="PROTECTEDTITLECACHE" use="optional" />
                <xsd:attribute name="URI" use="optional" />
+               <xsd:attribute name="PROTECTEDTITLECACHE" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="TAXONNODE_MARKER__type">
                <xsd:attribute name="MARKERS_ID" use="optional" />
@@ -2643,9 +2643,9 @@
                <xsd:attribute name="PREFERREDFLAG" use="optional" />
                <xsd:attribute name="UPDATEDBY_ID" use="optional" />
                <xsd:attribute name="ACTOR_ID" use="optional" />
+               <xsd:attribute name="IDENTIFIEDUNIT_ID" use="optional" />
                <xsd:attribute name="UPDATED" use="optional" />
                <xsd:attribute name="TIMEPERIOD_FREETEXT" use="optional" />
-               <xsd:attribute name="IDENTIFIEDUNIT_ID" use="optional" />
                <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="TIMEPERIOD_END" use="optional" />
                <xsd:attribute name="CREATEDBY_ID" use="optional" />
@@ -2837,8 +2837,8 @@
                <xsd:attribute name="CITATION_ID" use="optional" />
                <xsd:attribute name="UPDATED" use="optional" />
                <xsd:attribute name="ORIGINALNAMESTRING" use="optional" />
-               <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="TYPE_ID" use="optional" />
+               <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="CREATEDBY_ID" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="AGENTBASE_DEFINEDTERMBASE__type">
@@ -2929,8 +2929,8 @@
                <xsd:attribute name="UUID" use="optional" />
                <xsd:attribute name="TAXON_ID" use="optional" />
                <xsd:attribute name="SUBKEY_ID" use="optional" />
-               <xsd:attribute name="CREATED" use="optional" />
                <xsd:attribute name="QUESTION_ID" use="optional" />
+               <xsd:attribute name="CREATED" use="optional" />
                <xsd:attribute name="KEY_ID" use="optional" />
                <xsd:attribute name="UPDATEDBY_ID" use="optional" />
                <xsd:attribute name="NODENUMBER" use="optional" />
@@ -3489,8 +3489,8 @@
                <xsd:attribute name="UPDATED" use="optional" />
                <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="FEATURE_ID" use="optional" />
-               <xsd:attribute name="CREATEDBY_ID" use="optional" />
                <xsd:attribute name="OTHERNODE_ID" use="optional" />
+               <xsd:attribute name="CREATEDBY_ID" use="optional" />
                <xsd:attribute name="STATEMENT_ID" use="optional" />
                <xsd:attribute name="PARENT_ID" use="optional" />
                <xsd:attribute name="SORTINDEX" use="optional" />
@@ -3505,16 +3505,16 @@
                <xsd:attribute name="FEATURENODE_ID" use="optional" />
                <xsd:attribute name="REVTYPE" use="optional" />
        </xsd:complexType>
+       <xsd:complexType name="ORIGINALSOURCEBASE_MARKER__type">
+               <xsd:attribute name="MARKERS_ID" use="optional" />
+               <xsd:attribute name="ORIGINALSOURCEBASE_ID" use="optional" />
+       </xsd:complexType>
        <xsd:complexType name="AGENTBASE_MEDIA_AUD__type">
                <xsd:attribute name="REV" use="optional" />
                <xsd:attribute name="MEDIA_ID" use="optional" />
                <xsd:attribute name="REVTYPE" use="optional" />
                <xsd:attribute name="AGENTBASE_ID" use="optional" />
        </xsd:complexType>
-       <xsd:complexType name="ORIGINALSOURCEBASE_MARKER__type">
-               <xsd:attribute name="MARKERS_ID" use="optional" />
-               <xsd:attribute name="ORIGINALSOURCEBASE_ID" use="optional" />
-       </xsd:complexType>
        <xsd:complexType name="REPRESENTATION_ANNOTATION_AUD__type">
                <xsd:attribute name="ANNOTATIONS_ID" use="optional" />
                <xsd:attribute name="REV" use="optional" />
@@ -3680,18 +3680,18 @@
                <xsd:attribute name="SOURCES_ID" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="USERACCOUNT_AUD__type">
-               <xsd:attribute name="REV" use="optional" />
                <xsd:attribute name="CREDENTIALSNONEXPIRED" use="optional" />
-               <xsd:attribute name="UUID" use="optional" />
-               <xsd:attribute name="ACCOUNTNONLOCKED" use="optional" />
-               <xsd:attribute name="CREATED" use="optional" />
-               <xsd:attribute name="REVTYPE" use="optional" />
+               <xsd:attribute name="REV" use="optional" />
                <xsd:attribute name="ENABLED" use="optional" />
                <xsd:attribute name="PERSON_ID" use="optional" />
+               <xsd:attribute name="ACCOUNTNONLOCKED" use="optional" />
+               <xsd:attribute name="UUID" use="optional" />
                <xsd:attribute name="ID" use="optional" />
                <xsd:attribute name="USERNAME" use="optional" />
-               <xsd:attribute name="ACCOUNTNONEXPIRED" use="optional" />
                <xsd:attribute name="CREATEDBY_ID" use="optional" />
+               <xsd:attribute name="ACCOUNTNONEXPIRED" use="optional" />
+               <xsd:attribute name="CREATED" use="optional" />
+               <xsd:attribute name="REVTYPE" use="optional" />
                <xsd:attribute name="EMAILADDRESS" use="optional" />
        </xsd:complexType>
        <xsd:complexType name="TAXONBASE_ORIGINALSOURCEBASE__type">
@@ -3946,18 +3946,18 @@
                <xsd:attribute name="CHECKSUM" use="optional" />
                <xsd:attribute name="FILE_LAST_MODIFIED_AT" use="optional" />
        </xsd:complexType>
-       <xsd:complexType name="DEFINEDTERMBASE_MEDIA_AUD__type">
-               <xsd:attribute name="REV" use="optional" />
-               <xsd:attribute name="DEFINEDTERMBASE_ID" use="optional" />
-               <xsd:attribute name="MEDIA_ID" use="optional" />
-               <xsd:attribute name="REVTYPE" use="optional" />
-       </xsd:complexType>
        <xsd:complexType name="COLLECTION_EXTENSION_AUD__type">
                <xsd:attribute name="REV" use="optional" />
                <xsd:attribute name="COLLECTION_ID" use="optional" />
                <xsd:attribute name="EXTENSIONS_ID" use="optional" />
                <xsd:attribute name="REVTYPE" use="optional" />
        </xsd:complexType>
+       <xsd:complexType name="DEFINEDTERMBASE_MEDIA_AUD__type">
+               <xsd:attribute name="REV" use="optional" />
+               <xsd:attribute name="DEFINEDTERMBASE_ID" use="optional" />
+               <xsd:attribute name="MEDIA_ID" use="optional" />
+               <xsd:attribute name="REVTYPE" use="optional" />
+       </xsd:complexType>
        <xsd:complexType name="MEDIAKEY_SCOPE__type">
                <xsd:attribute name="SCOPERESTRICTIONS_ID" use="optional" />
                <xsd:attribute name="MEDIA_ID" use="optional" />
@@ -4191,8 +4191,8 @@
                <xsd:attribute name="MODIFIER_ID" use="optional" />
                <xsd:attribute name="CREATED" use="optional" />
                <xsd:attribute name="REVTYPE" use="optional" />
-               <xsd:attribute name="PREFERREDFLAG" use="optional" />
                <xsd:attribute name="UPDATEDBY_ID" use="optional" />
+               <xsd:attribute name="PREFERREDFLAG" use="optional" />
                <xsd:attribute name="ACTOR_ID" use="optional" />
                <xsd:attribute name="IDENTIFIEDUNIT_ID" use="optional" />
                <xsd:attribute name="UPDATED" use="optional" />
diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/dataset.xsd b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/dataset.xsd
index a4e4a82efe4d0da8825d1ad8b6f62e1ed2434696..cec0912384b80e87405b340420cb6ab4e5622a0b 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/dataset.xsd
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/dataset.xsd
@@ -51,8 +51,8 @@
                                <xsd:element name="REFERENCE_MARKER_AUD" type="dflt:REFERENCE_MARKER_AUD__type" />
                                <xsd:element name="PERMISSIONGROUP" type="dflt:PERMISSIONGROUP__type" />
                                <xsd:element name="TAXONINTERACTION_LANGUAGESTRING_AUD" type="dflt:TAXONINTERACTION_LANGUAGESTRING_AUD__type" />
-                               <xsd:element name="ORIGINALSOURCEBASE_ANNOTATION" type="dflt:ORIGINALSOURCEBASE_ANNOTATION__type" />
                                <xsd:element name="HOMOTYPICALGROUP_MARKER_AUD" type="dflt:HOMOTYPICALGROUP_MARKER_AUD__type" />
+                               <xsd:element name="ORIGINALSOURCEBASE_ANNOTATION" type="dflt:ORIGINALSOURCEBASE_ANNOTATION__type" />
                                <xsd:element name="COLLECTION_ANNOTATION" type="dflt:COLLECTION_ANNOTATION__type" />
                                <xsd:element name="MEDIAREPRESENTATION" type="dflt:MEDIAREPRESENTATION__type" />
                                <xsd:element name="MEDIA_RIGHTS" type="dflt:MEDIA_RIGHTS__type" />
@@ -387,8 +387,8 @@
                                <xsd:element name="POLYTOMOUSKEYNODE_AUD" type="dflt:POLYTOMOUSKEYNODE_AUD__type" />
                                <xsd:element name="SEQUENCE_ANNOTATION" type="dflt:SEQUENCE_ANNOTATION__type" />
                                <xsd:element name="FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF_AUD" type="dflt:FEATURENODE_DEFINEDTERMBASE_INAPPLICABLEIF_AUD__type" />
-                               <xsd:element name="AGENTBASE_MEDIA_AUD" type="dflt:AGENTBASE_MEDIA_AUD__type" />
                                <xsd:element name="ORIGINALSOURCEBASE_MARKER" type="dflt:ORIGINALSOURCEBASE_MARKER__type" />
+                               <xsd:element name="AGENTBASE_MEDIA_AUD" type="dflt:AGENTBASE_MEDIA_AUD__type" />
                                <xsd:element name="REPRESENTATION_ANNOTATION_AUD" type="dflt:REPRESENTATION_ANNOTATION_AUD__type" />
                                <xsd:element name="POLYTOMOUSKEY_RIGHTS_AUD" type="dflt:POLYTOMOUSKEY_RIGHTS_AUD__type" />
                                <xsd:element name="GATHERINGEVENT_ANNOTATION" type="dflt:GATHERINGEVENT_ANNOTATION__type" />
@@ -446,8 +446,8 @@
                                <xsd:element name="DERIVATIONEVENT_MARKER" type="dflt:DERIVATIONEVENT_MARKER__type" />
                                <xsd:element name="SPECIMENOROBSERVATIONBASE_RIGHTS" type="dflt:SPECIMENOROBSERVATIONBASE_RIGHTS__type" />
                                <xsd:element name="DBMAINTAIN_SCRIPTS" type="dflt:DBMAINTAIN_SCRIPTS__type" />
-                               <xsd:element name="DEFINEDTERMBASE_MEDIA_AUD" type="dflt:DEFINEDTERMBASE_MEDIA_AUD__type" />
                                <xsd:element name="COLLECTION_EXTENSION_AUD" type="dflt:COLLECTION_EXTENSION_AUD__type" />
+                               <xsd:element name="DEFINEDTERMBASE_MEDIA_AUD" type="dflt:DEFINEDTERMBASE_MEDIA_AUD__type" />
                                <xsd:element name="MEDIAKEY_SCOPE" type="dflt:MEDIAKEY_SCOPE__type" />
                                <xsd:element name="DETERMINATIONEVENT_REFERENCE_AUD" type="dflt:DETERMINATIONEVENT_REFERENCE_AUD__type" />
                                <xsd:element name="KEYSTATEMENT" type="dflt:KEYSTATEMENT__type" />