integrate 3.0.12 branch and adapt for 3.0.12 release

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index 5ec49f46ceb472447a666ff8ec2bed10554a43ef..b99707ee348171c8d49d0e00a07e9255324ef701 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.12.201207231357

 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin

diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index b70e907c21606778ee2197271396747958a17d3e..3623c97fb01c64ba393328ef89538249a22edbfc 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.12.201207231357</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index da5914383b9282c755e914b24438a54c27ebd801..9c917118db6f2ded73b582a18ccdc0bf3710df56 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.12.201207231357

 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index db7b958d0176da9fbc5c7ea95ea1231d61c0978c..757996997e957616302fabc9193e0f4fc8ee156f 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.12.201207231357</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index af0efc67df166667c4bce46d7e1a60695ebbf587..56e55b813a75f52e8079bd49efaa76af18ceff4f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,120 +1,128 @@
-<?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"/>
-       <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.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.12-SNAPSHOT.jar"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.12-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.12.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.12-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.12.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.12-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.12.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.12-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.12.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.12-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.12.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.12-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.12.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.12-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.12.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.12-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.12.jar"/>\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/postgresql-8.2-504.jdbc4.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 kind="output" path="target/classes"/>\r
+</classpath>\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 7ccdcee89d4790832049f03881c12454a5bea11e..bbe218206a8201704bb116abe5bdb9996250fc3d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -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-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.12.201207231357

 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,


@@ -878,11 +878,19 @@ Bundle-ClassPath: .,
  lib/xstream-1.3.1.jar,
  lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
  lib/spring-xml-1.5.6.jar,
  lib/xstream-1.3.1.jar,
  lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
  lib/spring-xml-1.5.6.jar,

- lib/cdmlib-commons-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-ext-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-io-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-model-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-print-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-remote-3.0.12-SNAPSHOT.jar,
- lib/cdmlib-services-3.0.12-SNAPSHOT.jar
+ lib/cdmlib-commons-3.0.12-sources.jar,
+ lib/cdmlib-commons-3.0.12.jar,
+ lib/cdmlib-ext-3.0.12-sources.jar,
+ lib/cdmlib-ext-3.0.12.jar,
+ lib/cdmlib-io-3.0.12-sources.jar,
+ lib/cdmlib-io-3.0.12.jar,
+ lib/cdmlib-model-3.0.12-sources.jar,
+ lib/cdmlib-model-3.0.12.jar,
+ lib/cdmlib-persistence-3.0.12-sources.jar,
+ lib/cdmlib-persistence-3.0.12.jar,
+ lib/cdmlib-print-3.0.12-sources.jar,
+ lib/cdmlib-print-3.0.12.jar,
+ lib/cdmlib-remote-3.0.12-sources.jar,
+ lib/cdmlib-remote-3.0.12.jar,
+ lib/cdmlib-services-3.0.12-sources.jar,
+ lib/cdmlib-services-3.0.12.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 425f3b3205607be5aee24472e6c82218b7b58c27..5e7461e7ff2c44fb7d257828b81740266e0b08ae 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -121,14 +121,22 @@ bin.includes = META-INF/,\
                lib/poi-3.6.jar,\\r
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
                lib/spring-xml-1.5.6.jar,\\r
                lib/poi-3.6.jar,\\r
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
                lib/spring-xml-1.5.6.jar,\\r

-               lib/cdmlib-commons-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.0.12-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.0.12-SNAPSHOT.jar\r
+               lib/cdmlib-commons-3.0.12-sources.jar,\\r
+               lib/cdmlib-commons-3.0.12.jar,\\r
+               lib/cdmlib-ext-3.0.12-sources.jar,\\r
+               lib/cdmlib-ext-3.0.12.jar,\\r
+               lib/cdmlib-io-3.0.12-sources.jar,\\r
+               lib/cdmlib-io-3.0.12.jar,\\r
+               lib/cdmlib-model-3.0.12-sources.jar,\\r
+               lib/cdmlib-model-3.0.12.jar,\\r
+               lib/cdmlib-persistence-3.0.12-sources.jar,\\r
+               lib/cdmlib-persistence-3.0.12.jar,\\r
+               lib/cdmlib-print-3.0.12-sources.jar,\\r
+               lib/cdmlib-print-3.0.12.jar,\\r
+               lib/cdmlib-remote-3.0.12-sources.jar,\\r
+               lib/cdmlib-remote-3.0.12.jar,\\r
+               lib/cdmlib-services-3.0.12-sources.jar,\\r
+               lib/cdmlib-services-3.0.12.jar\r

 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 bin.excludes = lib/activation-1.1src.zip,\\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 bin.excludes = lib/activation-1.1src.zip,\\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 13c544b1182e063880bea1b3a26551d7468eda70..8d19c68101a21d177e895e057f0d3d3b4c5bcf33 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -3,7 +3,7 @@
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r

