ICdmEntitySessionManager, CdmEntitySessionManager, MockCdmEntitySessionManager :...

CdmServiceInterceptorException, CdmServiceRequestExecutor, TermServiceRequestExecutor : New executor classes to be used to execute intercept remote service requests starting with the term service
httpInvokerServiceClients : replaced term service executor with custom executor
hibernate.cfg.xml : new model 3.4 updates
CdmApplicationRemoteConfiguration : added method to access the session manager

diff --git a/.gitattributes b/.gitattributes
index a551a04e00d17bdeadf2ad4b8f9390a1f94586ff..5c6ccc8d4c14993dd50759ded5245b3fffea0231 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -348,6 +348,9 @@ eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/sour
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceException.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/ICdmRemoteSource.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceInterceptorException.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java -text
+eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TermServiceRequestExecutor.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmClientSessionException.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java -text

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index e9dbfcec3c6fb7fc1e60bd79cbf17cd685a82dcb..6ab2a13c1a5508fd16d85578e64acc41f207294d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -1,224 +1,227 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project>\r
 \r
-       <parent>\r
-               <groupId>eu.etaxonomy</groupId>\r
-               <artifactId>taxeditor-parent</artifactId>\r
-               <version>3.4.0-SNAPSHOT</version>\r
-       </parent>\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
-       <packaging>eclipse-plugin</packaging>\r
-       <name>CDM Library Bundle</name>\r
-       <description>Cdm Library Plugin Taxonomic Editor</description>\r
+  <parent>\r
+    <groupId>eu.etaxonomy</groupId>\r
+    <artifactId>taxeditor-parent</artifactId>\r
+    <version>3.4.0-SNAPSHOT</version>\r
+  </parent>\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
+  <packaging>eclipse-plugin</packaging>\r
+  <name>CDM Library Bundle</name>\r
+  <description>Cdm Library Plugin Taxonomic Editor</description>\r
 \r
