Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 18 Jun 2015 13:17:06 +0000 (15:17 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 18 Jun 2015 13:17:06 +0000 (15:17 +0200)
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/.gitignore
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
eu.etaxonomy.taxeditor.test/.classpath

12 files changed:
1  2 
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/.gitignore
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
eu.etaxonomy.taxeditor/pom.xml
pom.xml

@@@ -2,8 -2,9 +2,9 @@@
  <classpath>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 -      <classpathentry kind="src" path="src/main/java"/>
 -      <classpathentry kind="src" path="src/main/resources"/>
 -      <classpathentry kind="src" path="src/test/java/"/>
 +      <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 +      <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
++      <classpathentry kind="src" path="src/test/java"/>
        <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
@@@ -1,1 -1,1 +1,5 @@@
 -bin
++<<<<<<< HEAD
 +bin
++=======
++bin
++>>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf
++<<<<<<< HEAD
 +<?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.6.1-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>
 +        <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>
 +      </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
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-model</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-persistence</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-remote</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-print</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-services</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-io</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-ext</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +\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
 +\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
 +\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.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
++=======
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <parent>
+     <groupId>eu.etaxonomy</groupId>
+     <artifactId>taxeditor-parent</artifactId>
+     <version>3.6.1-SNAPSHOT</version>
+   </parent>
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
+   <packaging>eclipse-plugin</packaging>
+   <name>CDM Library Dependencies Plugin</name>
+   <description>CDM Library and dependencies as a plugin</description>
+   <build>
+     <plugins>      
+       <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-dependency-plugin</artifactId>
+       <version>2.4</version>
+       <executions>
+         <execution>
+           <id>copy-dependencies</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <configuration>
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
+             <outputDirectory>lib</outputDirectory>
+             <overWriteReleases>true</overWriteReleases>
+             <overWriteSnapshots>true</overWriteSnapshots>
+             <excludeTransitive>true</excludeTransitive>             
+           </configuration>
+         </execution>
+         <execution>
+           <id>copy-dependencies-sources</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <configuration>
+             <classifier>sources</classifier>
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
+             <outputDirectory>lib</outputDirectory>
+             <overWriteReleases>true</overWriteReleases>
+             <overWriteSnapshots>true</overWriteSnapshots>
+             <excludeTransitive>true</excludeTransitive>
+             <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+           </configuration>
+         </execution>
+       </executions>
+       </plugin>
+       <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-antrun-plugin</artifactId>
+       <version>1.7</version>
+       <executions>
+         <execution>
+           <id>remove-existing-jars</id>
+           <phase>clean</phase>
+           <goals>
+             <goal>run</goal>
+           </goals>
+           <configuration>
+             <target>
+               <echo>Remove all cdmlib jars</echo>
+               <delete>
+                 <fileset dir="./lib" includes="cdmlib-*" />
+               </delete>
+             </target> 
+           </configuration>
+         </execution>
+         <execution>
+           <id>update-snapshot-jar-names</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>run</goal>
+           </goals>
+           <configuration>           
+             <target>
+               <echo>Update cdmlib jars to SNAPSHOT when build with timestamp</echo>
+               <move todir="./lib">
+                 <fileset dir="./lib" />
+                 <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
+               </move>                           
+               <move todir="./lib">
+                 <fileset dir="./lib" />
+                 <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" to="\1SNAPSHOT\2" />
+               </move>                           
+             </target> 
+           </configuration>
+         </execution>
+       </executions>
+       </plugin>
+     </plugins>
+   </build>
+   <dependencies>
+     <dependency>
+       <groupId>identificationKeyAPI</groupId>
+       <artifactId>identificationKeyAPI</artifactId>
+       <version>1.0-SNAPSHOT</version>
+     </dependency>
+     <dependency>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-commons</artifactId>
+       <version>${cdmlib.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-model</artifactId>
+       <version>${cdmlib.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-persistence</artifactId>
+       <version>${cdmlib.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-remote</artifactId>
+       <version>${cdmlib.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-print</artifactId>
+       <version>${cdmlib.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-services</artifactId>
+       <version>${cdmlib.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-io</artifactId>
+       <version>${cdmlib.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-ext</artifactId>
+       <version>${cdmlib.version}</version>
+     </dependency>
+       <dependency>
+       <groupId>org.aspectj</groupId>
+       <artifactId>aspectjrt</artifactId>
+         <version>1.7.1</version>
+       </dependency>
+         <dependency>
+         <groupId>org.aspectj</groupId>
+         <artifactId>aspectjweaver</artifactId>
+         <version>1.7.1</version>
+        </dependency>
+        
+     <!--  for ikey-plus 
+        TODO this should not be needed but the utils class contained  in this jar 
+        seems to be loaded as bean by spring
+     -->
+   </dependencies>
++>>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf
  </project>
@@@ -32,47 -20,23 +32,48 @@@ import eu.etaxonomy.taxeditor.session.I
   * @param <T>
   */
  @Component
 -public class CdmServiceCacher<T extends CdmBase> extends CdmCacher {
 +public class CdmServiceCacher extends CdmCacher  implements ICdmEntitySessionManagerObserver {
  
 -      @Autowired
 -      ITermService termService;
 +    @Autowired
 +    ITermService termService;
  
 -      @Override
 -      protected T findByUuid(UUID uuid) {
 -              return (T)termService.findWithoutFlush(uuid);
 -      }
  
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.cdm.api.cache.CdmCacher#setup()
 -     */
 +    private ICdmEntitySessionManager cdmEntitySessionManager;
 +
 +    private CdmTransientEntityCacher cdmTransientEntityCacher;
 +
 +    private CacheLoader cacheLoader;
 +
      @Override
      protected void setup() {
 -        // TODO Auto-generated method stub
 +        DefinedTermBase.setCacher(this);
 +        CdmTransientEntityCacher.setDefaultCacher(this);
 +        TermServiceRequestExecutor.setDefaultCacher(this);
 +        cacheLoader = new CacheLoader(this);
 +    }
  
++
 +    @Override
 +    protected CacheConfiguration getDefaultCacheConfiguration() {
 +        // For a better understanding on how to size caches, refer to
 +        // http://ehcache.org/documentation/configuration/cache-size
 +
 +        SizeOfPolicyConfiguration sizeOfConfig = new SizeOfPolicyConfiguration();
 +        sizeOfConfig.setMaxDepth(100);
 +        sizeOfConfig.setMaxDepthExceededBehavior("abort");
 +
 +        return new CacheConfiguration(DEFAULT_CACHE_NAME, 0)
 +        .eternal(true)
 +        .statistics(true)
 +        .sizeOfPolicy(sizeOfConfig)
 +        .overflowToOffHeap(false);
 +
 +    }
 +
 +    @Override
 +    protected CdmBase findByUuid(UUID uuid) {
 +        CdmBase term = termService.findWithoutFlush(uuid);
 +        return load(term);
      }
  
      /* (non-Javadoc)
          return false;
      }
  
 +
 +    public void setCdmEntitySessionManager(ICdmEntitySessionManager cdmEntitySessionManager) {
 +        this.cdmEntitySessionManager = cdmEntitySessionManager;
 +        if(cdmEntitySessionManager != null) {
 +            cdmEntitySessionManager.addSessionObserver(this);
 +        }
 +    }
 +
++
 +    public CdmTransientEntityCacher getCurrentCacher() {
 +        ICdmEntitySession cdmEntitySession = cdmEntitySessionManager.getActiveSession();
 +        if(cdmEntitySession != null && cdmEntitySession instanceof CdmEntitySession) {
 +            return ((CdmEntitySession) cdmEntitySession).getCacher();
 +        }
 +        return null;
 +    }
 +
 +    @Override
 +    public CdmBase getFromCache(CdmBase cdmBase) {
 +        CdmBase cachedCdmEntity = null;
 +        // first we check in the active session cache if the
 +        if(!isCachable(cdmBase) && cdmTransientEntityCacher != null) {
 +            CdmEntityCacheKey key = CdmTransientEntityCacher.generateKey(cdmBase);
 +            cachedCdmEntity = cdmTransientEntityCacher.getFromCache(key);
 +
 +        }
 +        if(cachedCdmEntity == null) {
 +            cachedCdmEntity = super.getFromCache(cdmBase);
 +        }
 +        return cachedCdmEntity;
 +    }
 +
 +
      /* (non-Javadoc)
       * @see eu.etaxonomy.cdm.api.cache.CdmCacher#load(eu.etaxonomy.cdm.model.common.CdmBase)
       */
      @Override
 -    public CdmBase load(CdmBase arg0) {
 -        // TODO Auto-generated method stub
 -        return null;
 +    public CdmBase load(CdmBase cdmEntity) {
 +        CdmBase cachedCdmEntity = getFromCache(cdmEntity.getUuid());
 +
 +        if(isCachable(cdmEntity)) {
 +            cachedCdmEntity =  cacheLoader.load(cdmEntity, true, false);
 +        }
 +        return cachedCdmEntity;
      }
  
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManagerObserver#changed()
 +     */
 +    @Override
 +    public void changed() {
 +        ICdmEntitySession cdmEntitySession = cdmEntitySessionManager.getActiveSession();
 +        if(cdmEntitySession != null && cdmEntitySession instanceof CdmEntitySession) {
 +            this.cdmTransientEntityCacher = ((CdmEntitySession) cdmEntitySession).getCacher();
 +        } else {
 +            this.cdmTransientEntityCacher = null;
 +        }
 +    }
  }
@@@ -941,14 -949,6 +949,4 @@@ public class TransientClassificationSer
      public UpdateResult createHierarchyInClassification(Classification arg1, CreateHierarchyForClassificationConfigurator arg2) {
         return defaultService.createHierarchyInClassification(arg1, arg2);
      }
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
-      */
-     @Override
-     public DeleteResult delete(UUID uuid) {
-         return defaultService.delete(uuid);
-     }
--
--
  }
@@@ -1120,44 -1115,51 +1120,46 @@@ public class TransientDescriptionServic
            return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber);
        }
  
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 -    }
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult deleteDescription(DescriptionBase arg0) {
 -        return defaultService.deleteDescription(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.deleteDescription(uuid);
      }
  
 -    /**
 -     * {@inheritDoc}
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID)
       */
      @Override
 -    public DeleteResult deleteDescription(UUID arg0) {
 -        return defaultService.deleteDescription(arg0);
 +    public DeleteResult deleteDescription(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescriptionElement(java.util.UUID)
       */
      @Override
 -    public UUID deleteDescriptionElement(UUID arg0) {
 -        return defaultService.deleteDescriptionElement(arg0);
 +    public UUID deleteDescriptionElement(UUID uuid) {
 +        return defaultService.deleteDescriptionElement(uuid);
      }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Taxon)
       */
      @Override
 -    public UpdateResult moveTaxonDescriptions(Taxon arg0, Taxon arg1) {
 -        return defaultService.moveTaxonDescriptions(arg0, arg1);
 +    public UpdateResult moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) {
 +        return defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon);
      }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(java.util.UUID, java.util.UUID)
       */
      @Override
 -    public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) {
 -        return defaultService.moveTaxonDescriptions(arg0, arg1);
 +    public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) {
 +        return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid);
++
      }
  }
@@@ -1150,35 -1150,40 +1150,39 @@@ public class TransientNameService imple
                return defaultService.findWithoutFlush(uuid);
        }
  
 -
        @Override
        public <S extends TaxonNameBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
  
  
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.INameService#setAsGroupsBasionym(java.util.UUID)
 +     */
 +    @Override
 +    public UpdateResult setAsGroupsBasionym(UUID nameUuid) {
 +        return defaultService.delete(nameUuid);
 +    }
 +
 +
        @Override
        public List<HashMap<String, String>> getNameRecords() {
  
                return defaultService.getNameRecords();
        }
  
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 -    }
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public UpdateResult setAsGroupsBasionym(UUID arg0) {
 -        return defaultService.setAsGroupsBasionym(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
  
  
 -
 -
  }
@@@ -1056,13 -1056,12 +1056,15 @@@ public class TransientOccurenceService 
            return defaultService.getAllHierarchyDerivatives(specimen);
        }
  
 -    /**
 -     * {@inheritDoc}
++
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
 +
++
  }
@@@ -1,12 -1,12 +1,12 @@@
  // $Id$
  /**
--* Copyright (C) 2013 EDIT
--* European Distributed Institute of Taxonomy
--* http://www.e-taxonomy.eu
--*
--* The contents of this file are subject to the Mozilla Public License Version 1.1
--* See LICENSE.TXT at the top of this package for the full license terms.
--*/
++ * Copyright (C) 2013 EDIT
++ * European Distributed Institute of Taxonomy
++ * http://www.e-taxonomy.eu
++ *
++ * The contents of this file are subject to the Mozilla Public License Version 1.1
++ * See LICENSE.TXT at the top of this package for the full license terms.
++ */
  package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
  
  import java.io.IOException;
@@@ -1088,7 -1088,7 +1088,7 @@@ public class TransientTaxonService impl
              String queryString, Classification classification, Set<NamedArea> namedAreas,
              Set<PresenceAbsenceTerm> distributionStatus, List<Language> languages, boolean highlightFragments,
              Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths)
--            throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
++                    throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
          return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
          return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
      }
  
--      @Override
--      public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
--                      TaxonRelationshipType oldRelationshipType,
--                      SynonymRelationshipType synonymRelationshipType)
--                      throws DataChangeNoRollbackException {
++    @Override
++    public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
++            TaxonRelationshipType oldRelationshipType,
++            SynonymRelationshipType synonymRelationshipType)
++                    throws DataChangeNoRollbackException {
  
--              return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
--      }
++        return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
++    }
  
      /* (non-Javadoc)
       * @see eu.etaxonomy.cdm.api.service.ITaxonService#pageAcceptedTaxaFor(java.util.UUID, java.util.UUID, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
          return defaultService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
--      @Override
--      public DeleteResult isDeletable(TaxonBase object,
--                      DeleteConfiguratorBase config) {
--              // TODO Auto-generated method stub
--              return null;
--      }
++    @Override
++    public DeleteResult isDeletable(TaxonBase object,
++            DeleteConfiguratorBase config) {
++        // TODO Auto-generated method stub
++        return null;
++    }
  
--      @Override
--      public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid,
--                      IncludedTaxonConfiguration configuration) {
--              // TODO Auto-generated method stub
--              return null;
--      }
++    @Override
++    public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid,
++            IncludedTaxonConfiguration configuration) {
++        // TODO Auto-generated method stub
++        return null;
++    }
  
--      @Override
--      public TaxonBase findWithoutFlush(UUID uuid) {
--              return defaultService.findWithoutFlush(uuid);
--      }
++    @Override
++    public TaxonBase findWithoutFlush(UUID uuid) {
++        return defaultService.findWithoutFlush(uuid);
++    }
  
      /* (non-Javadoc)
       * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaByName(eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator)
          return defaultService.findTaxaByName(config);
      }
  
--      @Override
--      public <S extends TaxonBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
--              return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
 -      }
 -
 -      /* (non-Javadoc)
 -       * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List)
 -       */
 -      @Override
 -      public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
 -              DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
 -              Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
 -          return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
