From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Wed, 12 Sep 2012 14:08:27 +0000 (+0000)
Subject: merging in latest changes from trunk
X-Git-Tag: 3.6.0~1022^2~9
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7d1e5a64918919bcea1cbf44e114141b652a7e50

merging in latest changes from trunk
---

7d1e5a64918919bcea1cbf44e114141b652a7e50
diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
index 415e6524b,80e78d4f9..cddaca381
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -1,128 -1,128 +1,121 @@@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<classpath>
 -	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 -	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 -	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar" sourcepath="lib/c3p0-0.9.1src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="lib/commons-beanutils-1.7.0src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar" sourcepath="lib/commons-dbcp-1.2.2src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar" sourcepath="lib/commons-pool-1.3src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar" sourcepath="lib/dozer-5.3.0src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar" sourcepath="lib/ehcache-1.2.3src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/ejb3-persistence.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.4.jar" sourcepath="lib/ezmorph-1.0.4src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/fop.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-core-3.4.0-SNAPSHOTsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-3.1.0.GA.jar" sourcepath="lib/hibernate-search-3.1.0.GAsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.0.0.CR1.jar" sourcepath="lib/hibernate-validator-4.0.0.CR1src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib/httpclient-4.0.1src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib/httpcore-4.0.1src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar" sourcepath="lib/jaxb-impl-2.1.6src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar" sourcepath="lib/joda-time-1.5src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar" sourcepath="lib/json-lib-2.2.3-jdk15src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar" sourcepath="lib/jsr250-api-1.0src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jta.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jtds-1.2.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar" sourcepath="lib/junit-4.8.1src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar" sourcepath="lib/log4j-1.2.14src.zip"/>
 -	<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-core-2.4.0.jar" sourcepath="lib/lucene-core-2.4.0src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-2.4.0.jar" sourcepath="lib/lucene-spellchecker-2.4.0src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar" sourcepath="lib/mail-1.4src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/msbase-2000.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/mssqlserver-2000.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/msutil-2000.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aop-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.asm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.asm-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aspects-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.beans-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context.support-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.core-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.expression-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.oxm-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/poi-3.6.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib/servlet-api-2.5src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar" sourcepath="lib/slf4j-api-1.5.2src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar" sourcepath="lib/slf4j-log4j12-1.5.2src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar" sourcepath="lib/spring-modules-cache-0.7src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar" sourcepath="lib/spring-modules-lucene-0.8asrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.0.5.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.0.5.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar" sourcepath="lib/wsdl4j-1.6.1src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar" sourcepath="lib/xml-resolver-1.2src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
 -	<classpathentry kind="output" path="target/classes"/>
 -</classpath>
 +<?xml version="1.0" encoding="UTF-8"?>
 +<classpath>
 +	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 +	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 +	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar" sourcepath="lib/c3p0-0.9.1src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="lib/commons-beanutils-1.7.0src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar" sourcepath="lib/commons-dbcp-1.2.2src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar" sourcepath="lib/commons-pool-1.3src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar" sourcepath="lib/dozer-5.3.0src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar" sourcepath="lib/ehcache-1.2.3src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/ejb3-persistence.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.4.jar" sourcepath="lib/ezmorph-1.0.4src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/fop.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-core-3.4.0-SNAPSHOTsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-3.1.0.GA.jar" sourcepath="lib/hibernate-search-3.1.0.GAsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.0.0.CR1.jar" sourcepath="lib/hibernate-validator-4.0.0.CR1src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib/httpclient-4.0.1src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib/httpcore-4.0.1src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar" sourcepath="lib/jaxb-impl-2.1.6src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar" sourcepath="lib/joda-time-1.5src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar" sourcepath="lib/json-lib-2.2.3-jdk15src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar" sourcepath="lib/jsr250-api-1.0src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jta.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jtds-1.2.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar" sourcepath="lib/junit-4.8.1src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar" sourcepath="lib/log4j-1.2.14src.zip"/>
 +	<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-core-2.4.0.jar" sourcepath="lib/lucene-core-2.4.0src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-2.4.0.jar" sourcepath="lib/lucene-spellchecker-2.4.0src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar" sourcepath="lib/mail-1.4src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/msbase-2000.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/mssqlserver-2000.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/msutil-2000.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aop-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.asm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.asm-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aspects-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.beans-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context.support-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.core-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.expression-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.oxm-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/poi-3.6.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/postgresql-8.2-504.jdbc4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib/servlet-api-2.5src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar" sourcepath="lib/slf4j-api-1.5.2src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar" sourcepath="lib/slf4j-log4j12-1.5.2src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar" sourcepath="lib/spring-modules-cache-0.7src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar" sourcepath="lib/spring-modules-lucene-0.8asrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.0.5.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.0.5.RELEASE.jar" sourcepath="/home/andreas/.m2/repository/org/springframework/security/spring-security-core/3.0.5.RELEASE/spring-security-core-3.0.5.RELEASE-sources.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar" sourcepath="lib/wsdl4j-1.6.1src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar" sourcepath="lib/xml-resolver-1.2src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.13-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.13-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.13-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.13-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar"/>
- 	<classpathentry kind="output" path="bin"/>
++	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
++	<classpathentry kind="output" path="target/classes"/>
 +</classpath>