-       <build>\r
-               <pluginManagement>\r
-                       <plugins>\r
-                               <plugin>\r
-                                       <groupId>org.apache.maven.plugins</groupId>\r
-                                       <artifactId>maven-surefire-plugin</artifactId>\r
-                                       <version>2.7</version>\r
-                               </plugin>\r
-                       </plugins>\r
-               </pluginManagement>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-dependency-plugin</artifactId>\r
-                               <version>2.4</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>copy-dependencies</id>\r
-                                               <phase>validate</phase>\r
-                                               <goals>\r
-                                                       <goal>copy-dependencies</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <excludeArtifactIds>\r
-                                                               cdmlib-remote-webapp\r
-                                                       </excludeArtifactIds>\r
-                                                       <includeArtifactIds>\r
-                                                               cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote\r
-                                                       </includeArtifactIds>\r
-                                                       <outputDirectory>${basedir}/lib</outputDirectory>\r
-                                                       <overWriteReleases>true</overWriteReleases>\r
-                                                       <overWriteSnapshots>true</overWriteSnapshots>\r
-                                                       <excludeTransitive>true</excludeTransitive>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>copy-dependency-war</id>\r
-                                               <phase>validate</phase>\r
-                                               <goals>\r
-                                                       <goal>copy-dependencies</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <includeArtifactIds>\r
-                                                               cdmlib-remote-webapp\r
-                                                       </includeArtifactIds>\r
-                                                       <outputDirectory>\r
-                                                               ${basedir}/src/main/resources/etc/jetty\r
-                                                       </outputDirectory>\r
-                                                       <overWriteReleases>true</overWriteReleases>\r
-                                                       <overWriteSnapshots>true</overWriteSnapshots>\r
-                                                       <excludeTransitive>true</excludeTransitive>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-antrun-plugin</artifactId>\r
-                               <version>1.7</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>update-snapshot-jar-names</id>\r
-                                               <phase>validate</phase>\r
-                                               <goals>\r
-                                                       <goal>run</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <target>\r
-                                                               <echo>Anonymizing war</echo>\r
-                                                               <move todir="./src/main/resources/etc/jetty">\r
-                                                                       <fileset dir="./src/main/resources/etc/jetty" />\r
-                                                                       <mapper type="regexp"\r
-                                                                               from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)" to="\1\2" />\r
-                                                               </move>\r
-                                                               <move todir="./src/main/resources/etc/jetty">\r
-                                                                       <fileset dir="./src/main/resources/etc/jetty" />\r
-                                                                       <mapper type="regexp"\r
-                                                                               from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)" to="\1\2" />\r
-                                                               </move>\r
-                                                               <echo>Update cdmlib jars to SNAPSHOT when build with\r
-                                                                       timestamp\r
-                                                               </echo>\r
-                                                               <move todir="./lib">\r
-                                                                       <fileset dir="./lib" />\r
-                                                                       <mapper type="regexp"\r
-                                                                               from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />\r
-                                                               </move>\r
-                                                               <move todir="./lib">\r
-                                                                       <fileset dir="./lib" />\r
-                                                                       <mapper type="regexp"\r
-                                                                               from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"\r
-                                                                               to="\1SNAPSHOT\2" />\r
-                                                               </move>\r
-                                                       </target>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-       <profiles>\r
-               <profile>\r
-                       <id>cleanCdmlibJars</id>\r
-                       <build>\r
-                               <plugins>\r
-                                       <plugin>\r
-                                               <artifactId>maven-clean-plugin</artifactId>\r
-                                               <version>2.3</version>\r
-                                               <configuration>\r
-                                                       <filesets>\r
-                                                               <fileset>\r
-                                                                       <directory>${basedir}/lib</directory>\r
-                                                                       <includes>\r
-                                                                               <include>cdmlib-*</include>\r
-                                                                       </includes>\r
-                                                                       <followSymlinks>false</followSymlinks>\r
-                                                               </fileset>\r
-                                                       </filesets>\r
-                                               </configuration>\r
-                                       </plugin>\r
-                               </plugins>\r
-                       </build>\r
-               </profile>\r
-               <profile>\r
-                       <id>cleanAllJars</id>\r
-                       <build>\r
-                               <plugins>\r
-                                       <plugin>\r
-                                               <artifactId>maven-clean-plugin</artifactId>\r
-                                               <version>2.3</version>\r
-                                               <configuration>\r
-                                                       <filesets>\r
-                                                               <fileset>\r
-                                                                       <directory>${basedir}/lib</directory>\r
-                                                                       <includes>\r
-                                                                               <include>*</include>\r
-                                                                       </includes>\r
-                                                                       <followSymlinks>false</followSymlinks>\r
-                                                               </fileset>\r
-                                                       </filesets>\r
-                                               </configuration>\r
-                                       </plugin>\r
-                               </plugins>\r
-                       </build>\r
-               </profile>\r
-               <profile>\r
-                       <id>copyAllJars</id>\r
-                       <build>\r
-                               <plugins>\r
-                                       <plugin>\r
-                                               <groupId>org.apache.maven.plugins</groupId>\r
-                                               <artifactId>maven-dependency-plugin</artifactId>\r
-                                               <version>2.4</version>\r
-                                               <executions>\r
-                                                       <execution>\r
-                                                               <id>copy-all-dependencies</id>\r
-                                                               <phase>validate</phase>\r
-                                                               <goals>\r
-                                                                       <goal>copy-dependencies</goal>\r
-                                                               </goals>\r
-                                                               <configuration>\r
-                                                                       <excludeArtifactIds>\r
-                                                                               cdmlib-remote-webapp\r
-                                                                       </excludeArtifactIds>\r
-                                                                       <outputDirectory>${basedir}/lib</outputDirectory>\r
-                                                                       <overWriteReleases>true</overWriteReleases>\r
-                                                                       <overWriteSnapshots>true</overWriteSnapshots>\r
-                                                                       <excludeTransitive>true</excludeTransitive>\r
-                                                               </configuration>\r
-                                                       </execution>\r
-                                               </executions>\r
-                                       </plugin>\r
-                               </plugins>\r
-                       </build>\r
-               </profile>\r
-       </profiles>\r
-       <repositories>\r
-               <repository>\r
-                       <id>SpringSource Enterprise Bundle Repository - External Bundle\r
-                               Milestones\r
-                       </id>\r
-                       <url>http://repository.springsource.com/maven/bundles/milestone\r
-                       </url>\r
-               </repository>\r
-               <repository>\r
-                       <id>SpringSource Enterprise Bundle Repository - SpringSource\r
-                               Bundle\r
-                               Releases\r
-                       </id>\r
-                       <url>http://repository.springsource.com/maven/bundles/release\r
-                       </url>\r
-               </repository>\r
-               <repository>\r
-                       <id>SpringSource Enterprise Bundle Repository - External Bundle\r
-                               Releases\r
-                       </id>\r
-                       <url>http://repository.springsource.com/maven/bundles/external\r
-                       </url>\r
-               </repository>\r
-       </repositories>\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>eu.etaxonomy</groupId>\r
-                       <artifactId>cdmlib-remote-webapp</artifactId>\r
-                       <version>${cdmlib.version}</version>\r
-                       <type>war</type>\r
-               </dependency>\r
+  <build>\r
+    <pluginManagement>\r
+      <plugins>\r
+        <plugin>\r
+          <groupId>org.apache.maven.plugins</groupId>\r
+          <artifactId>maven-surefire-plugin</artifactId>\r
+          <version>2.7</version>\r
+        </plugin>\r
+      </plugins>\r
+    </pluginManagement>\r
+    <plugins>\r
+      <plugin>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-dependency-plugin</artifactId>\r
+        <version>2.4</version>\r
+        <executions>\r
+          <execution>\r
+            <id>copy-dependencies</id>\r
+            <phase>validate</phase>\r
+            <goals>\r
+              <goal>copy-dependencies</goal>\r
+            </goals>\r
+            <configuration>\r
+              <excludeArtifactIds>\r
+                cdmlib-remote-webapp\r
+              </excludeArtifactIds>\r
+              <includeArtifactIds>\r
+                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote\r
+              </includeArtifactIds>\r
+              <outputDirectory>${basedir}/lib</outputDirectory>\r
+              <overWriteReleases>true</overWriteReleases>\r
+              <overWriteSnapshots>true</overWriteSnapshots>\r
+              <excludeTransitive>true</excludeTransitive>\r
+            </configuration>\r
+          </execution>\r
+          <execution>\r
+            <id>copy-dependency-war</id>\r
+            <phase>validate</phase>\r
+            <goals>\r
+              <goal>copy-dependencies</goal>\r
+            </goals>\r
+            <configuration>\r
+              <includeArtifactIds>\r
+                cdmlib-remote-webapp\r
+              </includeArtifactIds>\r
+              <outputDirectory>\r
+                ${basedir}/src/main/resources/etc/jetty\r
+              </outputDirectory>\r
+              <overWriteReleases>true</overWriteReleases>\r
+              <overWriteSnapshots>true</overWriteSnapshots>\r
+              <excludeTransitive>true</excludeTransitive>\r
+            </configuration>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
+      <plugin>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-antrun-plugin</artifactId>\r
+        <version>1.7</version>\r
+        <executions>\r
+          <execution>\r
+            <id>update-snapshot-jar-names</id>\r
+            <phase>validate</phase>\r
+            <goals>\r
+              <goal>run</goal>\r
+            </goals>\r
+            <configuration>\r
+              <target>\r
+                <echo>Anonymizing war</echo>\r
+                <move todir="./src/main/resources/etc/jetty">\r
+                  <fileset dir="./src/main/resources/etc/jetty" />\r
+                  <mapper type="regexp"\r
+                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)"\r
+                    to="\1\2" />\r
+                </move>\r
+                <move todir="./src/main/resources/etc/jetty">\r
+                  <fileset dir="./src/main/resources/etc/jetty" />\r
+                  <mapper type="regexp"\r
+                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)"\r
+                    to="\1\2" />\r
+                </move>\r
+                <echo>Update cdmlib jars to SNAPSHOT when build with\r
+                  timestamp\r
+                </echo>\r
+                <move todir="./lib">\r
+                  <fileset dir="./lib" />\r
+                  <mapper type="regexp"\r
+                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)"\r
+                    to="\1SNAPSHOT\2" />\r
+                </move>\r
+                <move todir="./lib">\r
+                  <fileset dir="./lib" />\r
+                  <mapper type="regexp"\r
+                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"\r
+                    to="\1SNAPSHOT\2" />\r
+                </move>\r
+              </target>\r
+            </configuration>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
+    </plugins>\r
+  </build>\r
+  <profiles>\r
+    <profile>\r
+      <id>cleanCdmlibJars</id>\r
+      <build>\r
+        <plugins>\r
+          <plugin>\r
+            <artifactId>maven-clean-plugin</artifactId>\r
+            <version>2.3</version>\r
+            <configuration>\r
+              <filesets>\r
+                <fileset>\r
+                  <directory>${basedir}/lib</directory>\r
+                  <includes>\r
+                    <include>cdmlib-*</include>\r
+                  </includes>\r
+                  <followSymlinks>false</followSymlinks>\r
+                </fileset>\r
+              </filesets>\r
+            </configuration>\r
+          </plugin>\r
+        </plugins>\r
+      </build>\r
+    </profile>\r
+    <profile>\r
+      <id>cleanAllJars</id>\r
+      <build>\r
+        <plugins>\r
+          <plugin>\r
+            <artifactId>maven-clean-plugin</artifactId>\r
+            <version>2.3</version>\r
+            <configuration>\r
+              <filesets>\r
+                <fileset>\r
+                  <directory>${basedir}/lib</directory>\r
+                  <includes>\r
+                    <include>*</include>\r
+                  </includes>\r
+                  <followSymlinks>false</followSymlinks>\r
+                </fileset>\r
+              </filesets>\r
+            </configuration>\r
+          </plugin>\r
+        </plugins>\r
+      </build>\r
+    </profile>\r
+    <profile>\r
+      <id>copyAllJars</id>\r
+      <build>\r
+        <plugins>\r
+          <plugin>\r
+            <groupId>org.apache.maven.plugins</groupId>\r
+            <artifactId>maven-dependency-plugin</artifactId>\r
+            <version>2.4</version>\r
+            <executions>\r
+              <execution>\r
+                <id>copy-all-dependencies</id>\r
+                <phase>validate</phase>\r
+                <goals>\r
+                  <goal>copy-dependencies</goal>\r
+                </goals>\r
+                <configuration>\r
+                  <excludeArtifactIds>\r
+                    cdmlib-remote-webapp\r
+                  </excludeArtifactIds>\r
+                  <outputDirectory>${basedir}/lib</outputDirectory>\r
+                  <overWriteReleases>true</overWriteReleases>\r
+                  <overWriteSnapshots>true</overWriteSnapshots>\r
+                  <excludeTransitive>true</excludeTransitive>\r
+                </configuration>\r
+              </execution>\r
+            </executions>\r
+          </plugin>\r
+        </plugins>\r
+      </build>\r
+    </profile>\r
+  </profiles>\r
+  <repositories>\r
+    <repository>\r
+      <id>SpringSource Enterprise Bundle Repository - External Bundle\r
+        Milestones\r
+      </id>\r
+      <url>http://repository.springsource.com/maven/bundles/milestone\r
+      </url>\r
+    </repository>\r
+    <repository>\r
+      <id>SpringSource Enterprise Bundle Repository - SpringSource\r
+        Bundle\r
+        Releases\r
+      </id>\r
+      <url>http://repository.springsource.com/maven/bundles/release\r
+      </url>\r
+    </repository>\r
+    <repository>\r
+      <id>SpringSource Enterprise Bundle Repository - External Bundle\r
+        Releases\r
+      </id>\r
+      <url>http://repository.springsource.com/maven/bundles/external\r
+      </url>\r
+    </repository>\r
+  </repositories>\r
+  <dependencies>\r
+    <dependency>\r
+      <groupId>eu.etaxonomy</groupId>\r
+      <artifactId>cdmlib-remote-webapp</artifactId>\r
+      <version>${cdmlib.version}</version>\r
+      <type>war</type>\r
+    </dependency>\r
     <dependency>\r
       <groupId>eu.etaxonomy</groupId>\r
       <artifactId>cdmlib-commons</artifactId>\r
