vmassol 2003/01/26 14:18:08
Modified: petals/ant build.xml build.properties.sample
. gump.xml
Log:
Use j2ee.jar instead of servlet.jar
Revision Changes Path
1.2 +6 -6 jakarta-cactus/petals/ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 23 Jan 2003 12:32:24 -0000 1.1
+++ build.xml 26 Jan 2003 22:18:08 -0000 1.2
@@ -91,7 +91,7 @@
-->
<target name="properties.target">
- <property name="target.dir" location="${base.dir}/target"/>
+ <property name="target.dir" location="${base.dir}/target-${j2ee.api}"/>
<property name="target.classes.dir" location="${target.dir}/classes"/>
<property name="target.classes.java.dir"
location="${target.classes.dir}/java"/>
@@ -110,7 +110,7 @@
-->
<target name="properties.distribution">
- <property name="dist.dir" location="${base.dir}/dist"/>
+ <property name="dist.dir" location="${base.dir}/dist-${j2ee.api}"/>
<property name="dist.lib.dir" location="${dist.dir}/lib"/>
<property name="dist.lib.client.dir" location="${dist.lib.dir}/client"/>
<property name="dist.lib.server.dir" location="${dist.lib.dir}/server"/>
@@ -173,7 +173,7 @@
</taskdef>
<checkProperty>
- <property name="servlet.jar" isfile="true"/>
+ <property name="j2ee.jar" isfile="true"/>
<property name="aspectjrt.jar" isfile="true"/>
<property name="commons.logging.jar" isfile="true"/>
<property name="commons.httpclient.jar" isfile="true"/>
@@ -194,7 +194,7 @@
<condition property="j2ee.api" value="13">
<available classname="javax.servlet.Filter">
<classpath>
- <pathelement location="${servlet.jar}"/>
+ <pathelement location="${j2ee.jar}"/>
</classpath>
</available>
</condition>
@@ -202,7 +202,7 @@
<condition property="j2ee.api" value="12">
<available classname="javax.servlet.Servlet">
<classpath>
- <pathelement location="${servlet.jar}"/>
+ <pathelement location="${j2ee.jar}"/>
</classpath>
</available>
</condition>
@@ -341,7 +341,7 @@
<!-- Gather all client side Cactus jars -->
<copy
tofile="${dist.lib.client.dir}/${antpetal.jar.name}-${project.version}.jar"
file="${target.dir}/${antpetal.jar.name}.jar"/>
- <copy todir="${dist.lib.dir}/client" file="${servlet.jar}"/>
+ <copy todir="${dist.lib.dir}/client" file="${j2ee.jar}"/>
<copy todir="${dist.lib.dir}/client" file="${commons.httpclient.jar}"/>
<copy todir="${dist.lib.dir}/client" file="${httpunit.jar}"/>
1.3 +5 -3 jakarta-cactus/petals/ant/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/build.properties.sample,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties.sample 25 Jan 2003 17:07:15 -0000 1.2
+++ build.properties.sample 26 Jan 2003 22:18:08 -0000 1.3
@@ -21,9 +21,11 @@
# below. You do not have to put all the external jars in a single location.
lib.repo = c:/apps/maven/repository
-# Location of the Servlet API jar (it is needed because we want to copy it
-# in the Cactus distribution).
-servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
+# The location of the J2EE API jar. Depending on the version (1.2 or 1.3) of
+# it, the corresponding Cactus Framework will be built. For example if you use
+# J2EE 1.3 jar, then the Cactus jar will contain the Filter Redirector which is
+# only available for Servlet 2.3 (part of J2EE 1.3).
+j2ee.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
# The location of the Commons Logging jar
commons.logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.1.jar
1.39 +1 -1 jakarta-cactus/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/gump.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gump.xml 26 Jan 2003 14:10:50 -0000 1.38
+++ gump.xml 26 Jan 2003 22:18:08 -0000 1.39
@@ -198,7 +198,7 @@
<ant buildfile="petals/ant/build.xml" target="dist">
- <depend property="servlet.jar" project="jakarta-servletapi-4"/>
+ <depend property="j2ee.jar" project="jakarta-servletapi-4"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
<depend property="commons.logging.jar" project="commons-logging" id="all"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