-               <version>3.0.12-SNAPSHOT</version>\r
+               <version>3.0.12.201207231357</version>\r

        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r

diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 65af273551cd1ad26209008134461bd953c30a59..1770ddc4e6615017d87b98775cec4af7d1f46370 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.12.201207231357

 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin

diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml
index 044ef40a5d74dc709e2a9611faaf74d6a72d562b..fcc27437f472cadc009ac0e26013a1d7826ac6c0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>

-    <version>3.0.12-SNAPSHOT</version>
+    <version>3.0.12.201207231357</version>

   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 5ccc5f31897b4061ab66d3594f2e86e785f71908..ec929a7c2135d9395b40878b4ad2dadc0af5a657 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"

-      version="3.0.12.qualifier"
+      version="3.0.12.201207231357"

       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">

diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
index 0d665cf5af7cf81d1206a6c4989f3f64d55678be..ca6c8d3e8a08857dd39552ab39bc6e0f5ba2bf92 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.12.201207231357</version>

        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index 1518c31385bbfe415ef4dde2d6911d5e18892a1c..3cdfe23ce9e914eb4d2c730324a4041a46286a1c 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"

-      version="3.0.12.qualifier"
+      version="3.0.12.201207231357"

       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"

diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index 4c8023d7f6054390d2af1a417253e6614f13fda8..f6088502eea1ff47b982720a4d4a24735d70b50d 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.12.201207231357</version>

        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>

diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index 9ccd37e3d87acb84baf7f5d09fd3131df01d34b6..54d07a864f5ac7b7a89b465606cbdbbd408cf048 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.12.201207231357

 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml
index dd947da4c8175ee64fe5f3c671ece42d58ff4d72..c24621144ac89b376ba40eb5bd4a8d53636e2856 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/pom.xml
+++ b/eu.etaxonomy.taxeditor.help/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.12.201207231357</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index 740c1909c5693aeae2f111e3da4eac91a9872f61..d7208fc8baba6039d36900012e62d07c7cb7ff2d 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.12.201207231357

 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,

diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml
index aa33ad597c86ff3e31b4c9f84a87102c16632bf7..3db5b4ca91ee3ddcd50b46dee528703ea85ad269 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.12.201207231357</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 3e55623bbe0e514152e05e21c24845eec2c4f7ec..41d8cb2588425bc9c93321dd05acadd545e5abd2 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.12.201207231357

 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,

diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
index 633947cfcfa74c105c0966d56ffa5d7b65e8a8b5..4c4c442c638695f264232513dda75109788fe8e6 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.12.201207231357</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index f8efcac309b19b35c4659f78caf81e4fd1cb6f1f..c50389b63be767b65bb3ff24fb8a59fa8edc0582 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true

-Bundle-Version: 3.0.12.qualifier
+Bundle-Version: 3.0.12.201207231357

 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,

diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml
index 40ddc832be3394f88a812ab12f4cb3279ac9033a..d5059dd10c30050827d99019f12c85bd5b02013b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>

-       <version>3.0.12-SNAPSHOT</version>
+       <version>3.0.12.201207231357</version>

   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
index a57cbc7dff8ed3281b55b7e9f169c881257c43da..cf39589ad5b5d0257308742ac2ce10faa265d947 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
@@ -169,7 +169,14 @@ public class NamedAreaSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getTitle(NamedArea namedArea) {
        /** {@inheritDoc} */
        @Override
        protected String getTitle(NamedArea namedArea) {

-               return NamedArea.labelWithLevel(namedArea, CdmStore.getDefaultLanguage());
+               try {
+                       String result = NamedArea.labelWithLevel(namedArea, CdmStore.getDefaultLanguage());
+                       return result;
+               } catch (Exception e) {
+                       //TODO still need to learn how errors are handled in the Tax Editor
+                       System.out.println("Error occurred when trying retrieve title for Named Area: " + namedArea.getUuid());
+                       return namedArea.getTitleCache();
+               }

        }
        
        /** {@inheritDoc} */
        }
        
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
index 4f4e24f5f651787624160966e96b9ab3cbc62f35..f9401eeee53caef77e05d91de846df7f47641399 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
@@ -10,7 +10,9 @@
 
 package eu.etaxonomy.taxeditor.ui.section.name;
 
 
 package eu.etaxonomy.taxeditor.ui.section.name;
 