@@ -260,336 +263,335 @@
       <version>${cdmlib.version}</version>\r
     </dependency>\r
 \r
-               <dependency>\r
-                       <groupId>org.unitils</groupId>\r
-                       <artifactId>unitils-core</artifactId>\r
-                       <version>3.4.2</version>\r
-               </dependency>\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-               <!-- <artifactId>jetty-server</artifactId> -->\r
-               <!-- <version>9.1.3.v20140225</version> -->\r
-               <!-- </dependency> -->\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-               <!-- <artifactId>jetty-util</artifactId> -->\r
-               <!-- <version>9.1.3.v20140225</version> -->\r
-               <!-- </dependency> -->\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-               <!-- <artifactId>jetty-xml</artifactId> -->\r
-               <!-- <version>9.1.3.v20140225</version> -->\r
-               <!-- </dependency> -->\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-               <!-- <artifactId>jetty-servlet</artifactId> -->\r
-               <!-- <version>9.1.3.v20140225</version> -->\r
-               <!-- </dependency> -->\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-               <!-- <artifactId>jetty-webapp</artifactId> -->\r
-               <!-- <version>9.1.3.v20140225</version> -->\r
-               <!-- </dependency> -->\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-               <!-- <artifactId>jetty-security</artifactId> -->\r
-               <!-- <version>9.1.3.v20140225</version> -->\r
-               <!-- </dependency> -->\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-               <!-- <artifactId>jetty-http</artifactId> -->\r
-               <!-- <version>${jetty.version}</version> -->\r
-               <!-- </dependency> -->\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>org.eclipse.jetty</groupId> -->\r
-               <!-- <artifactId>jetty-io</artifactId> -->\r
-               <!-- <version>${jetty.version}</version> -->\r
-               <!-- </dependency> -->\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>javax.servlet</groupId> -->\r
-               <!-- <artifactId>javax.servlet-api</artifactId> -->\r
-               <!-- <version>3.1.0</version> -->\r
-               <!-- </dependency> -->\r
-\r
-               <!-- <dependency> -->\r
-               <!-- <groupId>javax.servlet</groupId> -->\r
-               <!-- <artifactId>jsp-api</artifactId> -->\r
-               <!-- <version>2.0</version> -->\r
-               <!-- </dependency> -->\r
+    <dependency>\r
+      <groupId>org.unitils</groupId>\r
+      <artifactId>unitils-core</artifactId>\r
+      <version>3.4.2</version>\r
+    </dependency>\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
+    <!-- <artifactId>jetty-server</artifactId> -->\r
+    <!-- <version>9.1.3.v20140225</version> -->\r
+    <!-- </dependency> -->\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
+    <!-- <artifactId>jetty-util</artifactId> -->\r
+    <!-- <version>9.1.3.v20140225</version> -->\r
+    <!-- </dependency> -->\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
+    <!-- <artifactId>jetty-xml</artifactId> -->\r
+    <!-- <version>9.1.3.v20140225</version> -->\r
+    <!-- </dependency> -->\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
+    <!-- <artifactId>jetty-servlet</artifactId> -->\r
+    <!-- <version>9.1.3.v20140225</version> -->\r
+    <!-- </dependency> -->\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
+    <!-- <artifactId>jetty-webapp</artifactId> -->\r
+    <!-- <version>9.1.3.v20140225</version> -->\r
+    <!-- </dependency> -->\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
+    <!-- <artifactId>jetty-security</artifactId> -->\r
+    <!-- <version>9.1.3.v20140225</version> -->\r
+    <!-- </dependency> -->\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
+    <!-- <artifactId>jetty-http</artifactId> -->\r
+    <!-- <version>${jetty.version}</version> -->\r
+    <!-- </dependency> -->\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
+    <!-- <artifactId>jetty-io</artifactId> -->\r
+    <!-- <version>${jetty.version}</version> -->\r
+    <!-- </dependency> -->\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>javax.servlet</groupId> -->\r
+    <!-- <artifactId>javax.servlet-api</artifactId> -->\r
+    <!-- <version>3.1.0</version> -->\r
+    <!-- </dependency> -->\r
 \r
