dev-java/odfdom: version bump and fix of bug #343137

(Portage version: 2.1.9.31/cvs/Linux x86_64)

3 files changed, 44 insertions, 81 deletions

diff --git a/dev-java/odfdom/ChangeLog b/dev-java/odfdom/ChangeLog
index 6796ac899833..65c57b372bee 100644
--- a/dev-java/odfdom/ChangeLog
+++ b/dev-java/odfdom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/odfdom
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/ChangeLog,v 1.1 2010/05/30 02:53:55 ali_bush Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/ChangeLog,v 1.2 2011/01/17 02:12:47 fordfrog Exp $
+
+*odfdom-0.8.6 (17 Jan 2011)
+
+  17 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> -odfdom-0.8.ebuild,
+  +odfdom-0.8.6.ebuild, +files/build-0.8.6.xml, -files/build.xml:
+  Version bump and fixed all issues including bug #343137
 
 *odfdom-0.8 (30 May 2010)
 
diff --git a/dev-java/odfdom/files/build.xml b/dev-java/odfdom/files/build-0.8.6.xml
index 1f273e195e7b..a2750f73a117 100644
--- a/dev-java/odfdom/files/build.xml
+++ b/dev-java/odfdom/files/build-0.8.6.xml
@@ -4,15 +4,13 @@
 <!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
 <!-- ====================================================================== -->
 
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
 <!-- Any modifications will be overwritten.                                 -->
 <!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/26/10 7:38 PM                       -->
+<!-- Generated by Maven Ant Plugin on 1/17/11 1:59 AM                       -->
 <!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
 <!--                                                                        -->
+<!-- Also contains some hand made modifications                             -->
+<!--                                                                        -->
 <!-- ====================================================================== -->
 
 <project name="odfdom-java-from-maven" default="package" basedir=".">
@@ -24,6 +22,8 @@
   <property file="maven-build.properties"/>
 
   <property name="maven.build.finalName" value="odfdom"/>
+  <property name="maven.build.version" value="0.8.6"/>
+  <property name="maven.build.odfversion" value="1.2"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -53,6 +53,7 @@
       <include name="xercesImpl-2.9.1.jar"/>
       <include name="xml-apis-1.3.04.jar"/>
       <include name="junit-4.5.jar"/>
+      <include name="hamcrest-core.jar"/>
     </fileset>
   </path>
 
@@ -68,7 +69,7 @@
   <!-- Compilation target                                                     -->
   <!-- ====================================================================== -->
 
-  <target name="compile" depends="get-deps" description="Compile the code">
+  <target name="compile" description="Compile the code">
     <mkdir dir="${maven.build.outputDir}"/>
     <javac destdir="${maven.build.outputDir}" 
            nowarn="false" 
@@ -123,7 +124,7 @@
       <fileset dir="${maven.build.testResourceDir.0}"/>
     </copy>
     <copy todir="${maven.build.outputDir}">
-	<fileset dir="${maven.build.testResourceDir.0}"/>
+        <fileset dir="${maven.build.testResourceDir.0}"/>
     </copy>
   </target>
 
@@ -138,6 +139,7 @@
     <mkdir dir="${maven.test.reports}"/>
     <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
       <sysproperty key="basedir" value="."/>
+      <sysproperty key="odfdom.version" value="${maven.build.version}"/>
       <formatter type="xml"/>
       <formatter type="plain" usefile="false"/>
       <classpath>
@@ -150,13 +152,13 @@
           <include name="**/Test*.java"/>
           <include name="**/*Test.java"/>
           <include name="**/*TestCase.java"/>
-          <exclude name="**/integrationtest/**"/>
+          <exclude name="**/*Abstract*Test.java"/>
         </fileset>
       </batchtest>
       <batchtest todir="${maven.test.reports}" if="test">
         <fileset dir="${maven.build.testDir.0}">
           <include name="**/${test}.java"/>
-          <exclude name="**/integrationtest/**"/>
+          <exclude name="**/*Abstract*Test.java"/>
         </fileset>
       </batchtest>
     </junit>
@@ -205,7 +207,7 @@
              use="true" 
              author="true" 
              splitindex="true" 
-             windowtitle="ODFDOM API v0.8 - http://odftoolkit" 
+             windowtitle="ODFDOM API v0.8.6 - http://odftoolkit" 
              nodeprecated="false" 
              nodeprecatedlist="false" 
              notree="false" 