+import java.util.ArrayList;

 import java.util.Collection;
 import java.util.Collection;

+import java.util.List;

 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;


@@ -58,9 +60,14 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
 
        /** {@inheritDoc} */
        @Override
 
        /** {@inheritDoc} */
        @Override

-       public Collection<DescriptionElementBase> getCollection(
-                       TaxonNameBase entity) {
-               return getTaxonNameDescription(entity).getElements();
+       public Collection<DescriptionElementBase> getCollection(TaxonNameBase entity) {
+               Collection<DescriptionElementBase> result = new ArrayList<DescriptionElementBase>();
+               List<TaxonNameDescription> descriptions = getTaxonNameDescriptions(entity);
+               for (TaxonNameDescription desc : descriptions){
+                       result.addAll(desc.getElements());
+               }
+               return result;
+//OLD: return getTaxonNameDescription(entity).getElements();

        }
 
 
        }
 
 


@@ -80,13 +87,17 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
        /** {@inheritDoc} */
        @Override
        public void addElement(DescriptionElementBase element) {
        /** {@inheritDoc} */
        @Override
        public void addElement(DescriptionElementBase element) {

+               //for simplification we always use the first description to add elements here

                getTaxonNameDescription(getEntity()).addElement(element);
        }
 
        /** {@inheritDoc} */
        @Override
        public void removeElement(DescriptionElementBase element) {
                getTaxonNameDescription(getEntity()).addElement(element);
        }
 
        /** {@inheritDoc} */
        @Override
        public void removeElement(DescriptionElementBase element) {

-               getTaxonNameDescription(getEntity()).removeElement(element);
+               List<TaxonNameDescription> descriptions = getTaxonNameDescriptions(getEntity());
+               for (TaxonNameDescription desc : descriptions){
+                       desc.removeElement(element);
+               } 

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */


@@ -96,13 +107,33 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
                setEntity(name);
        }
        
                setEntity(name);
        }
        

+       /**
+        * NOTE: returns first description
+        * @param name
+        * @return
+        */

        private TaxonNameDescription getTaxonNameDescription(TaxonNameBase name){
        private TaxonNameDescription getTaxonNameDescription(TaxonNameBase name){

-               // FIXME does not handle multiple name descriptions at the moment

                if(name.getDescriptions().size() == 0){
                        name.addDescription(TaxonNameDescription.NewInstance(name));
                }
                return (TaxonNameDescription) name.getDescriptions().iterator().next();
        }
                if(name.getDescriptions().size() == 0){
                        name.addDescription(TaxonNameDescription.NewInstance(name));
                }
                return (TaxonNameDescription) name.getDescriptions().iterator().next();
        }

+       
+       /**
+        * Try to fix FIXME in {@link #getTaxonNameDescription(TaxonNameBase)}
+        * @param name
+        * @return
+        */
+       private List<TaxonNameDescription> getTaxonNameDescriptions(TaxonNameBase<?,?> name){
+               List<TaxonNameDescription> result = new ArrayList<TaxonNameDescription>();
+               if(name.getDescriptions().size() == 0){
+                       name.addDescription(TaxonNameDescription.NewInstance(name));
+               }
+               for (TaxonNameDescription desc : name.getDescriptions()){
+                       result.add(desc);
+               }
+               return result;
+       }

 
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
 
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index 8422ed5d958656970fb44e6c26698f2738505a55..1569bc08eb3467d5abbece97c0e85d93f9f332dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -41,7 +41,7 @@ public class DerivedUnitBaseDetailElement extends
 
        private TextWithLabelElement text_derivedUnitDefinitions;
 
 
        private TextWithLabelElement text_derivedUnitDefinitions;
 

-       private TextWithLabelElement text_accessionNumber;
+       private TextWithLabelElement text_barcode;

 
        private TextWithLabelElement text_catalogNumber;
 
 
        private TextWithLabelElement text_catalogNumber;
 


@@ -82,9 +82,8 @@ public class DerivedUnitBaseDetailElement extends
                // "Specimen Definition",
                // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
                // style);
                // "Specimen Definition",
                // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
                // style);

-               text_accessionNumber = formFactory.createTextWithLabelElement(
-                               formElement, "Accession Number", entity.getAccessionNumber(),
-                               style);
+               text_barcode = formFactory.createTextWithLabelElement(formElement,
+                               "Barcode", entity.getBarcode(), style);

                text_catalogNumber = formFactory
                                .createTextWithLabelElement(formElement, "Catalog Number",
                                                entity.getCatalogNumber(), style);
                text_catalogNumber = formFactory
                                .createTextWithLabelElement(formElement, "Catalog Number",
                                                entity.getCatalogNumber(), style);


@@ -134,8 +133,8 @@ public class DerivedUnitBaseDetailElement extends
                        getEntity().addDerivedUnitDefinition(
                                        text_derivedUnitDefinitions.getText(),
                                        CdmStore.getDefaultLanguage());
                        getEntity().addDerivedUnitDefinition(
                                        text_derivedUnitDefinitions.getText(),
                                        CdmStore.getDefaultLanguage());

-               } else if (eventSource == text_accessionNumber) {
-                       getEntity().setAccessionNumber(text_accessionNumber.getText());
+               } else if (eventSource == text_barcode) {
+                       getEntity().setBarcode(text_barcode.getText());

                } else if (eventSource == text_catalogNumber) {
                        getEntity().setCatalogNumber(text_catalogNumber.getText());
                } else if (eventSource == combo_preservationMethod) {
                } else if (eventSource == text_catalogNumber) {
                        getEntity().setCatalogNumber(text_catalogNumber.getText());
                } else if (eventSource == combo_preservationMethod) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
index 5951b23dbd878800e94853747e7b0ef71896c146..30f43dd00f4dad403647906fbbcb280a36ee594c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
@@ -44,7 +44,7 @@ public class GeneralDetailElement extends
        private EntitySelectionElement<AgentBase> selection_collector;
        private TextWithLabelElement text_collectingNumber;
        private EntitySelectionElement<Collection> selection_collection;
        private EntitySelectionElement<AgentBase> selection_collector;
        private TextWithLabelElement text_collectingNumber;
        private EntitySelectionElement<Collection> selection_collection;

-       private TextWithLabelElement text_barcode;
+       private TextWithLabelElement text_accessionNumber;

 
        /**
         * @param formFactory
 
        /**
         * @param formFactory


@@ -94,8 +94,10 @@ public class GeneralDetailElement extends
                                                getConversationHolder(), formElement, "Collection",
                                                entity.getCollection(),
                                                EntitySelectionElement.ALL, style);
                                                getConversationHolder(), formElement, "Collection",
                                                entity.getCollection(),
                                                EntitySelectionElement.ALL, style);

-               text_barcode = formFactory.createTextWithLabelElement(formElement,
-                               "Barcode", entity.getBarcode(), style);
+               text_accessionNumber = formFactory.createTextWithLabelElement(
+                               formElement, "Accession Number", entity.getAccessionNumber(),
+                               style);
+               

        }
 
        /*
        }
 
        /*


@@ -127,8 +129,8 @@ public class GeneralDetailElement extends
                        getEntity().setFieldNumber(text_collectingNumber.getText());
                } else if (eventSource == selection_collection) {
                        getEntity().setCollection(selection_collection.getSelection());
                        getEntity().setFieldNumber(text_collectingNumber.getText());
                } else if (eventSource == selection_collection) {
                        getEntity().setCollection(selection_collection.getSelection());

-               } else if (eventSource == text_barcode) {
-                       getEntity().setBarcode(text_barcode.getText());
+               } else if (eventSource == text_accessionNumber) {
+                       getEntity().setAccessionNumber(text_accessionNumber.getText());

                }
 
                if (eventSource != toggleableText_titleCache) {
                }
 
                if (eventSource != toggleableText_titleCache) {

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 4a714859db8a73d0b36e42824382e92f453734ad..610052f2d3e4590666a2deadef46063ca6ee205c 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r

-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.0.12.qualifier" useFeatures="true" includeLaunchers="true">\r
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.0.12.201207231357" useFeatures="true" includeLaunchers="true">\r

 \r
    <aboutInfo>\r
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
 \r
    <aboutInfo>\r
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 73d0bbd110b78879e157f557920d43becad95208..7cbdd48c59d11bb8352fbf34e077709c3cb5a3bc 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>

-               <version>3.0.12-SNAPSHOT</version>
+               <version>3.0.12.201207231357</version>

        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>