Merge branch 'release/4.0.0' root/tags/taxeditor/4.0.0 4.0.0
authorjenkins <jenkins-int@bgbm.org>
Tue, 3 May 2016 11:58:09 +0000 (13:58 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 3 May 2016 11:58:09 +0000 (13:58 +0200)
502 files changed:
.gitattributes
.gitignore
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/build.properties
eu.etaxonomy.taxeditor.application/plugin.xml
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle.properties
eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_de.properties
eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/messages.properties
eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/messages_de.properties
eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLables.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertTeam2PersonHandler.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/MediaEditorInput.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/Messages.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/MediaCreator.java [new file with mode: 0644]
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-2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.8.jar [moved from eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar with 52% similarity]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.8.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.7.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.7.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.7.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.7.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.7.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/identificationKeyAPI-1.0-SNAPSHOT.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0.jar [new file with mode: 0644]
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.5.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.5.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.5.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 [moved from eu.etaxonomy.taxeditor.webapp/lib/javax.servlet-api-3.1.0.jar with 100% similarity]
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.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.1.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.1.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.1.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.1.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.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.1.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.1.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.1.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.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.1.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.1.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.1.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.4.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-1206-jdbc4.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.6.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/resources/cdm.map.ser
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.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/remoting/source/CdmServerInfoConfig.java [new file with mode: 0644]
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.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/messages.properties
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/messages_de.properties
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties [deleted file]
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/EditorUtil.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/Messages.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
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/key/polytomous/PolytomousKeyListContentProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroup.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/MisapplicationContainer.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeToMisapplicationHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivativeEditorPropertyTester.java [new file with mode: 0644]
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/CreateFieldUnitContextMenu.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/OpenDerivativeEditorForDescriptionElement.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivativeEditorForTaxonNode.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/SingleReadHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/ToggleLinkWithTaxonSelectionHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchComposite.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java
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/OSGI-INF/l10n/bundle.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.molecular/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.molecular/OSGI-INF/l10n/plugin.properties [deleted file]
eu.etaxonomy.taxeditor.molecular/OSGI-INF/l10n/plugin_de.properties [deleted file]
eu.etaxonomy.taxeditor.molecular/OSGI-INF/l10n/plugin_en.properties [deleted file]
eu.etaxonomy.taxeditor.molecular/plugin.xml
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorActionUpdater.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AbstractAlignmentEditorHandler.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AbstractFocusedAlignmentAreaHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AlignmentEditorCopyHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AlignmentEditorCutHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AlignmentEditorPasteHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/EditSequenceHandler.java
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/NavigatorStateManager.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.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/TaxonNodeContentProvider.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.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/navigator/handler/MoveTaxonHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingDeleteTaxonNodeHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
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/editor/definedterm/DefinedTermEditor.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidParameterConverter.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/UuidsParameterTypeConverter.java [new file with mode: 0644]
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/DefaultOpenTaxonNodeWizardHandler.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/io/AbstractIOManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdSourceSelectionPage.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/CsvNameExportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.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/preference/DebugPreferences.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/AbstractEntityCollectionElementWizardPage.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteConfiguratorDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteSpecimenConfiguratorComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteTaxonBaseConfiguratorComposite.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteTaxonConfiguratorComposite.java
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/element/DateDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/AbstractEditWizard.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/EditTaxonNodeWizard.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeAgentRelationCollectionElement.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeAgentRelationCollectionSection.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/SourceComparator.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SynonymRelationshipWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TypeDesignationSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.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/supplemental/AbstractReferencedEntityElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
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/ui/selection/EditFromSelectionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
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/dataimport/BioCaseEditorInput.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/BioCaseEditorInput.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditor.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java with 99% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditorContextMenu.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorContextMenu.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditorInput.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorInput.java with 97% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportView.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportView.java with 99% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/GbifImportEditor.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/GbifImportEditor.java with 77% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/GbifImportEditorInput.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/GbifImportEditorInput.java with 97% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/GbifResponseImportView.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/GbifResponseImportView.java with 81% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/QueryType.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/QueryType.java with 88% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SaveImportedSpecimenAction.java with 98% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportEditor.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditor.java with 74% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportView.java with 80% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenProviderSelectionWizardPage.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizard.java with 61% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizardPage.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizardPage.java with 97% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/dataset.dtd
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/pom.xml
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNavigatorTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/CdmServerInfoTest.java
eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/writableResources/test.mgd.datasources.xml
eu.etaxonomy.taxeditor.test/src/test/resources/datasources.xml
eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.xml
eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.xml
eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.xml
eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.xml
eu.etaxonomy.taxeditor.test/src/test/resources/h2/cdmTest.h2.db
eu.etaxonomy.taxeditor.test/src/test/resources/h2/cdmTest.trace.db [deleted file]
eu.etaxonomy.taxeditor.webapp/.classpath
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.webapp/build.properties
eu.etaxonomy.taxeditor.webapp/lib/jetty-all-9.2.9.v20150224.jar [deleted file]
eu.etaxonomy.taxeditor.webapp/lib/log4j-1.2.17.jar [deleted file]
eu.etaxonomy.taxeditor.webapp/lib/mysql-connector-java-5.1.24.jar [deleted file]
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 c7b1273..877a615 100644 (file)
@@ -963,6 +963,10 @@ eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java -text
 eu.etaxonomy.taxeditor.help/toc.xml -text
 eu.etaxonomy.taxeditor.help/tocgettingstarted.xml -text
 eu.etaxonomy.taxeditor.help/tocnameparser.xml -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorActionUpdater.java -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AbstractFocusedAlignmentAreaHandler.java -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AlignmentEditorCutHandler.java -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AlignmentEditorPasteHandler.java -text
 eu.etaxonomy.taxeditor.navigation/.classpath -text
 eu.etaxonomy.taxeditor.navigation/.project -text
 eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF -text
@@ -1984,4 +1988,4 @@ src/site/site.xml -text
 eu.etaxonomy.taxeditor.cdmlib/.classpath merge=ours
 eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours
-eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours
\ No newline at end of file
+eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours
index 40d481b..a806330 100644 (file)
@@ -1,11 +1,9 @@
-/.project
+.project
+integration-test.log
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/*
-eu.etaxonomy.taxeditor.application/.settings
-eu.etaxonomy.taxeditor.application/target
-eu.etaxonomy.taxeditor.bulkeditor/.settings
-eu.etaxonomy.taxeditor.bulkeditor/target
-eu.etaxonomy.taxeditor.cdmlib/.directory
-eu.etaxonomy.taxeditor.cdmlib/.settings
+.settings
+target
+.directory
 eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.jar
 eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.zip
 eu.etaxonomy.taxeditor.cdmlib/dist
@@ -15,34 +13,21 @@ eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.servletbridge.extensionbun
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.transforms.hook-1.0.300.v20100719.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.weaving.hook-1.0.100.v20110502.jar
 eu.etaxonomy.taxeditor.cdmlib/log4j-1.2.14src.zip
-eu.etaxonomy.taxeditor.cdmlib/target
-eu.etaxonomy.taxeditor.editor/.settings
-eu.etaxonomy.taxeditor.editor/target
-eu.etaxonomy.taxeditor.feature.platform/.settings
 eu.etaxonomy.taxeditor.feature.platform/bin
-eu.etaxonomy.taxeditor.feature.platform/target
-eu.etaxonomy.taxeditor.feature/.settings
 eu.etaxonomy.taxeditor.feature/compile.eu.etaxonomy.taxeditor.product.feature.xml
 eu.etaxonomy.taxeditor.feature/plugin_customization.ini
-eu.etaxonomy.taxeditor.feature/target
-eu.etaxonomy.taxeditor.feature/workspace
-eu.etaxonomy.taxeditor.help/.settings
 eu.etaxonomy.taxeditor.help/original_document/~$xonomic_Editor_User_Manual_Version_4.doc
-eu.etaxonomy.taxeditor.help/target
-eu.etaxonomy.taxeditor.navigation/.settings
-eu.etaxonomy.taxeditor.navigation/target
-eu.etaxonomy.taxeditor.printpublisher/.settings
-eu.etaxonomy.taxeditor.printpublisher/target
-eu.etaxonomy.taxeditor.store/.settings
-eu.etaxonomy.taxeditor.store/hibernate.log
-eu.etaxonomy.taxeditor.store/target
+hibernate.log
 eu.etaxonomy.taxeditor.test/screenshots/*.jpeg
 eu.etaxonomy.taxeditor.test/src/test/resources/.cdm-server-ehcache
+eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/cdm_remote_servers.json
 eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/remote-webapp
-eu.etaxonomy.taxeditor.test/target
+eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/writableResources/test.mgd.datasources.xml
 eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war
-eu.etaxonomy.taxeditor/.settings
-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
+/eu.etaxonomy.taxeditor.webapp/lib/
+
index 97024cb..75d152b 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.4
+Bundle-Version: 4.0.0
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
  eu.etaxonomy.taxeditor.bulkeditor,
  eu.etaxonomy.taxeditor.editor,
  eu.etaxonomy.taxeditor.printpublisher,
- eu.etaxonomy.taxeditor.molecular,
+ eu.etaxonomy.taxeditor.molecular;resolution:=optional,
  eu.etaxonomy.taxeditor.help,
  org.eclipse.equinox.ds,
  org.eclipse.equinox.util,
index a83b192..46fe7ef 100644 (file)
@@ -1,6 +1,5 @@
 source.. = src/main/java/,\
-           src/test/java/,\
-           src/main/resources/
+           src/test/java/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
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 b27e29c..5eade58 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.12.4</version>
+    <version>4.0.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 51828f2..02d13bd 100644 (file)
@@ -12,6 +12,7 @@ import org.springframework.remoting.RemoteAccessException;
 import org.springframework.remoting.RemoteConnectFailureException;
 
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 
 
@@ -112,6 +113,9 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
                        return;
                    }
                        previousT = t;
+
+
+
                        // NOTE : Currently we only allow RuntimeExceptions since
                        //        allowing all kinds of exceptions would also include
                        //        those in generated status objects coming from from logging triggers
@@ -130,7 +134,18 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
                                    t,
                                    true);
 
-                       }
+                       } else if (t != null && ("Widget is disposed".equals(t.getMessage()))){
+                    MessagingUtils.warn(this.getClass(), t);
+                    if (PreferencesUtil.isShowUpWidgetIsDisposedMessages()){
+                        MessagingUtils.errorDialog("Widget is disposed",
+                                null,
+                                MessagingUtils.WIDGET_IS_DISPOSED_MESSAGE,
+                                statusAdapter.getStatus().getPlugin(),
+                                t,
+                                true);
+
+                    }
+                }
                    }
                }
 
index 16ce11a..f0a153c 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.4
+Bundle-Version: 4.0.0
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
@@ -31,138 +31,3 @@ Import-Package: eu.etaxonomy.taxeditor.editor,
  org.eclipse.jface.text.source,
  org.eclipse.ui.views.properties,
  org.osgi.framework
-Bundle-ClassPath: .,
- activation-1.1.jar,
- antlr-2.7.6.jar,
- aopalliance-1.0.jar,
- asm-attrs.jar,
- asm.jar,
- aspectjrt-1.6.3.jar,
- aspectjweaver-1.6.3.jar,
- avalon-framework-4.2.0.jar,
- batik-all-1.7.jar,
- c3p0-0.9.1.jar,
- cdmlib-commons-3.0.7-SNAPSHOT.jar,
- cdmlib-ext-3.0.7-SNAPSHOT.jar,
- cdmlib-io-3.0.7-SNAPSHOT.jar,
- cdmlib-model-3.0.7-SNAPSHOT.jar,
- cdmlib-persistence-3.0.7-SNAPSHOT.jar,
- cdmlib-print-3.0.7-SNAPSHOT.jar,
- cdmlib-remote-3.0.7-SNAPSHOT.jar,
- cglib-2.1.3.jar,
- commons-beanutils-1.7.0.jar,
- commons-collections-3.2.jar,
- commons-dbcp-1.2.2.jar,
- commons-io-1.3.1.jar,
- commons-logging-1.0.4.jar,
- commons-pool-1.3.jar,
- dom4j-1.6.1.jar,
- dozer-5.3.0-sources.jar,
- dozer-5.3.0.jar,
- ehcache-1.2.3.jar,
- ejb3-persistence.jar,
- ezmorph-1.0.4.jar,
- fop.jar,
- google-api-translate-java-0.92.jar,
- hibernate-annotations-3.4.0-SNAPSHOT.jar,
- hibernate-commons-annotations-3.4.0-SNAPSHOT.jar,
- hibernate-core-3.4.0-SNAPSHOT.jar,
- hibernate-envers-3.4.0-SNAPSHOT.jar,
- hibernate-search-3.1.0.GA.jar,
- hibernate-tools-3.2.0.ga.jar,
- hibernate-validator-4.0.0.CR1.jar,
- hsqldb.jar,
- httpclient-4.0.1.jar,
- httpcore-4.0.1.jar,
- javassist.jar,
- jaxb-api-2.1.6.jar,
- jaxb-impl-2.1.6.jar,
- jaxen-1.1.2.jar,
- jdbc-1.2.jar,
- jdbc2_0-stdext.jar,
- jdom.jar,
- joda-time-1.5.jar,
- joda-time-hibernate-1.0.jar,
- json-lib-2.2.3-jdk15.jar,
- jsr250-api-1.0.jar,
- jta.jar,
- jtds-1.2.2.jar,
- junit-4.4.jar,
- junit-4.8.1-sources.jar,
- junit-4.8.1.jar,
- log4j-1.2.14.jar,
- lsid-client-1.1.2.jar,
- lsid-server-1.1.2.jar,
- lucene-core-2.4.0.jar,
- lucene-spellchecker-2.4.0.jar,
- mail-1.4.jar,
- msbase-2000.3.jar,
- mssqlserver-2000.3.jar,
- msutil-2000.3.jar,
- mysql-connector-java-5.0.5.jar,
- odfdom-0.8.jar,
- opencsv-1.8.jar,
- org.springframework.aop-3.0.4.RELEASE-sources.jar,
- org.springframework.asm-3.0.4.RELEASE-sources.jar,
- org.springframework.aspects-3.0.4.RELEASE-sources.jar,
- org.springframework.beans-3.0.4.RELEASE-sources.jar,
- org.springframework.context-3.0.4.RELEASE-sources.jar,
- org.springframework.context.support-3.0.4.RELEASE-sources.jar,
- org.springframework.core-3.0.4.RELEASE-sources.jar,
- org.springframework.expression-3.0.4.RELEASE-sources.jar,
- org.springframework.jdbc-3.0.4.RELEASE-sources.jar,
- org.springframework.orm-3.0.4.RELEASE-sources.jar,
- org.springframework.oxm-3.0.4.RELEASE-sources.jar,
- org.springframework.transaction-3.0.4.RELEASE-sources.jar,
- org.springframework.web-3.0.4.RELEASE-sources.jar,
- org.springframework.web.servlet-3.0.4.RELEASE-sources.jar,
- poi-3.1-FINAL.jar,
- postgresql-8.2-504.jdbc4.jar,
- saxon9he.jar,
- serializer-2.7.0.jar,
- servlet-api-2.5.jar,
- spring-modules-cache-0.7.jar,
- spring-modules-lucene-0.8a.jar,
- wsdl4j-1.6.1.jar,
- xalan-2.7.0.jar,
- xercesImpl-2.7.1.jar,
- xercesImpl.jar,
- xml-apis-1.3.04.jar,
- xml-apis-ext-1.3.04.jar,
- xml-apis.jar,
- xml-resolver-1.2.jar,
- xmlgraphics-commons-1.3.1.jar,
- xom-1.0.jar,
- xsltc.jar,
- xstream-1.3.1.jar,
- yjp-controller-api-redist-8.0.1.jar,
- ant-antlr.jar,
- ant-apache-bcel.jar,
- ant-apache-bsf.jar,
- ant-apache-log4j.jar,
- ant-apache-oro.jar,
- ant-apache-regexp.jar,
- ant-apache-resolver.jar,
- ant-commons-logging.jar,
- ant-commons-net.jar,
- ant-jai.jar,
- ant-javamail.jar,
- ant-jdepend.jar,
- ant-jmf.jar,
- ant-jsch.jar,
- ant-junit.jar,
- ant-launcher.jar,
- ant-netrexx.jar,
- ant-nodeps.jar,
- ant-starteam.jar,
- ant-stylebook.jar,
- ant-swing.jar,
- ant-trax.jar,
- ant-weblogic.jar,
- ant.jar,
- runtime_registry_compatibility.jar,
- jdi.jar,
- jdimodel.jar,
- pdebuild.jar,
- compatibility.jar,
- junit.jar
index f77e70c..9ede48e 100644 (file)
@@ -16,10 +16,10 @@ command.label.2 = Remove as Candidate(s) for Duplicate Removal
 command.label.3 = De-Duplicate Group
 command.label.4 = Delete
 command.label.5 = Convert to Person
+command.label.6 = Convert to Team
 command.name = Merge Group
 command.name.0 = Set as Target for Group Merge
 command.name.1 = Dynamic Open Bulk Editor
-commandParameter.name = Bulk Editor Class
 command.name.2 = Dynamic New Object
 command.name.3 = Dynamic Delete Object
 command.name.4 = Set as Candidate for Group Merge
@@ -30,5 +30,6 @@ command.name.8 = convert to Person
 command.name.9 = convert to Team
 specification.label = Merge Candidate Annotation
 specification.label.0 = Merge Target Annotation
-command.label.6 = Convert to Team
-command.name.10 = convert Person to Team
\ No newline at end of file
+command.name.10 = convert Person to Team
+command.label.OPEN_REFERENCING_OBJECTS_VIEW = Referencing Objects View
+command.name.OPEN_REFERENCING_OBJECTS_VIEW = Open Referencing Objects View
\ No newline at end of file
index 1365dd1..f454140 100644 (file)
@@ -16,4 +16,20 @@ command.label.2 = Entferne Kandidat f\u00fcr Duplikatenentfernung
 command.label.3 = Dedupliziere Gruppe
 command.label.4 = L\u00f6schen
 command.label.5 = Umwandeln in Person
-command.label.6 = Umwandeln in Team
\ No newline at end of file
+command.label.6 = Umwandeln in Team
+command.name = Gruppen zusammenfügen
+command.name.0 = Setze als Ziel für Gruppenzusammenfügung
+command.name.1 = Dynamisches Öffnen Bulk Editor
+command.name.2 = Dynamisches Neues Objekt
+command.name.3 = Dynamisches Objekt Löschen
+command.name.4 = Setze als Kandidat für Gruppenzusammenfügung
+command.name.5 = Entferne Kandidat für Gruppenzusammenfügung
+command.name.6 = Setze Marker Flag
+command.name.7 = Löschen
+command.name.8 = In Person umwandeln
+command.name.9 = In Team umwandeln
+specification.label = Kandidat-Annotation zusammenfügen
+specification.label.0 = Ziel-Annotation zusammenfügen
+command.name.10 = Person in Team umwandeln
+command.label.OPEN_REFERENCING_OBJECTS_VIEW = Referenzierende Objekte
+command.name.OPEN_REFERENCING_OBJECTS_VIEW = Öffne Referenzierende Objekte
\ No newline at end of file
index 816633c..2250072 100644 (file)
@@ -6,3 +6,4 @@ BulkEditorInputType_4=Specimen and Observations
 BulkEditorInputType_5=Users\r
 BulkEditorInputType_6=Groups\r
 BulkEditorInputType_7=Taxa\r
+BulkEditorInputType_8=Media\r
index 56a3c86..4bf7416 100644 (file)
@@ -6,3 +6,4 @@ BulkEditorInputType_4=Belege und Beobachtungen
 BulkEditorInputType_5=Nutzer\r
 BulkEditorInputType_6=Nutzergruppen\r
 BulkEditorInputType_7=Taxa\r
+BulkEditorInputType_8=Medien
\ No newline at end of file
index 0f3dae0..4869f71 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>
+         <separator
+               name="eu.etaxonomy.taxeditor.bulkeditor.separator1">
+         </separator>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+         <command
+               commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+               label="%command.label.OPEN_REFERENCING_OBJECTS_VIEW"
+               style="push">
+         </command>
+      </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="Bulk Editor Class"
+               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
+            defaultHandler="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
+            id="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+            name="%command.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>
+      
+   </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 de7a2b4..72e5540 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.12.4</version>
+               <version>4.0.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index e1208b0..e7640f0 100644 (file)
@@ -164,6 +164,9 @@ public class AnnotatedLineEditor extends TextEditor implements IConversationEnab
         // to create / save the entity may have been closed
         if(entity != null && ((AnnotatedLineDocumentProvider) getDocumentProvider()).getEntityCreator(getEditorInput()).savesEntity()) {
             getConversationHolder().bind();
+            //FIXME: why do we use IOccurrenceService here? is this generic?
+            //because this method is only invoked by the handler which is used in the
+            //specimen bulk editor. This is unsafe and should be refactored!
             Object object = CdmStore.getService(IOccurrenceService.class).load(((CdmBase)entity).getUuid());
             entity = HibernateProxyHelper.deproxy(object);
         }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLables.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLables.java
new file mode 100644 (file)
index 0000000..7a230c5
--- /dev/null
@@ -0,0 +1,46 @@
+/**
+       * Copyright (C) 2016 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.bulkeditor;
+/**
+ * @author kluther
+ * @date 29 Feb 2016
+ *
+ */
+public interface BulkEditorLables {
+       
+
+
+           public static final String CONVERT_TEAM_2_PERSON_LABEL = "Convert Team to Person";
+           public static final String CONVERT_PERSON_2_TEAM_LABEL = "Convert Person to Team";
+           public static final String DELETE_LABEL = "Delete";
+           public static final String MERGE_GROUP_LABEL = "Merge Group";
+           public static final String REMOVE_MERGE_CANDIDATE_LABEL = "Remove from Merge Group";
+           public static final String SET_MERGE_CANDIDATE_LABEL = "Set as Merge Candidate";
+           public static final String SET_MERGE_TARGET_LABEL = "Set as Merge Target";
+
+           public static final String NO_CONVERT_PERSON_TO_TEAM_MESSAGE = "Can not convert Person into a Team.";
+           public static final String TRANSFORMATION_NOT_POSSIBLE_PERSON_PART_OF_TEAM_MESSAGE = "Person can not be transformed into team as it is already part of a team.";
+           public static final String NO_CONVERT_TEAM_TO_PERSON_MESSAGE = "Can not convert Team to Person";
+          
+          
+           public static final String UNSAVED_CHANGES_MESSAGE = "There are unsaved changes in the source taxon. Please save first.";
+               public static final String SINGLE_PERSON_SELECTION_MESSAGE = "The chosen operation is available only for a single person";
+               public static final String SINGLE_TEAM_SELECTION_MESSAGE = "The chosen operation is available only for a single team";
+               public static final String NO_PERSON_SELECTION_MESSAGE = "No person selected for conversion";
+               public static final String ONLY_PERSON_SELECTION_MESSAGE = "Only a person can be converted into a team.";
+               public static final String NO_TEAM_SELECTION_MESSAGE = "No team selected for conversion";
+               public static final String ONLY_TEAM_SELECTION_MESSAGE = "Only a team can be converted into a person.";
+               public static final String ONLY_FOR_BULKEDITOR_MESSAGE = "You have to choose a line in the bulkeditor to perform this operation.";
+
+
+
+       
+
+}
index bd8494c..bbfe04d 100644 (file)
@@ -17,6 +17,7 @@ import org.eclipse.ui.IEditorInput;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
 import eu.etaxonomy.taxeditor.bulkeditor.input.GroupEditorInput;
+import eu.etaxonomy.taxeditor.bulkeditor.input.MediaEditorInput;
 import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput;
 import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonEditorInput;
 
@@ -41,6 +42,7 @@ public class BulkEditorPropertyTester extends PropertyTester {
     public static final String IS_CONVERT_ENABLED = "isConvertingEnabled";
     public static final String IS_PERSON = "isPerson";
     public static final String IS_TEAM = "isTeam";
+    public static final String IS_MEDIA_EDITOR = "isMediaEditor";
        /* (non-Javadoc)
         * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
         */
@@ -72,6 +74,8 @@ public class BulkEditorPropertyTester extends PropertyTester {
                }
         else if(IS_TAXON_EDITOR.equals(property)){
             return bulkEditor.getEditorInput() instanceof TaxonEditorInput;
+        } else if(IS_MEDIA_EDITOR.equals(property)){
+            return bulkEditor.getEditorInput() instanceof MediaEditorInput;
         }
 
 //             if (("isPublishFlagEditingEnabled").equals(property)) {
index 4cb892e..8b6ad8d 100644 (file)
@@ -79,9 +79,10 @@ public class OpenBulkEditorContributionItem extends CompoundContributionItem {
         contributionItems.add(new Separator(groupName));
         contributionItems.add(BulkEditorInputType.OCCURRENCE.createContributionItem());
         contributionItems.add(new Separator(groupName));
+        contributionItems.add(BulkEditorInputType.MEDIA.createContributionItem());
+        contributionItems.add(new Separator(groupName));
         contributionItems.add(BulkEditorInputType.USER.createContributionItem());
         contributionItems.add(BulkEditorInputType.GROUP.createContributionItem());
-        
         return contributionItems.toArray(new IContributionItem[contributionItems.size()]);
     }
 
index dd2a497..ed21157 100644 (file)
@@ -21,6 +21,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.texteditor.IDocumentProvider;\r
 \r
 import eu.etaxonomy.cdm.api.service.IAgentService;\r
+import eu.etaxonomy.cdm.api.service.UpdateResult;\r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
@@ -74,11 +75,12 @@ public class ConvertPerson2TeamHandler extends AbstractHandler {
                        Team team ;\r
                        for(Object object : structuredSelection.toList()){\r
                                LineAnnotation annotation = (LineAnnotation) model.getAnnotation(object);\r
-                               team = null;\r
+                               UpdateResult result = null;\r
+                               team  = null;\r
                                if (object instanceof Person){\r
                                        Person person = HibernateProxyHelper.deproxy(object, Person.class);\r
                                        try {\r
-                                               team = CdmStore.getService(IAgentService.class).convertPerson2Team(person.getUuid());\r
+                                           result = CdmStore.getService(IAgentService.class).convertPerson2Team(person.getUuid());\r
                                        } catch (IllegalArgumentException e) {\r
                                                MessagingUtils.errorDialog("Can not convert Person into a Team", null, e.getLocalizedMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID,e, true);\r
                                        } catch (MergeException e) {\r
@@ -87,7 +89,9 @@ public class ConvertPerson2TeamHandler extends AbstractHandler {
                                }else{\r
                                        MessagingUtils.informationDialog("Can not convert Person into a Team", "convert Person to Team can only be called on a person.");\r
                                }\r
-\r
+                               if (result != null &&result.isOk()){\r
+                                   team = (Team)result.getCdmEntity();\r
+                               }\r
                                if (team != null){\r
                                        ((BulkEditor) editor).removeAnnotatedLine(annotation);\r
                                        ((BulkEditor) editor).createAnnotatedLine(team);\r
index 047cad6..d26b3ed 100644 (file)
@@ -21,6 +21,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.texteditor.IDocumentProvider;\r
 \r
 import eu.etaxonomy.cdm.api.service.IAgentService;\r
+import eu.etaxonomy.cdm.api.service.UpdateResult;\r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
@@ -74,10 +75,11 @@ public class ConvertTeam2PersonHandler extends AbstractHandler {
                        for(Object object : structuredSelection.toList()){\r
                                LineAnnotation annotation = (LineAnnotation) model.getAnnotation(object);\r
                                person = null;\r
+                               UpdateResult result = null;\r
                                if (object instanceof Team){\r
                                        Team team = HibernateProxyHelper.deproxy(object, Team.class);\r
                                        try {\r
-                                               person = CdmStore.getService(IAgentService.class).convertTeam2Person(team.getUuid());\r
+                                               result = CdmStore.getService(IAgentService.class).convertTeam2Person(team.getUuid());\r
                                        } catch (IllegalArgumentException e) {\r
                                                MessagingUtils.informationDialog("Can not convert Team to Person", e.getMessage());\r
                                        } catch (MergeException e) {\r
@@ -86,7 +88,9 @@ public class ConvertTeam2PersonHandler extends AbstractHandler {
                                }else{\r
                                        MessagingUtils.informationDialog("Can not convert Team to Person", "convertTeam2Person can only be called on a team.");\r
                                }\r
-\r
+                               if (result != null && result.isOk()){\r
+                                   person = (Person)result.getCdmEntity();\r
+                               }\r
                                if (person != null){\r
                                        ((BulkEditor) editor).removeAnnotatedLine(annotation);\r
                                        ((BulkEditor) editor).createAnnotatedLine(person);\r
index 08d0355..cb7da8a 100644 (file)
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.api.service.DeleteResult;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.api.service.IGroupService;
+import eu.etaxonomy.cdm.api.service.IMediaService;
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
@@ -39,6 +40,7 @@ import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -54,7 +56,6 @@ import eu.etaxonomy.taxeditor.model.DeleteResultMessagingUtils;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.dialog.deleteConfigurator.DeleteConfiguratorDialog;
-import eu.etaxonomy.taxeditor.ui.dialog.deleteConfigurator.DeleteTaxonConfiguratorComposite;
 
 
 /**
@@ -128,8 +129,8 @@ public class DeleteHandler extends AbstractHandler {
                                                INameService service = controller.getNameService();
                                                if (object != null){
                                                        NameDeletionConfigurator config = new NameDeletionConfigurator();
-                                                       
-                                                       DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the name", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0); 
+
+                                                       DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the name?", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0);
                                                        int result_dialog= dialog.open();
                                                        if (result_dialog == 1){
                                                                return null;
@@ -141,18 +142,29 @@ public class DeleteHandler extends AbstractHandler {
                                                ITaxonService service = controller.getTaxonService();
                                                if (object != null){
                                                        if (object instanceof Taxon){
-                                                               TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
+                                                           TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
                                                                config.setDeleteInAllClassifications(true);
-                                                               DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the taxon", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0); 
-                                                               int result_dialog= dialog.open();
-                                                               if (result_dialog == 1){
-                                                                       return null;
+                                                               DeleteConfiguratorDialog dialog;
+                                                               if (((Taxon)object).getTaxonNodes().isEmpty()){
+                                                                   dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the taxon?", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0);
+                                                                   int result_dialog= dialog.open();
+                                       if (result_dialog == 1){
+                                           return null;
+                                       }
+                                       result = service.deleteTaxon(((TaxonBase) object).getUuid(), config, null);
+                                       errorMessage = "The taxon ";
+                                                               } else{
+                                                                   MessagingUtils.messageDialog("Delete not possible", getClass(), "The taxon can not be deleted in bulk editor. It is used in a classification.", null);
+                                                                   return null;
                                                                }
-                                                               result = service.deleteTaxon(((TaxonBase) object).getUuid(), config, null);
-                                                               errorMessage = "The taxon ";
+
                                                        }else{
                                                                SynonymDeletionConfigurator config = new SynonymDeletionConfigurator();
-                                                               
+                                                               DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the synonym?", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0);
+                                int result_dialog= dialog.open();
+                                if (result_dialog == 1){
+                                     return null;
+                                }
                                                                result = service.deleteSynonym(((Synonym)object).getUuid(), config);
                                                                errorMessage = "The synonym ";
                                                        }
@@ -162,7 +174,13 @@ public class DeleteHandler extends AbstractHandler {
                                                //TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid());
                                                result = service.delete(((TeamOrPersonBase)object).getUuid());
                                                errorMessage = "The team or person ";
-                                       }
+                                       } else if (object instanceof Media){
+                        IMediaService service = controller.getMediaService();
+                        //TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid());
+                        result = service.delete(((Media)object).getUuid(), null);
+                        errorMessage = "The media ";
+                    }
+
                                } catch (Exception e){
                                        MessagingUtils.errorDialog("Exception occured. Delete not possible", getClass(), e.getMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID, null, true);
                                }
index cb7020b..a509aec 100644 (file)
@@ -1,7 +1,6 @@
 package eu.etaxonomy.taxeditor.bulkeditor.input;
 
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -14,6 +13,7 @@ import org.eclipse.ui.menus.CommandContributionItemParameter;
 
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.api.service.IGroupService;
+import eu.etaxonomy.cdm.api.service.IMediaService;
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
@@ -22,38 +22,38 @@ import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants;
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 public enum BulkEditorInputType {
-       AGENT(Messages.BulkEditorInputType_0, AgentEditorInput.ID), 
-       REFERENCE(Messages.BulkEditorInputType_1, ReferenceEditorInput.ID), 
-       NAME(Messages.BulkEditorInputType_2, NameEditorInput.ID), 
-       NAME_RELATIONSHIP(Messages.BulkEditorInputType_3, NameRelationshipEditorInput.ID), 
-       OCCURRENCE(Messages.BulkEditorInputType_4, OccurrenceEditorInput.ID), 
-       USER(Messages.BulkEditorInputType_5, UserEditorInput.ID), 
+       AGENT(Messages.BulkEditorInputType_0, AgentEditorInput.ID),
+       REFERENCE(Messages.BulkEditorInputType_1, ReferenceEditorInput.ID),
+       NAME(Messages.BulkEditorInputType_2, NameEditorInput.ID),
+       NAME_RELATIONSHIP(Messages.BulkEditorInputType_3, NameRelationshipEditorInput.ID),
+       OCCURRENCE(Messages.BulkEditorInputType_4, OccurrenceEditorInput.ID),
+       USER(Messages.BulkEditorInputType_5, UserEditorInput.ID),
        GROUP(Messages.BulkEditorInputType_6, GroupEditorInput.ID),
-       TAXON(Messages.BulkEditorInputType_7, TaxonEditorInput.ID);
+       TAXON(Messages.BulkEditorInputType_7, TaxonEditorInput.ID),
+       MEDIA(Messages.BulkEditorInputType_8, MediaEditorInput.ID);
 
        public String id;
        public String label;
-       public ResourceBundle resourceBundle; 
+       public ResourceBundle resourceBundle;
 
        BulkEditorInputType(String label, String id) {
                this.id = id;
                this.label = label;
        }
 
-       public IContributionItem createContributionItem(){ 
+       public IContributionItem createContributionItem(){
                return createContributionItem(label, id);
        }
-       
+
        /**
         * @param key
         * @param object
@@ -73,7 +73,7 @@ public enum BulkEditorInputType {
 
                return new CommandContributionItem(parameter);
        }
-       
+
        public static BulkEditorInputType getById(String id) {
 
                for (BulkEditorInputType type : values()) {
@@ -102,7 +102,9 @@ public enum BulkEditorInputType {
                        return USER;
                } else if (Taxon.class.isAssignableFrom(clazz)){
                        return TAXON;
-               }
+               } else if (Media.class.isAssignableFrom(clazz)){
+            return MEDIA;
+        }
                return null;
        }
 
@@ -123,7 +125,9 @@ public enum BulkEditorInputType {
                        return GROUP;
                } else if (input instanceof TaxonEditorInput){
                        return TAXON;
-               }
+               }else if (input instanceof MediaEditorInput){
+            return MEDIA;
+        }
                return null;
        }
 
@@ -146,12 +150,14 @@ public enum BulkEditorInputType {
                        return new GroupEditorInput();
                case TAXON:
                        return new TaxonEditorInput();
+               case MEDIA:
+            return new MediaEditorInput();
                default:
                        throw new IllegalStateException(
                                        "No input class for the given input type defined."); //$NON-NLS-1$
                }
        }
-       
+
        public static Class getServiceClass(
                        BulkEditorInputType inputType) {
                switch (inputType) {
@@ -171,6 +177,8 @@ public enum BulkEditorInputType {
                        return IGroupService.class;
                case TAXON:
                        return ITaxonService.class;
+               case MEDIA:
+            return IMediaService.class;
                default:
                        throw new IllegalStateException(
                                        "No input class for the given input type defined."); //$NON-NLS-1$
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/MediaEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/MediaEditorInput.java
new file mode 100644 (file)
index 0000000..6f3ccb2
--- /dev/null
@@ -0,0 +1,94 @@
+// $Id$
+/**
+* Copyright (C) 2016 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.bulkeditor.input;
+
+import java.util.List;
+
+import eu.etaxonomy.cdm.api.service.IMediaService;
+import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
+import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
+import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
+import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider;
+import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.MediaCreator;
+import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.IdentifiableEntitySortProvider;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+/**
+ * @author k.luther
+ * @date 10.03.2016
+ *
+ */
+public class MediaEditorInput extends AbstractBulkEditorInput<Media> {
+    public static final String ID = "bulkeditor.input.media";
+
+    private static MediaEditorInput instance;
+
+    public static String getID() {
+        return ID;
+    }
+
+    public static AbstractBulkEditorInput getInstance() {
+        if (instance == null) {
+            instance = new MediaEditorInput();
+        }
+        return instance;
+    }
+
+    @Override
+    public String getName() {
+        return BulkEditorInputType.MEDIA.label;
+    }
+
+    @Override
+    public String getToolTipText() {
+        return getName();
+    }
+
+    @Override
+    public Media save(Media entity) {
+        if(CdmStore.getCurrentSessionManager().isRemoting()) {
+            return CdmStore.getService(IMediaService.class).merge(entity, true).getMergedEntity();
+        } else {
+            CdmStore.getService(IMediaService.class).saveOrUpdate(entity) ;
+            return entity;
+        }
+    }
+
+    @Override
+    public boolean delete(Media entity) throws ReferencedObjectUndeletableException {
+        return CdmStore.getService(IMediaService.class).delete(entity) != null;
+    }
+
+    @Override
+    protected List<Media> listEntities(IIdentifiableEntityServiceConfigurator configurator) {
+        return CdmStore.getSearchManager().findMedia(configurator);
+    }
+
+    @Override
+    protected IEntityCreator<Media> createEntityCreator() {
+        return new MediaCreator();
+    }
+
+    @Override
+    public void merge() {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public List<IBulkEditorSortProvider<Media>> getSortProviders() {
+        List<IBulkEditorSortProvider<Media>> sortProviders = super.getSortProviders();
+
+        sortProviders.add(0, new IdentifiableEntitySortProvider<Media>());
+
+        return sortProviders;
+    }
+}
index 5d046af..1f9f272 100644 (file)
@@ -12,6 +12,7 @@ public class Messages extends NLS {
        public static String BulkEditorInputType_5;\r
        public static String BulkEditorInputType_6;\r
        public static String BulkEditorInputType_7;\r
+       public static String BulkEditorInputType_8;\r
        static {\r
                // initialize resource bundle\r
                NLS.initializeMessages(BUNDLE_NAME, Messages.class);\r
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/MediaCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/MediaCreator.java
new file mode 100644 (file)
index 0000000..8b28278
--- /dev/null
@@ -0,0 +1,67 @@
+// $Id$
+/**
+* Copyright (C) 2016 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.bulkeditor.input.entitycreator;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
+
+/**
+ * @author k.luther
+ * @date 10.03.2016
+ *
+ */
+public class MediaCreator implements IEntityCreator<Media> {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Media createEntity(String text) {
+        Media result = Media.NewInstance();
+        result.setTitleCache(text);
+        return result;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Media createEntity(Object key, String text) {
+        if (key.equals(Media.class)){
+            Media result = Media.NewInstance();
+            result.setTitleCache(text);
+            return result;
+        }
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Map<Object, String> getKeyLabelPairs() {
+        Map<Object, String> result = new HashMap<Object, String>();
+       result.put(Media.class, "Media");
+        return result;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean savesEntity() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+}
index 7895964..c8a273f 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,40 +31,55 @@ 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;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IAgentService;
+import eu.etaxonomy.cdm.api.service.IDescriptionService;
+import eu.etaxonomy.cdm.api.service.IEventBaseService;
 import eu.etaxonomy.cdm.api.service.IGroupService;
+import eu.etaxonomy.cdm.api.service.IMediaService;
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
+import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.IUserService;
+import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.common.EventBase;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.model.description.DescriptionBase;
+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.PolytomousKey;
+import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
+import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.cdm.model.molecular.Sequence;
 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,22 +88,18 @@ 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;
 
        private String referencedObjectTitleCache;
        private ConversationHolder conversation;
-       private ICdmEntitySession cdmEntitySession;
+       private final ICdmEntitySession cdmEntitySession;
 
        public ReferencingObjectsView() {
            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 +111,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 +135,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 +177,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();
@@ -221,12 +235,40 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                        referencedObject = CdmStore.getService(IUserService.class).load(entity);
                } else if (objectClass.isAssignableFrom(Group.class)){
                        referencedObject = CdmStore.getService(IGroupService.class).load(entity);
-               }
+               } else if (objectClass.isAssignableFrom(Media.class)){
+                   referencedObject = CdmStore.getService(IMediaService.class).load(entity);
+               } else if (DescriptionBase.class.isAssignableFrom(objectClass)){
+                   referencedObject = CdmStore.getService(IDescriptionService.class).load(entity);
+               } else if (DescriptionElementBase.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(IDescriptionService.class).loadDescriptionElement(entity, null);
+            } else if (objectClass.equals(Sequence.class)){
+                referencedObject = CdmStore.getService(ISequenceService.class).load(entity, null);
+            } else if (PolytomousKey.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(IPolytomousKeyService.class).load(entity, null);
+            } else if (PolytomousKeyNode.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(IPolytomousKeyNodeService.class).load(entity, null);
+            } else if (DefinedTermBase.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(ITermService.class).load(entity, null);
+            } else if (EventBase.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(IEventBaseService.class).load(entity, null);
+            } else if (User.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(IUserService.class).load(entity, null);
+            } else if (Group.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(IGroupService.class).load(entity, null);
+            }
                        //referencedObject =(CdmBase) CdmStore.getService(IIdentifiableEntityService.class).load(referencedObject.getUuid());
                Set<CdmBase> setOfReferencingObjects = null;
 
                if (referencedObject != null){
-                       referencedObjectTitleCache = ((IdentifiableEntity)referencedObject).getTitleCache();
+                   if(referencedObject.isInstanceOf(IdentifiableEntity.class)){
+                       referencedObjectTitleCache = (HibernateProxyHelper.deproxy(referencedObject, IdentifiableEntity.class)).getTitleCache();
+                   }
+                   else if(referencedObject.isInstanceOf(DescriptionElementBase.class)){
+                       referencedObjectTitleCache = DescriptionHelper.getLabel(referencedObject);
+                   }
+                   else{
+                       referencedObjectTitleCache = null;
+                   }
                        setOfReferencingObjects = CdmStore.getCommonService().getReferencingObjects(referencedObject);
                }
                if (setOfReferencingObjects != null){
@@ -246,9 +288,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 +303,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                }
        }
 
-       /**
-        *
-        */
        private void updateView(List<CdmBase> referencingObjects) {
                if (viewer != null && !viewer.getControl().isDisposed()){
                        try{
@@ -277,6 +313,8 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                                        setContentDescription("");
                                }
                                showViewer();
+                               //enable/disable table
+                               viewer.getControl().setEnabled(referencingObjects!=null);
                        }catch(Exception e){
                                setContentDescription("The referencing objects view could not be loaded completely. Some Problems occured.");
                        }
@@ -287,37 +325,31 @@ 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){
+               referencedObjectTitleCache = null;
+            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 CdmBase){
+                   updateReferencingObjects(((CdmBase) firstElement).getUuid(),firstElement.getClass() );
+               }
+               else{
+                   updateView(null);
+            setContentDescription("");
+               }
        }
 
        /** {@inheritDoc} */
@@ -331,27 +363,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 +382,6 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
        }
 
        public void refresh(){
-
                selectionService.removePostSelectionListener(this);
                selectionService.removeSelectionListener(this);
                selectionService.addPostSelectionListener(this);
index cbe4245..2d19a89 100644 (file)
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.12.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.12.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.12.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.12.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.12.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.12.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.12.4.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 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/apache-log4j-extras-1.2.17.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.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-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-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/c3p0-0.9.5.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.0.0.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.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-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-logging-1.1.2.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.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/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/easymock-3.1.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.9.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/guava-r05.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.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-4.1.10.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-5.0.7.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-commons-annotations-5.0.1.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-core-5.0.7.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-5.0.7.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-5.0.7.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-5.0.7.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-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/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-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/identificationKeyAPI-1.0.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.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.5.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.5.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/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/jboss-logging-3.1.3.GA.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/joda-time-2.1.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/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/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-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/lucene-analyzers-common-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-backward-codecs-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-facet-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-join-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-memory-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-misc-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-queries-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.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.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/p6spy-2.1.4.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-2.0.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.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-1206-jdbc4.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-2.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/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-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-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-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/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.6.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.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/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/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/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/xstream-1.4.4.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 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 kind="output" path="target/classes"/>
 </classpath>
index 6a3cca9..68379b5 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.4
+Bundle-Version: 4.0.0
 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.8.jar,
+ lib/aspectjweaver-1.8.8.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-4.0.0.jar,
+ lib/cdmlib-ext-4.0.0.jar,
+ lib/cdmlib-io-4.0.0.jar,
+ lib/cdmlib-model-4.0.0.jar,
+ lib/cdmlib-persistence-4.0.0.jar,
+ lib/cdmlib-print-4.0.0.jar,
+ lib/cdmlib-remote-4.0.0.jar,
+ lib/cdmlib-services-4.0.0.jar,
+ lib/cdmlib-test-4.0.0.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.7.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.7.Final.jar,
+ lib/hibernate-ehcache-5.0.7.Final.jar,
+ lib/hibernate-entitymanager-5.0.7.Final.jar,
+ lib/hibernate-envers-5.0.7.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/identificationKeyAPI-1.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.5.jar,
+ lib/jackson-core-2.6.5.jar,
  lib/jackson-core-asl-1.8.8.jar,
+ lib/jackson-databind-2.6.5.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.1.jar,
+ lib/lucene-backward-codecs-5.4.1.jar,
+ lib/lucene-core-5.4.1.jar,
+ lib/lucene-facet-5.4.1.jar,
+ lib/lucene-grouping-5.4.1.jar,
+ lib/lucene-highlighter-5.4.1.jar,
+ lib/lucene-join-5.4.1.jar,
+ lib/lucene-memory-5.4.1.jar,
+ lib/lucene-misc-5.4.1.jar,
+ lib/lucene-queries-5.4.1.jar,
+ lib/lucene-queryparser-5.4.1.jar,
+ lib/lucene-sandbox-5.4.1.jar,
+ lib/lucene-suggest-5.4.1.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.4.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-1206-jdbc4.jar,
+ lib/relaxngDatatype-20020414.jar,
+ lib/rngom-2.2.11.jar,
  lib/sanselan-0.97-incubator.jar,
+ lib/Saxon-HE-9.7.0-2.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.6.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/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.4.jar,
- lib/cdmlib-ext-3.12.4.jar,
- lib/cdmlib-io-3.12.4.jar,
- lib/cdmlib-model-3.12.4.jar,
- lib/cdmlib-persistence-3.12.4.jar,
- lib/cdmlib-print-3.12.4.jar,
- lib/cdmlib-remote-3.12.4.jar,
- lib/cdmlib-services-3.12.4.jar
+ lib/xsom-20140925.jar,
+ lib/xstream-1.4.8.jar,
+ lib/yjp-controller-api-redist-9.0.8.jar
 Import-Package: eu.etaxonomy.cdm.api.application
index 2785fef..cf341ed 100644 (file)
-bin.includes = META-INF/,\\r
-               .,\\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/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-extension-1.7.jar,\\r
-               lib/batik-gvt-1.7.jar,\\r
-               lib/batik-js-1.7.jar,\\r
-               lib/batik-parser-1.7.jar,\\r
-               lib/batik-script-1.7.jar,\\r
-               lib/batik-svg-dom-1.7.jar,\\r
-               lib/batik-svggen-1.7.jar,\\r
-               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/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-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-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/dozer-5.3.0.jar,\\r
-               lib/easymock-3.1.jar,\\r
-               lib/easymockclassextension-2.3.jar,\\r
-               lib/ehcache-core-2.6.9.jar,\\r
-               lib/ezmorph-1.0.6.jar,\\r
-               lib/fop-1.1.jar,\\r
-               lib/guava-r05.jar,\\r
-               lib/h2-1.3.170.jar,\\r
-               lib/hamcrest-core-1.3.jar,\\r
-               lib/hibernate-c3p0-4.1.10.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-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/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/jackson-core-asl-1.8.8.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/jaxb1-impl-2.2-EA.jar,\\r
-               lib/jaxen-1.1.4.jar,\\r
-               lib/jboss-logging-3.1.3.GA.jar,\\r
-               lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\\r
-               lib/jdbc4-2.0.jar,\\r
-               lib/jdom-1.1.3.jar,\\r
-               lib/joda-time-2.1.jar,\\r
-               lib/json-lib-2.4-jdk15.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/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/objenesis-1.2.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/paranamer-2.3.jar,\\r
-               lib/plexus-classworlds-1.2-alpha-9.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/sanselan-0.97-incubator.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/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-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/stax-1.2.0.jar,\\r
-               lib/stax-api-1.0.1.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/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/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/xpp3_min-1.1.4c.jar,\\r
-               lib/xpp3-1.1.4c.jar,\\r
-               lib/xstream-1.4.4.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/apache-log4j-extras-1.2.17.jar,\\r
-               resources/cdm.map.ser,\\r
-               lib/cdmlib-commons-3.12.4.jar,\\r
-               lib/cdmlib-ext-3.12.4.jar,\\r
-               lib/cdmlib-io-3.12.4.jar,\\r
-               lib/cdmlib-model-3.12.4.jar,\\r
-               lib/cdmlib-persistence-3.12.4.jar,\\r
-               lib/cdmlib-print-3.12.4.jar,\\r
-               lib/cdmlib-remote-3.12.4.jar,\\r
-               lib/cdmlib-services-3.12.4.jar\r
-\r
-jars.compile.order = .\r
-output.. = bin/\r
-source.. = src/main/java/,\\r
-           src/main/resources/\r
-src.includes = src/\r
-\r
+bin.includes = META-INF/,\
+               .,\
+               resources/cdm.map.ser,\
+               lib/activation-1.1.1.jar,\
+               lib/antlr-2.7.7.jar,\
+               lib/aopalliance-1.0.jar,\
+               lib/apache-log4j-extras-1.2.17.jar,\
+               lib/aspectjrt-1.8.8.jar,\
+               lib/aspectjweaver-1.8.8.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.8.jar,\
+               lib/batik-extension-1.7.jar,\
+               lib/batik-gvt-1.7.jar,\
+               lib/batik-js-1.7.jar,\
+               lib/batik-parser-1.7.jar,\
+               lib/batik-script-1.7.jar,\
+               lib/batik-svg-dom-1.7.jar,\
+               lib/batik-svggen-1.7.jar,\
+               lib/batik-transcoder-1.7.jar,\
+               lib/batik-util-1.7.jar,\
+               lib/batik-xml-1.7.jar,\
+               lib/c3p0-0.9.5.2.jar,\
+               lib/cdmlib-commons-4.0.0.jar,\
+               lib/cdmlib-ext-4.0.0.jar,\
+               lib/cdmlib-io-4.0.0.jar,\
+               lib/cdmlib-model-4.0.0.jar,\
+               lib/cdmlib-persistence-4.0.0.jar,\
+               lib/cdmlib-print-4.0.0.jar,\
+               lib/cdmlib-remote-4.0.0.jar,\
+               lib/cdmlib-services-4.0.0.jar,\
+               lib/cdmlib-test-4.0.0.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.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-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.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/dtd-parser-1.1.jar,\
+               lib/easymock-2.3.jar,\
+               lib/easymockclassextension-2.3.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/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-5.0.7.Final.jar,\
+               lib/hibernate-cglib-repack-2.1_3.jar,\
+               lib/hibernate-commons-annotations-5.0.1.Final.jar,\
+               lib/hibernate-core-5.0.7.Final.jar,\
+               lib/hibernate-ehcache-5.0.7.Final.jar,\
+               lib/hibernate-entitymanager-5.0.7.Final.jar,\
+               lib/hibernate-envers-5.0.7.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-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.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.5.jar,\
+               lib/jackson-core-2.6.5.jar,\
+               lib/jackson-core-asl-1.8.8.jar,\
+               lib/jackson-databind-2.6.5.jar,\
+               lib/jackson-mapper-asl-1.8.8.jar,\
+               lib/jakarta-regexp-1.4.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/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/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/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-common-5.4.1.jar,\
+               lib/lucene-backward-codecs-5.4.1.jar,\
+               lib/lucene-core-5.4.1.jar,\
+               lib/lucene-facet-5.4.1.jar,\
+               lib/lucene-grouping-5.4.1.jar,\
+               lib/lucene-highlighter-5.4.1.jar,\
+               lib/lucene-join-5.4.1.jar,\
+               lib/lucene-memory-5.4.1.jar,\
+               lib/lucene-misc-5.4.1.jar,\
+               lib/lucene-queries-5.4.1.jar,\
+               lib/lucene-queryparser-5.4.1.jar,\
+               lib/lucene-sandbox-5.4.1.jar,\
+               lib/lucene-suggest-5.4.1.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.osgi.core-1.0.0.jar,\
+               lib/osgi-3.6.0.jar,\
+               lib/p6spy-2.1.4.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-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-1206-jdbc4.jar,\
+               lib/relaxngDatatype-20020414.jar,\
+               lib/rngom-2.2.11.jar,\
+               lib/sanselan-0.97-incubator.jar,\
+               lib/Saxon-HE-9.7.0-2.jar,\
+               lib/servlet-api-2.5.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-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-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.6.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.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/xmlpull-1.1.3.1.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/xsom-20140925.jar,\
+               lib/xstream-1.4.8.jar,\
+               lib/yjp-controller-api-redist-9.0.8.jar
+
+jars.compile.order = .
+output.. = bin/
+source.. = src/main/java/,\
+           src/main/resources/
+src.includes = src/
+
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-2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-2.jar
new file mode 100644 (file)
index 0000000..83fc05a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-2.jar differ
similarity index 52%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.8.jar
index 351409c..4c69902 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.8.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.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.8.jar
new file mode 100644 (file)
index 0000000..5e5d3ce
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.8.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.7.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.7.Final.jar
new file mode 100644 (file)
index 0000000..bb6633e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.7.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.7.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.7.Final.jar
new file mode 100644 (file)
index 0000000..7265b21
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.7.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.7.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.7.Final.jar
new file mode 100644 (file)
index 0000000..a248250
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.7.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.7.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.7.Final.jar
new file mode 100644 (file)
index 0000000..31d1aa4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.7.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.7.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.7.Final.jar
new file mode 100644 (file)
index 0000000..dd5ed8a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.7.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/identificationKeyAPI-1.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar
deleted file mode 100644 (file)
index 1955f94..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0.jar
new file mode 100644 (file)
index 0000000..ec25356
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0.jar 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.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.5.jar
new file mode 100644 (file)
index 0000000..68b6162
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.5.jar
new file mode 100644 (file)
index 0000000..5ee8d20
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.5.jar
new file mode 100644 (file)
index 0000000..feb8bba
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.5.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/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