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 jr...@apache.org on 2003/04/02 11:34:05 UTC
cvs commit: jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/scripts/eclipse build-share.xml
jruaux 2003/04/02 01:34:05
Modified: integration/eclipse/org.apache.cactus.eclipse.runner
build.xml
integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/containers/ant
AntContainerManager.java
integration/eclipse/org.apache.cactus.eclipse.runner/src/scripts/eclipse
build-share.xml
Log:
Updated Eclipse runner's build with webmerge
Revision Changes Path
1.14 +28 -1 jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 28 Mar 2003 13:38:02 -0000 1.13
+++ build.xml 2 Apr 2003 09:34:05 -0000 1.14
@@ -236,6 +236,33 @@
-->
<target name="dist" depends="checkstyle,jar"
description="Generate the distributable files">
+
+
+ <filter token="cactus.antintegration.jar.name"
+ value="${cactus.antintegration.jar.name}-${project.version}.jar"/>
+ <filter token="cactus.framework.jar.name"
+ value="${cactus.framework.jar.name}-${project.version}.jar"/>
+
+ <basename property="log4j.jar.name" file="${log4j.jar}"/>
+ <filter token="log4j.jar.name" value="${log4j.jar.name}"/>
+ <basename property="aspectjrt.jar.name" file="${aspectjrt.jar}"/>
+ <filter token="aspectjrt.jar.name" value="${aspectjrt.jar.name}"/>
+ <basename property="commons.logging.jar.name" file="${commons.logging.jar}"/>
+ <filter token="commons.logging.jar.name" value="${commons.logging.jar.name}"/>
+ <basename property="junit.jar.name" file="${junit.jar}"/>
+ <filter token="junit.jar.name" value="${junit.jar.name}"/>
+ <basename property="commons.httpclient.jar.name" file="${commons.httpclient.jar}"/>
+ <filter token="commons.httpclient.jar.name" value="${commons.httpclient.jar.name}"/>
+ <basename property="httpunit.jar.name" file="${httpunit.jar}"/>
+ <filter token="httpunit.jar.name" value="${httpunit.jar.name}"/>
+ <basename property="nekohtml.jar.name" file="${nekohtml.jar}"/>
+ <filter token="nekohtml.jar.name" value="${nekohtml.jar.name}"/>
+ <basename property="xerces.jar.name" file="${xerces.jar}"/>
+ <filter token="xerces.jar.name" value="${xerces.jar.name}"/>
+ <basename property="xmlapis.jar.name" file="${xmlapis.jar}"/>
+ <filter token="xmlapis.jar.name" value="${xmlapis.jar.name}"/>
+
+
<mkdir dir="${dist.bin.integration.dir}"/>
@@ -260,7 +287,7 @@
<fileset dir="${cactus.antintegration.bin}"/>
</copy>
- <copy todir="${dist.bin.integration.dir}/ant">
+ <copy todir="${dist.bin.integration.dir}/ant" filtering="on">
<fileset dir="${src.scripts.dir}"/>
</copy>
1.3 +3 -1 jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/containers/ant/AntContainerManager.java
Index: AntContainerManager.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/containers/ant/AntContainerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AntContainerManager.java 21 Mar 2003 20:13:25 -0000 1.2
+++ AntContainerManager.java 2 Apr 2003 09:34:05 -0000 1.3
@@ -64,6 +64,7 @@
import org.apache.cactus.eclipse.runner.containers.IContainerManager;
import org.apache.cactus.eclipse.runner.containers.IContainerProvider;
import org.apache.cactus.eclipse.runner.ui.CactusPlugin;
+import org.apache.tools.ant.BuildLogger;
import org.eclipse.ant.core.AntRunner;
import org.eclipse.core.boot.BootLoader;
import org.eclipse.core.runtime.CoreException;
@@ -187,6 +188,7 @@
runner.setBuildFileLocation(buildFileLocation.getAbsolutePath());
runner.setArguments(getAllAntArguments(theProviderArguments));
runner.setExecutionTargets(new String[] {theTarget});
+ runner.addBuildLogger(BuildLogger.class.getName());
return runner;
}
1.2 +74 -25 jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/scripts/eclipse/build-share.xml
Index: build-share.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/scripts/eclipse/build-share.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-share.xml 12 Mar 2003 18:04:27 -0000 1.1
+++ build-share.xml 2 Apr 2003 09:34:05 -0000 1.2
@@ -19,6 +19,22 @@
<!-- Default webapp context -->
<property name="cactus.context" value="cactustest"/>
+
+ <!-- Decides whether the test result will be printed to the console or
+ not. Default is true -->
+ <property name="cactus.junit.usefile" value="false"/>
+
+ <!-- Location of junit test reports for the Cactus tests -->
+ <property name="cactus.reports.dir"
+ value="${cactus.target.dir}/test-cactus-reports"/>
+
+ <!-- Decides whether to halt the build on error and/or on failure -->
+ <property name="cactus.halt.on.failure" value="true"/>
+ <property name="cactus.halt.on.error" value="true"/>
+
+ <!-- JUnit Runner to use for executing the tests. Valid values are
+ "text" and "swing" -->
+ <property name="cactus.runner" value="text"/>
<!--
========================================================================
@@ -33,26 +49,33 @@
<property name="cactus.script.dir" value="scripts"/>
<property name="cactus.target.classes.dir" value="${cactus.target.dir}/classes"/>
+ <property name="cactus.target.conf.dir" value="${cactus.target.dir}/conf"/>
<!-- Cactus related jar locations -->
<property name="cactus.antintegration.jar"
- value="${cactus.lib.client.dir}/cactus-integration-ant-1.5dev.jar"/>
+ value="${cactus.lib.client.dir}/@cactus.antintegration.jar.name@"/>
<property name="cactus.framework.jar"
- value="${cactus.lib.common.dir}/cactus-framework-1.5dev.jar"/>
+ value="${cactus.lib.common.dir}/@cactus.framework.jar.name@"/>
<property name="cactus.log4j.jar"
- value="${cactus.lib.common.dir}/log4j-1.2.5.jar"/>
+ value="${cactus.lib.common.dir}/@log4j.jar.name@"/>
<property name="cactus.aspectjrt.jar"
- value="${cactus.lib.common.dir}/aspectjrt-1.0.6.jar"/>
+ value="${cactus.lib.common.dir}/@aspectjrt.jar.name@"/>
<property name="cactus.commons.logging.jar"
- value="${cactus.lib.common.dir}/commons-logging-1.0.jar"/>
+ value="${cactus.lib.common.dir}/@commons.logging.jar.name@"/>
<property name="cactus.junit.jar"
- value="${cactus.lib.common.dir}/junit-3.7.jar"/>
+ value="${cactus.lib.common.dir}/@junit.jar.name@"/>
<property name="cactus.httpunit.jar"
- value="${cactus.lib.common.dir}/httpunit-1.5.1.jar"/>
+ value="${cactus.lib.common.dir}/@httpunit.jar.name@"/>
<property name="cactus.commons.httpclient.jar"
- value="${cactus.lib.client.dir}/commons-httpclient.jar"/>
+ value="${cactus.lib.client.dir}/@commons.httpclient.jar.name@"/>
+ <property name="cactus.nekohtml.jar"
+ value="${cactus.lib.client.dir}/@nekohtml.jar.name@"/>
+ <property name="cactus.xerces.jar"
+ value="${cactus.lib.client.dir}/@xerces.jar.name@"/>
+ <property name="cactus.xmlapis.jar"
+ value="${cactus.lib.client.dir}/@xmlapis.jar.name@"/>
<!--
========================================================================
@@ -69,8 +92,7 @@
tests -->
<taskdef resource="cactus.tasks"
classpath="${cactus.antintegration.jar}"/>
- <taskdef name="eclipseruntests"
- classname="org.apache.cactus.eclipse.runner.containers.ant.EclipseRunTests"/>
+
</target>
<!--
@@ -117,24 +139,50 @@
<unwar src="${cactus.war}"
dest="${cactus.target.dir}/${cactus.context}"/>
- <!-- TODO: Perform a web.xml merge -->
+ <!-- Perform a web.xml merge -->
+ <webxmlmerge
+ srcfile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml"
+ mergefile="${cactus.conf.dir}/web.xml"
+ destfile="${cactus.target.dir}/${cactus.context}/WEB-INF/web.xml">
+ <xmlcatalog>
+ <dtd
+ publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ location="${cactus.conf.dir}/web-app.dtd"/>
+ <dtd
+ publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+ location="${cactus.conf.dir}/web-app.dtd"/>
+ </xmlcatalog>
+ </webxmlmerge>
<!-- Copy the Cactus web.xml -->
- <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF">
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF"
+ overwrite="true">
<fileset dir="${cactus.conf.dir}">
<include name="web.xml"/>
</fileset>
</copy>
+
+ <!-- Copy the log4j configuration files -->
+ <copy tofile="${cactus.target.dir}/${cactus.context}/WEB-INF/classes/log4j.properties"
+ file="${cactus.conf.dir}/log_server.properties"/>
- <!-- Copy the Cactus jars -->
- <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib">
- <fileset dir="${cactus.lib.server.dir}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${cactus.lib.common.dir}">
- <include name="*.jar"/>
- </fileset>
- </copy>
+ <!-- Copy the Cactus jars that should be on server side classpath.
+ Note: we used the named jars as it should
+ be possible to override the locations of jars and they should not
+ be expected to be in ${cactus.lib.*.dir}. For example this feature
+ is used by the Maven plugin for Cactus. -->
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
+ file="${cactus.framework.jar}"/>
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
+ file="${cactus.log4j.jar}"/>
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
+ file="${cactus.aspectjrt.jar}"/>
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
+ file="${cactus.commons.logging.jar}"/>
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
+ file="${cactus.junit.jar}"/>
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
+ file="${cactus.httpunit.jar}"/>
<!-- Copy the JSP Redirector -->
<copy todir="${cactus.target.dir}/${cactus.context}">
@@ -144,22 +192,23 @@
</copy>
</target>
-
+
<!--
========================================================================
- Run the tests in Eclipse
+ Trigger the Cactus test by running a JUnit Test Runner
========================================================================
-->
<target name="cactus.test">
<eclipseruntests/>
</target>
-
+
<!--
========================================================================
Clean generated files (including distributables)
========================================================================
-->
- <target name="cactus.clean" depends="cactus.init" description="Clean target directory">
+ <target name="cactus.clean" depends="cactus.init"
+ description="Clean target directory">
<delete includeEmptyDirs="true">
<fileset dir="${cactus.target.dir}/${cactus.context}"/>
</delete>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org