@@ -214,9 +216,12 @@
              nonavbar="false" 
              serialwarn="false" 
              charset="ISO-8859-1" 
+             linksource="false" 
              breakiterator="false" 
              maxmemory="1024m">
       <doctitle>&lt;![CDATA[ODFDOM]]&gt;</doctitle>
+      <link href="http://java.sun.com/javase/6/docs/api/"/>
+      <link href="http://xerces.apache.org/xerces-j/apiDocs/"/>
     </javadoc>
   </target>
 
@@ -232,7 +237,16 @@
          excludes="**/package.html">
       <manifest>
         <attribute name="Main-Class" 
-                   value="org.odftoolkit.odfdom.Version"/>
+                   value="org.odftoolkit.odfdom.JarManifest"/>
+        <attribute name="version" value="${maven.build.version}"/>
+        <section name="ODFDOM">
+          <attribute name="ODFDOM-Built-By" value="Gentoo"/>
+          <attribute name="ODFDOM-Built-Date" value="${TODAY}"/>
+          <attribute name="ODFDOM-Name" value="odfdom"/>
+          <attribute name="ODFDOM-Supported-Odf-Version" value="${maven.build.odfversion}"/>
+          <attribute name="ODFDOM-Version" value="${maven.build.version}"/>
+          <attribute name="ODFDOM-Website" value="http://odftoolkit.org"/>
+        </section>
       </manifest>
     </jar>
   </target>
@@ -253,62 +267,4 @@
     </condition>
   </target>
 
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/xerces/xercesImpl/2.9.1"/>
-    <get src="http://download.java.net/maven/2//xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar" 
-         dest="${maven.repo.local}/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://odftoolkit.org/svn/odfdom~maven2/snapshot//xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar" 
-         dest="${maven.repo.local}/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://odftoolkit.org/svn/odfdom~maven2/release//xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar" 
-         dest="${maven.repo.local}/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar" 
-         dest="${maven.repo.local}/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/xml-apis/xml-apis/1.3.04"/>
-    <get src="http://download.java.net/maven/2//xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" 
-         dest="${maven.repo.local}/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://odftoolkit.org/svn/odfdom~maven2/snapshot//xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" 
-         dest="${maven.repo.local}/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://odftoolkit.org/svn/odfdom~maven2/release//xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" 
-         dest="${maven.repo.local}/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" 
-         dest="${maven.repo.local}/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.5"/>
-    <get src="http://download.java.net/maven/2//junit/junit/4.5/junit-4.5.jar" 
-         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://odftoolkit.org/svn/odfdom~maven2/snapshot//junit/junit/4.5/junit-4.5.jar" 
-         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://odftoolkit.org/svn/odfdom~maven2/release//junit/junit/4.5/junit-4.5.jar" 
-         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/junit/junit/4.5/junit-4.5.jar" 
-         dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
 </project>
diff --git a/dev-java/odfdom/odfdom-0.8.ebuild b/dev-java/odfdom/odfdom-0.8.6.ebuild
index a0b660162d8c..840ad582c5c2 100644
--- a/dev-java/odfdom/odfdom-0.8.ebuild
+++ b/dev-java/odfdom/odfdom-0.8.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/odfdom-0.8.ebuild,v 1.1 2010/05/30 02:53:55 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/odfdom-0.8.6.ebuild,v 1.1 2011/01/17 02:12:47 fordfrog Exp $
 
-EAPI=3
+EAPI="3"
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -23,12 +23,16 @@ RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.5
 	${CDEPEND}
-	test? ( dev-java/ant-junit4:0 dev-java/junit:4 )"
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest-core:0
+		dev-java/junit:4
+	)"
 
 S="${WORKDIR}/${P}-sources"
 
 src_prepare() {
-	cp "${FILESDIR}/build.xml" build.xml || die
+	cp "${FILESDIR}/build-${PV}.xml" build.xml || die
 
 	mkdir lib || die
 	java-pkg_jar-from --into lib xerces-2 xercesImpl.jar xercesImpl-2.9.1.jar
@@ -41,12 +45,9 @@ EANT_JAVADOC_TARGET="javadoc"
 EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
 
 src_test() {
-	#remove this test as it fails as we don't
-	#bundle deps inside odtdom.jar
-	find . -iname 'VersionTest.java' -delete
-
 	java-pkg_jar-from --into lib junit-4 junit.jar junit-4.5.jar
-	ANT_TASKS="ant-junit4" eant test
+	java-pkg_jar-from --into lib hamcrest-core
+	ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {