merge-update from trunk

diff --git a/.gitattributes b/.gitattributes
index 20da387e16a59e52500c79cf42c62736308f3907..8674896df85fea719f9b3c424423335447c78c53 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -276,7 +276,9 @@ eu.etaxonomy.taxeditor.cdmlib/lib/paranamer-2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar -text

-eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar -text


@@ -298,6 +300,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/stax-1.2.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/stax-api-1.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/stax-1.2.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/stax-api-1.0.1.jar -text

+eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-core-3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-database-3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-dbmaintainer-3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-core-3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-database-3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-dbmaintainer-3.3.jar -text


@@ -317,6 +320,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.0.b2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-ext-1.3.04.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-resolver-1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-ext-1.3.04.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-resolver-1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar -text

+eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlpull-1.1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlpull-1.1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar -text


@@ -343,7 +347,7 @@ eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicati
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_persistence_security.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_persistence_security.xml -text
 eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml -text

-eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
+eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/datasources/cdm.datasources.xml -text

 eu.etaxonomy.taxeditor.editor/.classpath -text
 eu.etaxonomy.taxeditor.editor/.project -text
 eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF -text
 eu.etaxonomy.taxeditor.editor/.classpath -text
 eu.etaxonomy.taxeditor.editor/.project -text
 eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF -text

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 9bbc0cb9b273fb8fd4157e2bd089a1ddfd15d221..2cc9dede15dde187a6a1e10e15c6b450c1fc5311 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -141,7 +141,6 @@
        <classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>

-       <classpathentry exported="true" kind="lib" path="lib/poi-3.9.jar"/>

        <classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>


@@ -195,21 +194,26 @@
        <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>

-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.1-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.1-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.1-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.1-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>

        <classpathentry kind="output" path="target/classes"/>
 </classpath>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 1885ddd71b96957a52b9e0716dfa326cb2345f39..08ab4e5be42e7662e62ec5f201c5869a5ac86162 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.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier

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


@@ -94,6 +94,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.model.occurrence,
  eu.etaxonomy.cdm.model.reference,
  eu.etaxonomy.cdm.model.taxon,
  eu.etaxonomy.cdm.model.occurrence,
  eu.etaxonomy.cdm.model.reference,
  eu.etaxonomy.cdm.model.taxon,

+ eu.etaxonomy.cdm.model.validation,

  eu.etaxonomy.cdm.model.view,
  eu.etaxonomy.cdm.model.view.context,
  eu.etaxonomy.cdm.persistence.dao,
  eu.etaxonomy.cdm.model.view,
  eu.etaxonomy.cdm.model.view.context,
  eu.etaxonomy.cdm.persistence.dao,


@@ -109,12 +110,14 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.persistence.dao.hibernate.occurrence,
  eu.etaxonomy.cdm.persistence.dao.hibernate.reference,
  eu.etaxonomy.cdm.persistence.dao.hibernate.taxon,
  eu.etaxonomy.cdm.persistence.dao.hibernate.occurrence,
  eu.etaxonomy.cdm.persistence.dao.hibernate.reference,
  eu.etaxonomy.cdm.persistence.dao.hibernate.taxon,

+ eu.etaxonomy.cdm.persistence.dao.hibernate.validation,

  eu.etaxonomy.cdm.persistence.dao.hibernate.view,
  eu.etaxonomy.cdm.persistence.dao.media,
  eu.etaxonomy.cdm.persistence.dao.name,
  eu.etaxonomy.cdm.persistence.dao.occurrence,
  eu.etaxonomy.cdm.persistence.dao.reference,
  eu.etaxonomy.cdm.persistence.dao.taxon,
  eu.etaxonomy.cdm.persistence.dao.hibernate.view,
  eu.etaxonomy.cdm.persistence.dao.media,
  eu.etaxonomy.cdm.persistence.dao.name,
  eu.etaxonomy.cdm.persistence.dao.occurrence,
  eu.etaxonomy.cdm.persistence.dao.reference,
  eu.etaxonomy.cdm.persistence.dao.taxon,

+ eu.etaxonomy.cdm.persistence.dao.validation,

  eu.etaxonomy.cdm.persistence.fetch,
  eu.etaxonomy.cdm.persistence.hibernate,
  eu.etaxonomy.cdm.persistence.hibernate.permission,
  eu.etaxonomy.cdm.persistence.fetch,
  eu.etaxonomy.cdm.persistence.hibernate,
  eu.etaxonomy.cdm.persistence.hibernate.permission,


@@ -178,6 +181,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.strategy.merge,
  eu.etaxonomy.cdm.strategy.parser,
  eu.etaxonomy.cdm.strategy.parser.location,
  eu.etaxonomy.cdm.strategy.merge,
  eu.etaxonomy.cdm.strategy.parser,
  eu.etaxonomy.cdm.strategy.parser.location,

+ eu.etaxonomy.cdm.validation,

  eu.etaxonomy.cdm.validation.annotation,
  eu.etaxonomy.cdm.validation.constraint,
  eu.etaxonomy.remote.dto.rdf,
  eu.etaxonomy.cdm.validation.annotation,
  eu.etaxonomy.cdm.validation.constraint,
  eu.etaxonomy.remote.dto.rdf,


@@ -543,7 +547,6 @@ Bundle-ClassPath: .,
  lib/plexus-classworlds-1.2-alpha-9.jar,
  lib/plexus-container-default-1.0-alpha-30.jar,
  lib/plexus-utils-2.0.5.jar,
  lib/plexus-classworlds-1.2-alpha-9.jar,
  lib/plexus-container-default-1.0-alpha-30.jar,
  lib/plexus-utils-2.0.5.jar,

- lib/poi-3.9.jar,

  lib/postgresql-9.1-901.jdbc4.jar,
  lib/sanselan-0.97-incubator.jar,
  lib/servlet-api-2.5.jar,
  lib/postgresql-9.1-901.jdbc4.jar,
  lib/sanselan-0.97-incubator.jar,
  lib/servlet-api-2.5.jar,


@@ -597,20 +600,25 @@ Bundle-ClassPath: .,
  lib/spring-security-remoting-3.1.3.RELEASE.jar,
  lib/jena-core-2.11.2.jar,
  lib/jena-iri-1.0.2.jar,
  lib/spring-security-remoting-3.1.3.RELEASE.jar,
  lib/jena-core-2.11.2.jar,
  lib/jena-iri-1.0.2.jar,

- lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.4.0-SNAPSHOT.jar
+ lib/cdmlib-commons-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-services-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.4.1-SNAPSHOT.jar,
+ lib/poi-3.10-FINAL.jar,
+ lib/poi-ooxml-3.10-FINAL.jar,
+ lib/xmlbeans-2.3.0.jar,
+ lib/poi-ooxml-schemas-3.10-FINAL.jar,
+ lib/swagger-annotations-1.3.5.jar

 Import-Package: eu.etaxonomy.cdm.api.application
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 4278186a308eab1d97e68320d77d18fc08166442..89809ef1e9db65bde04e5adc7f8d532a4365eb84 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -135,7 +135,6 @@ bin.includes = META-INF/,\
                lib/plexus-classworlds-1.2-alpha-9.jar,\\r
                lib/plexus-container-default-1.0-alpha-30.jar,\\r
                lib/plexus-utils-2.0.5.jar,\\r
                lib/plexus-classworlds-1.2-alpha-9.jar,\\r
                lib/plexus-container-default-1.0-alpha-30.jar,\\r
                lib/plexus-utils-2.0.5.jar,\\r

-               lib/poi-3.9.jar,\\r

                lib/postgresql-9.1-901.jdbc4.jar,\\r
                lib/sanselan-0.97-incubator.jar,\\r
                lib/servlet-api-2.5.jar,\\r
                lib/postgresql-9.1-901.jdbc4.jar,\\r
                lib/sanselan-0.97-incubator.jar,\\r
                lib/servlet-api-2.5.jar,\\r


@@ -187,25 +186,31 @@ bin.includes = META-INF/,\
                lib/odfdom-0.8.jar,\\r
                lib/h2mig_pagestore_addon.jar,\\r
                lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
                lib/odfdom-0.8.jar,\\r
                lib/h2mig_pagestore_addon.jar,\\r
                lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r

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

                lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
                lib/jena-core-2.11.2.jar,\\r
                lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
                lib/jena-core-2.11.2.jar,\\r

-               lib/jena-iri-1.0.2.jar\r
+               lib/jena-iri-1.0.2.jar,\\r
+               lib/poi-3.10-FINAL.jar,\\r
+               lib/poi-ooxml-3.10-FINAL.jar,\\r
+               lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
+               lib/xmlbeans-2.3.0.jar,\\r
+               lib/cdmlib-commons-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-commons-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-ext-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-io-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-model-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-print-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-remote-3.4.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.4.1-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-services-3.4.1-SNAPSHOT.jar,\\r
+               lib/swagger-annotations-1.3.5.jar\r
+\r

 jars.compile.order = .\r
 output.. = bin/\r
 source.. = src/main/java/,\\r
 jars.compile.order = .\r
 output.. = bin/\r
 source.. = src/main/java/,\\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar
similarity index 54%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar
index 0f462880ea30349656038eca3bc94320efef0179..8862e217587e06a41c2a5dd8703e683428df8a54 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar
new file mode 100644 (file)
index 0000000..0782b07
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar
new file mode 100644 (file)
index 0000000..24d719e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar
new file mode 100644 (file)
index 0000000..6c6f5c2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar
new file mode 100644 (file)
index 0000000..ccd8163
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 51ab1e367dc7cdae518b909e2bc62186f4b53038..e988506cfd4cd17843c5acb0195660e8acdac268 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.4.0-SNAPSHOT</version>\r
+    <version>3.4.1-SNAPSHOT</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.cdmlib/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml b/eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/datasources/cdm.datasources.xml
similarity index 100%
rename from eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml
rename to eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/datasources/cdm.datasources.xml