Merge branch 'hotfix/3.12.3' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:37:37 +0000 (11:37 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:37:37 +0000 (11:37 +0100)
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java

338 files changed:
.gitignore
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/plugin.xml
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar [moved from eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar with 61% similarity]
eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar [moved from eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar with 79% similarity]
eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar [moved from eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar with 50% similarity]
eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar [moved from eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar with 70% similarity]
eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar [moved from eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar with 55% similarity]
eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorCdmViewer.java [deleted file]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenTaxonEditorHandler.java [deleted file]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SpecimenPropertyTester.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/TaxonParameterConverter.java [deleted file]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonNodeHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/SingleReadSequenceContextMenu.java [deleted file]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/SingleReadHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/plugin.xml
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/plugin.xml
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationCdmViewer.java [deleted file]
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java [deleted file]
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties
eu.etaxonomy.taxeditor.store/plugin.xml
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidsParameterTypeConverter.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidParameterConverter.java with 67% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenClassificationWizardHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenHandlerBase.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsView.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonWizard.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NameSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmEntityWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDeterminationDetailElement.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDeterminationDetailSection.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDeterminationHistoryDetailSection.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonWizardPage.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/ICdmViewer.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.webapp/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 40d481b..5c35255 100644 (file)
@@ -46,3 +46,7 @@ eu.etaxonomy.taxeditor/target
 /runtime-taxeditor.product
 /target
 /workspace
+/*.patch
+/eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.core.resources.prefs
+/eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.m2e.core.prefs
+
index d8dedfd..0fa402a 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.12.3
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 7453e21..ae74af8 100644 (file)
             id="eu.etaxonomy.taxeditor.application.perspective.taxonomic"
             name="%perspective.name">
       </perspective>
-      <!--perspective
-            class="eu.etaxonomy.taxeditor.perspective.BulkEditing"
-            id="eu.etaxonomy.taxeditor.application.perspective.bulkeditor"
-            name="Bulk Editing">
-      </perspective-->
       <perspective
             class="eu.etaxonomy.taxeditor.perspective.PolytomousKey"
             id="eu.etaxonomy.taxeditor.application.perspective.polytomous"
             restorable="true">
       </view>
    </extension-->
- <extension
-       point="org.eclipse.ui.perspectiveExtensions">
-    <perspectiveExtension
-          targetID="eu.etaxonomy.taxeditor.application.perspective.bulkeditor">
-       <showInPart
-             id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
-       </showInPart>
-       <showInPart
-             id="eu.etaxonomy.taxeditor.bulkeditor.referencingobjectsview">
-       </showInPart>
-    </perspectiveExtension>
-    <perspectiveExtension
-          targetID="eu.etaxonomy.taxeditor.application.perspective.polytomous">
-       <showInPart
-             id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
-       </showInPart>
-    </perspectiveExtension>
-    <perspectiveExtension
-          targetID="eu.etaxonomy.taxeditor.application.perspective.uses">
-       <showInPart
-             id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
-       </showInPart>
-    </perspectiveExtension>
- </extension>
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
index c88cc0f..263a9c8 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.3</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index e00c975..7f06772 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.12.3
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index 0f3dae0..6862728 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?eclipse version="3.4"?>\r
-<plugin>\r
-\r
-   <extension\r
-         id="application"\r
-         point="org.eclipse.core.runtime.applications">\r
-      <application>\r
-         <run\r
-               class="eu.etaxonomy.taxeditor.bulkeditor.Application">\r
-         </run>\r
-      </application>\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.editors">\r
-      <editor\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"\r
-            default="false"\r
-            id="bulkeditor.editor"\r
-            name="%editor.name">\r
-      </editor>\r
-      <editor\r
-            class="eu.etaxonomy.taxeditor.nameditor.TaxonNameEditor"\r
-            default="false"\r
-            id="nameeditor.editor"\r
-            name="%editor.name.0">\r
-      </editor>\r
-      <editor\r
-            class="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"\r
-            default="false"\r
-            id="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"\r
-            name="%editor.name.1">\r
-      </editor>\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.menus">\r
-      <menuContribution\r
-            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">\r
-         <menu\r
-               id="bulkeditor.menus.openmenu"\r
-               label="%menu.label">\r
-            <visibleWhen\r
-                  checkEnabled="true">\r
-               <reference\r
-                     definitionId="isCdmStoreConnected">\r
-               </reference>\r
-            </visibleWhen>\r
-         </menu>\r
-         <menu\r
-               label="%menu.label.0">\r
-            <visibleWhen\r
-                  checkEnabled="true">\r
-               <reference\r
-                     definitionId="isCdmStoreConnected">\r
-               </reference>\r
-            </visibleWhen>\r
-         </menu>\r
-      </menuContribution>\r
-      <menuContribution\r
-            locationURI="menu:bulkeditor.menus.openmenu">\r
-         <dynamic\r
-               class="eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem"\r
-               id="taxeditor-bulkeditor.dynamicopenmenu">\r
-            <visibleWhen\r
-                  checkEnabled="true">\r
-               <reference\r
-                     definitionId="isCdmStoreConnected">\r
-               </reference>\r
-            </visibleWhen>\r
-         </dynamic>\r
-         <!--command\r
-               commandId="taxeditor-nameeditor.commands.open"\r
-               label="Open Name Editor"\r
-               style="push">\r
-            <visibleWhen\r
-                  checkEnabled="false">\r
-               <reference\r
-                     definitionId="pigsFly">\r
-               </reference>\r
-            </visibleWhen>\r
-         </command-->\r
-      </menuContribution>\r
-      <menuContribution\r
-            locationURI="popup:#BulkEditorContext">\r
-         <command\r
-               commandId="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"\r
-               label="%command.label"\r
-               style="push">\r
-            <visibleWhen>\r
-               <reference\r
-                     definitionId="isTaxonBulkEditorInput">\r
-               </reference>\r
-            </visibleWhen>\r
-         </command>\r
-         <separator\r
-               name="taxeditor-bulkeditor.separator1"\r
-               visible="true">\r
-         </separator>\r
-         <menu\r
-               label="%menu.label.1">\r
-            <dynamic\r
-                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"\r
-                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">\r
-               <visibleWhen\r
-                     checkEnabled="false">\r
-                  <reference\r
-                        definitionId="isCdmStoreConnected">\r
-                  </reference>\r
-               </visibleWhen>\r
-            </dynamic>\r
-            <visibleWhen\r
-                  checkEnabled="true">\r
-               <reference\r
-                     definitionId="isCdmStoreConnected">\r
-               </reference>\r
-            </visibleWhen>\r
-         </menu>\r
-        <separator\r
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         id="application"
+         point="org.eclipse.core.runtime.applications">
+      <application>
+         <run
+               class="eu.etaxonomy.taxeditor.bulkeditor.Application">
+         </run>
+      </application>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"
+            default="false"
+            id="bulkeditor.editor"
+            name="%editor.name">
+      </editor>
+      <editor
+            class="eu.etaxonomy.taxeditor.nameditor.TaxonNameEditor"
+            default="false"
+            id="nameeditor.editor"
+            name="%editor.name.0">
+      </editor>
+      <editor
+            class="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
+            default="false"
+            id="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
+            name="%editor.name.1">
+      </editor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">
+         <menu
+               id="bulkeditor.menus.openmenu"
+               label="%menu.label">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </menu>
+         <menu
+               label="%menu.label.0">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </menu>
+      </menuContribution>
+      <menuContribution
+            locationURI="menu:bulkeditor.menus.openmenu">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem"
+               id="taxeditor-bulkeditor.dynamicopenmenu">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </dynamic>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:#BulkEditorContext">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.bulkeditor.cdmViewerContextMenu">
+         </dynamic>
+         <separator
+               name="taxeditor-bulkeditor.separator1"
+               visible="true">
+         </separator>
+         <menu
+               label="%menu.label.1">
+            <dynamic
+                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"
+                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">
+               <visibleWhen
+                     checkEnabled="false">
+                  <reference
+                        definitionId="isCdmStoreConnected">
+                  </reference>
+               </visibleWhen>
+            </dynamic>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </menu>
+         <separator
                name="taxeditor-bulkeditor.separator4"\r
                visible="true">\r
-         </separator>\r
-         <command\r
-               commandId="bulkeditor.commands.setmergetarget"\r
-               label="%command.label.0"\r
-               style="push">\r
-            <visibleWhen>\r
-               <reference\r
-                     definitionId="isMergeEnabled">\r
-               </reference>\r
-            </visibleWhen>\r
-         </command>\r
-         \r
-         <command\r
-               commandId="bulkeditor.commands.setmergecandidate"\r
-               label="%command.label.1"\r
-               style="push">\r
-            <visibleWhen>\r
-               <reference\r
-                     definitionId="isMergeEnabled">\r
-               </reference>\r
-            </visibleWhen>\r
-         </command>\r
-         <command\r
-               commandId="bulkeditor.commands.removemergecandidate"\r
-               label="%command.label.2"\r
-               style="push">\r
-            <visibleWhen>\r
-               <reference\r
-                     definitionId="isMergeEnabled">\r
-               </reference>\r
-            </visibleWhen>\r
-         </command>\r
-      <!--menuContribution\r
-            locationURI="popup:org.eclipse.ui.popup.any"-->            \r
-         <command\r
-               commandId="bulkeditor.commands.mergegroup"\r
-               label="%command.label.3"\r
-               style="push">\r
-            <visibleWhen>\r
-               <reference\r
-                     definitionId="isMergeEnabled">\r
-               </reference>\r
-            </visibleWhen>\r
-         </command>\r
+         </separator>
+         <command
+               commandId="bulkeditor.commands.setmergetarget"
+               label="%command.label.0"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMergeEnabled">
+               </reference>
+            </visibleWhen>
+         </command>
+         
+         <command
+               commandId="bulkeditor.commands.setmergecandidate"
+               label="%command.label.1"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMergeEnabled">
+               </reference>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="bulkeditor.commands.removemergecandidate"
+               label="%command.label.2"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMergeEnabled">
+               </reference>
+            </visibleWhen>
+         </command>
+      <!--menuContribution
+            locationURI="popup:org.eclipse.ui.popup.any"-->            
+         <command
+               commandId="bulkeditor.commands.mergegroup"
+               label="%command.label.3"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMergeEnabled">
+               </reference>
+            </visibleWhen>
+         </command>
          <separator\r
                name="eu.etaxonomy.taxeditor.bulkeditor.separator1"\r
                visible="true">\r
          </separator>\r
-         <command\r
-               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"\r
-               label="%command.label.5"\r
-               style="push">\r
-                  <visibleWhen\r
-                               checkEnabled="true">\r
-                               <and>\r
-                               <reference\r
-                       definitionId="isConvertEnabled">\r
-                               </reference>\r
-                               <reference \r
-                                               definitionId="isTeam">\r
-                               </reference>\r
-                       </and>\r
-                       </visibleWhen>\r
-         </command>\r
-         <command\r
-               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"\r
-               label="%command.label.6"\r
-               style="push">\r
-               <visibleWhen \r
-                       checkEnabled="true">>\r
-                               <and>\r
-                               <reference\r
-                       definitionId="isConvertEnabled">\r
-                               </reference>\r
-                               <reference \r
-                                       definitionId="isPerson">\r
-                               </reference>\r
-                       </and>\r
-                       </visibleWhen>\r
-         </command>\r
-         <separator\r
-               name="taxeditor-bulkeditor.separator2"\r
-               visible="true">\r
-         </separator>\r
-         <menu\r
-               label="%menu.label.2">\r
-            <dynamic\r
-                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicMarkerTypeEditingMenu"\r
-                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">\r
-            </dynamic>\r
-            <visibleWhen\r
-                  checkEnabled="true">\r
-               <reference\r
-                     definitionId="isCdmStoreConnected">\r
-               </reference>\r
-            </visibleWhen>\r
-         </menu>\r
-         <separator\r
-               name="taxeditor-bulkeditor.separator3"\r
-               visible="true">\r
-         </separator>\r
-         <command\r
-               commandId="eu.etaxonomy.taxeditor.bulkeditor.delete"\r
-               label="%command.label.4"\r
-               style="push">\r
-            <visibleWhen\r
-                  checkEnabled="true">\r
-               <reference\r
-                     definitionId="isCdmStoreConnected">\r
-               </reference>\r
-            </visibleWhen>\r
-         </command>\r
-      </menuContribution>\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.commands">\r
-      <command\r
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler"\r
-            id="bulkeditor.commands.mergegroup"\r
-            name="%command.name">\r
-      </command>\r
-      <command\r
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeTargetHandler"\r
-            id="bulkeditor.commands.setmergetarget"\r
-            name="%command.name.0">\r
-      </command>\r
-      <command\r
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.OpenBulkEditorHandler"\r
-            id="taxeditor-bulkeditor.dynamicopenmenu"\r
-            name="%command.name.1">\r
-         <commandParameter\r
-               id="taxeditor-bulkeditor.commandParameter.inputType"\r
-               name="%commandParameter.name"\r
-               values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">\r
-         </commandParameter>\r
-      </command>\r
-      <command\r
-            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.NewObjectHandler"\r
-            id="taxeditor-bulkeditor.dynamicnewobjectcommand"\r
-            name="%command.name.2">\r
-      </command>\r
-      <command\r
-            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.DeleteObjectHandler"\r
-            id="taxeditor-bulkeditor.dynamicdeleteobjectcommand"\r
-            name="%command.name.3">\r
-      </command>\r
-      <command\r
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeCandidateHandler"\r
-            id="bulkeditor.commands.setmergecandidate"\r
-            name="%command.name.4">\r
-      </command>\r
-      <command\r
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.RemoveMergeCandidateHandler"\r
-            id="bulkeditor.commands.removemergecandidate"\r
-            name="%command.name.5">\r
-      </command>\r
-      <command\r
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMarkerFlagHandler"\r
-            id="taxeditor-bulkeditor.command.setMarkerFlag"\r
-            name="%command.name.6">\r
-      </command>\r
-      <command\r
-            id="eu.etaxonomy.taxeditor.bulkeditor.delete"\r
-            name="%command.name.7">\r
-      </command>\r
-      <command\r
-            id="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"\r
-            name="%command.name.8">\r
-      </command>\r
-      <command\r
-            id="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"\r
-            name="%command.name.10">\r
-      </command>\r
-      <!--command\r
-            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"\r
-            id="eu.etaxonomy.taxeditor.bulkeditor.command.new"\r
-            name="New Entity">\r
-      </command-->\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">\r
-      <specification\r
-            annotationType="merge_candidate_annotation"\r
-            colorPreferenceKey="merge_candidate_annotation_color"\r
-            colorPreferenceValue="220,220,255"\r
-            highlightPreferenceValue="true"\r
-            icon="icons/merge_candidate.gif"\r
-            includeOnPreferencePage="true"\r
-            label="%specification.label"\r
-            overviewRulerPreferenceKey="merge_candidate_annotation_overview"\r
-            overviewRulerPreferenceValue="true"\r
-            presentationLayer="0"\r
-            symbolicIcon="task"\r
-            textPreferenceKey="merge_candidate_annotation_text"\r
-            textPreferenceValue="false"\r
-            textStylePreferenceValue="BOX"\r
-            verticalRulerPreferenceKey="merge_candidate_annotation_vertical"\r
-            verticalRulerPreferenceValue="true">\r
-      </specification>\r
-      <specification\r
-            annotationType="merge_target_annotation"\r
-            colorPreferenceKey="merge_target_annotation_color"\r
-            colorPreferenceValue="220,220,255"\r
-            highlightPreferenceValue="true"\r
-            icon="icons/merge_target.gif"\r
-            includeOnPreferencePage="true"\r
-            label="%specification.label.0"\r
-            overviewRulerPreferenceKey="merge_target_annotation_overview"\r
-            overviewRulerPreferenceValue="true"\r
-            presentationLayer="1"\r
-            symbolicIcon="task"\r
-            textPreferenceKey="merge_target_annotation_text"\r
-            textPreferenceValue="false"\r
-            textStylePreferenceValue="BOX"\r
-            verticalRulerPreferenceKey="merge_target_annotation_vertical"\r
-            verticalRulerPreferenceValue="true">\r
-      </specification>      \r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.editors.annotationTypes">\r
-      <type\r
-            name="merge_candidate_annotation">\r
-      </type>\r
-      <type\r
-            name="merge_target_annotation">\r
-      </type>\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.views">\r
-      <view\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"\r
-            id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"\r
-            name="%view.name"\r
-            restorable="false">\r
-      </view>\r
-   </extension>   \r
-   <extension\r
-         point="org.eclipse.core.expressions.definitions">\r
-      <definition\r
-            id="isMergeEnabled">\r
-         <with\r
-               variable="activeEditor">\r
-            <test\r
-                  property="taxeditor-bulkeditor.propertyTester.isMergingEnabled">\r
-            </test>\r
-         </with>\r
-      </definition>\r
-      <definition\r
-            id="isConvertEnabled">\r
-         <with\r
-               variable="activeEditor">\r
-            <test\r
-                  property="taxeditor-bulkeditor.propertyTester.isConvertingEnabled">\r
-            </test>\r
-         </with>\r
-      </definition>\r
-      <definition\r
-            id="isTaxonBulkEditorInput">\r
-         <with\r
-               variable="activeEditor">\r
-            <test\r
-                  property="taxeditor-bulkeditor.propertyTester.isTaxonEditor">\r
-            </test>\r
-         </with>\r
-      </definition>\r
-       <definition\r
-            id="isTeam">\r
-         <with\r
-               variable="selection">\r
-            <test\r
-                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isTeam">\r
-            </test>\r
-         </with>\r
-      </definition>\r
-      <definition\r
-            id="isPerson">\r
-         <with\r
-               variable="selection">\r
-            <test\r
-                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isPerson">\r
-            </test>\r
-         </with>\r
-      </definition>\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.core.expressions.propertyTesters">\r
-      <propertyTester\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"\r
-            id="taxeditor-bulkeditor.PropertyTester"\r
-            namespace="taxeditor-bulkeditor.propertyTester"\r
-            properties="isMergingEnabled, isDerivedUnitEditor, isTaxonEditor, isGroupEditor, isConvertingEnabled"\r
-            type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">\r
-      </propertyTester>\r
-      <propertyTester\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"\r
-            id="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"\r
-            namespace="eu.etaxonomy.taxeditor.bulkeditor.command"\r
-            properties="isTeam, isPerson"\r
-            type="java.lang.Object">\r
-      </propertyTester>\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.handlers">\r
-      <handler\r
-            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:cut"\r
-            commandId="org.eclipse.ui.edit.cut">\r
-         <activeWhen>\r
-            <with\r
-                  variable="activeFocusControlId">\r
-               <equals\r
-                     value="bulkeditor.textControlId">\r
-               </equals>\r
-            </with>\r
-         </activeWhen>\r
-      </handler>\r
-      <handler\r
-            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy"\r
-            commandId="org.eclipse.ui.edit.copy">\r
-         <activeWhen>\r
-            <with\r
-                  variable="activeFocusControlId">\r
-               <equals\r
-                     value="bulkeditor.textControlId">\r
-               </equals>\r
-            </with>\r
-         </activeWhen>\r
-      </handler>\r
-      <handler\r
-            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:paste"\r
-            commandId="org.eclipse.ui.edit.paste">\r
-         <activeWhen>\r
-            <with\r
-                  variable="activeFocusControlId">\r
-               <equals\r
-                     value="bulkeditor.textControlId">\r
-               </equals>\r
-            </with>\r
-         </activeWhen>\r
-      </handler>\r
-      <handler\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"\r
-            commandId="eu.etaxonomy.taxeditor.bulkeditor.delete">\r
-         <activeWhen>\r
-            <with\r
-                  variable="selection">\r
-               <instanceof\r
-                     value="eu.etaxonomy.taxeditor.model.LineSelection">\r
-               </instanceof>\r
-            </with>\r
-         </activeWhen>\r
-      </handler>\r
-      <handler\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertTeam2PersonHandler"\r
-            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person">\r
-      </handler>\r
-      <handler\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertPerson2TeamHandler"\r
-            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team">\r
-      </handler>\r
-      \r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.preferencePages">\r
-      <page\r
-            category="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorMarkerPreferencePage"\r
-            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.markerTypes"\r
-            name="%page.name">\r
-      </page>\r
-      <page\r
-            category="eu.etaxonomy.taxeditor.preferences.general"\r
-            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorGeneralPreferencePage"\r
-            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"\r
-            name="%page.name.0">\r
-      </page>\r
-   </extension>\r
-   <extension\r
-         point="org.eclipse.ui.perspectiveExtensions">\r
-      <perspectiveExtension\r
-            targetID="*">\r
-         <showInPart\r
-               id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"></showInPart>\r
-         <showInPart\r
-               id="eu.etaxonomy.taxeditor.view.detail">\r
-         </showInPart>\r
-      </perspectiveExtension>\r
-   </extension>\r
-<!-- start set marker -->\r
-\r
-</plugin>\r
+         <command
+               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
+               label="%command.label.5"
+               style="push">
+                  <visibleWhen
+                               checkEnabled="true">
+                               <and>
+                               <reference
+                       definitionId="isConvertEnabled">
+                               </reference>
+                               <reference 
+                                               definitionId="isTeam">
+                               </reference>
+                       </and>
+                       </visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
+               label="%command.label.6"
+               style="push">
+               <visibleWhen 
+                       checkEnabled="true">>
+                               <and>
+                               <reference
+                       definitionId="isConvertEnabled">
+                               </reference>
+                               <reference 
+                                       definitionId="isPerson">
+                               </reference>
+                       </and>
+                       </visibleWhen>
+         </command>
+         <separator
+               name="taxeditor-bulkeditor.separator2"
+               visible="true">
+         </separator>
+         <menu
+               label="%menu.label.2">
+            <dynamic
+                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicMarkerTypeEditingMenu"
+                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">
+            </dynamic>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </menu>
+         <separator
+               name="taxeditor-bulkeditor.separator3"
+               visible="true">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.bulkeditor.delete"
+               label="%command.label.4"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.referencingObjectsView.cdmViewerContextMenu">
+         </dynamic>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler"
+            id="bulkeditor.commands.mergegroup"
+            name="%command.name">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeTargetHandler"
+            id="bulkeditor.commands.setmergetarget"
+            name="%command.name.0">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.OpenBulkEditorHandler"
+            id="taxeditor-bulkeditor.dynamicopenmenu"
+            name="%command.name.1">
+         <commandParameter
+               id="taxeditor-bulkeditor.commandParameter.inputType"
+               name="%commandParameter.name"
+               values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">
+         </commandParameter>
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.NewObjectHandler"
+            id="taxeditor-bulkeditor.dynamicnewobjectcommand"
+            name="%command.name.2">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.DeleteObjectHandler"
+            id="taxeditor-bulkeditor.dynamicdeleteobjectcommand"
+            name="%command.name.3">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeCandidateHandler"
+            id="bulkeditor.commands.setmergecandidate"
+            name="%command.name.4">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.RemoveMergeCandidateHandler"
+            id="bulkeditor.commands.removemergecandidate"
+            name="%command.name.5">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMarkerFlagHandler"
+            id="taxeditor-bulkeditor.command.setMarkerFlag"
+            name="%command.name.6">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.bulkeditor.delete"
+            name="%command.name.7">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
+            name="%command.name.8">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
+            name="%command.name.10">
+      </command>
+      <command
+            id="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+            name="Open Referencing Objects View">
+      </command>
+      <!--command
+            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"
+            id="eu.etaxonomy.taxeditor.bulkeditor.command.new"
+            name="New Entity">
+      </command-->
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.markerAnnotationSpecification">
+      <specification
+            annotationType="merge_candidate_annotation"
+            colorPreferenceKey="merge_candidate_annotation_color"
+            colorPreferenceValue="220,220,255"
+            highlightPreferenceValue="true"
+            icon="icons/merge_candidate.gif"
+            includeOnPreferencePage="true"
+            label="%specification.label"
+            overviewRulerPreferenceKey="merge_candidate_annotation_overview"
+            overviewRulerPreferenceValue="true"
+            presentationLayer="0"
+            symbolicIcon="task"
+            textPreferenceKey="merge_candidate_annotation_text"
+            textPreferenceValue="false"
+            textStylePreferenceValue="BOX"
+            verticalRulerPreferenceKey="merge_candidate_annotation_vertical"
+            verticalRulerPreferenceValue="true">
+      </specification>
+      <specification
+            annotationType="merge_target_annotation"
+            colorPreferenceKey="merge_target_annotation_color"
+            colorPreferenceValue="220,220,255"
+            highlightPreferenceValue="true"
+            icon="icons/merge_target.gif"
+            includeOnPreferencePage="true"
+            label="%specification.label.0"
+            overviewRulerPreferenceKey="merge_target_annotation_overview"
+            overviewRulerPreferenceValue="true"
+            presentationLayer="1"
+            symbolicIcon="task"
+            textPreferenceKey="merge_target_annotation_text"
+            textPreferenceValue="false"
+            textStylePreferenceValue="BOX"
+            verticalRulerPreferenceKey="merge_target_annotation_vertical"
+            verticalRulerPreferenceValue="true">
+      </specification>      
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.annotationTypes">
+      <type
+            name="merge_candidate_annotation">
+      </type>
+      <type
+            name="merge_target_annotation">
+      </type>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"
+            id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"
+            name="%view.name"
+            restorable="false">
+      </view>
+   </extension>   
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="isMergeEnabled">
+         <with
+               variable="activeEditor">
+            <test
+                  property="taxeditor-bulkeditor.propertyTester.isMergingEnabled">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isConvertEnabled">
+         <with
+               variable="activeEditor">
+            <test
+                  property="taxeditor-bulkeditor.propertyTester.isConvertingEnabled">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isTaxonBulkEditorInput">
+         <with
+               variable="activeEditor">
+            <test
+                  property="taxeditor-bulkeditor.propertyTester.isTaxonEditor">
+            </test>
+         </with>
+      </definition>
+       <definition
+            id="isTeam">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isTeam">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isPerson">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isPerson">
+            </test>
+         </with>
+      </definition>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
+            id="taxeditor-bulkeditor.PropertyTester"
+            namespace="taxeditor-bulkeditor.propertyTester"
+            properties="isMergingEnabled, isDerivedUnitEditor, isTaxonEditor, isGroupEditor, isConvertingEnabled"
+            type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
+      </propertyTester>
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
+            id="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
+            namespace="eu.etaxonomy.taxeditor.bulkeditor.command"
+            properties="isTeam, isPerson"
+            type="java.lang.Object">
+      </propertyTester>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:cut"
+            commandId="org.eclipse.ui.edit.cut">
+         <activeWhen>
+            <with
+                  variable="activeFocusControlId">
+               <equals
+                     value="bulkeditor.textControlId">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy"
+            commandId="org.eclipse.ui.edit.copy">
+         <activeWhen>
+            <with
+                  variable="activeFocusControlId">
+               <equals
+                     value="bulkeditor.textControlId">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:paste"
+            commandId="org.eclipse.ui.edit.paste">
+         <activeWhen>
+            <with
+                  variable="activeFocusControlId">
+               <equals
+                     value="bulkeditor.textControlId">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"
+            commandId="eu.etaxonomy.taxeditor.bulkeditor.delete">
+         <activeWhen>
+            <with
+                  variable="selection">
+               <instanceof
+                     value="eu.etaxonomy.taxeditor.model.LineSelection">
+               </instanceof>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertTeam2PersonHandler"
+            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person">
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertPerson2TeamHandler"
+            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team">
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
+            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="bulkeditor.editor">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
+            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorMarkerPreferencePage"
+            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.markerTypes"
+            name="%page.name">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorGeneralPreferencePage"
+            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
+            name="%page.name.0">
+      </page>
+   </extension>
+   <extension
+         point="eu.etaxonomy.taxeditor.store.cdmViewer">
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+            selection="java.lang.Object"
+            viewerName="Referencing Objects View">
+      </viewCommandMapping>
+   </extension>
+<!-- start set marker -->
+
+</plugin>
index 8490a13..30c4c11 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.12.3</version>
+               <version>3.13.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 7895964..6c76b43 100644 (file)
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.jface.viewers.ISelection;
@@ -30,10 +31,13 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.TreeNode;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchPart;
 
@@ -54,16 +58,12 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.model.DescriptionHelper;
-import eu.etaxonomy.taxeditor.model.LineSelection;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 
 /**
- * <p>ReferencingObjectsView class.</p>
- *
  * @author p.ciardelli
  * @created 08.07.2009
  * @version 1.0
@@ -72,7 +72,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
        private static final Logger logger = Logger
                        .getLogger(ReferencingObjectsView.class);
 
-       /** Constant <code>ID="eu.etaxonomy.taxeditor.bulkeditor.refer"{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects";
 
        private TableViewer viewer;
@@ -85,9 +84,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
            cdmEntitySession = CdmStore.getCurrentSessionManager().bindNullSession();
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#createViewer(org.eclipse.swt.widgets.Composite)
-        */
        /** {@inheritDoc} */
        @Override
        public void createViewer(Composite parent) {
@@ -99,11 +95,8 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                viewer.setContentProvider(new ReferencingObjectsContentProvider());
                viewer.setLabelProvider(new ReferencingObjectsLabelProvider());
                viewer.setCellModifier(new ICellModifier() {
-
             @Override
             public void modify(Object element, String property, Object value) {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
@@ -126,7 +119,16 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                 return true;
             }
         });
-//             viewer.setInput(new ArrayList<CdmBase>());
+
+        //create context menu
+        MenuManager menuManager = new MenuManager();
+        getSite().registerContextMenu(menuManager, viewer);
+        Control control = viewer.getControl();
+        Menu menu = menuManager.createContextMenu(control);
+        control.setMenu(menu);
+
+        // Propagate selection from viewer
+        getSite().setSelectionProvider(viewer);
        }
 
        /**
@@ -159,11 +161,7 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
        public void setFocus() {
            cdmEntitySession.bind();
        }
-       /**
-        * <p>updateReferencingObjects</p>
-        *
-        * @param entity a {@link eu.etaxonomy.cdm.model.common.IdentifiableEntity} object.
-        */
+
        public void updateReferencingObjects(final UUID entityUUID, final Class objectClass) {
 
                final Display display = Display.getCurrent();
@@ -246,9 +244,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 
        class ReferencingClassComparator implements Comparator<CdmBase> {
 
-               /* (non-Javadoc)
-                * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-                */
                @Override
         public int compare(CdmBase o1, CdmBase o2) {
                        String string1 = o1.getClass().getSimpleName();
@@ -264,9 +259,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                }
        }
 
-       /**
-        *
-        */
        private void updateView(List<CdmBase> referencingObjects) {
                if (viewer != null && !viewer.getControl().isDisposed()){
                        try{
@@ -287,37 +279,29 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
        /** {@inheritDoc} */
        @Override
     public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-               if(! (part instanceof BulkEditor)){
-                       setContentDescription("");
-                       showEmptyPage();
-                       return;
-               }
-
-               if(! (selection instanceof LineSelection)){
-                       return;
-               }
-               LineSelection lineSelection = (LineSelection) selection;
-
-               if(lineSelection.size() != 1){
-                       return;
-               }
-
-               if(! (lineSelection.getFirstElement() instanceof IdentifiableEntity)){
-                       return;
-               }
-
-               showViewer(part, lineSelection);
+        if(part == this){
+            return;
+        }
+        if(selection instanceof IStructuredSelection){
+            showViewer(part, (IStructuredSelection) selection);
+        }
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#showViewer(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-        */
        /** {@inheritDoc} */
        @Override
        public void showViewer(IWorkbenchPart part, IStructuredSelection selection) {
        //      this.part = part;
 
-               updateReferencingObjects(((IdentifiableEntity) selection.getFirstElement()).getUuid(),selection.getFirstElement().getClass() );
+               Object firstElement = selection.getFirstElement();
+               if(firstElement instanceof TreeNode){
+                   firstElement = ((TreeNode) firstElement).getValue();
+               }
+               if(firstElement instanceof IdentifiableEntity){
+                   updateReferencingObjects(((IdentifiableEntity) firstElement).getUuid(),firstElement.getClass() );
+               }
+               else{
+            setContentDescription("");
+               }
        }
 
        /** {@inheritDoc} */
@@ -331,27 +315,18 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#getViewer()
-        */
        /** {@inheritDoc} */
        @Override
        public Viewer getViewer() {
                return viewer;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#dirtyStateChanged()
-        */
        /** {@inheritDoc} */
        @Override
        public void changed(Object object) {
                // no editing in this view
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#onComplete()
-        */
        /** {@inheritDoc} */
        @Override
        public boolean onComplete() {
@@ -359,7 +334,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
        }
 
        public void refresh(){
-
                selectionService.removePostSelectionListener(this);
                selectionService.removeSelectionListener(this);
                selectionService.addPostSelectionListener(this);
index bfffeca..8ee99d5 100644 (file)
 <?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.7"/>
-       <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.12.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.12.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.12.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.12.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.2.jar" sourcepath="/home/cmathew/.m2/repository/eu/etaxonomy/cdmlib-persistence/3.12.0-SNAPSHOT/cdmlib-persistence-3.12.2-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.12.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.12.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.12.2.jar"/>
-       <classpathentry kind="output" path="target/classes"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-3.13.0-SNAPSHOT.jar"/>
+    <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/apache-log4j-extras-1.2.17.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.7.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.8.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.5.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.13.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.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.9.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-csv-1.0.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-lang3-3.3.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/commons-logging-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.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/dtd-parser-1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/easymock-2.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/FastInfoset-1.2.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-5.0.6.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-5.0.1.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-core-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-5.0.6.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.1-api-1.0.0.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-5.5.2.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-5.5.2.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-5.2.2.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-cdi-5.2.2.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/httpclient-cache-4.2.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-2.21.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/istack-commons-tools-2.21.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.6.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.4.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.6.4.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/jandex-2.0.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/javassist-3.20.0-GA.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/javax.el-2.2.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/javax.el-api-2.2.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.12.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-jxc-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2.11.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/jaxen-1.1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.3.0.Final.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/jcl-over-slf4j-1.7.6.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/jdom2-2.0.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jena-arq-2.13.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jena-core-2.13.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jena-tdb-1.1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/joda-time-2.9.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jsonld-java-0.5.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jta-1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.7.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/libthrift-0.9.2.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-common-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-backward-codecs-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-facet-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-join-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-memory-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-misc-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-queries-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/mapstruct-1.0.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.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.osgi.core-1.0.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/p6spy-2.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-component-annotations-1.5.5.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-3.0.15.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/poi-3.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1205-jdbc42.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/relaxngDatatype-20020414.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/rngom-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.7.0-1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.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-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-aspects-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-beans-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-context-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-context-support-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-core-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-expression-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-jdbc-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-orm-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-oxm-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-plugin-core-1.2.0.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-plugin-metadata-1.2.0.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-security-config-4.0.3.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-security-core-4.0.3.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-security-web-4.0.3.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-test-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-tx-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-web-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/spring-webmvc-4.2.4.RELEASE.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-core-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-schema-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-spi-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-spring-web-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-swagger-common-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/springfox-swagger2-2.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/standard-1.1.2.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/stax-ex-1.7.7.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.5.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/swagger-models-1.5.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/tools.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/txw2-2.2.11.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.4.2.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.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.1.0.Final.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.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/xmlbeans-2.6.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xom-1.2.5.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/xsom-20140925.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.8.jar"/>
+    <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+    <classpathentry kind="src" path="src/main/java"/>
+    <classpathentry kind="src" path="src/main/resources"/>
+    <classpathentry kind="output" path="target/classes"/>
 </classpath>
index 25237c6..161e563 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.12.3
+Bundle-Version: 3.13.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -186,6 +186,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.strategy.merge,
  eu.etaxonomy.cdm.strategy.parser,
  eu.etaxonomy.cdm.strategy.parser.location,
+ eu.etaxonomy.cdm.test.integration,
  eu.etaxonomy.cdm.validation,
  eu.etaxonomy.cdm.validation.annotation,
  eu.etaxonomy.cdm.validation.constraint,
@@ -273,7 +274,7 @@ Export-Package: com.google.api,
    org.w3c.dom,
    org.xml.sax",
  org.apache.lucene.index,
- org.apache.lucene.queryParser,
+ org.apache.lucene.queryparser.classic,
  org.apache.lucene.util,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
@@ -300,7 +301,6 @@ Export-Package: com.google.api,
  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,
@@ -421,7 +421,6 @@ Export-Package: com.google.api,
  org.springframework.security.core.context,
  org.springframework.security.core.userdetails,
  org.springframework.security.provisioning,
- org.springframework.security.remoting.httpinvoker,
  org.springframework.stereotype,
  org.springframework.transaction;uses:="org.springframework.core",
  org.springframework.transaction.annotation;uses:="javax.ejb,org.springframework.transaction.interceptor",
@@ -477,15 +476,16 @@ Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
  lib/antlr-2.7.7.jar,
  lib/aopalliance-1.0.jar,
- lib/aspectjrt-1.7.1.jar,
- lib/aspectjweaver-1.7.1.jar,
+ lib/apache-log4j-extras-1.2.17.jar,
+ lib/aspectjrt-1.8.7.jar,
+ lib/aspectjweaver-1.8.7.jar,
  lib/avro-1.6.3.jar,
  lib/batik-anim-1.7.jar,
  lib/batik-awt-util-1.7.jar,
  lib/batik-bridge-1.7.jar,
  lib/batik-css-1.7.jar,
  lib/batik-dom-1.7.jar,
- lib/batik-ext-1.7.jar,
+ lib/batik-ext-1.8.jar,
  lib/batik-extension-1.7.jar,
  lib/batik-gvt-1.7.jar,
  lib/batik-js-1.7.jar,
@@ -496,175 +496,224 @@ Bundle-ClassPath: .,
  lib/batik-transcoder-1.7.jar,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
- lib/c3p0-0.9.2.jar,
- lib/cglib-nodep-2.2.2.jar,
+ lib/c3p0-0.9.5.2.jar,
+ lib/cdmlib-commons-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-io-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-model-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-print-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-services-3.13.0-SNAPSHOT.jar,
+ lib/cglib-3.2.0.jar,
+ lib/cglib-nodep-3.2.0.jar,
+ lib/classmate-1.3.1.jar,
+ lib/codemodel-2.2.11.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
- lib/commons-beanutils-1.8.3.jar,
- lib/commons-codec-20041127.091804.jar,
- lib/commons-collections-3.2.1.jar,
+ lib/commons-beanutils-1.9.2.jar,
+ lib/commons-codec-1.10.jar,
+ lib/commons-collections-3.2.2.jar,
+ lib/commons-csv-1.0.jar,
  lib/commons-dbcp-1.4.jar,
  lib/commons-io-2.4.jar,
  lib/commons-lang-2.6.jar,
- lib/commons-logging-1.1.2.jar,
+ lib/commons-lang3-3.3.2.jar,
+ lib/commons-logging-1.2.jar,
  lib/commons-pool-1.5.4.jar,
  lib/concurrent-1.3.4.jar,
  lib/dbunit-2.4.9.jar,
  lib/dom4j-1.6.1.jar,
- lib/doxia-core-1.3.jar,
- lib/doxia-logging-api-1.3.jar,
- lib/doxia-module-apt-1.3.jar,
- lib/doxia-module-xhtml-1.3.jar,
- lib/doxia-sink-api-1.3.jar,
+ lib/doxia-core-1.6.jar,
+ lib/doxia-logging-api-1.6.jar,
+ lib/doxia-module-apt-1.6.jar,
+ lib/doxia-module-xhtml-1.6.jar,
+ lib/doxia-sink-api-1.6.jar,
  lib/dozer-5.3.0.jar,
- lib/easymock-3.1.jar,
+ lib/dtd-parser-1.1.jar,
+ lib/easymock-2.3.jar,
  lib/easymockclassextension-2.3.jar,
- lib/ehcache-core-2.6.9.jar,
+ lib/ehcache-core-2.6.11.jar,
  lib/ezmorph-1.0.6.jar,
+ lib/FastInfoset-1.2.13.jar,
  lib/fop-1.1.jar,
- lib/guava-r05.jar,
- lib/h2-1.3.170.jar,
+ lib/google-api-translate-java-0.92.jar,
+ lib/guava-19.0.jar,
+ lib/h2-1.4.190.jar,
+ lib/h2mig_pagestore_addon.jar,
  lib/hamcrest-core-1.3.jar,
- lib/hibernate-c3p0-4.1.10.Final.jar,
+ lib/hibernate-c3p0-5.0.6.Final.jar,
  lib/hibernate-cglib-repack-2.1_3.jar,
- lib/hibernate-commons-annotations-4.0.1.Final.jar,
- lib/hibernate-core-4.1.10.Final.jar,
- lib/hibernate-ehcache-4.1.10.Final.jar,
- lib/hibernate-entitymanager-4.1.10.Final.jar,
- lib/hibernate-envers-4.1.10.Final.jar,
- lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,
+ lib/hibernate-commons-annotations-5.0.1.Final.jar,
+ lib/hibernate-core-5.0.6.Final.jar,
+ lib/hibernate-ehcache-5.0.6.Final.jar,
+ lib/hibernate-entitymanager-5.0.6.Final.jar,
+ lib/hibernate-envers-5.0.6.Final.jar,
+ lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,
  lib/hibernate-search-4.2.0.Final.jar,
  lib/hibernate-search-analyzers-4.2.0.Final.jar,
- lib/hibernate-search-engine-4.2.0.Final.jar,
- lib/hibernate-search-orm-4.2.0.Final.jar,
- lib/hibernate-validator-4.3.1.Final.jar,
- lib/hsqldb-1.8.0.10.jar,
- lib/httpclient-4.2.3.jar,
- lib/httpcore-4.2.4.jar,
+ lib/hibernate-search-engine-5.5.2.Final.jar,
+ lib/hibernate-search-orm-5.5.2.Final.jar,
+ lib/hibernate-validator-5.2.2.Final.jar,
+ lib/hibernate-validator-cdi-5.2.2.Final.jar,
+ lib/hsqldb-2.3.3.jar,
+ lib/httpclient-4.5.1.jar,
+ lib/httpclient-cache-4.2.6.jar,
+ lib/httpcore-4.4.4.jar,
+ lib/httpmime-4.5.1.jar,
  lib/icu4j-2.6.1.jar,
- lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
  lib/identificationKeyAPI-1.0-SNAPSHOT.jar,
- lib/itextpdf-5.4.0.jar,
+ lib/istack-commons-runtime-2.21.jar,
+ lib/istack-commons-tools-2.21.jar,
+ lib/itextpdf-5.5.8.jar,
+ lib/jackson-annotations-2.6.4.jar,
+ lib/jackson-core-2.6.4.jar,
  lib/jackson-core-asl-1.8.8.jar,
+ lib/jackson-databind-2.6.4.jar,
  lib/jackson-mapper-asl-1.8.8.jar,
  lib/jakarta-regexp-1.4.jar,
- lib/javassist-3.17.1-GA.jar,
- lib/jaxb-api-2.2.7.jar,
- lib/jaxb-impl-2.2-EA.jar,
- lib/jaxb-xjc-2.2-EA.jar,
+ lib/jandex-2.0.0.Final.jar,
+ lib/javassist-3.20.0-GA.jar,
+ lib/javax.el-2.2.6.jar,
+ lib/javax.el-api-2.2.5.jar,
+ lib/javax.servlet-api-3.1.0.jar,
+ lib/jaxb-api-2.2.12.jar,
+ lib/jaxb-core-2.2.11.jar,
+ lib/jaxb-jxc-2.2.11.jar,
+ lib/jaxb-runtime-2.2.11.jar,
+ lib/jaxb-xjc-2.2.11.jar,
  lib/jaxb1-impl-2.2-EA.jar,
  lib/jaxen-1.1.4.jar,
- lib/jboss-logging-3.1.3.GA.jar,
+ lib/jaxen-1.1.6.jar,
+ lib/jboss-logging-3.3.0.Final.jar,
  lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
+ lib/jcl-over-slf4j-1.7.6.jar,
  lib/jdbc4-2.0.jar,
  lib/jdom-1.1.3.jar,
- lib/joda-time-2.1.jar,
+ lib/jdom2-2.0.6.jar,
+ lib/jena-arq-2.13.0.jar,
+ lib/jena-core-2.13.0.jar,
+ lib/jena-iri-1.1.2.jar,
+ lib/jena-tdb-1.1.2.jar,
+ lib/joda-time-2.9.1.jar,
+ lib/json-20090211.jar,
  lib/json-lib-2.4-jdk15.jar,
+ lib/jsonld-java-0.5.1.jar,
  lib/jsr250-api-1.0.jar,
- lib/jtds-1.3.0.jar,
- lib/junit-4.11.jar,
- lib/junit-benchmarks-0.5.0.jar,
+ lib/jta-1.1.jar,
+ lib/jtds-1.3.1.jar,
+ lib/junit-4.12.jar,
+ lib/junit-benchmarks-0.7.2.jar,
+ lib/libthrift-0.9.2.jar,
  lib/log4j-1.2.17.jar,
  lib/lsid-client-1.1.2.jar,
  lib/lsid-server-1.1.2.jar,
- lib/lucene-analyzers-3.6.2.jar,
- lib/lucene-core-3.6.2.jar,
- lib/lucene-facet-3.6.2.jar,
- lib/lucene-grouping-3.6.2.jar,
- lib/lucene-highlighter-3.6.2.jar,
- lib/lucene-kuromoji-3.6.2.jar,
- lib/lucene-memory-3.6.2.jar,
- lib/lucene-misc-3.6.2.jar,
- lib/lucene-phonetic-3.6.2.jar,
- lib/lucene-queries-3.6.2.jar,
- lib/lucene-smartcn-3.6.2.jar,
- lib/lucene-spatial-3.6.2.jar,
- lib/lucene-spellchecker-3.6.2.jar,
- lib/lucene-stempel-3.6.2.jar,
- lib/mchange-commons-java-0.2.3.3.jar,
- lib/mysql-connector-java-5.1.24.jar,
+ lib/lucene-analyzers-common-5.4.0.jar,
+ lib/lucene-backward-codecs-5.4.0.jar,
+ lib/lucene-core-5.4.0.jar,
+ lib/lucene-facet-5.4.0.jar,
+ lib/lucene-grouping-5.4.0.jar,
+ lib/lucene-highlighter-5.4.0.jar,
+ lib/lucene-join-5.4.0.jar,
+ lib/lucene-memory-5.4.0.jar,
+ lib/lucene-misc-5.4.0.jar,
+ lib/lucene-queries-5.4.0.jar,
+ lib/lucene-queryparser-5.4.0.jar,
+ lib/lucene-sandbox-5.4.0.jar,
+ lib/lucene-suggest-5.4.0.jar,
+ lib/mapstruct-1.0.0.Final.jar,
+ lib/mchange-commons-java-0.2.11.jar,
+ lib/mysql-connector-java-5.1.38.jar,
  lib/objenesis-1.2.jar,
+ lib/odfdom-0.8.jar,
  lib/odfdom-java-0.8.7.jar,
  lib/ognl-2.6.9.jar,
  lib/opencsv-2.3.jar,
- lib/org.eclipse.equinox.common-3.6.0.v20110523.jar,
- lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,
  lib/org.osgi.core-1.0.0.jar,
- lib/org.springframework.aop-3.2.2.RELEASE.jar,
- lib/org.springframework.aspects-3.2.2.RELEASE.jar,
- lib/org.springframework.beans-3.2.2.RELEASE.jar,
- lib/org.springframework.context-3.2.2.RELEASE.jar,
- lib/org.springframework.core-3.2.2.RELEASE.jar,
- lib/org.springframework.expression-3.2.2.RELEASE.jar,
- lib/org.springframework.jdbc-3.2.2.RELEASE.jar,
- lib/org.springframework.orm-3.2.2.RELEASE.jar,
- lib/org.springframework.oxm-3.2.2.RELEASE.jar,
- lib/org.springframework.test-3.2.2.RELEASE.jar,
- lib/org.springframework.transaction-3.2.2.RELEASE.jar,
- lib/org.springframework.web-3.2.2.RELEASE.jar,
- lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,
  lib/osgi-3.6.0.jar,
- lib/p6spy-1.3.jar,
+ lib/p6spy-2.1.3.jar,
  lib/paranamer-2.3.jar,
  lib/plexus-classworlds-1.2-alpha-9.jar,
+ lib/plexus-component-annotations-1.5.5.jar,
  lib/plexus-container-default-1.0-alpha-30.jar,
- lib/plexus-utils-2.0.5.jar,
- lib/postgresql-9.1-901.jdbc4.jar,
+ lib/plexus-utils-3.0.15.jar,
+ lib/poi-3.13.jar,
+ lib/poi-ooxml-3.13.jar,
+ lib/poi-ooxml-schemas-3.13.jar,
+ lib/postgresql-9.4-1205-jdbc42.jar,
+ lib/relaxngDatatype-20020414.jar,
+ lib/rngom-2.2.11.jar,
  lib/sanselan-0.97-incubator.jar,
+ lib/Saxon-HE-9.7.0-1.jar,
  lib/servlet-api-2.5.jar,
- lib/slf4j-api-1.7.2.jar,
- lib/slf4j-log4j12-1.7.2.jar,
+ lib/slf4j-api-1.7.13.jar,
+ lib/slf4j-log4j12-1.7.13.jar,
+ lib/slf4j-nop-1.7.13.jar,
  lib/snappy-java-1.0.4.1.jar,
  lib/solr-analysis-extras-3.6.2.jar,
  lib/solr-core-3.6.2.jar,
  lib/solr-solrj-3.6.2.jar,
- lib/spring-aop-3.2.2.RELEASE.jar,
- lib/spring-beans-3.2.2.RELEASE.jar,
- lib/spring-context-3.2.2.RELEASE.jar,
- lib/spring-context-support-3.2.2.RELEASE.jar,
- lib/spring-core-3.2.2.RELEASE.jar,
- lib/spring-expression-3.2.2.RELEASE.jar,
+ lib/spring-aop-4.2.4.RELEASE.jar,
+ lib/spring-aspects-4.2.4.RELEASE.jar,
+ lib/spring-beans-4.2.4.RELEASE.jar,
+ lib/spring-context-4.2.4.RELEASE.jar,
+ lib/spring-context-support-4.2.4.RELEASE.jar,
+ lib/spring-core-4.2.4.RELEASE.jar,
+ lib/spring-expression-4.2.4.RELEASE.jar,
+ lib/spring-jdbc-4.2.4.RELEASE.jar,
  lib/spring-modules-cache-0.7.jar,
- lib/spring-security-config-3.1.3.RELEASE.jar,
- lib/spring-security-core-3.1.3.RELEASE.jar,
+ lib/spring-orm-4.2.4.RELEASE.jar,
+ lib/spring-oxm-4.2.4.RELEASE.jar,
+ lib/spring-plugin-core-1.2.0.RELEASE.jar,
+ lib/spring-plugin-metadata-1.2.0.RELEASE.jar,
+ lib/spring-security-config-4.0.3.RELEASE.jar,
+ lib/spring-security-core-4.0.3.RELEASE.jar,
+ lib/spring-security-web-4.0.3.RELEASE.jar,
+ lib/spring-test-4.2.4.RELEASE.jar,
+ lib/spring-tx-4.2.4.RELEASE.jar,
+ lib/spring-web-4.2.4.RELEASE.jar,
+ lib/spring-webmvc-4.2.4.RELEASE.jar,
+ lib/springfox-core-2.3.1.jar,
+ lib/springfox-schema-2.3.1.jar,
+ lib/springfox-spi-2.3.1.jar,
+ lib/springfox-spring-web-2.3.1.jar,
+ lib/springfox-swagger-common-2.3.1.jar,
+ lib/springfox-swagger2-2.3.1.jar,
+ lib/standard-1.1.2.jar,
  lib/stax-1.2.0.jar,
  lib/stax-api-1.0.1.jar,
+ lib/stax-ex-1.7.7.jar,
+ lib/swagger-annotations-1.5.5.jar,
+ lib/swagger-models-1.5.5.jar,
+ lib/tools.jar,
+ lib/txw2-2.2.11.jar,
+ lib/unitils-core-3.4.2.jar,
+ lib/unitils-database-3.4.2.jar,
+ lib/unitils-dbmaintainer-3.4.2.jar,
+ lib/unitils-dbunit-3.4.2.jar,
+ lib/unitils-easymock-3.4.2.jar,
+ lib/unitils-inject-3.4.2.jar,
+ lib/unitils-mock-3.4.2.jar,
+ lib/unitils-orm-3.4.2.jar,
+ lib/unitils-spring-3.4.2.jar,
  lib/usertype.jodatime-2.0.1.jar,
  lib/usertype.spi-2.0.1.jar,
- lib/validation-api-1.0.0.GA.jar,
- lib/wsdl4j-1.6.2.jar,
- lib/xalan-2.6.0.jar,
+ lib/validation-api-1.1.0.Final.jar,
+ lib/wsdl4j-1.6.3.jar,
+ lib/xalan-2.7.0.jar,
  lib/xercesImpl-2.11.0.jar,
  lib/xml-apis-1.0.b2.jar,
  lib/xml-apis-ext-1.3.04.jar,
  lib/xml-resolver-1.2.jar,
+ lib/xmlbeans-2.6.0.jar,
  lib/xmlgraphics-commons-1.5.jar,
- lib/xmlParserAPIs-2.6.2.jar,
  lib/xmlpull-1.1.3.1.jar,
- lib/xmlunit-1.4.jar,
- lib/xom-1.0.jar,
+ lib/xmlunit-1.6.jar,
+ lib/xom-1.2.5.jar,
  lib/xpp3_min-1.1.4c.jar,
  lib/xpp3-1.1.4c.jar,
- lib/xstream-1.4.4.jar,
+ lib/xsom-20140925.jar,
+ lib/xstream-1.4.8.jar,
  lib/yjp-controller-api-redist-9.0.8.jar,
- lib/google-api-translate-java-0.92.jar,
- lib/odfdom-0.8.jar,
- lib/h2mig_pagestore_addon.jar,
- lib/spring-security-remoting-3.1.3.RELEASE.jar,
- lib/jena-core-2.11.2.jar,
- lib/jena-iri-1.0.2.jar,
- lib/poi-3.10-FINAL.jar,
- lib/poi-ooxml-3.10-FINAL.jar,
- lib/xmlbeans-2.3.0.jar,
- lib/poi-ooxml-schemas-3.10-FINAL.jar,
- lib/swagger-annotations-1.3.5.jar,
- lib/apache-log4j-extras-1.2.17.jar,
- lib/cdmlib-commons-3.12.2.jar,
- lib/cdmlib-ext-3.12.2.jar,
- lib/cdmlib-io-3.12.2.jar,
- lib/cdmlib-model-3.12.2.jar,
- lib/cdmlib-persistence-3.12.2.jar,
- lib/cdmlib-print-3.12.2.jar,
- lib/cdmlib-remote-3.12.2.jar,
- lib/cdmlib-services-3.12.2.jar
+ lib/cdmlib-test-3.13.0-SNAPSHOT.jar
 Import-Package: eu.etaxonomy.cdm.api.application
index 1510adf..fe5ec2b 100644 (file)
@@ -1,17 +1,20 @@
 bin.includes = META-INF/,\\r
                .,\\r
+               lib/spring-security-remoting-4.0.3.RELEASE.jar,\\r
+               resources/cdm.map.ser,\\r
                lib/activation-1.1.1.jar,\\r
                lib/antlr-2.7.7.jar,\\r
                lib/aopalliance-1.0.jar,\\r
-               lib/aspectjrt-1.7.1.jar,\\r
-               lib/aspectjweaver-1.7.1.jar,\\r
+               lib/apache-log4j-extras-1.2.17.jar,\\r
+               lib/aspectjrt-1.8.7.jar,\\r
+               lib/aspectjweaver-1.8.7.jar,\\r
                lib/avro-1.6.3.jar,\\r
                lib/batik-anim-1.7.jar,\\r
                lib/batik-awt-util-1.7.jar,\\r
                lib/batik-bridge-1.7.jar,\\r
                lib/batik-css-1.7.jar,\\r
                lib/batik-dom-1.7.jar,\\r
-               lib/batik-ext-1.7.jar,\\r
+               lib/batik-ext-1.8.jar,\\r
                lib/batik-extension-1.7.jar,\\r
                lib/batik-gvt-1.7.jar,\\r
                lib/batik-js-1.7.jar,\\r
@@ -22,179 +25,226 @@ bin.includes = META-INF/,\
                lib/batik-transcoder-1.7.jar,\\r
                lib/batik-util-1.7.jar,\\r
                lib/batik-xml-1.7.jar,\\r
-               lib/c3p0-0.9.2.jar,\\r
-               lib/cglib-nodep-2.2.2.jar,\\r
+               lib/c3p0-0.9.5.2.jar,\\r
+               lib/cdmlib-commons-3.13.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.13.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.13.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.13.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.13.0-SNAPSHOT.jar,\\r
+               lib/cglib-3.2.0.jar,\\r
+               lib/cglib-nodep-3.2.0.jar,\\r
+               lib/classmate-1.3.1.jar,\\r
+               lib/codemodel-2.2.11.jar,\\r
                lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\\r
-               lib/commons-beanutils-1.8.3.jar,\\r
-               lib/commons-codec-20041127.091804.jar,\\r
-               lib/commons-collections-3.2.1.jar,\\r
+               lib/commons-beanutils-1.9.2.jar,\\r
+               lib/commons-codec-1.10.jar,\\r
+               lib/commons-collections-3.2.2.jar,\\r
+               lib/commons-csv-1.0.jar,\\r
                lib/commons-dbcp-1.4.jar,\\r
                lib/commons-io-2.4.jar,\\r
                lib/commons-lang-2.6.jar,\\r
-               lib/commons-logging-1.1.2.jar,\\r
+               lib/commons-lang3-3.3.2.jar,\\r
+               lib/commons-logging-1.2.jar,\\r
                lib/commons-pool-1.5.4.jar,\\r
                lib/concurrent-1.3.4.jar,\\r
                lib/dbunit-2.4.9.jar,\\r
                lib/dom4j-1.6.1.jar,\\r
-               lib/doxia-core-1.3.jar,\\r
-               lib/doxia-logging-api-1.3.jar,\\r
-               lib/doxia-module-apt-1.3.jar,\\r
-               lib/doxia-module-xhtml-1.3.jar,\\r
-               lib/doxia-sink-api-1.3.jar,\\r
+               lib/doxia-core-1.6.jar,\\r
+               lib/doxia-logging-api-1.6.jar,\\r
+               lib/doxia-module-apt-1.6.jar,\\r
+               lib/doxia-module-xhtml-1.6.jar,\\r
+               lib/doxia-sink-api-1.6.jar,\\r
                lib/dozer-5.3.0.jar,\\r
-               lib/easymock-3.1.jar,\\r
+               lib/dtd-parser-1.1.jar,\\r
+               lib/easymock-2.3.jar,\\r
                lib/easymockclassextension-2.3.jar,\\r
-               lib/ehcache-core-2.6.9.jar,\\r
+               lib/ehcache-core-2.6.11.jar,\\r
                lib/ezmorph-1.0.6.jar,\\r
+               lib/FastInfoset-1.2.13.jar,\\r
                lib/fop-1.1.jar,\\r
-               lib/guava-r05.jar,\\r
-               lib/h2-1.3.170.jar,\\r
+               lib/google-api-translate-java-0.92.jar,\\r
+               lib/guava-19.0.jar,\\r
+               lib/h2-1.4.190.jar,\\r
+               lib/h2mig_pagestore_addon.jar,\\r
                lib/hamcrest-core-1.3.jar,\\r
-               lib/hibernate-c3p0-4.1.10.Final.jar,\\r
+               lib/hibernate-c3p0-5.0.6.Final.jar,\\r
                lib/hibernate-cglib-repack-2.1_3.jar,\\r
-               lib/hibernate-commons-annotations-4.0.1.Final.jar,\\r
-               lib/hibernate-core-4.1.10.Final.jar,\\r
-               lib/hibernate-ehcache-4.1.10.Final.jar,\\r
-               lib/hibernate-entitymanager-4.1.10.Final.jar,\\r
-               lib/hibernate-envers-4.1.10.Final.jar,\\r
-               lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,\\r
+               lib/hibernate-commons-annotations-5.0.1.Final.jar,\\r
+               lib/hibernate-core-5.0.6.Final.jar,\\r
+               lib/hibernate-ehcache-5.0.6.Final.jar,\\r
+               lib/hibernate-entitymanager-5.0.6.Final.jar,\\r
+               lib/hibernate-envers-5.0.6.Final.jar,\\r
+               lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,\\r
                lib/hibernate-search-4.2.0.Final.jar,\\r
                lib/hibernate-search-analyzers-4.2.0.Final.jar,\\r
-               lib/hibernate-search-engine-4.2.0.Final.jar,\\r
-               lib/hibernate-search-orm-4.2.0.Final.jar,\\r
-               lib/hibernate-validator-4.3.1.Final.jar,\\r
-               lib/hsqldb-1.8.0.10.jar,\\r
-               lib/httpclient-4.2.3.jar,\\r
-               lib/httpcore-4.2.4.jar,\\r
+               lib/hibernate-search-engine-5.5.2.Final.jar,\\r
+               lib/hibernate-search-orm-5.5.2.Final.jar,\\r
+               lib/hibernate-validator-5.2.2.Final.jar,\\r
+               lib/hibernate-validator-cdi-5.2.2.Final.jar,\\r
+               lib/hsqldb-2.3.3.jar,\\r
+               lib/httpclient-4.5.1.jar,\\r
+               lib/httpclient-cache-4.2.6.jar,\\r
+               lib/httpcore-4.4.4.jar,\\r
+               lib/httpmime-4.5.1.jar,\\r
                lib/icu4j-2.6.1.jar,\\r
-               lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\\r
                lib/identificationKeyAPI-1.0-SNAPSHOT.jar,\\r
-               lib/itextpdf-5.4.0.jar,\\r
+               lib/istack-commons-runtime-2.21.jar,\\r
+               lib/istack-commons-tools-2.21.jar,\\r
+               lib/itextpdf-5.5.8.jar,\\r
+               lib/jackson-annotations-2.6.4.jar,\\r
+               lib/jackson-core-2.6.4.jar,\\r
                lib/jackson-core-asl-1.8.8.jar,\\r
+               lib/jackson-databind-2.6.4.jar,\\r
                lib/jackson-mapper-asl-1.8.8.jar,\\r
                lib/jakarta-regexp-1.4.jar,\\r
-               lib/javassist-3.17.1-GA.jar,\\r
-               lib/jaxb-api-2.2.7.jar,\\r
-               lib/jaxb-impl-2.2-EA.jar,\\r
-               lib/jaxb-xjc-2.2-EA.jar,\\r
+               lib/jandex-2.0.0.Final.jar,\\r
+               lib/javassist-3.20.0-GA.jar,\\r
+               lib/javax.el-2.2.6.jar,\\r
+               lib/javax.el-api-2.2.5.jar,\\r
+               lib/javax.servlet-api-3.1.0.jar,\\r
+               lib/jaxb-api-2.2.12.jar,\\r
+               lib/jaxb-core-2.2.11.jar,\\r
+               lib/jaxb-jxc-2.2.11.jar,\\r
+               lib/jaxb-runtime-2.2.11.jar,\\r
+               lib/jaxb-xjc-2.2.11.jar,\\r
                lib/jaxb1-impl-2.2-EA.jar,\\r
                lib/jaxen-1.1.4.jar,\\r
-               lib/jboss-logging-3.1.3.GA.jar,\\r
+               lib/jaxen-1.1.6.jar,\\r
+               lib/jboss-logging-3.3.0.Final.jar,\\r
                lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\\r
+               lib/jcl-over-slf4j-1.7.6.jar,\\r
                lib/jdbc4-2.0.jar,\\r
                lib/jdom-1.1.3.jar,\\r
-               lib/joda-time-2.1.jar,\\r
+               lib/jdom2-2.0.6.jar,\\r
+               lib/jena-arq-2.13.0.jar,\\r
+               lib/jena-core-2.13.0.jar,\\r
+               lib/jena-iri-1.1.2.jar,\\r
+               lib/jena-tdb-1.1.2.jar,\\r
+               lib/joda-time-2.9.1.jar,\\r
+               lib/json-20090211.jar,\\r
                lib/json-lib-2.4-jdk15.jar,\\r
+               lib/jsonld-java-0.5.1.jar,\\r
                lib/jsr250-api-1.0.jar,\\r
-               lib/jtds-1.3.0.jar,\\r
-               lib/junit-4.11.jar,\\r
-               lib/junit-benchmarks-0.5.0.jar,\\r
+               lib/jta-1.1.jar,\\r
+               lib/jtds-1.3.1.jar,\\r
+               lib/junit-4.12.jar,\\r
+               lib/junit-benchmarks-0.7.2.jar,\\r
+               lib/libthrift-0.9.2.jar,\\r
                lib/log4j-1.2.17.jar,\\r
                lib/lsid-client-1.1.2.jar,\\r
                lib/lsid-server-1.1.2.jar,\\r
-               lib/lucene-analyzers-3.6.2.jar,\\r
-               lib/lucene-core-3.6.2.jar,\\r
-               lib/lucene-facet-3.6.2.jar,\\r
-               lib/lucene-grouping-3.6.2.jar,\\r
-               lib/lucene-highlighter-3.6.2.jar,\\r
-               lib/lucene-kuromoji-3.6.2.jar,\\r
-               lib/lucene-memory-3.6.2.jar,\\r
-               lib/lucene-misc-3.6.2.jar,\\r
-               lib/lucene-phonetic-3.6.2.jar,\\r
-               lib/lucene-queries-3.6.2.jar,\\r
-               lib/lucene-smartcn-3.6.2.jar,\\r
-               lib/lucene-spatial-3.6.2.jar,\\r
-               lib/lucene-spellchecker-3.6.2.jar,\\r
-               lib/lucene-stempel-3.6.2.jar,\\r
-               lib/mchange-commons-java-0.2.3.3.jar,\\r
-               lib/mysql-connector-java-5.1.24.jar,\\r
+               lib/lucene-analyzers-common-5.4.0.jar,\\r
+               lib/lucene-backward-codecs-5.4.0.jar,\\r
+               lib/lucene-core-5.4.0.jar,\\r
+               lib/lucene-facet-5.4.0.jar,\\r
+               lib/lucene-grouping-5.4.0.jar,\\r
+               lib/lucene-highlighter-5.4.0.jar,\\r
+               lib/lucene-join-5.4.0.jar,\\r
+               lib/lucene-memory-5.4.0.jar,\\r
+               lib/lucene-misc-5.4.0.jar,\\r
+               lib/lucene-queries-5.4.0.jar,\\r
+               lib/lucene-queryparser-5.4.0.jar,\\r
+               lib/lucene-sandbox-5.4.0.jar,\\r
+               lib/lucene-suggest-5.4.0.jar,\\r
+               lib/mapstruct-1.0.0.Final.jar,\\r
+               lib/mchange-commons-java-0.2.11.jar,\\r
+               lib/mysql-connector-java-5.1.38.jar,\\r
                lib/objenesis-1.2.jar,\\r
+               lib/odfdom-0.8.jar,\\r
                lib/odfdom-java-0.8.7.jar,\\r
                lib/ognl-2.6.9.jar,\\r
                lib/opencsv-2.3.jar,\\r
-               lib/org.eclipse.equinox.common-3.6.0.v20110523.jar,\\r
-               lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,\\r
                lib/org.osgi.core-1.0.0.jar,\\r
-               lib/org.springframework.aop-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.aspects-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.beans-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.context-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.core-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.expression-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.jdbc-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.orm-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.oxm-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.test-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.transaction-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.web-3.2.2.RELEASE.jar,\\r
-               lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,\\r
                lib/osgi-3.6.0.jar,\\r
-               lib/p6spy-1.3.jar,\\r
+               lib/p6spy-2.1.3.jar,\\r
                lib/paranamer-2.3.jar,\\r
                lib/plexus-classworlds-1.2-alpha-9.jar,\\r
+               lib/plexus-component-annotations-1.5.5.jar,\\r
                lib/plexus-container-default-1.0-alpha-30.jar,\\r
-               lib/plexus-utils-2.0.5.jar,\\r
-               lib/postgresql-9.1-901.jdbc4.jar,\\r
+               lib/plexus-utils-3.0.15.jar,\\r
+               lib/poi-3.13.jar,\\r
+               lib/poi-ooxml-3.13.jar,\\r
+               lib/poi-ooxml-schemas-3.13.jar,\\r
+               lib/postgresql-9.4-1205-jdbc42.jar,\\r
+               lib/relaxngDatatype-20020414.jar,\\r
+               lib/rngom-2.2.11.jar,\\r
                lib/sanselan-0.97-incubator.jar,\\r
+               lib/Saxon-HE-9.7.0-1.jar,\\r
                lib/servlet-api-2.5.jar,\\r
-               lib/slf4j-api-1.7.2.jar,\\r
-               lib/slf4j-log4j12-1.7.2.jar,\\r
+               lib/slf4j-api-1.7.13.jar,\\r
+               lib/slf4j-log4j12-1.7.13.jar,\\r
+               lib/slf4j-nop-1.7.13.jar,\\r
                lib/snappy-java-1.0.4.1.jar,\\r
                lib/solr-analysis-extras-3.6.2.jar,\\r
                lib/solr-core-3.6.2.jar,\\r
                lib/solr-solrj-3.6.2.jar,\\r
-               lib/spring-aop-3.2.2.RELEASE.jar,\\r
-               lib/spring-beans-3.2.2.RELEASE.jar,\\r
-               lib/spring-context-3.2.2.RELEASE.jar,\\r
-               lib/spring-context-support-3.2.2.RELEASE.jar,\\r
-               lib/spring-core-3.2.2.RELEASE.jar,\\r
-               lib/spring-expression-3.2.2.RELEASE.jar,\\r
+               lib/spring-aop-4.2.4.RELEASE.jar,\\r
+               lib/spring-aspects-4.2.4.RELEASE.jar,\\r
+               lib/spring-beans-4.2.4.RELEASE.jar,\\r
+               lib/spring-context-4.2.4.RELEASE.jar,\\r
+               lib/spring-context-support-4.2.4.RELEASE.jar,\\r
+               lib/spring-core-4.2.4.RELEASE.jar,\\r
+               lib/spring-expression-4.2.4.RELEASE.jar,\\r
+               lib/spring-jdbc-4.2.4.RELEASE.jar,\\r
                lib/spring-modules-cache-0.7.jar,\\r
-               lib/spring-security-config-3.1.3.RELEASE.jar,\\r
-               lib/spring-security-core-3.1.3.RELEASE.jar,\\r
+               lib/spring-orm-4.2.4.RELEASE.jar,\\r
+               lib/spring-oxm-4.2.4.RELEASE.jar,\\r
+               lib/spring-plugin-core-1.2.0.RELEASE.jar,\\r
+               lib/spring-plugin-metadata-1.2.0.RELEASE.jar,\\r
+               lib/spring-security-config-4.0.3.RELEASE.jar,\\r
+               lib/spring-security-core-4.0.3.RELEASE.jar,\\r
+               lib/spring-security-web-4.0.3.RELEASE.jar,\\r
+               lib/spring-test-4.2.4.RELEASE.jar,\\r
+               lib/spring-tx-4.2.4.RELEASE.jar,\\r
+               lib/spring-web-4.2.4.RELEASE.jar,\\r
+               lib/spring-webmvc-4.2.4.RELEASE.jar,\\r
+               lib/springfox-core-2.3.1.jar,\\r
+               lib/springfox-schema-2.3.1.jar,\\r
+               lib/springfox-spi-2.3.1.jar,\\r
+               lib/springfox-spring-web-2.3.1.jar,\\r
+               lib/springfox-swagger-common-2.3.1.jar,\\r
+               lib/springfox-swagger2-2.3.1.jar,\\r
+               lib/standard-1.1.2.jar,\\r
                lib/stax-1.2.0.jar,\\r
                lib/stax-api-1.0.1.jar,\\r
+               lib/stax-ex-1.7.7.jar,\\r
+               lib/swagger-annotations-1.5.5.jar,\\r
+               lib/swagger-models-1.5.5.jar,\\r
+               lib/tools.jar,\\r
+               lib/txw2-2.2.11.jar,\\r
+               lib/unitils-core-3.4.2.jar,\\r
+               lib/unitils-database-3.4.2.jar,\\r
+               lib/unitils-dbmaintainer-3.4.2.jar,\\r
+               lib/unitils-dbunit-3.4.2.jar,\\r
+               lib/unitils-easymock-3.4.2.jar,\\r
+               lib/unitils-inject-3.4.2.jar,\\r
+               lib/unitils-mock-3.4.2.jar,\\r
+               lib/unitils-orm-3.4.2.jar,\\r
+               lib/unitils-spring-3.4.2.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/wsdl4j-1.6.2.jar,\\r
-               lib/xalan-2.6.0.jar,\\r
+               lib/validation-api-1.1.0.Final.jar,\\r
+               lib/wsdl4j-1.6.3.jar,\\r
+               lib/xalan-2.7.0.jar,\\r
                lib/xercesImpl-2.11.0.jar,\\r
                lib/xml-apis-1.0.b2.jar,\\r
                lib/xml-apis-ext-1.3.04.jar,\\r
                lib/xml-resolver-1.2.jar,\\r
+               lib/xmlbeans-2.6.0.jar,\\r
                lib/xmlgraphics-commons-1.5.jar,\\r
-               lib/xmlParserAPIs-2.6.2.jar,\\r
                lib/xmlpull-1.1.3.1.jar,\\r
-               lib/xmlunit-1.4.jar,\\r
-               lib/xom-1.0.jar,\\r
+               lib/xmlunit-1.6.jar,\\r
+               lib/xom-1.2.5.jar,\\r
                lib/xpp3_min-1.1.4c.jar,\\r
                lib/xpp3-1.1.4c.jar,\\r
-               lib/xstream-1.4.4.jar,\\r
+               lib/xsom-20140925.jar,\\r
+               lib/xstream-1.4.8.jar,\\r
                lib/yjp-controller-api-redist-9.0.8.jar,\\r
-               lib/google-api-translate-java-0.92.jar,\\r
-               lib/odfdom-0.8.jar,\\r
-               lib/h2mig_pagestore_addon.jar,\\r
-               lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
-               lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
-               lib/jena-core-2.11.2.jar,\\r
-               lib/jena-iri-1.0.2.jar,\\r
-               lib/poi-3.10-FINAL.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,\\r
-               lib/cdmlib-commons-3.12.2.jar,\\r
-               lib/cdmlib-ext-3.12.2.jar,\\r
-               lib/cdmlib-io-3.12.2.jar,\\r
-               lib/cdmlib-model-3.12.2.jar,\\r
-               lib/cdmlib-persistence-3.12.2.jar,\\r
-               lib/cdmlib-print-3.12.2.jar,\\r
-               lib/cdmlib-remote-3.12.2.jar,\\r
-               lib/cdmlib-services-3.12.2.jar,\\r
-               lib/apache-log4j-extras-1.2.17.jar,\\r
-               resources/cdm.map.ser\r
+               lib/cdmlib-test-3.13.0-SNAPSHOT.jar\r
 \r
 jars.compile.order = .\r
 output.. = bin/\r
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar
new file mode 100644 (file)
index 0000000..933e4ee
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar
new file mode 100644 (file)
index 0000000..2804585
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar
deleted file mode 100644 (file)
index 351409c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar
new file mode 100644 (file)
index 0000000..26dcea2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar
deleted file mode 100644 (file)
index 9949bc5..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar
new file mode 100644 (file)
index 0000000..ca1829a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar
deleted file mode 100644 (file)
index 57fb273..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar
new file mode 100644 (file)
index 0000000..6a09ca3
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar
deleted file mode 100644 (file)
index 5dea94b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar
new file mode 100644 (file)
index 0000000..579cedd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar
new file mode 100644 (file)
index 0000000..51e2d85
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar
deleted file mode 100644 (file)
index 02d81e8..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar
new file mode 100644 (file)
index 0000000..e11f7cb
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar
new file mode 100644 (file)
index 0000000..01bf55b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar
new file mode 100644 (file)
index 0000000..02f3da4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar
deleted file mode 100644 (file)
index 218510b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar
new file mode 100644 (file)
index 0000000..7d075ed
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar
new file mode 100644 (file)
index 0000000..1d7417c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar
deleted file mode 100644 (file)
index 0df1030..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar
deleted file mode 100644 (file)
index c35fa1f..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar
new file mode 100644 (file)
index 0000000..fa5df82
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar
new file mode 100644 (file)
index 0000000..5f58e40
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar
new file mode 100644 (file)
index 0000000..2ce08ae
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar
deleted file mode 100644 (file)
index d6a543c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar
new file mode 100644 (file)
index 0000000..93a3b9f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar
deleted file mode 100644 (file)
index 9f8fb36..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar
new file mode 100644 (file)
index 0000000..4f595c6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar
deleted file mode 100644 (file)
index 59e009b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar
new file mode 100644 (file)
index 0000000..aa3d909
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar
deleted file mode 100644 (file)
index ae4f3c6..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar
new file mode 100644 (file)
index 0000000..9080348
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar
deleted file mode 100644 (file)
index b888a40..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar
new file mode 100644 (file)
index 0000000..ca6607e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar differ
similarity index 61%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar
index 10ca4b6..7ddd397 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar
new file mode 100644 (file)
index 0000000..e6e6c4e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar
new file mode 100644 (file)
index 0000000..190213e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar
deleted file mode 100644 (file)
index 4b79dd1..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar and /dev/null differ
similarity index 79%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar
index 99dd2d2..0eb926b 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar
new file mode 100644 (file)
index 0000000..b175ca8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar
deleted file mode 100644 (file)
index 0407b9c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar
deleted file mode 100644 (file)
index 869798e..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar
new file mode 100644 (file)
index 0000000..8b11e2e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar
deleted file mode 100644 (file)
index 7eb1a03..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar
new file mode 100644 (file)
index 0000000..f3fedee
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar
deleted file mode 100644 (file)
index ac9d674..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar
new file mode 100644 (file)
index 0000000..82e425d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar
deleted file mode 100644 (file)
index a8ac85d..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar
new file mode 100644 (file)
index 0000000..593d33f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar
deleted file mode 100644 (file)
index f534c03..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar
new file mode 100644 (file)
index 0000000..7f694d0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar
deleted file mode 100644 (file)
index 92d74fd..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar
new file mode 100644 (file)
index 0000000..2e5c789
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar
deleted file mode 100644 (file)
index f54d748..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar
new file mode 100644 (file)
index 0000000..d533819
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
deleted file mode 100644 (file)
index 1e9f71b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar
new file mode 100644 (file)
index 0000000..e2f2c59
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar
deleted file mode 100644 (file)
index 3acd5ac..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar
new file mode 100644 (file)
index 0000000..13da63d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar
deleted file mode 100644 (file)
index 9f384c8..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar
new file mode 100644 (file)
index 0000000..8ebf70b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar
deleted file mode 100644 (file)
index 5656793..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar
new file mode 100644 (file)
index 0000000..ba42764
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar
new file mode 100644 (file)
index 0000000..37f8ab1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar
deleted file mode 100644 (file)
index e010269..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar
new file mode 100644 (file)
index 0000000..2f05edf
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar
deleted file mode 100644 (file)
index 53c1c26..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar
new file mode 100644 (file)
index 0000000..b9c0c1c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar
new file mode 100644 (file)
index 0000000..f6a7cd4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar
deleted file mode 100644 (file)
index 9f45bd9..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar
new file mode 100644 (file)
index 0000000..ac4a877
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar
new file mode 100644 (file)
index 0000000..53a6420
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar
deleted file mode 100755 (executable)
index 2ec64a8..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar
new file mode 100644 (file)
index 0000000..aa950a8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar
new file mode 100644 (file)
index 0000000..acfa7e3
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar
deleted file mode 100644 (file)
index e1e2713..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar
new file mode 100644 (file)
index 0000000..3f6ea6c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar
new file mode 100644 (file)
index 0000000..9efc5bd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar
new file mode 100644 (file)
index 0000000..1a31f17
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar
new file mode 100644 (file)
index 0000000..5812b47
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar
new file mode 100644 (file)
index 0000000..d24086a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar
deleted file mode 100644 (file)
index a248980..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar
new file mode 100644 (file)
index 0000000..0f1ff72
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar
new file mode 100644 (file)
index 0000000..90a9ab5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar
new file mode 100644 (file)
index 0000000..4a3001e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar
new file mode 100644 (file)
index 0000000..6b14c3d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar
new file mode 100644 (file)
index 0000000..3f4638c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar
deleted file mode 100644 (file)
index ae2adee..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar
new file mode 100644 (file)
index 0000000..cc0aad1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar
deleted file mode 100644 (file)
index 4977608..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar
new file mode 100644 (file)
index 0000000..79db7c4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar
new file mode 100644 (file)
index 0000000..a1f047f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar
deleted file mode 100644 (file)
index f8e5ff8..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar
new file mode 100644 (file)
index 0000000..0a753d0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar
new file mode 100644 (file)
index 0000000..52f47a4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar
deleted file mode 100644 (file)
index ff3a103..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar
new file mode 100644 (file)
index 0000000..ea45d4d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar
new file mode 100644 (file)
index 0000000..1a1ceee
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar
new file mode 100644 (file)
index 0000000..2850ca1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar
new file mode 100644 (file)
index 0000000..3b17e6e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar
deleted file mode 100644 (file)
index 7d7d210..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar
new file mode 100644 (file)
index 0000000..ba93796
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar
deleted file mode 100644 (file)
index f54fb49..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar
new file mode 100644 (file)
index 0000000..d520498
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar
new file mode 100644 (file)
index 0000000..580c9cd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar
deleted file mode 100644 (file)
index b2aca95..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar
new file mode 100644 (file)
index 0000000..583e06a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar
new file mode 100644 (file)
index 0000000..ef29094
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar
new file mode 100644 (file)
index 0000000..d61cc0f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar
new file mode 100644 (file)
index 0000000..7736ec9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar differ
similarity index 50%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar
index 60f119c..518b425 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar
deleted file mode 100644 (file)
index aaf7444..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar
new file mode 100644 (file)
index 0000000..3a7fc26
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar
deleted file mode 100644 (file)
index b1e1c51..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar
new file mode 100644 (file)
index 0000000..93aee13
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar
new file mode 100644 (file)
index 0000000..39143a5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar
deleted file mode 100644 (file)
index 752c714..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar
new file mode 100644 (file)
index 0000000..16b447e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar
new file mode 100644 (file)
index 0000000..73ae74e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar
deleted file mode 100644 (file)
index cc374b7..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar
new file mode 100644 (file)
index 0000000..52d41e5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar
deleted file mode 100644 (file)
index 7b8d21c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar
new file mode 100644 (file)
index 0000000..fa65b53
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar
deleted file mode 100644 (file)
index 37a4406..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar
new file mode 100644 (file)
index 0000000..694e569
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar
deleted file mode 100644 (file)
index 47923cc..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar
new file mode 100644 (file)
index 0000000..fc565b5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar
new file mode 100644 (file)
index 0000000..34193e1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar
deleted file mode 100644 (file)
index 093efbd..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar
deleted file mode 100644 (file)
index 5e1937f..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar
new file mode 100644 (file)
index 0000000..0853094
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar
deleted file mode 100644 (file)
index 6276656..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar
new file mode 100644 (file)
index 0000000..4cc68c3
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar
deleted file mode 100644 (file)
index b67de4c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar
deleted file mode 100644 (file)
index 8e2c2b7..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar
new file mode 100644 (file)
index 0000000..52e3d02
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar
new file mode 100644 (file)
index 0000000..d928ea9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar
new file mode 100644 (file)
index 0000000..b684159
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar
deleted file mode 100644 (file)
index ea5930b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar
deleted file mode 100644 (file)
index 2f2bf0b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar
deleted file mode 100644 (file)
index 501701d..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar
deleted file mode 100644 (file)
index bf83933..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar
new file mode 100644 (file)
index 0000000..4c0156d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar
new file mode 100644 (file)
index 0000000..20a0d2c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar
new file mode 100644 (file)
index 0000000..88f1d47
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar
deleted file mode 100644 (file)
index c44160e..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar
deleted file mode 100644 (file)
index c640a8d..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar
new file mode 100644 (file)
index 0000000..be09493
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
deleted file mode 100644 (file)
index 4cf488e..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
deleted file mode 100644 (file)
index f131a43..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 3b9cbb1..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index b8c0595..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 172c395..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index e285a21..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 0b73e4a..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index f992bff..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index a46dc3a..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 412412b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 84af61c..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 30962d0..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 4d4c662..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index bfe1d97..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 015aacd..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar
deleted file mode 100644 (file)
index 44b8987..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar
new file mode 100644 (file)
index 0000000..e158377
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar
new file mode 100644 (file)
index 0000000..e4de16f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar
deleted file mode 100644 (file)
index 1cf1a7a..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar
new file mode 100644 (file)
index 0000000..feab196
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar
deleted file mode 100644 (file)
index 8862e21..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar
new file mode 100644 (file)
index 0000000..a9e3800
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar
deleted file mode 100644 (file)
index 0782b07..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar
new file mode 100644 (file)
index 0000000..726768c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar differ
similarity index 70%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar
index 24d719e..bd88397 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar
deleted file mode 100644 (file)
index 63e5416..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar
new file mode 100644 (file)
index 0000000..0e470f5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar
new file mode 100644 (file)
index 0000000..db9206f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar
new file mode 100644 (file)
index 0000000..00cf5b4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar
new file mode 100644 (file)
index 0000000..f07884e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar
deleted file mode 100644 (file)
index 1a88708..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar
new file mode 100644 (file)
index 0000000..a8dd5c5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar
deleted file mode 100644 (file)
index 5dfcf4b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar
new file mode 100644 (file)
index 0000000..5496e46
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 386fe32..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..7fb0ba7
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..8be8424
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 52d0ae6..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..89232b4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index b027ab8..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..38cfab6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index f1df10b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..d979371
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index 906326d..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..f2cd8fb
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar
deleted file mode 100644 (file)
index b5c6f1a..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..483f3f1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..4f0abf1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..e4f6cca
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..f191a6b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar
new file mode 100644 (file)
index 0000000..c290363
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar
new file mode 100644 (file)
index 0000000..6eaa98c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar
deleted file mode 100644 (file)
index 37f66bc..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar
new file mode 100644 (file)
index 0000000..427c2b2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar
deleted file mode 100644 (file)
index 81e3566..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar
new file mode 100644 (file)
index 0000000..18c51b3
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar
deleted file mode 100644 (file)
index 6268e58..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar
new file mode 100644 (file)
index 0000000..018f192
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..f5a6691
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..dda3bc0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..d788595
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar
new file mode 100644 (file)
index 0000000..ee87814
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar
new file mode 100644 (file)
index 0000000..0cedf11
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar
new file mode 100644 (file)
index 0000000..e1ccee6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar
new file mode 100644 (file)
index 0000000..2dd9873
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar
new file mode 100644 (file)
index 0000000..c64b035
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar
new file mode 100644 (file)
index 0000000..31302c9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar
new file mode 100644 (file)
index 0000000..31744df
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar
new file mode 100644 (file)
index 0000000..bc528ac
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar
new file mode 100644 (file)
index 0000000..31a6aad
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar
deleted file mode 100644 (file)
index 6c6f5c2..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar
new file mode 100644 (file)
index 0000000..b1f4405
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar
new file mode 100644 (file)
index 0000000..a14a5ff
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar
new file mode 100644 (file)
index 0000000..4f98c80
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar
new file mode 100644 (file)
index 0000000..eca81b2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar
new file mode 100644 (file)
index 0000000..01b1f95
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar
new file mode 100644 (file)
index 0000000..25351e1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar
new file mode 100644 (file)
index 0000000..588258e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar
new file mode 100644 (file)
index 0000000..538064a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar
deleted file mode 100644 (file)
index 1ff2dd7..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar
new file mode 100644 (file)
index 0000000..de85403
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar
deleted file mode 100644 (file)
index b9ffc36..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar
new file mode 100644 (file)
index 0000000..b9c10b9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld b/eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld
new file mode 100644 (file)
index 0000000..e52ffe8
--- /dev/null
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+    
+  <description>JSTL 1.1 XML library</description>
+  <display-name>JSTL XML</display-name>
+  <tlib-version>1.1</tlib-version>
+  <short-name>x</short-name>
+  <uri>http://java.sun.com/jsp/jstl/xml</uri>
+
+  <validator>
+    <description>
+        Provides validation features for JSTL XML tags.
+    </description>
+    <validator-class>
+       org.apache.taglibs.standard.tlv.JstlXmlTLV
+    </validator-class>
+  </validator>
+
+  <tag>
+    <description>
+        Simple conditional tag that establishes a context for
+        mutually exclusive conditional operations, marked by
+        &lt;when&gt; and &lt;otherwise&gt;
+    </description>
+    <name>choose</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <description>
+       Like &lt;%= ... &gt;, but for XPath expressions.
+    </description>
+    <name>out</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ExprTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
+        <name>select</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Determines whether characters &lt;,&gt;,&amp;,'," in the
+resulting string should be converted to their
+corresponding character entity codes. Default
+value is true.
+        </description>
+        <name>escapeXml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        XML conditional tag, which evalutes its body if the
+        supplied XPath expression evalutes to 'true' as a boolean
+    </description>
+    <name>if</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The test condition that tells whether or not the
+body content should be processed.
+        </description>
+        <name>select</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+resulting value of the test condition. The type
+of the scoped variable is Boolean.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+       XML iteration tag.
+    </description>
+    <name>forEach</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped variable
+has nested visibility. Its type depends on the
+result of the XPath expression in the select
+attribute.
+        </description>
+       <name>var</name>
+       <required>false</required>
+       <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
+       <name>select</name>
+       <required>true</required>
+       <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Iteration begins at the item located at the
+specified index. First item of the collection has
+index 0.
+        </description>
+       <name>begin</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+       <type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration ends at the item located at the specified
+index (inclusive).
+        </description>
+       <name>end</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+       <type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration will only process every step items of
+the collection, starting with the first one.
+        </description>
+       <name>step</name>
+       <required>false</required>
+       <rtexprvalue>true</rtexprvalue>
+       <type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of type
+javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+        </description>
+       <name>varStatus</name>
+       <required>false</required>
+       <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+       Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
+       and runs only if all of the prior conditions evaluated to
+       'false'
+    </description>
+    <name>otherwise</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+    <body-content>JSP</body-content>
+  </tag>
+
+  <tag>
+    <description>
+        Adds a parameter to a containing 'transform' tag's Transformer
+    </description>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the transformation parameter.
+        </description>
+        <name>name</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Value of the parameter.
+        </description>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+       Parses XML content from 'source' attribute or 'body'
+    </description>
+    <name>parse</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParseTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is implementation
+dependent.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+        </description>
+        <name>varDom</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for varDom.
+        </description>
+        <name>scopeDom</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Deprecated. Use attribute 'doc' instead.
+        </description>
+        <name>xml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Source XML document to be parsed.
+        </description>
+        <name>doc</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+The system identifier (URI) for parsing the
+XML document.
+        </description>
+        <name>systemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Filter to be applied to the source
+document.
+        </description>
+        <name>filter</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+       Saves the result of an XPath expression evaluation in a 'scope'
+    </description>
+    <name>set</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+        <description>
+Name of the exported scoped variable to hold
+the value specified in the action. The type of the
+scoped variable is whatever type the select
+expression evaluates to.
+        </description>
+        <name>var</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
+       <name>select</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+       Conducts a transformation given a source XML document
+       and an XSLT stylesheet
+    </description>
+    <name>transform</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.TransformTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Name of the exported
+scoped variable for the
+transformed XML
+document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+        </description>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Scope for var.
+        </description>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Result
+Object that captures or
+processes the transformation
+result.
+        </description>
+        <name>result</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Deprecated. Use attribute
+'doc' instead.
+        </description>
+        <name>xml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Source XML document to be
+transformed. (If exported by
+&lt;x:set&gt;, it must correspond
+to a well-formed XML
+document, not a partial
+document.)
+        </description>
+        <name>doc</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Deprecated. Use attribute
+'docSystemId' instead.
+        </description>
+        <name>xmlSystemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+The system identifier (URI)
+for parsing the XML
+document.
+        </description>
+        <name>docSystemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+javax.xml.transform.Source
+Transformation stylesheet as
+a String, Reader, or
+Source object.
+        </description>
+       <name>xslt</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+The system identifier (URI)
+for parsing the XSLT
+stylesheet.
+        </description>
+       <name>xsltSystemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <description>
+        Subtag of &lt;choose&gt; that includes its body if its
+        expression evalutes to 'true'
+    </description>
+    <name>when</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+        <description>
+The test condition that tells whether or
+not the body content should be
+processed
+        </description>
+        <name>select</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+</taglib>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar
deleted file mode 100644 (file)
index 73cf175..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar
new file mode 100644 (file)
index 0000000..007be39
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar
deleted file mode 100644 (file)
index 2dd8377..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar and /dev/null differ
similarity index 55%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar
index ccd8163..d1b6627 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar
deleted file mode 100644 (file)
index d7c072d..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar
new file mode 100644 (file)
index 0000000..b9328ef
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar
deleted file mode 100644 (file)
index 22cd958..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar
new file mode 100644 (file)
index 0000000..1f71ab9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar
new file mode 100644 (file)
index 0000000..f391598
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar
deleted file mode 100644 (file)
index dcedd5a..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar
new file mode 100644 (file)
index 0000000..a493c3b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar differ
index 4ed60ae..444633d 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.12.3</version>\r
+    <version>3.13.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
@@ -39,7 +39,7 @@
                 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
+                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdmlib-test\r
               </includeArtifactIds>\r
               <outputDirectory>${basedir}/lib</outputDirectory>\r
               <overWriteReleases>true</overWriteReleases>\r
       <url>http://repository.springsource.com/maven/bundles/external\r
       </url>\r
     </repository>\r
+        <repository>\r
+        <id>repository.springsource.release</id>\r
+        <name>SpringSource GA Repository</name>\r
+        <url>http://repo.springsource.org/release</url>\r
+    </repository>\r
   </repositories>\r
   <dependencies>\r
     <dependency>\r
       <artifactId>cdmlib-ext</artifactId>\r
       <version>${cdmlib.version}</version>\r
     </dependency>\r
+    <dependency>\r
+      <groupId>eu.etaxonomy</groupId>\r
+      <artifactId>cdmlib-test</artifactId>\r
+      <version>${cdmlib.version}</version>\r
+    </dependency>\r
 \r
     <!-- <dependency> -->\r
     <!-- <groupId>org.eclipse.jetty</groupId> -->\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
+      <artifactId>spring-context</artifactId>\r
+      <version>4.2.4.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
+      <artifactId>spring-context-support</artifactId>\r
+      <version>4.2.4.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
+      <artifactId>spring-aspects</artifactId>\r
+      <version>4.2.4.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
+      <artifactId>spring-test</artifactId>\r
+      <version>4.2.4.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
+      <artifactId>spring-beans</artifactId>\r
+      <version>4.2.4.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
+      <artifactId>spring-tx</artifactId>\r
+      <version>4.2.4.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
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-web</artifactId>\r
+               <version>4.2.4.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
+      <artifactId>spring-core</artifactId>\r
+      <version>4.2.4.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
+      <artifactId>spring-aop</artifactId>\r
+      <version>4.2.4.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
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-expression</artifactId>\r
+               <version>4.2.4.RELEASE</version>\r
+       </dependency>\r
+   <dependency>\r
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-orm</artifactId>\r
+               <version>4.2.4.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
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-jdbc</artifactId>\r
+               <version>4.2.4.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
+      <version>4.0.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
+      <version>4.0.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
+      <version>4.0.3.RELEASE</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.jboss.logging</groupId>\r
index 47757c9..cdb3a1c 100644 (file)
@@ -19,7 +19,7 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.BeansException;\r
 import org.springframework.context.ApplicationContext;\r
 import org.springframework.context.ApplicationContextAware;\r
-import org.springframework.remoting.httpinvoker.CommonsHttpInvokerRequestExecutor;\r
+import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor;\r
 import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;\r
 import org.springframework.security.access.AccessDecisionVoter;\r
 import org.springframework.security.authentication.AuthenticationProvider;\r
@@ -128,7 +128,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
         this.remoteSource = remoteSource;\r
     }\r
 \r
-    private Object getService(Class<?> clazz, String serviceSuffix, CommonsHttpInvokerRequestExecutor executor) {\r
+    private Object getService(Class<?> clazz, String serviceSuffix, HttpComponentsHttpInvokerRequestExecutor executor) {\r
         if(serviceMap.containsKey(clazz)) {\r
             return serviceMap.get(clazz);\r
         }\r
@@ -140,7 +140,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
     public static Object getService(Class<?> clazz,\r
             String serviceSuffix,\r
             ICdmRemoteSource remoteSource,\r
-            CommonsHttpInvokerRequestExecutor executor) {\r
+            HttpComponentsHttpInvokerRequestExecutor executor) {\r
 \r
         String baseUrl;\r
         if(remoteSource.getContextPath() == null || remoteSource.getContextPath().equals("")) {\r
@@ -305,16 +305,16 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
 \r
 \r
     public static IUserService getUserService(ICdmRemoteSource remoteSource) {\r
-        return (IUserService) getService(IUserService.class, "/remoting-public/user.service", remoteSource, new CommonsHttpInvokerRequestExecutor());\r
+        return (IUserService) getService(IUserService.class, "/remoting-public/user.service", remoteSource, new HttpComponentsHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
     public IMetadataService getMetadataService() {\r
-        return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", new CommonsHttpInvokerRequestExecutor());\r
+        return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", new HttpComponentsHttpInvokerRequestExecutor());\r
     }\r
 \r
     public static IMetadataService getMetadataService(ICdmRemoteSource remoteSource) {\r
-        return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", remoteSource, new CommonsHttpInvokerRequestExecutor());\r
+        return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", remoteSource, new HttpComponentsHttpInvokerRequestExecutor());\r
     }\r
 \r
     @Override\r
@@ -426,7 +426,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
         if(cdmPermissionEvaluator != null) {\r
             return cdmPermissionEvaluator;\r
         }\r
-        List<AccessDecisionVoter> decisionVoters = new ArrayList<AccessDecisionVoter>();\r
+        List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();\r
         decisionVoters.add(new GrantAlwaysVoter());\r
         decisionVoters.add(new TaxonNodeVoter());\r
         decisionVoters.add(new TaxonBaseVoter());\r
index cf53ea5..9975269 100644 (file)
@@ -17,12 +17,20 @@ import net.sf.ehcache.Element;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
-import org.hibernate.property.Getter;
+import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.property.access.spi.Getter;
 import org.osgi.framework.Bundle;
 
+import org.hibernate.boot.Metadata;
+
 
 public class CdmModelCacher {
 
@@ -63,22 +71,39 @@ public class CdmModelCacher {
 
 
     public Map<String, CdmModelFieldPropertyFromClass> generateModelClassMap() {
-
-        Configuration configuration = buildConfiguration(HB_CONFIG_FILE_PATH);
-        Iterator<PersistentClass> classMappingIterator =   configuration.getClassMappings();
-
-        Map<String, CdmModelFieldPropertyFromClass> modelClassMap = new HashMap<String, CdmModelFieldPropertyFromClass>();
-
-        while(classMappingIterator.hasNext()) {
-            PersistentClass persistentClass = classMappingIterator.next();
-            Class mappedClass = persistentClass.getMappedClass();
-            String mappedClassName = mappedClass.getName();
-
-            CdmModelFieldPropertyFromClass cmgmfc = new CdmModelFieldPropertyFromClass(mappedClassName);
-            System.out.println("Adding class : " + mappedClassName + " to cache");
-            addGetters(persistentClass, cmgmfc);
-            modelClassMap.put(mappedClassName, cmgmfc);
-        }
+       
+       // A SessionFactory is set up once for an application!
+       final StandardServiceRegistry registry = new StandardServiceRegistryBuilder()
+                       .configure(HB_CONFIG_FILE_PATH) // configures settings from hibernate.cfg.xml
+                       .build();
+       SessionFactory sessionFactory = null;
+       Map<String, CdmModelFieldPropertyFromClass> modelClassMap = new HashMap<String, CdmModelFieldPropertyFromClass>();
+       try {
+               sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory();
+               Configuration configuration = buildConfiguration(HB_CONFIG_FILE_PATH);
+               Map<String, ClassMetadata> classMetaDataMap = sessionFactory.getAllClassMetadata();
+               Metadata metadata = new MetadataSources( registry ).getMetadataBuilder().applyImplicitNamingStrategy( ImplicitNamingStrategyJpaCompliantImpl.INSTANCE ).build();
+           
+
+            for(ClassMetadata classMetaData :classMetaDataMap.values()) {
+               Class mappedClass = classMetaData.getMappedClass();
+               
+                String mappedClassName = mappedClass.getName();
+               
+                PersistentClass persistentClass =metadata.getEntityBinding(mappedClassName);
+                CdmModelFieldPropertyFromClass cmgmfc = new CdmModelFieldPropertyFromClass(mappedClassName);
+                System.out.println("Adding class : " + mappedClassName + " to cache");
+                addGetters(persistentClass, cmgmfc);
+                modelClassMap.put(mappedClassName, cmgmfc);
+            }
+       }
+       catch (Exception e) {
+               // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory
+               // so destroy it manually.
+               StandardServiceRegistryBuilder.destroy( registry );
+       }
+       
+       
         return modelClassMap;
     }
 
index ccea9a8..b5a0f8a 100644 (file)
@@ -379,12 +379,12 @@ public class CdmServerInfo {
     public static List<CdmServerInfo> getCdmServers() {
         if(cdmServerInfoList == null) {
            cdmServerInfoList = new ArrayList<CdmServerInfo>();
-           cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80, "", false));
+           // cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80, ""));
            //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80, CDMSERVER_PREFIX));
            cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80, CDMSERVER_PREFIX, false));
            // cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80, CDMSERVER_PREFIX));
-           //cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
-           cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, false));
+           cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
+           cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, true));
            cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST, NULL_PORT, CDMSERVER_PREFIX, false));
         }
         return cdmServerInfoList;
index 692a3ba..f46b81a 100644 (file)
@@ -13,7 +13,8 @@ import java.io.IOException;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.springframework.remoting.httpinvoker.CommonsHttpInvokerRequestExecutor;
+import org.apache.http.client.methods.HttpPost;
+import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor;
 import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
@@ -25,11 +26,11 @@ import eu.etaxonomy.cdm.api.application.CdmApplicationState;
  * @date 27 Jan 2015
  *
  */
-public class CdmAuthenticatedHttpInvokerRequestExecutor extends CommonsHttpInvokerRequestExecutor {
+public class CdmAuthenticatedHttpInvokerRequestExecutor extends HttpComponentsHttpInvokerRequestExecutor {
 
     @Override
-    protected PostMethod createPostMethod(HttpInvokerClientConfiguration config) throws IOException {
-        PostMethod postMethod = super.createPostMethod(config);
+    protected HttpPost createHttpPost(HttpInvokerClientConfiguration config) throws IOException {
+       HttpPost postMethod = super.createHttpPost(config);
 
         SecurityContext securityContext = CdmApplicationState.getCurrentSecurityContext();
         if(securityContext != null) {
@@ -37,7 +38,7 @@ public class CdmAuthenticatedHttpInvokerRequestExecutor extends CommonsHttpInvok
             if ((auth != null) && (auth.getName() != null) &&
                     (auth.getCredentials() != null)) {
                 String base64 = auth.getName() + ":" + auth.getCredentials().toString();
-                postMethod.setRequestHeader("Authorization", "Basic " +
+                postMethod.setHeader("Authorization", "Basic " +
                         new String(Base64.encodeBase64(base64.getBytes())));
             }
         }
index f2debcc..2224ce5 100644 (file)
@@ -236,11 +236,11 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
                if ( isTempSession ) {
                        // TODO: On the next major release, add an
                        // 'isJTA' or 'getTransactionFactory' method to Session.
-                       isJTA = session.getTransactionCoordinator()
+                       /*isJTA = session.getTransactionCoordinator()
                                        .getTransactionContext().getTransactionEnvironment()
                                        .getTransactionFactory()
-                                       .compatibleWithJtaSynchronization();
-
+                                       .compatibleWithJtaSynchronization();*/
+                       isJTA = session.getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta();
                        if ( !isJTA ) {
                                // Explicitly handle the transactions only if we're not in
                                // a JTA environment.  A lazy loading temporary session can
index 5915948..f9920b6 100644 (file)
@@ -203,10 +203,12 @@ public abstract class AbstractLazyInitializer implements LazyInitializer {
 
                                // TODO: On the next major release, add an
                                // 'isJTA' or 'getTransactionFactory' method to Session.
-                               boolean isJTA = session.getTransactionCoordinator()
+                               /*boolean isJTA = session.getTransactionCoordinator()
                                                .getTransactionContext().getTransactionEnvironment()
                                                .getTransactionFactory()
                                                .compatibleWithJtaSynchronization();
+                               */
+                               boolean isJTA = session.getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta();
 
                                if ( !isJTA ) {
                                        // Explicitly handle the transactions only if we're not in
index f660224..1c730c9 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.12.3
+Bundle-Version: 3.13.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index d6cc82e..3450b36 100644 (file)
@@ -148,7 +148,7 @@ command.label.54 = Delete (with children)
 command.tooltip = Show Only Individuals Associations\r
 command.label.55 = Open Associated Specimens\r
 command.name.41 = Show Only Individual Associations\r
-command.name.42 = Open Taxon Editor\r
+command.name.42 = Open Taxon Editor for taxon\r
 command.name.43 = Create Field Unit\r
 command.name.44 = Deep Delete\r
 command.name.46 = Move Synonym (Homotypical Group) to another Accepted Taxon\r
index 7cf0948..70e779d 100644 (file)
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator4"
+               visible="true">
+         </separator>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.derivativeEditor.CdmViewerContextMenu">
+         </dynamic>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
+         </dynamic>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator3"
+               visible="true">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleRead"
+               id="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleReadMenuItem"
+               label="Reuse single read here"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isSingleReadReusableHere">
+               </reference>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.derivative.copySingleReadToClipBoard"
+               label="Reuse for other sequence"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isSingleRead">
+               </reference>
+            </visibleWhen>
+         </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.derivate.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.derivative.removeSingleReadFromSequence"
+               label="Remove from this sequence"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isSingleReadReused">
+               </reference>
+            </visibleWhen>
+         </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator7"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.edit.delete"
                label="%command.label.52"
                style="push">
          </command>
                label="%command.label.54"
                style="push">
          </command>
-         <dynamic
-               class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
-               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
-         </dynamic>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.view.derivate.command.delete">
+            commandId="org.eclipse.ui.edit.delete">
          <activeWhen>
             <with
                   variable="activePartId">
             </reference>
          </activeWhen>
       </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
+            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
    </extension>
    <extension
          name="%extension.name"
             name="%command.name.41">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenTaxonEditorHandler"
-            id="eu.etaxonomy.taxeditor.editor.openTaxonEditor"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonHandler"
+            id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon"
             name="%command.name.42">
          <commandParameter
-               id="eu.etaxonomy.taxeditor.editor.taxonParameter"
+               id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon.uuid"
                name="%commandParameter.name"
                optional="false"
-               typeId="eu.etaxonomy.taxeditor.editor.taxonParameterType">
+               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
+         </commandParameter>
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonNodeHandler"
+            id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode"
+            name="Open Taxon Editor for taxonnode">
+         <commandParameter
+               id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode.uuid"
+               name="taxon node uuid"
+               optional="true"
+               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
          </commandParameter>
       </command>
-      <commandParameterType
-            converter="eu.etaxonomy.taxeditor.editor.handler.TaxonParameterConverter"
-            id="eu.etaxonomy.taxeditor.editor.taxonParameterType"
-            type="eu.etaxonomy.cdm.model.taxon.TaxonBase">
-      </commandParameterType>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
             id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
             id="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
             name="Open Derivative Editor">
-         <commandParameter
-               id="eu.etaxonomy.taxeditor.specimenUuidParameter"
-               name="Specimen UUID parameter"
-               optional="true"
-               typeId="eu.etaxonomy.taxeditor.specimenUuidParameterType">
-         </commandParameter>
       </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ListenToSelectionChangeHandler"
             id="eu.etaxonomy.taxeditor.editor.derivative.listenToSelectionChange"
             name="Link with taxon selection">
       </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivative.copySingleReadToClipBoard"
+            name="Copy SingleRead to clipboard">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleRead"
+            name="Reuse SingleRead">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivative.removeSingleReadFromSequence"
+            name="Remove SingleRead from sequence">
+      </command>
         
    </extension>
    <extension
-         point="org.eclipse.ui.commands">
-      <commandParameterType
-            converter="eu.etaxonomy.taxeditor.handler.UuidParameterConverter"
-            id="eu.etaxonomy.taxeditor.specimenUuidParameterType"
-            type="java.util.UUID">
-      </commandParameterType>
-   </extension>
-   <extension
          point="org.eclipse.core.expressions.definitions">
       <definition
             id="nameEditorActive">
             </test>
          </with>
       </definition>
+      <definition
+            id="isSingleReadReusableHere">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSingleReadReusableHere">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isSingleReadReused">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSingleReadReused">
+            </test>
+         </with>
+      </definition>
    </extension>
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
             class="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
             id="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
             namespace="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
-            properties="isSequence,isSingleRead"
+            properties="isSequence,isSingleRead,isSingleReadReusableHere,isSingleReadReused"
             type="org.eclipse.jface.viewers.IStructuredSelection">
       </propertyTester>
    </extension>
    </extension>
    <extension
           point="eu.etaxonomy.taxeditor.store.cdmViewer">
-       <cdmViewer
-             class="eu.etaxonomy.taxeditor.editor.EditorCdmViewer">
-       </cdmViewer>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode"
+            selection="eu.etaxonomy.cdm.model.taxon.TaxonNode"
+            viewerName="Taxon Editor">
+      </viewCommandMapping>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon"
+            selection="eu.etaxonomy.cdm.model.taxon.TaxonBase"
+            viewerName="TaxonEditor">
+      </viewCommandMapping>
     </extension>
 </plugin>
index 4a9fa35..aad6862 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.3</version>
+    <version>3.13.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorCdmViewer.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorCdmViewer.java
deleted file mode 100644 (file)
index 796d19a..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2015 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.ui.PartInitException;
-
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.view.ICdmViewer;
-
-/**
- * @author pplitzner
- * @date Feb 23, 2015
- *
- */
-public class EditorCdmViewer implements ICdmViewer {
-
-    private final Logger logger = Logger.getLogger(EditorCdmViewer.class);
-
-    @Override
-    public void show(Object input, Class<?> viewerClass) {
-        try {
-            if(viewerClass.equals(MultiPageTaxonEditor.class)){
-                if(input instanceof TaxonBase){
-                    TaxonEditorInput editorInput = TaxonEditorInput.NewInstanceFromTaxonBase(((TaxonBase<?>) input).getUuid());
-                    EditorUtil.open(editorInput);
-                }
-            }
-            else if(viewerClass.equals(DerivateView.class)){
-                if(input instanceof SpecimenOrObservationBase){
-                }
-            }
-        } catch (PartInitException e) {
-            String errorMessage = "Could not open editor";
-            logger.error(errorMessage, e);
-            MessagingUtils.error(EditorCdmViewer.class, errorMessage, e);
-        }
-    }
-
-    @Override
-    public Map<Class<?>, String> getViewerClasses(Object input) {
-        Map<Class<?>, String> viewerNameMap = new HashMap<Class<?>, String>();
-        if(input instanceof TaxonBase){
-            viewerNameMap.put(MultiPageTaxonEditor.class, "Taxon Editor");
-        }
-        return viewerNameMap;
-    }
-
-}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenTaxonEditorHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenTaxonEditorHandler.java
deleted file mode 100644 (file)
index b416726..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-package eu.etaxonomy.taxeditor.editor.handler;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.ParameterType;
-import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.ui.PartInitException;
-
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-
-
-public class OpenTaxonEditorHandler extends AbstractHandler {
-
-    @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException {
-        Object object = event.getObjectParameterForExecution("eu.etaxonomy.taxeditor.editor.taxonParameter");
-
-        try {
-            ParameterType parameterType = event.getCommand().getParameterType("eu.etaxonomy.taxeditor.editor.taxonParameter");
-            if(parameterType.isCompatible(object)){
-                EditorUtil.openTaxonEditor(object);
-            }
-        } catch (NotDefinedException e) {
-            MessagingUtils.error(this.getClass(), "Parameter type not defined", e);
-        } catch (PartInitException e) {
-            MessagingUtils.error(OpenTaxonEditorHandler.class, "Error opening the editor", e);
-        }
-        return null;
-    }
-
-}
index eb3995c..ec87507 100644 (file)
@@ -2,12 +2,17 @@ package eu.etaxonomy.taxeditor.editor.handler;
 
 
 import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeNode;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.cdm.model.molecular.SingleRead;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
 
 
 
@@ -20,6 +25,8 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil;
 public class SpecimenPropertyTester extends PropertyTester {
     private static final String SEQUENCE = "isSequence";
     private static final String SINGLE_READ = "isSingleRead";
+    private static final String IS_SINGLEREAD_REUSABLE_HERE = "isSingleReadReusableHere";
+    private static final String IS_SINGLEREAD_REUSED = "isSingleReadReused";
 
 
     public SpecimenPropertyTester() {}
@@ -37,12 +44,39 @@ public class SpecimenPropertyTester extends PropertyTester {
                 else if (SINGLE_READ.equals(property)) {
                        return isSingleReadAlignment(treeNodeOfSelection.getValue());
                 }
+                else if (IS_SINGLEREAD_REUSABLE_HERE.equals(property)) {
+                    return isSingleReadReusableHere(treeNodeOfSelection.getValue());
+                }
+                else if (IS_SINGLEREAD_REUSED.equals(property)) {
+                    return isSingleReadReused(treeNodeOfSelection.getValue());
+                }
             }
         }
         return false;
     }
 
-       private boolean isSequence(Object object) {
+    private boolean isSingleReadReused(Object value) {
+        final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+        final IEditorPart activeEditor = window.getActivePage().getActiveEditor();
+        if(value instanceof SingleRead){
+            if(activeEditor instanceof DerivateView
+                    && ((DerivateView) activeEditor).getMultiLinkSingleReads().contains(value)){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isSingleReadReusableHere(Object value) {
+        TreeNode clipboardNode = EditorUtil.getTreeNodeOfSelection(LocalSelectionTransfer.getTransfer().getSelection());
+        if(value instanceof Sequence && clipboardNode!=null && clipboardNode.getValue() instanceof SingleRead
+                && !((Sequence) value).getSingleReads().contains(clipboardNode.getValue())){
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isSequence(Object object) {
        return (object instanceof Sequence);
        }
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/TaxonParameterConverter.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/TaxonParameterConverter.java
deleted file mode 100644 (file)
index 0283f4d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.etaxonomy.taxeditor.editor.handler;
-
-import java.util.UUID;
-
-import org.eclipse.core.commands.AbstractParameterValueConverter;
-import org.eclipse.core.commands.ParameterValueConversionException;
-
-import eu.etaxonomy.cdm.api.service.ITaxonService;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-public class TaxonParameterConverter extends AbstractParameterValueConverter {
-
-    public TaxonParameterConverter() {
-    }
-
-    @Override
-    public Object convertToObject(String parameterValue) throws ParameterValueConversionException {
-        return CdmStore.getService(ITaxonService.class).load(UUID.fromString(parameterValue));
-    }
-
-    @Override
-    public String convertToString(Object parameterValue) throws ParameterValueConversionException {
-        if(parameterValue instanceof TaxonBase<?>){
-            return ((TaxonBase<?>) parameterValue).getUuid().toString();
-        }
-        return null;
-    }
-
-}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java
new file mode 100644 (file)
index 0000000..7584a80
--- /dev/null
@@ -0,0 +1,31 @@
+package eu.etaxonomy.taxeditor.editor.handler.defaultHandler;
+import java.util.UUID;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.ui.PartInitException;
+
+import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenHandlerBase;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+
+public class DefaultOpenTaxonEditorForTaxonHandler extends DefaultOpenHandlerBase<TaxonBase> {
+
+    @Override
+    protected TaxonBase getEntity(UUID uuid) {
+        return CdmStore.getService(ITaxonService.class).load(uuid);
+    }
+
+    @Override
+    protected void open(ExecutionEvent event, TaxonBase entity) {
+        try {
+            EditorUtil.openTaxonBase(entity.getUuid());
+        } catch (PartInitException e) {
+            MessagingUtils.error(DefaultOpenTaxonEditorForTaxonHandler.class, "Could not open taxon editor for taxon/synonym "+entity, e);
+        }
+    }
+
+}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonNodeHandler.java
new file mode 100644 (file)
index 0000000..52937c8
--- /dev/null
@@ -0,0 +1,33 @@
+package eu.etaxonomy.taxeditor.editor.handler.defaultHandler;
+import java.util.UUID;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.ui.PartInitException;
+
+import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
+import eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenHandlerBase;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+
+public class DefaultOpenTaxonEditorForTaxonNodeHandler extends DefaultOpenHandlerBase<TaxonNode> {
+
+    @Override
+    protected TaxonNode getEntity(UUID uuid) {
+        return CdmStore.getService(ITaxonNodeService.class).load(uuid);
+    }
+
+    @Override
+    protected void open(ExecutionEvent event, TaxonNode entity) {
+        TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(entity.getTaxon().getUuid());
+        try {
+            EditorUtil.open(input);
+        } catch (PartInitException e) {
+            MessagingUtils.error(DefaultOpenTaxonEditorForTaxonNodeHandler.class, "Could not open taxon editor for taxon "+input.getTaxon(), e);
+        }
+    }
+
+}
index 30289e8..0516b1a 100644 (file)
@@ -18,7 +18,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;
index 9d43c00..96726be 100644 (file)
@@ -18,7 +18,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;
index fc6cf73..0289d9a 100644 (file)
@@ -18,7 +18,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;