rpms/xdoclet/devel xdoclet-ant.not-required.patch, 1.2, 1.3 xdoclet-build_xml.patch, 1.2, 1.3

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sun Jul 23 05:33:18 UTC 2006 

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10787

Modified Files:
	xdoclet-ant.not-required.patch xdoclet-build_xml.patch 
Log Message:
Update patches to upstream version


xdoclet-ant.not-required.patch:
 core/src/xdoclet/TemplateSubTask.java                                          |    8 ++++----
 core/src/xdoclet/XmlSubTask.java                                               |    4 ++--
 modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java   |    2 +-
 modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java                         |    4 ++--
 modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java              |    2 +-
 modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java             |    2 +-
 modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java          |    2 +-
 modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java                    |   10 +++++-----
 modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java               |    2 +-
 modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java            |    4 ++--
 modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java    |    2 +-
 modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java |    2 +-
 modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java       |    2 +-
 modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java              |    6 +++---
 modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java                |    2 +-
 15 files changed, 27 insertions(+), 27 deletions(-)

Index: xdoclet-ant.not-required.patch
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet-ant.not-required.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdoclet-ant.not-required.patch	7 Jun 2005 10:05:58 -0000	1.2
+++ xdoclet-ant.not-required.patch	23 Jul 2006 05:33:03 -0000	1.3
@@ -193,10 +193,10 @@
      {
 --- modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
 +++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java	2004-06-30 20:39:18.000000000 +0200
-@@ -216,7 +216,7 @@
-      * Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2
+@@ -228,7 +228,7 @@
+      * Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
       *
-      * @param version      The new version value. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2
+      * @param version      The new version value. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
 -     * @ant.not-required   No, default is "2.6".
 +     * @ant.not-required   "No, default is '2.6'."
       */

xdoclet-build_xml.patch:
 build.xml                  |    9 +++++----
 core/build.xml             |    2 +-
 modules/modules-common.ent |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

Index: xdoclet-build_xml.patch
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet-build_xml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdoclet-build_xml.patch	7 Jun 2005 10:05:58 -0000	1.2
+++ xdoclet-build_xml.patch	23 Jul 2006 05:33:03 -0000	1.3
@@ -20,44 +20,36 @@
  
          <pretty2 settingsDir="${config.dir}" cvs="true" compileDir="${module.classes.dir}">
              <fileset dir="${module.src.dir}">
---- build.xml.orig	2005-05-04 09:59:46.000000000 -0400
-+++ build.xml	2005-05-04 11:09:49.000000000 -0400
-@@ -6,14 +6,19 @@
+--- build.xml.orig	2004-06-21 15:14:10.000000000 -0400
++++ build.xml	2005-03-07 12:34:42.000000000 -0500
+@@ -6,6 +6,7 @@
      <property file="${user.home}/build.properties"/>
      <property name="xjavadoc.jar" location="${lib.dir}/xjavadoc-${xjavadoc.version}.jar"/>
      <property environment="env"/>
 +    <property name="xjavadoc.uptodate" value="true"/>
-+    <property name="xjavadoc.sources.present" value="true"/>
  
      <target name="xjavadoc-determine-presence">
          <available property="xjavadoc.sources.present"
-                    file="${basedir}/../xjavadoc"
+@@ -13,7 +14,7 @@
                     type="dir"/>
-+        <condition property="xjavadoc.sources.available">
-+            <istrue value="${xjavadoc.sources.present}" />
-+        </condition>
      </target>
  
 -    <target name="xjavadoc-determine-uptodate" depends="xjavadoc-determine-presence" if="xjavadoc.sources.present">
-+    <target name="xjavadoc-determine-uptodate" depends="xjavadoc-determine-presence" if="xjavadoc.sources.present" unless="xjavadoc.uptodate">
++    <target name="xjavadoc-determine-uptodate" depends="xjavadoc-determine-presence,download-xjavadoc" if="xjavadoc.sources.present">
          <echo>XJavaDoc sources are available. Checking against ${xjavadoc.jar}</echo>
          <uptodate property="xjavadoc.uptodate"
                    targetfile="${xjavadoc.jar}">
-@@ -23,7 +28,7 @@
-         </uptodate>
+@@ -36,7 +37,7 @@
+         <echo>The XJavaDoc binaries are up to date. No need to build.</echo>
      </target>
  
--    <target name="build-xjavadoc" depends="xjavadoc-determine-uptodate" if="xjavadoc.sources.present" unless="xjavadoc.uptodate">
-+    <target name="build-xjavadoc" depends="download-xjavadoc,xjavadoc-determine-uptodate" if="xjavadoc.sources.available" unless="xjavadoc.uptodate">
-         <echo>XJavaDoc sources modified after jar file. Building XJavaDoc...</echo>
-         <ant dir="${basedir}/../xjavadoc">
-             <property name="rootdir" value="${basedir}/../xjavadoc"/>
-@@ -47,9 +52,11 @@
-         
-         <get src="http://xdoclet.sourceforge.net/repository/xjavadoc/jars/xjavadoc-${xjavadoc.version}.jar"
+-    <target name="download-xjavadoc" depends="xjavadoc-determine-presence" unless="xjavadoc.sources.present">
++    <target name="download-xjavadoc" depends="xjavadoc-determine-presence" unless="xjavadoc.uptodate">
+         <echo>
+         XJavaDoc's sources are not available in ${basedir}/../xjavadoc
+         Trying to download xjavadoc via HTTP. If you're behind a proxy, you should uncomment
+@@ -49,7 +50,7 @@
               dest="${xjavadoc.jar}"/>
-+
-+        <property name="xjavadoc.sources.available" value="true"/>
      </target>
  
 -    <target name="xjavadoc" depends="build-xjavadoc,dont-build-xjavadoc,download-xjavadoc"/>
@@ -65,7 +57,7 @@
  
      <target name="core">
          <ant dir="${core.dir}"/>
-@@ -145,7 +152,7 @@
+@@ -145,7 +146,7 @@
          <copy file="${lib.dir}/log4j.jar" todir="${dist.lib.dir}"/>
  
          <!-- Copy the Jakarta Commons Collections jar to the dist.lib directory -->

More information about the fedora-cvs-commits mailing list