-               <dependency>\r
-                       <groupId>net.sf.ehcache</groupId>\r
-                       <artifactId>ehcache-core</artifactId>\r
-                       <version>2.4.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.hibernate</groupId>\r
-                       <artifactId>hibernate-core</artifactId>\r
-                       <version>4.1.10.Final</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.hibernate.common</groupId>\r
-                       <artifactId>hibernate-commons-annotations</artifactId>\r
-                       <version>4.0.1.Final</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.hibernate</groupId>\r
-                       <artifactId>hibernate-search-engine</artifactId>\r
-                       <version>4.2.0.Final</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.hibernate.javax.persistence</groupId>\r
-                       <artifactId>hibernate-jpa-2.0-api</artifactId>\r
-                       <version>1.0.1.Final</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.hibernate</groupId>\r
-                       <artifactId>hibernate-envers</artifactId>\r
-                       <version>4.1.10.Final</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.hibernate</groupId>\r
-                       <artifactId>hibernate-entitymanager</artifactId>\r
-                       <version>4.1.10.Final</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>dom4j</groupId>\r
-                       <artifactId>dom4j</artifactId>\r
-                       <version>1.6</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.jadira.usertype</groupId>\r
-                       <artifactId>usertype.jodatime</artifactId>\r
-                       <version>2.0.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.jadira.usertype</groupId>\r
-                       <artifactId>usertype.spi</artifactId>\r
-                       <version>2.0.1</version>\r
-               </dependency>\r
+    <!-- <dependency> -->\r
+    <!-- <groupId>javax.servlet</groupId> -->\r
+    <!-- <artifactId>jsp-api</artifactId> -->\r
+    <!-- <version>2.0</version> -->\r
+    <!-- </dependency> -->\r
 \r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>4.11</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>log4j</groupId>\r
