rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.build.properties.default.patch, 1.1, 1.2 jakarta-commons-modeler.build.xml.patch, 1.1, 1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 26 00:35:52 UTC 2007


Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30826

Modified Files:
	jakarta-commons-modeler.build.properties.default.patch 
	jakarta-commons-modeler.build.xml.patch 
Log Message:
Update Patches to what jpp currently has


jakarta-commons-modeler.build.properties.default.patch:
 build.properties.default |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: jakarta-commons-modeler.build.properties.default.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.build.properties.default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-modeler.build.properties.default.patch	10 Aug 2006 19:40:02 -0000	1.1
+++ jakarta-commons-modeler.build.properties.default.patch	26 Apr 2007 00:35:50 -0000	1.2
@@ -1,39 +1,39 @@
---- build.properties.default.original	2006-08-10 11:13:12.000000000 -0400
-+++ build.properties.default	2006-08-10 11:31:26.000000000 -0400
+--- build.properties.default.orig	2007-02-27 15:27:41.000000000 -0500
++++ build.properties.default	2007-02-27 15:30:31.000000000 -0500
 @@ -15,7 +15,7 @@
- # --------------------------------------------------
- 
- # ----- Commons Digester, version 1.4 or later -----
--commons-digester.home=${base.path}/commons-digester-1.4.1
-+commons-digester.home=${base.path}
- commons-digester.lib=${commons-digester.home}
- commons-digester.jar=${commons-digester.lib}/commons-digester.jar
- commons-digester.loc=http://www.apache.org/dist/jakarta/commons/digester/binaries/commons-digester-1.4.1.tar.gz
+ # --------------------------------------------------
+ 
+ # ----- Commons Digester, version 1.4 or later -----
+-commons-digester.home=${base.path}/commons-digester-1.4.1
++commons-digester.home=${base.path}
+ commons-digester.lib=${commons-digester.home}
+ commons-digester.jar=${commons-digester.lib}/commons-digester.jar
+ commons-digester.loc=http://www.apache.org/dist/jakarta/commons/digester/binaries/commons-digester-1.4.1.tar.gz
 @@ -25,7 +25,7 @@
- # --------------------------------------------------
- 
- # ----- Commons Logging, version 1.0.1 or later -----
--commons-logging.home=${base.path}/commons-logging-1.0.3
-+commons-logging.home=${base.path}
- commons-logging.lib=${commons-logging.home}
- commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
- commons-logging.jar=${commons-logging.lib}/commons-logging.jar
+ # --------------------------------------------------
+ 
+ # ----- Commons Logging, version 1.0.1 or later -----
+-commons-logging.home=${base.path}/commons-logging-1.0.3
++commons-logging.home=${base.path}
+ commons-logging.lib=${commons-logging.home}
+ commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
+ commons-logging.jar=${commons-logging.lib}/commons-logging.jar
 @@ -33,15 +33,15 @@
- 
- 
- # ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or later -----
--jmx.home=${base.path}/mx4j-1.1.1
--jmx.lib=${jmx.home}/lib
-+jmx.home=${base.path}
-+jmx.lib=${jmx.home}/mx4j
- jmx.jar=${jmx.lib}/mx4j-jmx.jar
- jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
- jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.1.tar.gz
- 
- 
- # ----- JUnit Unit Test Suite, version 3.7 or later -----
--junit.home=${base.path}/junit3.7
-+junit.home=${base.path}
- junit.lib=${junit.home}
- junit.jar=${junit.lib}/junit.jar
- junit.loc=http://telia.dl.sourceforge.net/sourceforge/junit/junit3.7.zip
+ 
+ 
+ # ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or later -----
+-jmx.home=${base.path}/mx4j-1.1.1
+-jmx.lib=${jmx.home}/lib
++jmx.home=${base.path}
++jmx.lib=${jmx.home}/mx4j
+ jmx.jar=${jmx.lib}/mx4j-jmx.jar
+ jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
+ jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.1.tar.gz
+ 
+ 
+ # ----- JUnit Unit Test Suite, version 3.7 or later -----
+-junit.home=${base.path}/junit3.7
++junit.home=${base.path}
+ junit.lib=${junit.home}
+ junit.jar=${junit.lib}/junit.jar
+ junit.loc=http://telia.dl.sourceforge.net/sourceforge/junit/junit3.7.zip

jakarta-commons-modeler.build.xml.patch:
 build.xml |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

