craigmcc 2004/07/05 14:01:14
Modified: el build.xml
Log:
Avoid problems if "commons-el.jar" is predefined, and use
canonical property name "commons-logging.jar" for consistency.
Revision Changes Path
1.11 +6 -7 jakarta-commons/el/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/el/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 27 Feb 2004 23:17:53 -0000 1.10
+++ build.xml 5 Jul 2004 21:01:14 -0000 1.11
@@ -25,9 +25,9 @@
<!-- ========== Initialize Properties ===================================== -->
- <property file="${user.home}/build.properties"/> <!-- User local -->
<property file="build.properties"/> <!-- Component local -->
<property file="../build.properties"/> <!-- Commons local -->
+ <property file="${user.home}/build.properties"/> <!-- User local -->
<!-- ========== External Dependencies ===================================== -->
@@ -35,7 +35,7 @@
<!-- The home directory for the Servlet 2.4 and JSP 2.0 classes
distribution -->
- <property name="api.home" value="../jakarta-servletapi-5"/>
+ <property name="api.home" value="../../jakarta-servletapi-5"/>
<!-- The directory containing your binary distribution of JUnit,
version 3.7 or later -->
@@ -85,7 +85,6 @@
<!-- The base directory for unit test sources -->
<property name="test.home" value="src/test"/>
- <property name="commons-el.jar"
value="${dist.home}/commons-${component.name}.jar" />
<!-- ========== Compiler Defaults ========================================= -->
@@ -104,7 +103,7 @@
<pathelement location="${build.home}/classes"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
- <pathelement location="${commons.logging.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
</path>
@@ -264,7 +263,7 @@
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<copy file="NOTICE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
- <jar jarfile="${commons-el.jar}"
+ <jar jarfile="${dist.home}/commons-${component.name}.jar"
manifest="${build.home}/conf/MANIFEST.MF">
<fileset dir="${build.home}/classes" includes="org/apache/commons/el/**" />
<fileset dir="${build.home}/classes" includes="META-INF/LICENSE.txt" />
@@ -281,7 +280,7 @@
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<copy file="NOTICE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
- <jar jarfile="${commons-el.jar}"
+ <jar jarfile="${dist.home}/commons-${component.name}.jar"
manifest="${build.home}/classes/META-INF/MANIFEST.MF">
<fileset dir="${build.home}/classes" includes="org/apache/commons/el/**" />
<fileset dir="${build.home}/classes" includes="META-INF/LICENSE.txt" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