-                       <artifactId>log4j</artifactId>\r
-                       <version>1.2.17</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.jdom</groupId>\r
-                       <artifactId>jdom</artifactId>\r
-                       <version>1.1.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.context</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.context.support</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.aspects</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.test</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.beans</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.transaction</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.web</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.core</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.aop</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.expression</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.orm</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>org.springframework.jdbc</artifactId>\r
-                       <version>3.2.2.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.security</groupId>\r
-                       <artifactId>spring-security-core</artifactId>\r
-                       <version>3.1.3.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.security</groupId>\r
-                       <artifactId>spring-security-config</artifactId>\r
-                       <version>3.1.3.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.security</groupId>\r
-                       <artifactId>spring-security-remoting</artifactId>\r
-                       <version>3.1.3.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.jboss.logging</groupId>\r
-                       <artifactId>jboss-logging</artifactId>\r
-                       <version>3.1.3.GA</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.hamcrest</groupId>\r
-                       <artifactId>hamcrest-core</artifactId>\r
-                       <version>1.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.mchange</groupId>\r
-                       <artifactId>c3p0</artifactId>\r
-                       <version>0.9.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.jboss.spec.javax.transaction</groupId>\r
-                       <artifactId>jboss-transaction-api_1.1_spec</artifactId>\r
-                       <version>1.0.0.Final</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.aspectj</groupId>\r
-                       <artifactId>aspectjrt</artifactId>\r
-                       <version>1.7.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-logging</groupId>\r
-                       <artifactId>commons-logging</artifactId>\r
-                       <version>1.1.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-lang</groupId>\r
-                       <artifactId>commons-lang</artifactId>\r
-                       <version>2.6</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>aopalliance</groupId>\r
-                       <artifactId>aopalliance</artifactId>\r
-                       <version>1.0</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>joda-time</groupId>\r
-                       <artifactId>joda-time</artifactId>\r
-                       <version>2.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.ibm.lsid</groupId>\r
-                       <artifactId>lsid-client</artifactId>\r
-                       <version>1.1.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.ibm.lsid</groupId>\r
-                       <artifactId>lsid-server</artifactId>\r
-                       <version>1.1.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.lucene</groupId>\r
-                       <artifactId>lucene-core</artifactId>\r
-                       <version>3.6.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.slf4j</groupId>\r
-                       <artifactId>slf4j-api</artifactId>\r
-                       <version>1.7.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.javassist</groupId>\r
-                       <artifactId>javassist</artifactId>\r
-                       <version>3.17.1-GA</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>au.com.bytecode</groupId>\r
-                       <artifactId>opencsv</artifactId>\r
-                       <version>2.4</version>\r
-               </dependency>\r
+    <dependency>\r
+      <groupId>net.sf.ehcache</groupId>\r
+      <artifactId>ehcache-core</artifactId>\r
+      <version>2.4.3</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.hibernate</groupId>\r
+      <artifactId>hibernate-core</artifactId>\r
+      <version>4.1.10.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.hibernate.common</groupId>\r
+      <artifactId>hibernate-commons-annotations</artifactId>\r
+      <version>4.0.1.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.hibernate</groupId>\r
+      <artifactId>hibernate-search-engine</artifactId>\r
+      <version>4.2.0.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.hibernate.javax.persistence</groupId>\r
+      <artifactId>hibernate-jpa-2.0-api</artifactId>\r
+      <version>1.0.1.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.hibernate</groupId>\r
+      <artifactId>hibernate-envers</artifactId>\r
+      <version>4.1.10.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.hibernate</groupId>\r
+      <artifactId>hibernate-entitymanager</artifactId>\r
+      <version>4.1.10.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>dom4j</groupId>\r
+      <artifactId>dom4j</artifactId>\r
+      <version>1.6</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.jadira.usertype</groupId>\r
+      <artifactId>usertype.jodatime</artifactId>\r
+      <version>2.0.1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.jadira.usertype</groupId>\r
+      <artifactId>usertype.spi</artifactId>\r
+      <version>2.0.1</version>\r
+    </dependency>\r
 \r
+    <dependency>\r
+      <groupId>junit</groupId>\r
+      <artifactId>junit</artifactId>\r
+      <version>4.11</version>\r
+      <scope>test</scope>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>log4j</groupId>\r
+      <artifactId>log4j</artifactId>\r
+      <version>1.2.17</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.jdom</groupId>\r
+      <artifactId>jdom</artifactId>\r
+      <version>1.1.3</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.context</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.context.support</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.aspects</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.test</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.beans</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.transaction</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.web</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.core</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.aop</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.expression</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.orm</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>org.springframework.jdbc</artifactId>\r
+      <version>3.2.2.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework.security</groupId>\r
+      <artifactId>spring-security-core</artifactId>\r
+      <version>3.1.3.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework.security</groupId>\r
+      <artifactId>spring-security-config</artifactId>\r
+      <version>3.1.3.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework.security</groupId>\r
+      <artifactId>spring-security-remoting</artifactId>\r
+      <version>3.1.3.RELEASE</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.jboss.logging</groupId>\r
+      <artifactId>jboss-logging</artifactId>\r
+      <version>3.1.3.GA</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.hamcrest</groupId>\r
+      <artifactId>hamcrest-core</artifactId>\r
+      <version>1.3</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.mchange</groupId>\r
+      <artifactId>c3p0</artifactId>\r
+      <version>0.9.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.jboss.spec.javax.transaction</groupId>\r
+      <artifactId>jboss-transaction-api_1.1_spec</artifactId>\r
+      <version>1.0.0.Final</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.aspectj</groupId>\r
+      <artifactId>aspectjrt</artifactId>\r
+      <version>1.7.1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>commons-logging</groupId>\r
+      <artifactId>commons-logging</artifactId>\r
+      <version>1.1.1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>commons-lang</groupId>\r
+      <artifactId>commons-lang</artifactId>\r
+      <version>2.6</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>aopalliance</groupId>\r
+      <artifactId>aopalliance</artifactId>\r
+      <version>1.0</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>joda-time</groupId>\r
+      <artifactId>joda-time</artifactId>\r
+      <version>2.1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.ibm.lsid</groupId>\r
+      <artifactId>lsid-client</artifactId>\r
+      <version>1.1.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.ibm.lsid</groupId>\r
+      <artifactId>lsid-server</artifactId>\r
+      <version>1.1.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.apache.lucene</groupId>\r
+      <artifactId>lucene-core</artifactId>\r
+      <version>3.6.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.slf4j</groupId>\r
+      <artifactId>slf4j-api</artifactId>\r
+      <version>1.7.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.javassist</groupId>\r
+      <artifactId>javassist</artifactId>\r
+      <version>3.17.1-GA</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>au.com.bytecode</groupId>\r
+      <artifactId>opencsv</artifactId>\r
+      <version>2.4</version>\r
+    </dependency>\r
 \r
