Author: martinc Date: Tue Dec 14 21:47:37 2004 New Revision: 111950 URL: http://svn.apache.org/viewcvs?view=rev&rev=111950 Log: Simplify the config for Cactus testing by removing the need for most of the explicit properties. Modified: struts/core/trunk/build-tests.xml struts/core/trunk/build.properties.sample struts/core/trunk/build.properties.sample.lib
Modified: struts/core/trunk/build-tests.xml Url: http://svn.apache.org/viewcvs/struts/core/trunk/build-tests.xml?view=diff&rev=111950&p1=struts/core/trunk/build-tests.xml&r1=111949&p2=struts/core/trunk/build-tests.xml&r2=111950 ============================================================================== --- struts/core/trunk/build-tests.xml (original) +++ struts/core/trunk/build-tests.xml Tue Dec 14 21:47:37 2004 @@ -35,14 +35,6 @@ cactus.contextApp The application(context) being tested, ie test - aspectjrt.jar The AspectJ runtime jar that is - included with Cactus 1.3 - - cactus.jar The Cactus jar (either for Servlet API - 2.2 or 2.3). - - cactus.ant.jar The Cactus custom Ant tasks jar - junit.jar The JUnit jar tomcat.home.32 The home directory of where Tomcat 3.2 @@ -96,6 +88,16 @@ <!-- Context test is taking place on --> <property name="cactus.contextURL" value="${cactus.contextScheme}://${cactus.contextHost}:${cactus.contextPort}/${cactus.contextApp}"/> + <!-- Cactus jar files (that we need) --> + <patternset id="cactus.jars"> + <include name="aspectj*.jar"/> + <include name="cactus*.jar"/> + <include name="commons-httpclient*.jar"/> + <include name="httpunit*.jar"/> + <include name="junit*.jar"/> + <include name="log4j*.jar"/> + </patternset> + <!-- Compilation Classpath --> <path id="compile.classpath"> <pathelement location="${build.home}/library/${app.name}.jar"/> @@ -103,17 +105,15 @@ <pathelement location="${commons-beanutils.jar}"/> <pathelement location="${commons-digester.jar}"/> <pathelement location="${commons-fileupload.jar}"/> - <pathelement location="${commons-httpclient.jar}"/> <pathelement location="${commons-logging.jar}"/> <pathelement location="${commons-validator.jar}"/> - <pathelement location="${httpunit.jar}"/> - <pathelement location="${aspectjrt.jar}"/> <pathelement location="${jakarta-oro.jar}"/> - <pathelement location="${cactus.jar}"/> - <pathelement location="${junit.jar}"/> <pathelement location="${servlet.jar}"/> <pathelement location="${struts.jar}"/> <pathelement location="${antlr.jar}"/> + <fileset dir="${cactus.lib}"> + <patternset refid="cactus.jars"/> + </fileset> </path> <!-- ========== Executable Targets ======================================== --> @@ -128,7 +128,9 @@ classname="org.apache.cactus.integration.ant.RunServerTestsTask"> <classpath> - <pathelement location="${cactus.ant.jar}"/> + <fileset dir="${cactus.lib}"> + <include name="cactus-ant*.jar"/> + </fileset> <pathelement path="${java.class.path}"/> </classpath> </taskdef> @@ -192,12 +194,8 @@ <!-- Copy needed libs in /lib --> <copy file="${build.home}/library/${app.name}.jar" todir="${out.test.dir}/lib"/> - <copy file="${aspectjrt.jar}" todir="${out.test.dir}/lib"/> - <copy file="${httpunit.jar}" todir="${out.test.dir}/lib"/> - <copy file="${junit.jar}" todir="${out.test.dir}/lib"/> <copy file="${jakarta-oro.jar}" todir="${out.test.dir}/lib"/> <copy file="${log4j.jar}" todir="${out.test.dir}/lib"/> - <copy file="${cactus.jar}" todir="${out.test.dir}/lib"/> <copy file="${commons-beanutils.jar}" todir="${out.test.dir}/lib"/> <copy file="${commons-digester.jar}" @@ -209,7 +207,7 @@ <war warfile="${out.test.dir}/test.war" webxml="${conf.test.dir}/web.xml"> - <fileset dir="${web.dir}/test"/> + <fileset dir="${web.dir}/test"/> <classes dir="${out.test.dir}/classes"/> @@ -220,6 +218,9 @@ by the war classloader. This will depend on servlet engines --> <lib dir="${out.test.dir}/lib"/> + <lib dir="${cactus.lib}"> + <patternset refid="cactus.jars"/> + </lib> <webinf dir="${out.test.dir}/WEB-INF" includes="**/*.*"/> @@ -236,7 +237,6 @@ <classpath> <pathelement path="${java.class.path}"/> - <pathelement location="${commons-httpclient.jar}"/> <pathelement location="${out.test.dir}/classes"/> <!-- For cactus.properties --> <pathelement location="${conf.test.dir}"/> Modified: struts/core/trunk/build.properties.sample Url: http://svn.apache.org/viewcvs/struts/core/trunk/build.properties.sample?view=diff&rev=111950&p1=struts/core/trunk/build.properties.sample&r1=111949&p2=struts/core/trunk/build.properties.sample&r2=111950 ============================================================================== --- struts/core/trunk/build.properties.sample (original) +++ struts/core/trunk/build.properties.sample Tue Dec 14 21:47:37 2004 @@ -120,166 +120,28 @@ # junit.jar in ANT_HOME/lib (See Ant docs on JUnit task) # # ----------------------------------------- -# Cactus 12-1.3 home -#cactus.home=${apache.home}/jakarta-cactus-12-1.3 -#cactus.lib=${cactus.home}/lib - -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2rc1.jar - -# JUnit jar file, version 3.81 or newer required. -#junit.jar = ${apache.home}/junit3.8.1/junit.jar - -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient-20020421.jar - -# ----------------------------------------- -# Cactus 12-1.4 home -#cactus.home=${apache.home}/jakarta-cactus-12-1.4 -#cactus.lib=${cactus.home}/lib - -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus-1.4.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2.5.jar - -# JUnit jar file, version 3.81 or newer required. -#junit.jar = ${apache.home}/junit3.8.1/junit.jar - -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar - -# ----------------------------------------- -# Cactus 12-1.4.1 home -#cactus.home=${apache.home}/jakarta-cactus-12-1.4.1 -#cactus.lib=${cactus.home}/lib - -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus-1.4.1.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.1.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2.5.jar - -# JUnit jar file, version 3.81 or newer required. -#junit.jar = ${apache.home}/junit3.8.1/junit.jar - -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar - -# ----------------------------------------- # Cactus 13-1.3 home #cactus.home=${apache.home}/jakarta-cactus-13-1.3 #cactus.lib=${cactus.home}/lib -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2rc1.jar - # JUnit jar file, version 3.81 or newer required. #junit.jar = ${cactus.lib}/junit.jar -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient.jar - # ----------------------------------------- # Cactus 13-1.4 home #cactus.home=${apache.home}/jakarta-cactus-13-1.4 #cactus.lib=${cactus.home}/lib -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus-1.4.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2.5.jar - # JUnit jar file, version 3.81 or newer required. #junit.jar = ${apache.home}/junit3.8.1/junit.jar -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar - # ----------------------------------------- # Cactus 13-1.4.1 home cactus.home=${apache.home}/jakarta-cactus-13-1.4.1 cactus.lib=${cactus.home}/lib -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -cactus.jar = ${cactus.lib}/cactus-1.4.1.jar - -# Cactus Ant custom tasks jar -cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.1.jar - -# AspectJ from Cactus distribution -aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar - -# The httpunit runtime jar -httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar - -# Log4J from Jakarta-Commons -log4j.jar = ${cactus.lib}/log4j-1.2.5.jar - # JUnit jar file, version 3.8.1 or newer required. junit.jar = ${apache.home}/junit3.8.1/junit.jar - -# Httpclient from Jakarta-Commons -commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar # ----------------------------------------- Modified: struts/core/trunk/build.properties.sample.lib Url: http://svn.apache.org/viewcvs/struts/core/trunk/build.properties.sample.lib?view=diff&rev=111950&p1=struts/core/trunk/build.properties.sample.lib&r1=111949&p2=struts/core/trunk/build.properties.sample.lib&r2=111950 ============================================================================== --- struts/core/trunk/build.properties.sample.lib (original) +++ struts/core/trunk/build.properties.sample.lib Tue Dec 14 21:47:37 2004 @@ -122,149 +122,23 @@ # In order for the Cactus tests to work, you must have a copy of # junit.jar in ANT_HOME/lib (See Ant docs on JUnit task) # -# -- Cactus 12-1.3 home ------------------ -#cactus.home=${apache.home}/jakarta-cactus-12-1.3 -#cactus.lib=${cactus.home}/lib - -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2rc1.jar - -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient-20020421.jar - -# -- Cactus 12-1.4 home -------------------- -#cactus.home=${apache.home}/jakarta-cactus-12-1.4 -#cactus.lib=${cactus.home}/lib - -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus-1.4.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2.5.jar - -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar - -# -- Cactus 12-1.4.1 home ---------------- -#cactus.home=${apache.home}/jakarta-cactus-12-1.4.1 -#cactus.lib=${cactus.home}/lib - -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus-1.4.1.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.1.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2.5.jar - -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar - # -- Cactus 13-1.3 home ------------------- #cactus.home=${apache.home}/jakarta-cactus-13-1.3 #cactus.lib=${cactus.home}/lib -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2rc1.jar - # JUnit jar file, version 3.81 or newer required. # if you uncomment this, comment the one above #junit.jar = ${cactus.lib}/junit.jar -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient.jar - # -- Cactus 13-1.4 home ------------------- #cactus.home=${apache.home}/jakarta-cactus-13-1.4 #cactus.lib=${cactus.home}/lib -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -#cactus.jar = ${cactus.lib}/cactus-1.4.jar - -# Cactus Ant custom tasks jar -#cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.jar - -# AspectJ from Cactus distribution -#aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar - -# The httpunit runtime jar -#httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar - -# Log4J from Jakarta-Commons -#log4j.jar = ${cactus.lib}/log4j-1.2.5.jar - -# Httpclient from Jakarta-Commons -#commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar - # -- Cactus 13-1.4.1 home ---------------- cactus.home=${apache.home}/jakarta-cactus-13-1.4.1 cactus.lib=${cactus.home}/lib -# Cactus jar for the Servlet API corresponding to the servlet.jar file -# selected above (either 2.2 or 2.3) -cactus.jar = ${cactus.lib}/cactus-1.4.1.jar - -# Cactus Ant custom tasks jar -cactus.ant.jar = ${cactus.lib}/cactus-ant-1.4.1.jar - -# AspectJ from Cactus distribution -aspectjrt.jar = ${cactus.lib}/aspectjrt-1.0.5.jar - -# The httpunit runtime jar -httpunit.jar = ${cactus.lib}/httpunit-1.4.1.jar - -# Log4J from Jakarta-Commons -log4j.jar = ${cactus.lib}/log4j-1.2.5.jar - -# Httpclient from Jakarta-Commons -commons-httpclient.jar = ${cactus.lib}/commons-httpclient-2.0alpha1-20020606.jar - -# -- Shared catus settings ---------------- +# -- Shared Cactus settings ---------------- # Scheme used to run tests for cactus, http, https. cactus.contextScheme = http # Host used to run tests for cactus, localhost. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