--      }
 -
 -
++    @Override
++    public <S extends TaxonBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
++        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
++    }
++    /* (non-Javadoc)
++     * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List)
++     */
++    @Override
++    public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
++            DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
++            Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
++        return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
++    }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List)
-        */
-       @Override
-       public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
-               DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
-               Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-           return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
-       }
  
  
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteSynonym(java.util.UUID, java.util.UUID, eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator)
 +     */
 +    @Override
 +    public DeleteResult deleteSynonym(UUID synonymUuid, UUID taxonUuid, SynonymDeletionConfigurator config) {
 +        return defaultService.deleteSynonym(synonymUuid, taxonUuid, config);
 +    }
  
 -      @Override
 -      public SynonymRelationship moveSynonymToAnotherTaxon(
 -                      SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
 -                      boolean moveHomotypicGroup,
 -                      SynonymRelationshipType newSynonymRelationshipType,
 -                      Reference reference, String referenceDetail, boolean keepReference)
 -                      throws HomotypicalGroupChangeException {
  
 -              return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
 -      }
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(java.util.UUID, java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public UpdateResult swapSynonymAndAcceptedTaxon(UUID synonymUUid, UUID acceptedTaxonUuid) {
 +        return defaultService.swapSynonymAndAcceptedTaxon(synonymUUid, acceptedTaxonUuid);
      }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteTaxon(java.util.UUID, eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator, java.util.UUID)
       */
      @Override
 -    public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) {
 -        return defaultService.deleteSynonym(arg0, arg1, arg2);
 +    public DeleteResult deleteTaxon(UUID taxonUuid, TaxonDeletionConfigurator config, UUID classificationUuid) {
 +        return defaultService.deleteTaxon(taxonUuid, config, classificationUuid);
      }
  
-       @Override
-       public SynonymRelationship moveSynonymToAnotherTaxon(
-                       SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
-                       boolean moveHomotypicGroup,
-                       SynonymRelationshipType newSynonymRelationshipType,
-                       Reference reference, String referenceDetail, boolean keepReference)
-                       throws HomotypicalGroupChangeException {
 -    /**
 -     * {@inheritDoc}
 -     */
+     @Override
 -    public DeleteResult deleteTaxon(UUID arg0, TaxonDeletionConfigurator arg1, UUID arg2) {
 -        return defaultService.deleteTaxon(arg0, arg1, arg2);
++    public SynonymRelationship moveSynonymToAnotherTaxon(
++            SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
++            boolean moveHomotypicGroup,
++            SynonymRelationshipType newSynonymRelationshipType,
++            Reference reference, String referenceDetail, boolean keepReference)
++                    throws HomotypicalGroupChangeException {
++
++        return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
+     }
  
-               return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
-       }
 -    /**
 -     * {@inheritDoc}
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public UpdateResult swapSynonymAndAcceptedTaxon(UUID arg0, UUID arg1) {
 -        return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
++
      }
  
  }
@@@ -1,12 -1,12 +1,12 @@@
  // $Id$
  /**
--* Copyright (C) 2013 EDIT
--* European Distributed Institute of Taxonomy
--* http://www.e-taxonomy.eu
--*
--* The contents of this file are subject to the Mozilla Public License Version 1.1
--* See LICENSE.TXT at the top of this package for the full license terms.
--*/
++ * Copyright (C) 2013 EDIT
++ * European Distributed Institute of Taxonomy
++ * http://www.e-taxonomy.eu
++ *
++ * The contents of this file are subject to the Mozilla Public License Version 1.1
++ * See LICENSE.TXT at the top of this package for the full license terms.
++ */
  package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
  
  import java.net.URI;
@@@ -846,11 -846,11 +846,11 @@@ public class TransientTermService imple
          return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz);
      }
  
--      @Override
--      public DeleteResult isDeletable(DefinedTermBase object,
--                      DeleteConfiguratorBase config) {
--              return defaultService.isDeletable(object, config);
--      }
++    @Override
++    public DeleteResult isDeletable(DefinedTermBase object,
++            DeleteConfiguratorBase config) {
++        return defaultService.isDeletable(object, config);
++    }
  
      /* (non-Javadoc)
       * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
          return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
      }
  
--      @Override
--      public DefinedTermBase findWithoutFlush(UUID uuid) {
--              return defaultService.findWithoutFlush(uuid);
--      }
++    @Override
++    public DefinedTermBase findWithoutFlush(UUID uuid) {
++        return defaultService.findWithoutFlush(uuid);
++    }
  
  
--      @Override
--      public <S extends DefinedTermBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
--              return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
--      }
++    @Override
++    public <S extends DefinedTermBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
++        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
++    }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
  }
Simple merge
diff --cc pom.xml
Simple merge