-               <!-- For Unit Tests Start -->\r
-               <dependency>\r
-                       <groupId>org.unitils</groupId>\r
-                       <artifactId>unitils-spring</artifactId>\r
-                       <version>3.4.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.unitils</groupId>\r
-                       <artifactId>unitils-database</artifactId>\r
-                       <version>3.4.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-dbcp</groupId>\r
-                       <artifactId>commons-dbcp</artifactId>\r
-                       <version>1.4</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-pool</groupId>\r
-                       <artifactId>commons-pool</artifactId>\r
-                       <version>1.5.4</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.unitils</groupId>\r
-                       <artifactId>unitils-dbmaintainer</artifactId>\r
-                       <version>3.4.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.h2database</groupId>\r
-                       <artifactId>h2</artifactId>\r
-                       <version>1.4.181</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.unitils</groupId>\r
-                       <artifactId>unitils-dbunit</artifactId>\r
-                       <version>3.4.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.dbunit</groupId>\r
-                       <artifactId>dbunit</artifactId>\r
-                       <version>2.4.9</version>\r
-               </dependency>\r
-               <!-- For Unit Tests End -->\r
+    <!-- For Unit Tests Start -->\r
+    <dependency>\r
+      <groupId>org.unitils</groupId>\r
+      <artifactId>unitils-spring</artifactId>\r
+      <version>3.4.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.unitils</groupId>\r
+      <artifactId>unitils-database</artifactId>\r
+      <version>3.4.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>commons-dbcp</groupId>\r
+      <artifactId>commons-dbcp</artifactId>\r
+      <version>1.4</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>commons-pool</groupId>\r
+      <artifactId>commons-pool</artifactId>\r
+      <version>1.5.4</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.unitils</groupId>\r
+      <artifactId>unitils-dbmaintainer</artifactId>\r
+      <version>3.4.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>com.h2database</groupId>\r
+      <artifactId>h2</artifactId>\r
+      <version>1.4.181</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.unitils</groupId>\r
+      <artifactId>unitils-dbunit</artifactId>\r
+      <version>3.4.2</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.dbunit</groupId>\r
+      <artifactId>dbunit</artifactId>\r
+      <version>2.4.9</version>\r
+    </dependency>\r
+    <!-- For Unit Tests End -->\r
 \r
-               <!-- For Hibernate Mapping Start -->\r
-               <dependency>\r
-                       <groupId>wsdl4j</groupId>\r
-                       <artifactId>wsdl4j</artifactId>\r
-                       <version>1.6.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>javax.validation</groupId>\r
-                       <artifactId>validation-api</artifactId>\r
-                       <version>1.1.0.Final</version>\r
-               </dependency>\r
-               <!-- For Hibernate Mapping End -->\r
-       </dependencies>\r
+    <!-- For Hibernate Mapping Start -->\r
+    <dependency>\r
+      <groupId>wsdl4j</groupId>\r
+      <artifactId>wsdl4j</artifactId>\r
+      <version>1.6.3</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>javax.validation</groupId>\r
+      <artifactId>validation-api</artifactId>\r
+      <version>1.1.0.Final</version>\r
+    </dependency>\r
+    <!-- For Hibernate Mapping End -->\r
+  </dependencies>\r
 </project>
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 556647bc8dfb1071ad54e0782e2c7e07ff81e630..7de578e929398cd26df62aa9ede1728f44d77f84 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -1,11 +1,11 @@
 /**\r
-* Copyright (C) 2014 EDIT\r
-* European Distributed Institute of Taxonomy\r
-* http://www.e-taxonomy.eu\r
-*\r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
+ * Copyright (C) 2014 EDIT\r
+ * European Distributed Institute of Taxonomy\r
+ * http://www.e-taxonomy.eu\r
+ *\r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ */\r
 \r
 package eu.etaxonomy.cdm.api.application;\r
 \r
@@ -18,13 +18,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration;\r
 import eu.etaxonomy.cdm.api.cache.ICachedCommonService;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;\r
-import eu.etaxonomy.cdm.api.service.ICommonService;\r
 import eu.etaxonomy.cdm.ext.geo.IEditGeoService;\r
-import eu.etaxonomy.taxeditor.session.CdmEntitySessionManager;\r
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;\r
 \r
 \r
@@ -36,28 +33,29 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 @Component\r
 public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConfiguration {\r
 \r
-       @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);\r
+    @SuppressWarnings("unused")\r
+    private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);\r
 \r
-       @Autowired\r
-       IEditGeoService editGeoService;\r
+    @Autowired\r
+    IEditGeoService editGeoService;\r
 \r
     @Autowired\r
     private ICachedCommonService cachedCommonService;\r
-    \r
-       @Autowired\r
-       protected ICdmEntitySessionManager cdmEntitySessionManager;\r
 \r
