Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 16 Sep 2015 17:19:25 +0000 (19:19 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 16 Sep 2015 17:19:25 +0000 (19:19 +0200)
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml

1  2 
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
pom.xml

 -<?xml version="1.0" encoding="UTF-8"?>\r
 -<classpath>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.12.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.12.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.12.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.12.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.12.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.12.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.12.0-SNAPSHOT.jar"/>\r
 -      <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
 -      <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
 -      <classpathentry kind="src" path="src/main/java"/>\r
 -      <classpathentry kind="src" path="src/main/resources"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.7.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-core-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-4.2.0.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.4.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/javassist-3.17.1-GA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.3.GA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-memory-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-misc-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-phonetic-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20110523.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-aop-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-beans-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-context-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-context-support-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-core-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/validation-api-1.0.0.GA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xalan-2.6.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>\r
 -      <classpathentry kind="output" path="target/classes"/>\r
 -</classpath>\r
 +<?xml version="1.0" encoding="UTF-8"?>
 +<classpath>
 +      <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.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 exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.7.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-core-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-4.2.0.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.4.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/javassist-3.17.1-GA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.3.GA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-memory-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-misc-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-phonetic-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20110523.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-aop-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-beans-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-context-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-context-support-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/validation-api-1.0.0.GA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xalan-2.6.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.11.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.12.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.12.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.12.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.12.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.12.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.12.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.12.0-SNAPSHOT.jar"/>
 +      <classpathentry kind="output" path="target/classes"/>
 +</classpath>
++
@@@ -657,13 -612,12 +657,14 @@@ Bundle-ClassPath: .
   lib/xmlbeans-2.3.0.jar,
   lib/poi-ooxml-schemas-3.10-FINAL.jar,
   lib/swagger-annotations-1.3.5.jar,
-  lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,
-  lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,
-  lib/cdmlib-io-3.11.0-SNAPSHOT.jar,
-  lib/cdmlib-model-3.11.0-SNAPSHOT.jar,
-  lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,
-  lib/cdmlib-print-3.11.0-SNAPSHOT.jar,
-  lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,
-  lib/cdmlib-services-3.11.0-SNAPSHOT.jar
 + lib/apache-log4j-extras-1.2.17.jar,
+  lib/cdmlib-commons-3.12.0-SNAPSHOT.jar,
+  lib/cdmlib-ext-3.12.0-SNAPSHOT.jar,
+  lib/cdmlib-io-3.12.0-SNAPSHOT.jar,
+  lib/cdmlib-model-3.12.0-SNAPSHOT.jar,
+  lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar,
+  lib/cdmlib-print-3.12.0-SNAPSHOT.jar,
+  lib/cdmlib-remote-3.12.0-SNAPSHOT.jar,
+  lib/cdmlib-services-3.12.0-SNAPSHOT.jar
++
  Import-Package: eu.etaxonomy.cdm.api.application
@@@ -185,16 -194,14 +185,16 @@@ bin.includes = META-INF/,
                 lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                 lib/xmlbeans-2.3.0.jar,\\r
                 lib/swagger-annotations-1.3.5.jar,\\r
-                lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-io-3.11.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-model-3.11.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-print-3.11.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-services-3.11.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-commons-3.12.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-ext-3.12.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-io-3.12.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-model-3.12.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-print-3.12.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-remote-3.12.0-SNAPSHOT.jar,\\r
 -               lib/cdmlib-services-3.12.0-SNAPSHOT.jar\r
++               lib/cdmlib-services-3.12.0-SNAPSHOT.jar.\\r
 +               lib/apache-log4j-extras-1.2.17.jar,\\r
 +               resources/cdm.map.ser\r
  \r
  jars.compile.order = .\r
  output.. = bin/\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.11.0-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\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\.jar)" to="\1SNAPSHOT\2" />
 -              </move>                           
 -              <move todir="./lib">
 -                <fileset dir="./lib" />
 -                <mapper type="regexp" from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-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>
 -</project>
++<?xml version="1.0" encoding="UTF-8"?>\r
++<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">\r
++  <parent>\r
++    <groupId>eu.etaxonomy</groupId>\r
++    <artifactId>taxeditor-parent</artifactId>\r
++    <version>3.11.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 Dependencies Plugin</name>\r
 +  <description>CDM Library and dependencies as a plugin</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>
-       <plugin>
++    <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>
++        </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\-remote\-webapp).*(\.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\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\.jar)"\r
 +                    to="\1SNAPSHOT\2" />\r
 +                </move>\r
 +                <move todir="./lib">\r
 +                  <fileset dir="./lib" />\r
 +                  <mapper type="regexp"\r
 +                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-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>
- </project>
++\r
++  </dependencies>\r
++</project>\r
diff --cc pom.xml
+++ b/pom.xml
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     <cdmlib.version>3.11.0-SNAPSHOT</cdmlib.version>
+     <cdmlib.version>3.12.0-SNAPSHOT</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.22.0</tycho.version>
-     <taxeditor.version>3.11.0-SNAPSHOT</taxeditor.version>
+     <taxeditor.version>3.12.0-SNAPSHOT</taxeditor.version>
      <update.dir>snapshot</update.dir>
 +    <unitils.version>3.4.2</unitils.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>