removed new dependency on joda

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@825294 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 14, 2009 · ccf7a6d · ccf7a6d
1 parent 1833764
commit ccf7a6d
Show file tree

Hide file tree

Showing 7 changed files with 201 additions and 115 deletions.
diff --git a/build.xml b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 
+<!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
@@ -30,7 +30,7 @@ under the License.
         Bruno Girin         brunogirin@gmail.com
 
     This build was tested with ant 1.6.2 although it will probably work with
-    other versions.  The following jar files should be available on the 
+    other versions.  The following jar files should be available on the
     classpath when running ant:
 
     LIBRARY         LOCATION
@@ -44,7 +44,7 @@ under the License.
     To build the documentation you will need to install forrest and set
     the FORREST_HOME environment variable.  Forrest 0.5.1 required.
 
-    Since POI 3.5 you will need JDK 1.5 or newer to build POI. 
+    Since POI 3.5 you will need JDK 1.5 or newer to build POI.
 
     Some people may find the tests hang when run through Ant. If this
     happens to you, try giving Ant some more memory when you run it, eg:
@@ -123,7 +123,7 @@ under the License.
   <property name="ooxml.output.test.dir" location="build/ooxml-test-classes"/>
   <property name="ooxml.testokfile" location="build/ooxml-testokfile.txt"/>
 
-  <!-- The following jars are downloaded by the fetch-ooxml-jars task --> 
+  <!-- The following jars are downloaded by the fetch-ooxml-jars task -->
   <property name="ooxml.dom4j.jar" location="${ooxml.lib}/dom4j-1.6.1.jar"/>
   <property name="ooxml.dom4j.url" value="${repository.m2}/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
   <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
@@ -142,8 +142,6 @@ under the License.
   <property name="ooxml.xalan.url" value="${repository.m2}/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar"/>
   <property name="ooxml.xalan-serializer.jar" location="${ooxml.lib}/serializer-2.7.1.jar"/>
   <property name="ooxml.xalan-serializer.url" value="${repository.m2}/maven2/xalan/serializer/2.7.1/serializer-2.7.1.jar"/>
-  <property name="ooxml.joda-time.jar" location="${ooxml.lib}/joda-time-1.6.jar"/>
-  <property name="ooxml.joda-time.url" value="${repository.m2}/maven2/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
   <!-- BouncyCastle is used only for OOXML Digital Signature tests -->
   <property name="ooxml.bcprov.jar" location="${ooxml.lib}/bcprov-jdk15-140.jar"/>
   <property name="ooxml.bcprov.url" value="${repository.m2}/maven2/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar"/>
@@ -157,7 +155,7 @@ under the License.
 
   <property name="maven.ooxml.xsds.version.id" value="1.0"/>
   <property name="maven.ooxml.xsds.jar" value="ooxml-schemas-${maven.ooxml.xsds.version.id}.jar"/>
-  
+
   <property name="build.site" location="build/tmp/site/build/site"/>
   <property name="build.site.src" location="build/tmp/site"/>
   <property name="junit.report.dir" location="${build.site}/junit"/>
@@ -175,12 +173,12 @@ under the License.
   <property name="jdk.version.source" value="1.5"
     description="JDK version of source code"/>
   <property name="jdk.version.class" value="1.5"
-    description="JDK version of generated class files"/>  
+    description="JDK version of generated class files"/>
 
     <path id="main.classpath">
-        <fileset dir="${main.lib}"> 
-           <include name="*.jar"/> 
-        </fileset> 
+        <fileset dir="${main.lib}">
+           <include name="*.jar"/>
+        </fileset>
         <pathelement location="${main.resource1.dir}"/>
     </path>
 
@@ -224,7 +222,7 @@ under the License.
         <pathelement location="${ooxml.output.dir}"/>
         <pathelement location="${ooxml.output.test.dir}"/>
         <pathelement location="${main.output.test.dir}"/> <!-- ooxml tests use some utilities from main tests -->
-        <pathelement location="${scratchpad.output.test.dir}"/> 
+        <pathelement location="${scratchpad.output.test.dir}"/>
         <pathelement location="${junit.jar1.dir}"/>
         <pathelement location="${ooxml.src.test}"/>
     </path>
@@ -290,7 +288,7 @@ under the License.
 
         <available resource="clovertasks" property="clover.present"/>
         <antcall target="with.clover"/>