-       public CdmApplicationRemoteConfiguration() {\r
-       }\r
+\r
+    @Autowired\r
+    protected ICdmEntitySessionManager cdmEntitySessionManager;\r
+\r
+    public CdmApplicationRemoteConfiguration() {\r
+    }\r
 \r
     /* (non-Javadoc)\r
      * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#getTransactionManager()\r
      */\r
     @Override\r
     public PlatformTransactionManager getTransactionManager() throws UnsupportedOperationException {\r
-               throw new UnsupportedOperationException("getTransactionManager is not implemented for CdmApplicationRemoteConfiguration");\r
-       }\r
+        throw new UnsupportedOperationException("getTransactionManager is not implemented for CdmApplicationRemoteConfiguration");\r
+    }\r
 \r
 \r
     /* (non-Javadoc)\r
@@ -65,8 +63,8 @@ public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConf
      */\r
     @Override\r
     public TransactionStatus startTransaction() throws UnsupportedOperationException {\r
-               throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
-       }\r
+        throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
+    }\r
 \r
 \r
     /* (non-Javadoc)\r
@@ -74,8 +72,8 @@ public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConf
      */\r
     @Override\r
     public TransactionStatus startTransaction(Boolean readOnly) throws UnsupportedOperationException {\r
-               throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
-       }\r
+        throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
+    }\r
 \r
 \r
     /* (non-Javadoc)\r
@@ -83,23 +81,23 @@ public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConf
      */\r
     @Override\r
     public void commitTransaction(TransactionStatus txStatus) throws UnsupportedOperationException {\r
-               throw new UnsupportedOperationException("commitTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#NewConversation()\r
-        */\r
-       @Override\r
-       public ConversationHolder NewConversation() {\r
-               return new ConversationHolderMock();\r
-       }\r
-\r
-       /**\r
-        * @return\r
-        */\r
-       public IEditGeoService getEditGeoService() {\r
-               return this.editGeoService;\r
-       }\r
+        throw new UnsupportedOperationException("commitTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
+    }\r
+\r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#NewConversation()\r
+     */\r
+    @Override\r
+    public ConversationHolder NewConversation() {\r
+        return new ConversationHolderMock();\r
+    }\r
+\r
+    /**\r
+     * @return\r
+     */\r
+    public IEditGeoService getEditGeoService() {\r
+        return this.editGeoService;\r
+    }\r
 \r
     /**\r
      * @return\r
@@ -107,30 +105,30 @@ public class CdmApplicationRemoteConfiguration extends CdmApplicationDefaultConf
     public ICachedCommonService getCachedCommonService(){\r
         return this.cachedCommonService;\r
     }\r
-    \r
-    \r
+\r
+\r
     public ICdmEntitySessionManager getCdmEntitySessionManager() {\r
-       return this.cdmEntitySessionManager;\r
+        return this.cdmEntitySessionManager;\r
     }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setDataSource(javax.sql.DataSource)\r
-        */\r
-       @Override\r
-       public void setDataSource(DataSource dataSource) {\r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setDataSource(javax.sql.DataSource)\r
+     */\r
+    @Override\r
+    public void setDataSource(DataSource dataSource) {\r
     }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setTransactionManager(org.springframework.transaction.PlatformTransactionManager)\r
-        */\r
-       @Override\r
-       public void setTransactionManager(PlatformTransactionManager transactionManager) {\r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setTransactionManager(org.springframework.transaction.PlatformTransactionManager)\r
+     */\r
+    @Override\r
+    public void setTransactionManager(PlatformTransactionManager transactionManager) {\r
     }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setSessionFactory(org.hibernate.SessionFactory)\r
-        */\r
-       @Override\r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration#setSessionFactory(org.hibernate.SessionFactory)\r
+     */\r
+    @Override\r
     public void setSessionFactory(SessionFactory sessionFactory) {\r
     }\r
 }\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceInterceptorException.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceInterceptorException.java
new file mode 100644 (file)
index 0000000..292eda2
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceInterceptorException.java
@@ -0,0 +1,13 @@
+package eu.etaxonomy.taxeditor.service;
+
+public class CdmServiceInterceptorException extends RuntimeException {
+       
+       public CdmServiceInterceptorException(String message) {
+               super(message);
+       }
+       
+       public CdmServiceInterceptorException(Exception ex) {
+               super(ex);
+       }
+
+}

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
new file mode 100644 (file)
index 0000000..439e845
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
@@ -0,0 +1,40 @@
+package eu.etaxonomy.taxeditor.service;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
+import org.springframework.remoting.support.RemoteInvocation;
+import org.springframework.remoting.support.RemoteInvocationResult;
+import org.springframework.security.remoting.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor;
+
+public abstract class CdmServiceRequestExecutor extends AuthenticationSimpleHttpInvokerRequestExecutor {
+       
+       private RemoteInvocation currentRemoteInvocation;
+       
+       @Override
+       protected void writeRemoteInvocation(RemoteInvocation invocation, OutputStream os) throws IOException {
+               currentRemoteInvocation = invocation;
+               super.writeRemoteInvocation(invocation, os);
+       }
+
+       @Override
+       protected RemoteInvocationResult doExecuteRequest(HttpInvokerClientConfiguration config,
+                       java.io.ByteArrayOutputStream baos)
+                                       throws java.io.IOException,
+                                       java.lang.ClassNotFoundException {
+               RemoteInvocationResult rir = fromCache(currentRemoteInvocation);
+       
+               if(rir == null) {
+                       rir = super.doExecuteRequest(config, baos);
+                       cache(currentRemoteInvocation, rir);
+               } 
+               
+               currentRemoteInvocation = null;
+               return rir;
+       }
+       
+       public abstract void cache(RemoteInvocation ri, RemoteInvocationResult rir);
+       
+       public abstract RemoteInvocationResult fromCache(RemoteInvocation ri);
+}

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TermServiceRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TermServiceRequestExecutor.java
new file mode 100644 (file)
index 0000000..801e3c8
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TermServiceRequestExecutor.java
@@ -0,0 +1,53 @@
+package eu.etaxonomy.taxeditor.service;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.Element;
+
+import org.springframework.remoting.support.RemoteInvocation;
+import org.springframework.remoting.support.RemoteInvocationResult;
+
+import eu.etaxonomy.cdm.api.cache.CdmCacher;
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.common.TermType;
+
+
+public class TermServiceRequestExecutor extends CdmServiceRequestExecutor {
+
+       private static Map<TermType, RemoteInvocationResult>  termTypeMap = new 
+                       HashMap<TermType, RemoteInvocationResult>();
+
+
+       @Override
+       public void cache(RemoteInvocation ri, RemoteInvocationResult rir) {
+               if(ri.getMethodName().equals("listByTermType")) {
+                       if(ri.getArguments()[1] == null) {
+                               Set<DefinedTermBase> terms = new HashSet<DefinedTermBase>();
+                               if(rir.getValue() != null) {
+                                       terms.addAll((List<DefinedTermBase>)rir.getValue());
+                                       Cache defaultCache = CdmCacher.getDefaultCache();
+                                       for(DefinedTermBase<?> term : terms) {
+                                               defaultCache.put(new Element(term.getUuid(), term));
+                                       }               
+                                       termTypeMap.put((TermType)ri.getArguments()[0], rir);
+                               }
+                               
+                       }
+               }
+
+       }
+
+
+       @Override
+       public  RemoteInvocationResult fromCache(RemoteInvocation ri) {
+               return termTypeMap.get(ri.getArguments()[0]);
+       }
+
+
+
+}

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java
index 74e9ac7f3f4b630fb85d9e5c9c9785e6d88f602a..1ede0f803507402198ba198bce79e097076a7ebc 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java
@@ -39,30 +39,7 @@ public class CdmEntitySessionManager implements ICdmEntitySessionManager {
     
     private ICdmEntitySession activeSession;
 
-    
-    /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#getActiveSession()
-        */
-    @Override
-       public ICdmEntitySession getActiveSession() {
-               return activeSession;
-       }
-    
-    /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager#getSession(eu.etaxonomy.taxeditor.session.ISessionEventListener)
-        */
-    @Override
-       public ICdmEntitySession getSession(ISessionEventListener sessionOwner) {
-       if(sessionOwner == null) {
-               return null;
-       }
-       
-               ICdmEntitySession session = ownerSessionMap.get(sessionOwner);
-               if(session == null) {
-                       logger.info("No session exists for session owner with class : " + sessionOwner.getClass().getName());                   
-               }
-               return session;
-       }
+   
        
        private ICdmEntitySession newSession(ISessionEventListener sessionOwner, boolean setAsActive) {
                CdmEntitySession session = ownerSessionMap.get(sessionOwner);

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java
index 2dc43a5902f83731401fe42769b614c6ffa37547..0b62dc0e1f055772d906d063b33f7d8015f86d2f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java
@@ -7,11 +7,6 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 
 public interface ICdmEntitySessionManager {
 
-       public abstract ICdmEntitySession getActiveSession();
-
-       public abstract ICdmEntitySession getSession(
-                       ISessionEventListener sessionOwner);
-
        public abstract void bind(ISessionEventListener sessionOwner);
 
        public abstract <T extends Object> T load(

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java
index 0a6fcaf2196f4527f7bbd3e38e42b489b863a675..d84b6ce6092b9f7a93a94cc7ac243239f0d28d7b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java
@@ -13,15 +13,6 @@ import eu.etaxonomy.taxeditor.session.ISessionEventListener;
 
 public class MockCdmEntitySessionManager implements ICdmEntitySessionManager {
 
-       @Override
-       public ICdmEntitySession getActiveSession() {           
-               return null;
-       }
-
-       @Override
-       public ICdmEntitySession getSession(ISessionEventListener sessionOwner) {               
-               return null;
-       }
 
        @Override
        public void bind(ISessionEventListener sessionOwner) {          

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 c78919662efc176f14f5642ecfcd149d3e12bed2..fe9d863890893a93e40953a98ed439a5ae97b33d 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.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
index e3c0f9fd8ef75e7c6a175a3d9c1a5fd0d74c6dba..e9502c5e9de9b820eb6c3248131b04e3548ac3eb 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
@@ -315,7 +315,7 @@
                        <value>eu.etaxonomy.cdm.api.service.ITermService</value>\r
                </property>\r
                <property name="httpInvokerRequestExecutor">\r
-                       <bean class="org.springframework.security.remoting.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor" />\r
+                       <bean class="eu.etaxonomy.taxeditor.service.TermServiceRequestExecutor" />\r
                </property>\r
        </bean>\r
 \r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
index 53e2bbbd49cdbcde883731eb9746c379aacae157..9b9aea02c710e2683c44930c9c3c32a01915cc39 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml
@@ -84,7 +84,6 @@
       <mapping class="eu.etaxonomy.cdm.model.common.TermVocabulary"/>\r
       <mapping class="eu.etaxonomy.cdm.model.common.User"/>\r
       <!-- Description Package -->\r
-      <mapping class="eu.etaxonomy.cdm.model.description.AbsenceTerm"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.CategoricalData"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.CommonTaxonName"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.DescriptionBase"/>\r
@@ -101,8 +100,7 @@
       <mapping class="eu.etaxonomy.cdm.model.description.MultiAccessKey"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.PolytomousKey"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.PolytomousKeyNode"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase"/>\r
-      <mapping class="eu.etaxonomy.cdm.model.description.PresenceTerm"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.QuantitativeData"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.SpecimenDescription"/>\r
       <mapping class="eu.etaxonomy.cdm.model.description.State"/>\r
@@ -139,10 +137,12 @@
       <mapping class="eu.etaxonomy.cdm.model.molecular.DnaQuality"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.DnaSample"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.Amplification"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.molecular.AmplificationResult"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.Primer"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.Sequence"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.SequenceString"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.SingleRead"/>\r
+      <mapping class="eu.etaxonomy.cdm.model.molecular.SingleReadAlignment"/>\r
       <mapping class="eu.etaxonomy.cdm.model.molecular.Cloning"/>\r
       <!-- Name Package -->\r
       <mapping class="eu.etaxonomy.cdm.model.name.BacterialName"/>\r