merge of security branch with trunk

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

diff --combined eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 7312c6efb455e5e0607dba6b7f943540bb246773,619e6dcbc2fc3cf8a0c1dc4aa7f265d3912a3c59..3fe59615ed36ff5c8853a546f8388bd504b12b67
--- 1/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -383,6 -383,7 +383,7 @@@ Export-Package: com.google.api
     org.hibernate.type,
     org.hibernate.event,
     eu.etaxonomy.cdm.model.common",
+  eu.etaxonomy.cdm.persistence.hibernate.permission,
   eu.etaxonomy.cdm.persistence.query;uses:="org.hibernate,org.hibernate.envers.query,org.hibernate.criterion",
   eu.etaxonomy.cdm.print,
   eu.etaxonomy.cdm.print.out,
@@@ -880,19 -881,19 +881,19 @@@ Bundle-ClassPath: .
   lib/postgresql-9.1-901.jdbc4.jar,
   lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
   lib/identificationKeyAPI-1.0-SNAPSHOT.jar,
-- lib/cdmlib-commons-3.0.14-SNAPSHOT-sources.jar,
-- lib/cdmlib-commons-3.0.14-SNAPSHOT.jar,
-- lib/cdmlib-ext-3.0.14-SNAPSHOT-sources.jar,
-- lib/cdmlib-ext-3.0.14-SNAPSHOT.jar,
-- lib/cdmlib-io-3.0.14-SNAPSHOT-sources.jar,
-- lib/cdmlib-io-3.0.14-SNAPSHOT.jar,
-- lib/cdmlib-model-3.0.14-SNAPSHOT-sources.jar,
-- lib/cdmlib-model-3.0.14-SNAPSHOT.jar,
-- lib/cdmlib-persistence-3.0.14-SNAPSHOT-sources.jar,
-- lib/cdmlib-persistence-3.0.14-SNAPSHOT.jar,
-- lib/cdmlib-print-3.0.14-SNAPSHOT-sources.jar,
-- lib/cdmlib-print-3.0.14-SNAPSHOT.jar,
-- lib/cdmlib-remote-3.0.14-SNAPSHOT-sources.jar,
-- lib/cdmlib-remote-3.0.14-SNAPSHOT.jar,
-- lib/cdmlib-services-3.0.14-SNAPSHOT-sources.jar,
-- lib/cdmlib-services-3.0.14-SNAPSHOT.jar
++ lib/cdmlib-commons-3.1-sources.jar,
++ lib/cdmlib-commons-3.1.jar,
++ lib/cdmlib-ext-3.1-sources.jar,
++ lib/cdmlib-ext-3.1.jar,
++ lib/cdmlib-io-3.1-sources.jar,
++ lib/cdmlib-io-3.1.jar,
++ lib/cdmlib-model-3.1-sources.jar,
++ lib/cdmlib-model-3.1.jar,
++ lib/cdmlib-persistence-3.1-sources.jar,
++ lib/cdmlib-persistence-3.1.jar,
++ lib/cdmlib-print-3.1-sources.jar,
++ lib/cdmlib-print-3.1.jar,
++ lib/cdmlib-remote-3.1-sources.jar,
++ lib/cdmlib-remote-3.1.jar,
++ lib/cdmlib-services-3.1-sources.jar,
++ lib/cdmlib-services-3.1.jar

diff --combined eu.etaxonomy.taxeditor.cdmlib/build.properties
index e2fcb862f743cd07acc346ec988b66abdaa5d5e2,e2fcb862f743cd07acc346ec988b66abdaa5d5e2..356ee59d43f2b1e2677bc777158026887cbd87c6
--- 1/eu.etaxonomy.taxeditor.cdmlib/build.properties
--- 2/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@@ -123,22 -123,22 +123,22 @@@ bin.includes = META-INF/,
                 lib/postgresql-9.1-901.jdbc4.jar,\\r
                 lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\\r
                 lib/identificationKeyAPI-1.0-SNAPSHOT.jar,\\r
