Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 18:38:52 +0000 (20:38 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 18:38:52 +0000 (20:38 +0200)
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

12 files changed:
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.editor/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index f4268c62f558abf0ee3971246719d8553984c898,4b50b935bae95583b657a3215622c7dd3635f1dc..9fe1b3ced4971d065bb1df29c832d84a438ae282
@@@ -2,15 -2,14 +2,15 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Application
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
- Bundle-Version: 3.10.0.qualifier
+ Bundle-Version: 3.11.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
  Bundle-Vendor: EDIT
  Bundle-Localization: OSGI-INF/l10n/plugin
  Export-Package: eu.etaxonomy.taxeditor
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 -Import-Package: org.apache.log4j,
 +Import-Package: eu.etaxonomy.cdm.database,
 + org.apache.log4j,
   org.eclipse.equinox.app,
   org.eclipse.equinox.p2.repository.metadata,
   org.osgi.framework,
index dab5ffc9df9d8a8e9ec5b80ebaa61412deb484d5,b972553eb5c3c0edfbe33454e9068d1be5deac2d..d835f626d9a871187b561fff87b163e679a8654b
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Bulkeditor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
- Bundle-Version: 3.10.0.qualifier
+ Bundle-Version: 3.11.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
  Bundle-Vendor: EDIT
  Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
@@@ -21,8 -21,7 +21,8 @@@ Require-Bundle: org.eclipse.ui
   eu.etaxonomy.taxeditor.cdmlib
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Bundle-ActivationPolicy: lazy
 -Import-Package: org.eclipse.core.runtime,
 +Import-Package: eu.etaxonomy.taxeditor.editor,
 + org.eclipse.core.runtime,
   org.eclipse.equinox.app,
   org.eclipse.jface.text,
   org.eclipse.jface.text.presentation,
index 4477b7310a3024d0bb2d8060cd674d9edc5279a3,03bacd7f5c58e9056f5f9130b7daddf74fb3c38d..da7d39d0123aa75e7b7a8fcaba6c571676dc27b4
 -<?xml version="1.0" encoding="UTF-8"?>\r
 -<classpath>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.11.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.11.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.11.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.11.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.11.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.11.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.11.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.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.10.0-SNAPSHOT.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 kind="output" path="target/classes"/>
 +</classpath>
index 7ea3ae90331fba2e05222b6f2fac4e68e8efcf5e,192228d8de7cc6f8e87624474bd13fc04664e1b7..fe6cb91751a2759549c7133a5f497e85983b2976
@@@ -2,16 -2,15 +2,16 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: CDM Library Dependencies Plugin
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
- Bundle-Version: 3.10.0.qualifier
+ Bundle-Version: 3.11.0.qualifier
  Eclipse-BundleShape: dir
  Export-Package: com.google.api,
   com.google.api.detect,
   com.google.api.translate,
 + eu.etaxonomy.cdm,
   eu.etaxonomy.cdm.api.application,
 + eu.etaxonomy.cdm.api.cache,
   eu.etaxonomy.cdm.api.conversation,
   eu.etaxonomy.cdm.api.facade,
 - eu.etaxonomy.cdm.api.lazyloading,
   eu.etaxonomy.cdm.api.service,
   eu.etaxonomy.cdm.api.service.config,
   eu.etaxonomy.cdm.api.service.description,
@@@ -77,7 -76,6 +77,7 @@@
   eu.etaxonomy.cdm.io.sdd.ikeyplus,
   eu.etaxonomy.cdm.io.sdd.in,
   eu.etaxonomy.cdm.io.sdd.out,
 + eu.etaxonomy.cdm.io.service,
   eu.etaxonomy.cdm.io.specimen,
   eu.etaxonomy.cdm.io.specimen.abcd206.in,
   eu.etaxonomy.cdm.io.specimen.excel.in,
   eu.etaxonomy.cdm.persistence.dao.hibernate.occurrence,
   eu.etaxonomy.cdm.persistence.dao.hibernate.reference,
   eu.etaxonomy.cdm.persistence.dao.hibernate.taxon,
 - eu.etaxonomy.cdm.persistence.dao.hibernate.validation,
   eu.etaxonomy.cdm.persistence.dao.hibernate.view,
   eu.etaxonomy.cdm.persistence.dao.media,
   eu.etaxonomy.cdm.persistence.dao.name,
   eu.etaxonomy.cdm.print.out.pdf,
   eu.etaxonomy.cdm.print.out.taxpub,
   eu.etaxonomy.cdm.print.out.xml,
 - eu.etaxonomy.cdm.remote,
   eu.etaxonomy.cdm.remote.config,
   eu.etaxonomy.cdm.remote.controller,
   eu.etaxonomy.cdm.remote.controller.dto,
   eu.etaxonomy.cdm.validation.annotation,
   eu.etaxonomy.cdm.validation.constraint,
   eu.etaxonomy.remote.dto.rdf,
 + eu.etaxonomy.taxeditor.remoting,
 + eu.etaxonomy.taxeditor.remoting.cache,
 + eu.etaxonomy.taxeditor.remoting.server,
 + eu.etaxonomy.taxeditor.remoting.source,
 + eu.etaxonomy.taxeditor.service,
 + eu.etaxonomy.taxeditor.session,
 + eu.etaxonomy.taxeditor.session.mock,
 + javassist.util.proxy,
   javax.persistence,
   junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runner.notification",
 + net.sf.ehcache,
 + net.sf.ehcache.config,
 + net.sf.ehcache.statistics,
 + net.sf.ehcache.store,
   net.sf.json;uses:="net.sf.json.processors,net.sf.json.util,org.apache.commons.lang.exception",
 + org.aopalliance.aop,
   org.apache.commons.collections;uses:="org.apache.commons.collections.keyvalue,new org.apache.commons.collections",
 + org.apache.commons.collections.buffer,
 + org.apache.commons.dbcp,
   org.apache.commons.io;uses:="org.apache.commons.io.filefilter",
   org.apache.commons.lang;uses:="org.apache.commons.lang.exception",
   org.apache.commons.lang.exception,
 + org.apache.commons.lang.text,
 + org.apache.commons.logging,
   org.apache.fop.apps,
   org.apache.http,
   org.apache.http.client,
 + org.apache.http.util,
   org.apache.log4j;uses:="org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi",
   org.apache.log4j.chainsaw;
    uses:="org.apache.log4j,
   org.hibernate,
   org.hibernate.annotations.common.reflection,
   org.hibernate.cache.internal,
 + org.hibernate.cfg,
   org.hibernate.classic,
   org.hibernate.collection.internal,
 + org.hibernate.collection.spi,
   org.hibernate.criterion,
 + org.hibernate.engine.internal,
 + org.hibernate.engine.spi,
 + org.hibernate.engine.transaction.spi,
   org.hibernate.envers.query.criteria,
 + org.hibernate.internal,
 + org.hibernate.internal.util,
 + org.hibernate.internal.util.collections,
 + org.hibernate.mapping,
 + org.hibernate.persister.collection,
 + org.hibernate.persister.entity,
 + org.hibernate.pretty,
 + org.hibernate.property,
   org.hibernate.proxy,
 + org.hibernate.proxy.pojo.javassist,
   org.hibernate.search,
   org.hibernate.search.spatial.impl,
 + org.hibernate.type,
   org.jadira.usertype.dateandtime.joda,
   org.jadira.usertype.dateandtime.shared.spi,
   org.jboss.logging,
   org.odftoolkit.odfdom.dom.element,
   org.odftoolkit.odfdom.dom.element.style,
   org.odftoolkit.odfdom.dom.style,
 + org.slf4j,
 + org.springframework.aop,
 + org.springframework.aop.framework,
 + org.springframework.beans,
   org.springframework.beans.factory,
   org.springframework.beans.factory.annotation;
    uses:="org.apache.commons.logging,
     org.springframework.beans.factory.wiring,
     org.springframework.core.type,
     org.springframework.beans.factory",
 + org.springframework.beans.factory.config,
 + org.springframework.beans.factory.support,
 + org.springframework.beans.factory.xml,
   org.springframework.cache.ehcache,
   org.springframework.context;
    uses:="org.springframework.core.io,
     org.springframework.core.io.support,
     org.springframework.beans.factory.config,
     org.springframework.beans.factory",
 + org.springframework.context.config,
   org.springframework.context.event;
    uses:="org.springframework.core,
     org.aopalliance.intercept,
     org.springframework.context,
     org.springframework.beans.factory",
 + org.springframework.context.support,
   org.springframework.core;uses:="org.springframework.util",
 + org.springframework.core.env,
   org.springframework.core.io;uses:="org.jboss.virtual",
 + org.springframework.core.io.support,
   org.springframework.core.type.classreading,
 + org.springframework.jdbc.datasource,
   org.springframework.orm.hibernate3;
    uses:="org.apache.commons.logging,
     org.aopalliance.intercept,
     org.springframework.dao,
     org.springframework.transaction.support",
   org.springframework.orm.hibernate4,
 + org.springframework.remoting,
 + org.springframework.remoting.httpinvoker,
 + org.springframework.remoting.support,
   org.springframework.security.access,
   org.springframework.security.authentication,
 + org.springframework.security.authentication.dao,
 + org.springframework.security.authentication.encoding,
   org.springframework.security.authentication.event,
 + org.springframework.security.config,
   org.springframework.security.core,
   org.springframework.security.core.context,
   org.springframework.security.core.userdetails,
     org.springframework.transaction,
     org.apache.commons.logging,
     org.springframework.beans.factory",
 + org.springframework.util,
   org.springframework.web.servlet;
    uses:="org.springframework.web.multipart,
     org.apache.commons.logging,
  Bundle-Vendor: EDIT
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Require-Bundle: org.eclipse.osgi,
 - org.eclipse.equinox.common
 + org.eclipse.equinox.common,
 + org.apache.commons.httpclient;bundle-version="3.1.0",
 + org.eclipse.core.runtime
  Bundle-ClassPath: .,
   lib/activation-1.1.1.jar,
   lib/antlr-2.7.7.jar,
   lib/spring-security-core-3.1.3.RELEASE.jar,
   lib/stax-1.2.0.jar,
   lib/stax-api-1.0.1.jar,
 - lib/unitils-core-3.3.jar,
 - lib/unitils-database-3.3.jar,
 - lib/unitils-dbmaintainer-3.3.jar,
 - lib/unitils-dbunit-3.3.jar,
 - lib/unitils-easymock-3.3.jar,
 - lib/unitils-inject-3.3.jar,
 - lib/unitils-mock-3.3.jar,
 - lib/unitils-orm-3.3.jar,
 - lib/unitils-spring-3.3.jar,
   lib/usertype.jodatime-2.0.1.jar,
   lib/usertype.spi-2.0.1.jar,
   lib/validation-api-1.0.0.GA.jar,
   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.10.0-SNAPSHOT.jar,
-  lib/cdmlib-ext-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-io-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-model-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-print-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-remote-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-services-3.10.0-SNAPSHOT.jar
 + lib/apache-log4j-extras-1.2.17.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
  Import-Package: eu.etaxonomy.cdm.api.application
index 3e8cb3de9ba645e7a8db684b9986846f92fbc573,890aefc46332a9d1556afcbdaa0e0735ea04f7ff..5622c0ecc35f41b98ee6ce12bfd152d8068a3271
@@@ -155,6 -155,15 +155,6 @@@ bin.includes = META-INF/,
                 lib/spring-security-core-3.1.3.RELEASE.jar,\\r
                 lib/stax-1.2.0.jar,\\r
                 lib/stax-api-1.0.1.jar,\\r
 -               lib/unitils-core-3.3.jar,\\r
 -               lib/unitils-database-3.3.jar,\\r
 -               lib/unitils-dbmaintainer-3.3.jar,\\r
 -               lib/unitils-dbunit-3.3.jar,\\r
 -               lib/unitils-easymock-3.3.jar,\\r
 -               lib/unitils-inject-3.3.jar,\\r
 -               lib/unitils-mock-3.3.jar,\\r
 -               lib/unitils-orm-3.3.jar,\\r
 -               lib/unitils-spring-3.3.jar,\\r
                 lib/usertype.jodatime-2.0.1.jar,\\r
                 lib/usertype.spi-2.0.1.jar,\\r
                 lib/validation-api-1.0.0.GA.jar,\\r
                 lib/poi-ooxml-3.10-FINAL.jar,\\r
                 lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                 lib/xmlbeans-2.3.0.jar,\\r
-                lib/swagger-annotations-1.3.5.jar,\
-                lib/cdmlib-commons-3.10.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-ext-3.10.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-io-3.10.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-model-3.10.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-print-3.10.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-remote-3.10.0-SNAPSHOT.jar,\\r
-                lib/cdmlib-services-3.10.0-SNAPSHOT.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-services-3.11.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
  source.. = src/main/java/,\\r
 -           src/main/resources/,\\r
 -           src/test/java/\r
 +           src/main/resources/\r
  src.includes = src/\r
  \r
index 049df7d6b280513caf2807f38799c7f3941075af,6c56dbd8372029cd5dba42f1a8e921ed266d8a95..8180196b83dc472b64a44649a44de1101f065a08
    <parent>
      <groupId>eu.etaxonomy</groupId>
      <artifactId>taxeditor-parent</artifactId>
-     <version>3.10.0-SNAPSHOT</version>
+     <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>      
 +  <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>
 -      <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
 -    -->
 +        <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\-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>
index 5c429ec45c91a5344bc51a2c569068583fb11ff2,2b57e974c779a0efc262773019b52b712763df6e..0782e269bd0e5d43e893e486cacffd7196847910
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Editor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
- Bundle-Version: 3.10.0.qualifier
+ Bundle-Version: 3.11.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
  Bundle-Vendor: %Bundle-Vendor.0
  Bundle-Localization: OSGI-INF/l10n/plugin
@@@ -12,7 -12,6 +12,7 @@@ Export-Package: eu.etaxonomy.taxeditor.
   eu.etaxonomy.taxeditor.editor.key.polytomous,
   eu.etaxonomy.taxeditor.editor.name,
   eu.etaxonomy.taxeditor.editor.name.handler,
 + eu.etaxonomy.taxeditor.editor.name.operation,
   eu.etaxonomy.taxeditor.editor.view.concept,
   eu.etaxonomy.taxeditor.editor.view.dataimport,
   eu.etaxonomy.taxeditor.editor.view.descriptive,
index 6dfe54ab3f8c1ab305a4baaafc18dc4cea04cac4,e6a73bf392d3a392ed0c68af75d644c93bf3258c..cf00b6c7747086422d40f40a20aa53e68cac95cb
@@@ -1,10 -1,9 +1,10 @@@
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 +  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    
    <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-     <version>3.10.0-SNAPSHOT</version>
+     <version>3.11.0-SNAPSHOT</version>
    </parent>
    
    <modelVersion>4.0.0</modelVersion>
@@@ -12,7 -11,7 +12,7 @@@
    <packaging>eclipse-plugin</packaging>
    
    <name>Editor Bundle</name>
 -  <description />
 +  <description></description>
    <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
    
  </project>
index a6cdb1726adb6143db4dcfffc281f60f04e28737,b766be50d9d6c538c0e411f138bf3e452c2690b3..06db0dce5e92e2026497f20a2c1f48c6f11d6032
@@@ -2,15 -2,13 +2,15 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Navigation Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
- Bundle-Version: 3.10.0.qualifier
+ Bundle-Version: 3.11.0.qualifier
  Bundle-Vendor: EDIT
  Export-Package: eu.etaxonomy.cdm,
   eu.etaxonomy.taxeditor.navigation,
   eu.etaxonomy.taxeditor.navigation.internal,
   eu.etaxonomy.taxeditor.navigation.key.polytomous,
 + eu.etaxonomy.taxeditor.navigation.key.polytomous.operation,
   eu.etaxonomy.taxeditor.navigation.navigator,
 + eu.etaxonomy.taxeditor.navigation.navigator.operation,
   eu.etaxonomy.taxeditor.navigation.search
  Require-Bundle: org.eclipse.ui,
   org.eclipse.ui.navigator,
index ffd10c2599ba86bc29ad6d783659bcabd8e765ba,788f1fdc10c15fdcc1b0e838e8e6bfc56dd26b63..4cd823c98ffd410069dd80e031813986233eb267
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: DataStore Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
- Bundle-Version: 3.10.0.qualifier
+ Bundle-Version: 3.11.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
  Bundle-Vendor: EDIT
  Export-Package: eu.etaxonomy.cdm,
@@@ -47,7 -47,6 +47,7 @@@
   eu.etaxonomy.taxeditor.ui.section.supplemental,
   eu.etaxonomy.taxeditor.ui.section.taxon,
   eu.etaxonomy.taxeditor.ui.selection,
 + eu.etaxonomy.taxeditor.util,
   eu.etaxonomy.taxeditor.view,
   eu.etaxonomy.taxeditor.view.datasource,
   eu.etaxonomy.taxeditor.view.datasource.handler,
@@@ -85,8 -84,7 +85,8 @@@ Import-Package: org.eclipse.core.comman
   org.eclipse.ui.editors.text,
   org.eclipse.ui.forms.widgets,
   org.eclipse.ui.ide.undo,
 - org.osgi.framework
 + org.osgi.framework,
 + org.osgi.service.prefs;version="1.1.1"
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Bundle-ClassPath: .,
index 947d45258831ddbeb386cd9da9af3f993d1edc3f,ce40f429b95a5ef975e261403be86480ace54a7b..1774fe8966b3970006addf90167a35fcaf9be9cf
@@@ -2,7 -2,7 +2,7 @@@
    <parent>
      <groupId>eu.etaxonomy</groupId>
      <artifactId>taxeditor-parent</artifactId>
-     <version>3.10.0-SNAPSHOT</version>
+     <version>3.11.0-SNAPSHOT</version>
    </parent>
  
    <modelVersion>4.0.0</modelVersion>
    <name>EDIT Taxonomic Editor Product</name>
    <description>The EDIT Taxonomic Desktop Editor</description>
    <url>http://wp5.e-taxonomy.eu/taxeditor</url>
 -  <properties>    
 +  <properties>
      <product.id>eu.etaxonomy.taxeditor.product</product.id>
    </properties>
 -  <build>
 -    <plugins>
 -      <plugin>
 -        <groupId>org.eclipse.tycho</groupId>
 -        <artifactId>tycho-p2-director-plugin</artifactId>
 -        <version>${tycho.version}</version>
 -        <executions>
 -          <execution>
 -            <id>materialize-products</id>
 -            <goals>
 -              <goal>materialize-products</goal>
 -            </goals>
 -          </execution>
 -          <execution>
 -            <id>archive-products</id>
 -            <goals>
 -              <goal>archive-products</goal>
 -            </goals>
 -          </execution>
 -        </executions>
 -        <configuration>
 -          <products>
 -            <product>
 -              <id>${product.id}</id>
 -              <rootFolder>EDIT Taxonomic Editor</rootFolder>
 -            </product>
 -          </products>
 -        </configuration>
 -      </plugin>
 -    </plugins>
 -  </build>
 +
    <profiles>
 +    <profile>
 +      <id>buildProducts</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <groupId>org.eclipse.tycho</groupId>
 +            <artifactId>tycho-p2-director-plugin</artifactId>
 +            <version>${tycho.version}</version>
 +            <executions>
 +              <execution>
 +                <id>materialize-products</id>
 +                <goals>
 +                  <goal>materialize-products</goal>
 +                </goals>
 +              </execution>
 +              <execution>
 +                <id>archive-products</id>
 +                <goals>
 +                  <goal>archive-products</goal>
 +                </goals>
 +              </execution>
 +            </executions>
 +            <configuration>
 +              <products>
 +                <product>
 +                  <id>${product.id}</id>
 +                  <rootFolder>EDIT Taxonomic Editor</rootFolder>
 +                </product>
 +              </products>
 +            </configuration>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
      <profile>
        <id>signJars</id>
        <build>
diff --combined pom.xml
index 4cbcd591f312ff2251eea062a9ed08b2d7057d13,81b268eb914b819e057afcad41ef852307212d0d..8e0e789e97d7dfd2296237253fc986d6b16ccd05
+++ b/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
    </prerequisites>
    <groupId>eu.etaxonomy</groupId>
    <artifactId>taxeditor-parent</artifactId>
-   <version>3.10.0-SNAPSHOT</version>
+   <version>3.11.0-SNAPSHOT</version>
    <name>EDIT Taxonomic Editor</name>
    <description>The Taxonomic Editor for EDIT's platform for
      cybertaxonomy
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     <cdmlib.version>3.10.0-SNAPSHOT</cdmlib.version>
+     <cdmlib.version>3.11.0-SNAPSHOT</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.22.0</tycho.version>
-     <taxeditor.version>3.10.0-SNAPSHOT</taxeditor.version>
+     <taxeditor.version>3.11.0-SNAPSHOT</taxeditor.version>
      <update.dir>snapshot</update.dir>
 +    <unitils.version>3.4.2</unitils.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>
        </url>
      </repository>
    </distributionManagement>
 +
  </project>