You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by fe...@apache.org on 2006/01/07 04:13:20 UTC
svn commit: r366642 - in /jakarta/cactus/branches/CACTUS_17_BRANCH:
build.properties.default build.xml dependencies.xml.default download.xml
samples/ejb/build.xml samples/ejb/src/scripts/share/build.xml
Author: felipeal
Date: Fri Jan 6 19:13:11 2006
New Revision: 366642
URL: http://svn.apache.org/viewcvs?rev=366642&view=rev
Log:
CACTUS-234: replaced jboss-j2ee by geronimo equivalent on binary distribution
Modified:
jakarta/cactus/branches/CACTUS_17_BRANCH/build.properties.default
jakarta/cactus/branches/CACTUS_17_BRANCH/build.xml
jakarta/cactus/branches/CACTUS_17_BRANCH/dependencies.xml.default
jakarta/cactus/branches/CACTUS_17_BRANCH/download.xml
jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/build.xml
jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/src/scripts/share/build.xml
Modified: jakarta/cactus/branches/CACTUS_17_BRANCH/build.properties.default
URL: http://svn.apache.org/viewcvs/jakarta/cactus/branches/CACTUS_17_BRANCH/build.properties.default?rev=366642&r1=366641&r2=366642&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_17_BRANCH/build.properties.default (original)
+++ jakarta/cactus/branches/CACTUS_17_BRANCH/build.properties.default Fri Jan 6 19:13:11 2006
@@ -173,6 +173,9 @@
j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
j2ee.13.jar = ${lib.repo}/${j2ee.13.project}/jars/${j2ee.13.artifact}-${j2ee.13.version}.jar
j2ee.14.jar = ${lib.repo}/${j2ee.14.project}/jars/${j2ee.14.artifact}-${j2ee.14.version}.jar
+# j2ee.13 is distributed in order to run the examples, so it must be an
+# ASL2-compliant JAR
+j2ee-dist.13.jar = ${lib.repo}/${j2ee-dist.13.project}/jars/${j2ee-dist.13.artifact}-${j2ee-dist.13.version}.jar
# List all available Servlet versions. Note that it is required to list all
# versions if you wish to call "ant release" in jakarta-cactus. If you only
Modified: jakarta/cactus/branches/CACTUS_17_BRANCH/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/branches/CACTUS_17_BRANCH/build.xml?rev=366642&r1=366641&r2=366642&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_17_BRANCH/build.xml (original)
+++ jakarta/cactus/branches/CACTUS_17_BRANCH/build.xml Fri Jan 6 19:13:11 2006
@@ -125,6 +125,7 @@
<ant antfile="samples/ejb/build.xml" inheritAll="false"
target="dist">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="j2ee-dist.jar" value="${j2ee-dist.13.jar}"/>
<property name="servlet.jar" value="${servlet.23.jar}"/>
<property name="clover.enable" value="true"/>
<property name="env" value="${env}"/>
@@ -263,7 +264,7 @@
prefix="${main.release.name}/samples/ejb">
<exclude name="lib/**"/>
</zipfileset>
- <zipfileset file="${j2ee.13.jar}" prefix="${main.release.name}/lib"/>
+ <zipfileset file="${j2ee-dist.13.jar}" prefix="${main.release.name}/lib"/>
<zipfileset file="${jetty.jar}" prefix="${main.release.name}/lib"/>
<zipfileset file="${jasper-runtime.jar}" prefix="${main.release.name}/lib"/>
<zipfileset file="${jasper-compiler.jar}" prefix="${main.release.name}/lib"/>
Modified: jakarta/cactus/branches/CACTUS_17_BRANCH/dependencies.xml.default
URL: http://svn.apache.org/viewcvs/jakarta/cactus/branches/CACTUS_17_BRANCH/dependencies.xml.default?rev=366642&r1=366641&r2=366642&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_17_BRANCH/dependencies.xml.default (original)
+++ jakarta/cactus/branches/CACTUS_17_BRANCH/dependencies.xml.default Fri Jan 6 19:13:11 2006
@@ -29,6 +29,10 @@
artifact="jboss-j2ee" version="3.2.3"/>
<j2ee.14 project="jboss"
artifact="jboss-j2ee" version="4.0.0DR4"/>
+<!-- j2ee.13 is distributed in order to run the examples, so it must be an
+ ASL2-compliant JAR -->
+ <j2ee-dist.13 project="geronimo-spec"
+ artifact="geronimo-spec-j2ee" version="1.4-rc4"/>
<jasper-compiler project="tomcat"
artifact="jasper-compiler" version="4.1.30"/>
<jasper-runtime project="tomcat"
Modified: jakarta/cactus/branches/CACTUS_17_BRANCH/download.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/branches/CACTUS_17_BRANCH/download.xml?rev=366642&r1=366641&r2=366642&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_17_BRANCH/download.xml (original)
+++ jakarta/cactus/branches/CACTUS_17_BRANCH/download.xml Fri Jan 6 19:13:11 2006
@@ -129,6 +129,7 @@
<download jar="servlet.23"/>
<download jar="servlet.24"/>
<download jar="j2ee.13"/>
+ <download jar="j2ee-dist.13"/>
<download jar="j2ee.14"/>
<download jar="standard"/>
<download jar="xerces"/>
Modified: jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/build.xml?rev=366642&r1=366641&r2=366642&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/build.xml (original)
+++ jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/build.xml Fri Jan 6 19:13:11 2006
@@ -128,6 +128,7 @@
<!-- Copy scripts -->
<basename property="j2ee.jar.name" file="${j2ee.jar}"/>
+ <basename property="j2ee-dist.jar.name" file="${j2ee-dist.jar}"/>
<basename property="aspectjrt.jar.name" file="${aspectjrt.jar}"/>
<basename property="commons.httpclient.jar.name"
file="${commons.httpclient.jar}"/>
@@ -138,6 +139,7 @@
<filterset id="jar.names">
<filter token="j2ee.jar.name" value="${j2ee.jar.name}"/>
+ <filter token="j2ee-dist.jar.name" value="${j2ee-dist.jar.name}"/>
<filter token="aspectjrt.jar.name" value="${aspectjrt.jar.name}"/>
<filter token="cactus.ant.jar.name" value="${cactus.ant.jar.name}.jar"/>
<filter token="cactus.jar.name" value="${cactus.jar.name}.jar"/>
Modified: jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/src/scripts/share/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/src/scripts/share/build.xml?rev=366642&r1=366641&r2=366642&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/src/scripts/share/build.xml (original)
+++ jakarta/cactus/branches/CACTUS_17_BRANCH/samples/ejb/src/scripts/share/build.xml Fri Jan 6 19:13:11 2006
@@ -85,7 +85,7 @@
<!-- Libraries required for the sample project -->
<property name="j2ee.jar"
- location="../../lib/@j2ee.jar.name@"/>
+ location="../../lib/@j2ee-dist.jar.name@"/>
<path id="project.classpath">
<pathelement location="${j2ee.jar}"/>
</path>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org