-        
+
         <mkdir dir="build"/>
         <mkdir dir="build/non-ant-classes"/>
         <mkdir dir="${main.output.dir}"/>
@@ -375,7 +373,6 @@ under the License.
                     <available file="${ooxml.xmlsec.jar}"/>
                     <available file="${ooxml.xalan.jar}"/>
                     <available file="${ooxml.xalan-serializer.jar}"/>
-                    <available file="${ooxml.joda-time.jar}"/>
                     <available file="${ooxml.bcprov.jar}"/>
                 </and>
                 <isset property="disconnected"/>
@@ -419,10 +416,6 @@ under the License.
         <param name="sourcefile" value="${ooxml.xalan-serializer.url}"/>
         <param name="destfile" value="${ooxml.xalan-serializer.jar}"/>
       </antcall>
-      <antcall target="downloadfile">
-        <param name="sourcefile" value="${ooxml.joda-time.url}"/>
-        <param name="destfile" value="${ooxml.joda-time.jar}"/>
-      </antcall>
       <antcall target="downloadfile">
         <param name="sourcefile" value="${ooxml.bcprov.url}"/>
         <param name="destfile" value="${ooxml.bcprov.jar}"/>
@@ -482,7 +475,7 @@ under the License.
 		</xmlbean>
 	</target>
 
-  <target name="compile" depends="init, compile-main, 
+  <target name="compile" depends="init, compile-main,
     compile-scratchpad, compile-contrib, compile-examples, compile-scratchpad-examples"
     description="Compiles the POI main classes, scratchpad, contrib, examples, and scratchpad examples"/>
 
@@ -605,7 +598,7 @@ under the License.
 	<!-- Generate the .java file -->
 	<property name="version.java" value="${main.output.dir}/org/apache/poi/Version.java" />
 	<delete file="${version.java}" />
-	<copy 
+	<copy
 		file="src/resources/version/Version.java.template"
 		tofile="${version.java}">
 		<filterset>
@@ -638,9 +631,9 @@ under the License.
     <junit fork="yes" forkmode="once" printsummary="yes" haltonfailure="${halt.on.test.failure}"
       failureproperty="main.test.failed" showoutput="true">
       <classpath refid="test.classpath"/>
-      <sysproperty key="user.language" value="en"/> 
-      <sysproperty key="user.country" value="US"/> 
-      <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
+      <sysproperty key="user.language" value="en"/>
+      <sysproperty key="user.country" value="US"/>
+      <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
       <sysproperty key="java.awt.headless" value="true"/>
       <formatter type="plain"/>
       <formatter type="xml"/>
@@ -669,9 +662,9 @@ under the License.
         <pathelement location="${scratchpad.output.test.dir}"/>
         <pathelement location="${junit.jar1.dir}"/>
       </classpath>
-      <sysproperty key="user.language" value="en"/> 
-      <sysproperty key="user.country" value="US"/> 
-      <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
+      <sysproperty key="user.language" value="en"/>
+      <sysproperty key="user.country" value="US"/>
+      <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
       <sysproperty key="java.awt.headless" value="true"/>
       <formatter type="plain" usefile="no"/>
       <batchtest todir="${main.reports.test}">
@@ -681,7 +674,7 @@ under the License.
         </fileset>
       </batchtest>
     </junit>
-  </target>        
+  </target>
 
 
 
@@ -695,9 +688,9 @@ under the License.
               <pathelement location="${scratchpad.output.test.dir}"/>
               <pathelement location="${junit.jar1.dir}"/>
             </classpath>
-            <sysproperty key="user.language" value="en"/> 
-            <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
+            <sysproperty key="user.language" value="en"/>
+            <sysproperty key="user.country" value="US"/>
+            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain" usefile="no"/>
             <formatter type="xml"/>
@@ -731,9 +724,9 @@ under the License.
                 <pathelement location="${scratchpad.output.test.dir}"/>
                 <pathelement location="${junit.jar1.dir}"/>
             </classpath>
-            <sysproperty key="user.language" value="en"/> 
-            <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
+            <sysproperty key="user.language" value="en"/>
+            <sysproperty key="user.country" value="US"/>
+            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -762,17 +755,17 @@ under the License.
 	            <pathelement location="${scratchpad.output.test.dir}"/>
 	            <pathelement location="${junit.jar1.dir}"/>
 	        </classpath>
