merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Jul 2013 12:00:55 +0000 (12:00 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Jul 2013 12:00:55 +0000 (12:00 +0000)
commit2312fc7b8f438d1f527d6df8e6f27ed7e9c6f8ca
tree32a39744ea9a0e933fbf5664aa91a96e98db23d3
parenteccca676ec4aa93a6851e2b584d49dc255e6d5e1
merge-update from trunk
119 files changed:
.gitattributes
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.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/activation-1.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.7.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/asm-attrs.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/asm.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.6.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.6.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/avalon-framework-4.2.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/batik-all-1.7.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT.jar
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-ext-3.2.0-SNAPSHOT.jar
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-io-3.2.0-SNAPSHOT.jar
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-model-3.2.0-SNAPSHOT.jar
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT-tests.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-remote-3.2.0-SNAPSHOT.jar
eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-services-3.2.0-SNAPSHOT.jar
eu.etaxonomy.taxeditor.cdmlib/lib/cglib-2.1.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.4-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.6-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/fop.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.1.115.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-tools-3.2.0.ga.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar [changed mode: 0755->0644]
eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jdbc-1.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jdbc2_0-stdext.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jdom.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-1.5.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-hibernate-1.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.2.3-jdk15.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.0.5.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/saxon9he.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/serializer-2.7.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.5.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.5.2.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8a.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/usertype.jodatime-2.0.1-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/usertype.spi-2.0.1-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl-2.7.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.3.04.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.3.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xsltc.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-8.0.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java