--               lib/cdmlib-commons-3.0.14-SNAPSHOT-sources.jar,\\r
--               lib/cdmlib-commons-3.0.14-SNAPSHOT.jar,\\r
--               lib/cdmlib-ext-3.0.14-SNAPSHOT-sources.jar,\\r
--               lib/cdmlib-ext-3.0.14-SNAPSHOT.jar,\\r
--               lib/cdmlib-io-3.0.14-SNAPSHOT-sources.jar,\\r
--               lib/cdmlib-io-3.0.14-SNAPSHOT.jar,\\r
--               lib/cdmlib-model-3.0.14-SNAPSHOT-sources.jar,\\r
--               lib/cdmlib-model-3.0.14-SNAPSHOT.jar,\\r
--               lib/cdmlib-persistence-3.0.14-SNAPSHOT-sources.jar,\\r
--               lib/cdmlib-persistence-3.0.14-SNAPSHOT.jar,\\r
--               lib/cdmlib-print-3.0.14-SNAPSHOT-sources.jar,\\r
--               lib/cdmlib-print-3.0.14-SNAPSHOT.jar,\\r
--               lib/cdmlib-remote-3.0.14-SNAPSHOT-sources.jar,\\r
--               lib/cdmlib-remote-3.0.14-SNAPSHOT.jar,\\r
--               lib/cdmlib-services-3.0.14-SNAPSHOT-sources.jar,\\r
--               lib/cdmlib-services-3.0.14-SNAPSHOT.jar\r
++               lib/cdmlib-commons-3.1-sources.jar,\\r
++               lib/cdmlib-commons-3.1.jar,\\r
++               lib/cdmlib-ext-3.1-sources.jar,\\r
++               lib/cdmlib-ext-3.1.jar,\\r
++               lib/cdmlib-io-3.1-sources.jar,\\r
++               lib/cdmlib-io-3.1.jar,\\r
++               lib/cdmlib-model-3.1-sources.jar,\\r
++               lib/cdmlib-model-3.1.jar,\\r
++               lib/cdmlib-persistence-3.1-sources.jar,\\r
++               lib/cdmlib-persistence-3.1.jar,\\r
++               lib/cdmlib-print-3.1-sources.jar,\\r
++               lib/cdmlib-print-3.1.jar,\\r
++               lib/cdmlib-remote-3.1-sources.jar,\\r
++               lib/cdmlib-remote-3.1.jar,\\r
++               lib/cdmlib-services-3.1-sources.jar,\\r
++               lib/cdmlib-services-3.1.jar\r
  jars.compile.order = cdmLibrary.jar\r
  src.includes = lib/\r
  bin.excludes = lib/activation-1.1src.zip,\\r

diff --combined eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
index 25f118068392d39fda76feea6c855dfb3633db17,25f118068392d39fda76feea6c855dfb3633db17..f131a431cbf20a8f2194c84912950bd3e0a6485b
Binary files differ

diff --combined eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 05574f256d9b3b978863a0b3d6d911fff101236d,5793674d4469d67a9ab8ce710fff4edd54fd92b6..6102f991ca1f2fd6a6b3876bf2acf44231e7c834
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@@ -67,7 -67,7 +67,7 @@@ import eu.etaxonomy.taxeditor.ui.sectio
  import eu.etaxonomy.taxeditor.ui.section.description.NaturalLanguageSection;
  import eu.etaxonomy.taxeditor.ui.section.description.ScopeSection;
  import eu.etaxonomy.taxeditor.ui.section.feature.FeatureDistributionDetailSection;
--import eu.etaxonomy.taxeditor.ui.section.group.GrantedAuthorityDetailSection;
++import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityDetailSection;
  import eu.etaxonomy.taxeditor.ui.section.group.GroupDetailSection;
  import eu.etaxonomy.taxeditor.ui.section.group.MemberDetailSection;
  import eu.etaxonomy.taxeditor.ui.section.key.GeographicalScopeDetailSection;
@@@ -729,8 -729,8 +729,8 @@@ public class DetailsViewer extends Abst
                          getConversationHolder(), parent, this, Section.TWISTIE
                                  | Section.EXPANDED);
  
-         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
- 
+ //        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+ //
  //        GeographicalScopeDetailSection geographicalScopeDetailSection = (GeographicalScopeDetailSection) formFactory
  //                .createEntityDetailSection(EntityDetailType.GEOGRAPHICAL_SCOPE,
  //                        getConversationHolder(), parent, Section.TWISTIE | Section.COMPACT);
@@@ -742,16 -742,16 +742,16 @@@
  //                        getConversationHolder(), parent, Section.TWISTIE | Section.COMPACT);
  //
  //        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
- 
-         TaxonomicScopeSection taxonomicScopeSection = (TaxonomicScopeSection) formFactory
-                 .createEntityDetailSection(EntityDetailType.TAXONOMIC_SCOPE,
-                         getConversationHolder(), parent, Section.TWISTIE | Section.COMPACT);        
+ //
+ //        TaxonomicScopeSection taxonomicScopeSection = (TaxonomicScopeSection) formFactory
+ //                .createEntityDetailSection(EntityDetailType.TAXONOMIC_SCOPE,
+ //                        getConversationHolder(), parent, Section.TWISTIE | Section.COMPACT);        
  
            addPart(polytomousKeyDetailSection);
            addPart(polytomousKeyNodeDetailSection);
  //        addPart(geographicalScopeDetailSection);
  //        addPart(scopeRestrictionSection);
-           addPart(taxonomicScopeSection);
+ //        addPart(taxonomicScopeSection);
  
        }
        

diff --combined pom.xml
index d16c2262906d59c12bd2d24964a0059d24f11072,d16c2262906d59c12bd2d24964a0059d24f11072..d814fce7fd5a98c78b6421e85ec873a81b8fe1cd
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -14,7 -14,7 +14,7 @@@
    <packaging>pom</packaging>
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--    <cdmlib.version>3.0.14-SNAPSHOT</cdmlib.version><!-- TODO can we use project.version ????? -->
++    <cdmlib.version>3.1</cdmlib.version><!-- TODO can we use project.version ????? -->
      <tycho.version>0.14.0</tycho.version>
      <taxeditor.version>3.0.14-SNAPSHOT</taxeditor.version>
    </properties>