-              <sysproperty key="user.language" value="en"/> 
-              <sysproperty key="user.country" value="US"/> 
-              <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
+              <sysproperty key="user.language" value="en"/>
+              <sysproperty key="user.country" value="US"/>
+              <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
 	            <sysproperty key="java.awt.headless" value="true"/>
 	            <sysproperty key="java.awt.headless" value="true"/>
 	            <formatter type="plain" usefile="no"/>
 	            <formatter type="xml"/>
 	            <test name="${testcase}"/>
 	        </junit>
 	    </target>
-	
+
     <target name="-test-contrib-check">
         <uptodate property="contrib.test.notRequired" targetfile="${contrib.testokfile}">
             <srcfiles dir="${contrib.src}"/>
@@ -789,8 +782,8 @@ under the License.
                 <pathelement location="${contrib.output.test.dir}"/>
                 <pathelement location="${junit.jar1.dir}"/>
             </classpath>
-            <sysproperty key="user.language" value="en"/> 
-            <sysproperty key="user.country" value="US"/> 
+            <sysproperty key="user.language" value="en"/>
+            <sysproperty key="user.country" value="US"/>
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -819,9 +812,9 @@ under the License.
     <target name="test-ooxml" depends="compile-main,compile-ooxml,-test-ooxml-check" unless="ooxml.test.notRequired">
         <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}" failureproperty="ooxml.test.failed">
             <classpath refid="test.ooxml.classpath" />
-            <sysproperty key="user.language" value="en"/> 
-            <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
+            <sysproperty key="user.language" value="en"/>
+            <sysproperty key="user.country" value="US"/>
+            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -843,9 +836,9 @@ under the License.
     <target name="single-test-ooxml" depends="-test-property-check,compile-main,compile-ooxml" description="Runs a single ooxml test case specified with -Dtestcase=classname">
         <junit printsummary="yes" showoutput="true" filtertrace="no" haltonfailure="false" >
             <classpath refid="test.ooxml.classpath" />
-            <sysproperty key="user.language" value="en"/> 
-            <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
+            <sysproperty key="user.language" value="en"/>
+            <sysproperty key="user.country" value="US"/>
+            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain" usefile="no"/>
             <formatter type="xml"/>
@@ -1094,7 +1087,7 @@ FORREST_HOME environment variable!</echo>
                 <attribute name="Implementation-Title" value="Apache POI"/>
                 <attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
                 <attribute name="Implementation-Vendor" value="Apache"/>
-            </manifest>        
+            </manifest>
         </jar>
         <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar">
 			      <fileset dir="${contrib.output.dir}" />
@@ -1107,7 +1100,7 @@ FORREST_HOME environment variable!</echo>
                 <attribute name="Implementation-Title" value="Apache POI"/>
                 <attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
                 <attribute name="Implementation-Vendor" value="Apache"/>
-            </manifest>        
+            </manifest>
         </jar>
         <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar">
       			<fileset dir="${scratchpad.output.dir}" />
@@ -1120,7 +1113,7 @@ FORREST_HOME environment variable!</echo>
                 <attribute name="Implementation-Title" value="Apache POI"/>
                 <attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
                 <attribute name="Implementation-Vendor" value="Apache"/>
-            </manifest>        
+            </manifest>
         </jar>
         <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar">
             <fileset dir="${ooxml.output.dir}" />
@@ -1133,7 +1126,7 @@ FORREST_HOME environment variable!</echo>
                 <attribute name="Implementation-Title" value="Apache POI"/>
                 <attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
                 <attribute name="Implementation-Vendor" value="Apache"/>
-            </manifest>        
+            </manifest>
         </jar>
     </target>
   <target name="jar-examples" depends="compile, compile-version" description="Creates a jar file of the examples, in case people want to use them as-is">
@@ -1148,7 +1141,7 @@ FORREST_HOME environment variable!</echo>
                 <attribute name="Implementation-Title" value="Apache POI"/>
                 <attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
                 <attribute name="Implementation-Vendor" value="Apache"/>
-            </manifest>        
+            </manifest>
         </jar>
     </target>
 
@@ -1251,7 +1244,7 @@ FORREST_HOME environment variable!</echo>
       JDepend is not available. You must download JDepend from
       &lt;http://www.clarkware.com/software/JDepend.html&gt; and include the
       JAR file in your classpath.
-    </echo> 
+    </echo>
     <fail message="JDepend is not available."/>
   </target>