upgrade poi to 3.10-FINAL and add ooxml functionality

diff --git a/.gitattributes b/.gitattributes
index ad21b4af28c90f086fd923c0f5b94f1837a9d2e3..48c7acfff5b513ab960c6b7d0c7d0eb1a30743e0 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -278,7 +278,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/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
@@ -319,6 +321,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/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

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 1885ddd71b96957a52b9e0716dfa326cb2345f39..e7dd1c14eb0a6cf4576057a27345cf101d0dfdf3 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -543,7 +543,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/poi-3.9.jar,
  lib/postgresql-9.1-901.jdbc4.jar,
  lib/sanselan-0.97-incubator.jar,
  lib/servlet-api-2.5.jar,
@@ -612,5 +611,9 @@ Bundle-ClassPath: .,
  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-services-3.4.0-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
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 2180b5cf8457d6b563a591f75d1b6dc8da7a9181..496754f9fd415330079707c4c56e20b30f1b5183 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/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
@@ -190,6 +189,10 @@ bin.includes = META-INF/,\
                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/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.0-SNAPSHOT-sources.jar,\\r
                lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,\\r
                lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,\\r
@@ -206,6 +209,7 @@ bin.includes = META-INF/,\
                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
+\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/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