Index: jakarta-commons-modeler.build.xml.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.build.xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-modeler.build.xml.patch	10 Aug 2006 19:40:02 -0000	1.1
+++ jakarta-commons-modeler.build.xml.patch	26 Apr 2007 00:35:50 -0000	1.2
@@ -1,32 +1,32 @@
---- build.xml.original	2006-08-10 11:35:09.000000000 -0400
-+++ build.xml	2006-08-10 11:49:22.000000000 -0400
+--- build.xml.orig	2007-02-27 15:31:59.000000000 -0500
++++ build.xml	2007-02-27 15:33:05.000000000 -0500
 @@ -20,24 +20,23 @@
- 
- 
-   <!-- The directories corresponding to your necessary dependencies -->
--  <property name="base.path"               value="/usr/local" />
--  <property name="jaxp.home"               value="${base.path}/jaxp-1.1"/>
--  <property name="junit.home"              value="${base.path}/junit3.7"/>
-+  <property name="jaxp.home"               value="${base.path}"/>
-+  <property name="junit.home"              value="${base.path}"/>
-   <property name="commons.home"            location="../../jakarta-commons"/>
-   <property name="sandbox.home"            location="../../jakarta-commons-sandbox"/>
-   <property name="digester.home"           value="${commons.home}/digester"/>
--  <property name="jmx.home"                value="${base.path}/jmx-ri_1.0.1/jmx"/>
-+  <property name="jmx.home"                value="${base.path}"/>
-   <property name="logging.home"            value="${commons.home}/logging"/>
- 
- <!-- ========== Derived Values ============================================ -->
- 
- 
-   <!-- The locations of necessary jar files -->
--  <property name="ant.jar"                 value="${ant.home}/lib/ant.jar"/>
-+  <property name="ant.jar"                 value="${base.path}/ant.jar"/>
-   <property name="jaxp.jaxp.jar"           value="${jaxp.home}/jaxp.jar"/>
-   <property name="jaxp.parser.jar"         value="${jaxp.home}/crimson.jar"/>
-   <property name="jaxp.xalan.jar"          value="${jaxp.home}/xalan.jar"/>
--  <property name="jmx.jar"                 value="${jmx.home}/lib/jmxri.jar"/>
-+  <property name="jmx.jar"                 value="${jmx.home}/jmxri.jar"/>
-   <property name="junit.jar"               value="${junit.home}/junit.jar"/>
-   <property name="commons-digester.jar"    value="${digester.home}/dist/commons-digester.jar"/>
-   <property name="commons-logging.jar"     value="${logging.home}/target/commons-logging.jar"/>
+ 
+ 
+   <!-- The directories corresponding to your necessary dependencies -->
+-  <property name="base.path"               value="/usr/local" />
+-  <property name="jaxp.home"               value="${base.path}/jaxp-1.1"/>
+-  <property name="junit.home"              value="${base.path}/junit3.7"/>
++  <property name="jaxp.home"               value="${base.path}"/>
++  <property name="junit.home"              value="${base.path}"/>
+   <property name="commons.home"            location="../../jakarta-commons"/>
+   <property name="sandbox.home"            location="../../jakarta-commons-sandbox"/>
+   <property name="digester.home"           value="${commons.home}/digester"/>
+-  <property name="jmx.home"                value="${base.path}/jmx-ri_1.0.1/jmx"/>
++  <property name="jmx.home"                value="${base.path}"/>
+   <property name="logging.home"            value="${commons.home}/logging"/>
+ 
+ <!-- ========== Derived Values ============================================ -->
+ 
+ 
+   <!-- The locations of necessary jar files -->
+-  <property name="ant.jar"                 value="${ant.home}/lib/ant.jar"/>
++  <property name="ant.jar"                 value="${base.path}/ant.jar"/>
+   <property name="jaxp.jaxp.jar"           value="${jaxp.home}/jaxp.jar"/>
+   <property name="jaxp.parser.jar"         value="${jaxp.home}/crimson.jar"/>
+   <property name="jaxp.xalan.jar"          value="${jaxp.home}/xalan.jar"/>
+-  <property name="jmx.jar"                 value="${jmx.home}/lib/jmxri.jar"/>
++  <property name="jmx.jar"                 value="${jmx.home}/jmxri.jar"/>
+   <property name="junit.jar"               value="${junit.home}/junit.jar"/>
+   <property name="commons-digester.jar"    value="${digester.home}/dist/commons-digester.jar"/>
+   <property name="commons-logging.jar"     value="${logging.home}/target/commons-logging.jar"/>




More information about the fedora-cvs-commits mailing list