From 8eec3cda111300224f2c9d56cb8854d337318737 Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Fri, 6 Jul 2012 07:52:32 +0000
Subject: [PATCH] BIS-113 SP-186 : Upgrade to Apache POI 3.8
SVN: 26015
---
datastore_server/build/build.xml | 22 +++++++++----------
.../DataSetUploadClientServingServlet.java | 6 ++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index f2e0c13e734..6feccc4e1ac 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -269,9 +269,9 @@
<copy todir="${dist.datastore_server.lib}/${dss_upload_gui}" >
<fileset dir="${dist.dss_upload_gui.lib}" />
</copy>
- <copy file="${lib}/poi/poi-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/poi/poi-ooxml-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/poi/poi-ooxml-schemas-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/poi/poi.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/poi/poi-ooxml.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/poi/poi-ooxml-schemas.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/poi/ooxml-lib/dom4j-1.6.1.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/poi/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/poi/ooxml-lib/xmlbeans-2.3.0.jar" todir="${dist.datastore_server.lib}" />
@@ -393,7 +393,7 @@
<attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.client.api.cli.DssClient" />
<attribute name="Class-Path"
value="cisd-base.jar cisd-args4j.jar stream-supporting-httpinvoker.jar log4j.jar commons-lang.jar commons-io.jar commons-logging.jar
- commons-codec.jar commons-httpclient.jar spring.jar jline.jar jython.jar poi-3.7-20101029.jar poi-ooxml-3.7-20101029.jar poi-ooxml-schemas-3.7-20101029.jar dom4j-1.6.1.jar geronimo-stax-api_1.0_spec-1.0.jar xmlbeans-2.3.0.jar" />
+ commons-codec.jar commons-httpclient.jar spring.jar jline.jar jython.jar poi.jar poi-ooxml.jar poi-ooxml-schemas.jar dom4j-1.6.1.jar geronimo-stax-api_1.0_spec-1.0.jar xmlbeans-2.3.0.jar" />
<attribute name="Version" value="${version.number}" />
<attribute name="Build-Number"
value="${version.number} (r${revision.number},${clean.flag})" />
@@ -427,9 +427,9 @@
<copy file="${lib}/spring/spring.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/jline/jline.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/jython/jython.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/poi/poi-3.7-20101029.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/poi/poi-ooxml-3.7-20101029.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/poi/poi-ooxml-schemas-3.7-20101029.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/poi/poi.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/poi/poi-ooxml.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/poi/poi-ooxml-schemas.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/ooxml-lib/dom4j-1.6.1.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/ooxml-lib/xmlbeans-2.3.0.jar" todir="${dist.dss_client.lib}" />
@@ -474,7 +474,7 @@
<attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient" />
<attribute name="Class-Path"
value="cisd-base.jar cisd-args4j.jar cglib-nodep.jar stream-supporting-httpinvoker.jar log4j.jar commons-lang.jar commons-io.jar commons-logging.jar
- commons-codec.jar commons-httpclient.jar spring.jar jline.jar jython.jar poi-3.7-20101029.jar poi-ooxml-3.7-20101029.jar poi-ooxml-schemas-3.7-20101029.jar dom4j-1.6.1.jar geronimo-stax-api_1.0_spec-1.0.jar xmlbeans-2.3.0.jar" />
+ commons-codec.jar commons-httpclient.jar spring.jar jline.jar jython.jar poi.jar poi-ooxml.jar poi-ooxml-schemas.jar dom4j-1.6.1.jar geronimo-stax-api_1.0_spec-1.0.jar xmlbeans-2.3.0.jar" />
<attribute name="Version" value="${version.number}" />
<attribute name="Build-Number"
value="${version.number} (r${revision.number},${clean.flag})" />
@@ -552,15 +552,15 @@
</antcall>
<antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi" />
- <param name="jar" value="poi-3.7-20101029.jar" />
+ <param name="jar" value="poi.jar" />
</antcall>
<antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi" />
- <param name="jar" value="poi-ooxml-3.7-20101029.jar" />
+ <param name="jar" value="poi-ooxml.jar" />
</antcall>
<antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/poi" />
- <param name="jar" value="poi-ooxml-schemas-3.7-20101029.jar" />
+ <param name="jar" value="poi-ooxml-schemas.jar" />
</antcall>
<antcall target="copy-and-sign-upload-ui-jar">
<param name="dir" value="${lib}/log4j" />
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
index 0aa01730ef2..02190b28797 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
@@ -63,9 +63,9 @@ public class DataSetUploadClientServingServlet extends AbstractWebStartClientSer
+ " <jar href='jython.jar'/>\n"
+ " <jar href='dss_upload_gui.jar'/>\n"
+ " <jar href='log4j.jar'/>\n"
- + " <jar href='poi-3.7-20101029.jar'/>\n"
- + " <jar href='poi-ooxml-3.7-20101029.jar'/>\n"
- + " <jar href='poi-ooxml-schemas-3.7-20101029.jar'/>\n"
+ + " <jar href='poi.jar'/>\n"
+ + " <jar href='poi-ooxml.jar'/>\n"
+ + " <jar href='poi-ooxml-schemas.jar'/>\n"
+ " <jar href='dom4j-1.6.1.jar'/>\n"
+ " <jar href='geronimo-stax-api_1.0_spec-1.0.jar'/>\n"
+ " <jar href='xmlbeans-2.3.0.jar'/>\n"
--
GitLab