vmassol 2004/05/16 02:22:26
Modified: framework build.xml
. build.properties.sample dependencies.xml
build.properties.vmassol download.xml
Log:
Use jboss-j2ee-3.2.3.jar in replacement of the Sun j2ee jar. The advantage is that
the JBoss jar can be distributed and is available on ibiblio.org. Thus it makes our
build for J2EE 1.3 seamless. I still need to check whether we can redistribute it in
our Cactus distribution. I think it should be ok as we've moved to the 2.0 Apache
license.
Revision Changes Path
1.85 +4 -1 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- build.xml 14 May 2004 10:33:34 -0000 1.84
+++ build.xml 16 May 2004 09:22:26 -0000 1.85
@@ -103,6 +103,7 @@
<echo> commons.logging.jar = [${commons.logging.jar}]</echo>
<echo> httpunit.jar = [${httpunit.jar}]</echo>
<echo> j2ee.jar = [${j2ee.jar}]</echo>
+ <echo> servlet.jar = [${servlet.jar}]</echo>
<echo> junit.jar = [${junit.jar}]</echo>
<echo> mockobjects.jar = [${mockobjects.jar}]</echo>
<echo> jetty.jar = [${jetty.jar}]</echo>
@@ -120,6 +121,7 @@
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${httpunit.jar}"/>
<pathelement location="${j2ee.jar}"/>
+ <pathelement location="${servlet.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${xmlapis.jar}"/>
</path>
@@ -131,6 +133,7 @@
<available file="${commons.logging.jar}"/>
<available file="${httpunit.jar}"/>
<available file="${j2ee.jar}"/>
+ <available file="${servlet.jar}"/>
<available file="${junit.jar}"/>
<available file="${mockobjects.jar}"/>
<available file="${jetty.jar}"/>
1.109 +9 -14 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- build.properties.sample 14 May 2004 10:33:35 -0000 1.108
+++ build.properties.sample 16 May 2004 09:22:26 -0000 1.109
@@ -47,13 +47,16 @@
# 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).
#
-# Note: The J2EE jar can be retrieved from the Sun web site defined below.
-# Unfortunately, you'll also need to download the whole J2EE SDK just to get
-# this file. In the future we'll work towards using the JSR jars provided by
+# Note: In the future we'll work towards using the JSR jars provided by
# the Geronimo project.
# - For J2EE 1.3: http://java.sun.com/j2ee/sdk_1.3/
# - For J2EE 1.2: http://java.sun.com/j2ee/sdk_1.2.1/
-j2ee.jar = ${lib.repo}/j2ee/jars/j2ee-1.3.jar
+j2ee.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
+#j2ee.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
+
+# Location of the Servlet API jar.
+servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
+#servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
# The location of the Commons Logging jar
commons.logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.3.jar
@@ -95,14 +98,6 @@
jetty.jar = ${lib.repo}/jetty/jars/org.mortbay.jetty-4.2.11.jar
# -----------------------------------------------------------------------------
-# Mandatory properties for the Sample Servlet project.
-# -----------------------------------------------------------------------------
-
-# Location of the Servlet API jar.
-servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
-#servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
-
-# -----------------------------------------------------------------------------
# Mandatory properties for the Jetty Sample
# -----------------------------------------------------------------------------
@@ -147,7 +142,7 @@
# Location of J2EE API jars for the "*.all" targets
j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
-j2ee.13.jar = ${lib.repo}/j2ee/jars/j2ee-1.3.jar
+j2ee.13.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
# Location of Servlet API jars for the "*.all" targets
servlet.22.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
1.3 +2 -0 jakarta-cactus/dependencies.xml
Index: dependencies.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/dependencies.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dependencies.xml 9 Jan 2004 13:53:19 -0000 1.2
+++ dependencies.xml 16 May 2004 09:22:26 -0000 1.3
@@ -43,6 +43,8 @@
artifact="servletapi" version="2.2"/>
<servlet.23 project="servletapi"
artifact="servletapi" version="2.3"/>
+ <j2ee.13 project="jboss"
+ artifact="jboss-j2ee" version="3.2.3"/>
<standard project="taglibs"
artifact="standard" version="1.0.2"/>
<xerces project="xerces"
1.20 +9 -3 jakarta-cactus/build.properties.vmassol
Index: build.properties.vmassol
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.vmassol,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.properties.vmassol 14 May 2004 10:33:35 -0000 1.19
+++ build.properties.vmassol 16 May 2004 09:22:26 -0000 1.20
@@ -21,7 +21,13 @@
# 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}/j2ee/jars/j2ee-1.3.jar
+#
+# Note: In the future we'll work towards using the JSR jars provided by
+# the Geronimo project.
+# - For J2EE 1.3: http://java.sun.com/j2ee/sdk_1.3/
+# - For J2EE 1.2: http://java.sun.com/j2ee/sdk_1.2.1/
+j2ee.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
+#j2ee.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
# The location of the Commons Logging jar
commons.logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.3.jar
@@ -115,7 +121,7 @@
# Location of J2EE API jars for the "*.all" targets
j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
-j2ee.13.jar = ${lib.repo}/j2ee/jars/j2ee-1.3.jar
+j2ee.13.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
# Location of Servlet API jars for the "*.all" targets
servlet.22.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
1.4 +2 -1 jakarta-cactus/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/download.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- download.xml 11 Jan 2004 10:05:23 -0000 1.3
+++ download.xml 16 May 2004 09:22:26 -0000 1.4
@@ -83,6 +83,7 @@
<download jar="regexp"/>
<download jar="servlet.22"/>
<download jar="servlet.23"/>
+ <download jar="j2ee.13"/>
<download jar="standard"/>
<download jar="xerces"/>
<download jar="xmlapis"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
