Excellent -- thanks for taking care of this. A cleaner solution... [EMAIL PROTECTED] wrote:
>Author: ekoneil >Date: Wed Nov 30 08:54:17 2005 >New Revision: 349985 > >URL: http://svn.apache.org/viewcvs?rev=349985&view=rev >Log: >Re-enable the Struts 1.1 tests for the NetUI BVTs. Also adds them back to the >Cruisecontrol machine. > >This change adds a test/ant/struts-imports.xml file that can be used to remove >a Struts 1.2 runtime from a web application and replace it with the Struts 1.1 >runtime. It's no longer generally available in the top-level Ant build >because this is really just a test thing -- we don't even ship NetUI with >Struts 1.1. > >BB: self >Test: NetUI && dist test pass > > >Added: > beehive/trunk/netui/test/ant/struts-imports.xml (with props) >Modified: > beehive/trunk/netui/ant/webappTemplate.xml > beehive/trunk/netui/test/dist-test/build.xml > beehive/trunk/netui/test/dist-test/files/build.xml > beehive/trunk/netui/test/webapps/drt/build.properties > beehive/trunk/netui/test/webapps/drt/build.xml > >Modified: beehive/trunk/netui/ant/webappTemplate.xml >URL: >http://svn.apache.org/viewcvs/beehive/trunk/netui/ant/webappTemplate.xml?rev=349985&r1=349984&r2=349985&view=diff >============================================================================== >--- beehive/trunk/netui/ant/webappTemplate.xml (original) >+++ beehive/trunk/netui/ant/webappTemplate.xml Wed Nov 30 08:54:17 2005 >@@ -24,7 +24,6 @@ > > <property name="resource.dir.name" value="resources/beehive/version1"/> > <property name="template.root.dir" > location="${src.dir}/webapp-template/"/> >- <property name="struts11.dir" >location="${struts.dir}/legacy/jakarta-struts-1.1-lib"/> > > <property name="webapp.dist.dir" > location="${beehive.home}/netui/build/dist/webapp"/> > <property name="compiler.dist.dir" > location="${beehive.home}/netui/build/dist/compiler"/> >@@ -124,42 +123,7 @@ > </target> > > <target name="deploy.struts"> >- <echo>struts version: ${struts.version}</echo> >- <condition property="struts11" value="true"> >- <equals arg1="${struts.version}" arg2="1.1"/> >- </condition> >- <condition property="struts12" value="true"> >- <or> >- <equals arg1="${struts.version}" arg2="1.2"/> >- <not><isset property="struts.version"/></not> >- </or> >- </condition> >- >- <echo>struts11: ${struts11}</echo> >- <echo>struts12: ${struts12}</echo> >- >- <antcall target="struts11"/> >- <antcall target="struts12"/> >- <!-- todo: would be great to check here for the struts.jar in the >webinf.lib dir --> >- </target> >- >- <target name="struts11" if="struts11"> >- <echo>Deploy Struts 1.1</echo> >- <copy todir="${webapp.dir}/WEB-INF/lib"> >- <fileset dir="${struts11.dir}"> >- <patternset refid="struts11.jars"/> >- </fileset> >- </copy> >- <copy todir="${webapp.dir}/WEB-INF"> >- <fileset dir="${struts11.dir}"> >- <patternset refid="struts11.webinf"/> >- </fileset> >- </copy> >- </target> >- >- <target name="struts12" if="struts12"> > <echo>Deploy Struts 1.2</echo> >- <!-- copy the Struts JARs --> > <copy todir="${webapp.dir}/WEB-INF/lib"> > <fileset dir="${struts.dir}"> > <patternset refid="struts12.jars"/> >@@ -189,10 +153,6 @@ > <include name="standard.jar"/> > <include name="log4j-1.2.8.jar"/> > <include name="beehive-controls.jar"/> >- </patternset> >- >- <patternset id="struts11.webinf"> >- <include name="validator-rules.xml"/> > </patternset> > > <patternset id="struts12.webinf"> > >Added: beehive/trunk/netui/test/ant/struts-imports.xml >URL: >http://svn.apache.org/viewcvs/beehive/trunk/netui/test/ant/struts-imports.xml?rev=349985&view=auto >============================================================================== >--- beehive/trunk/netui/test/ant/struts-imports.xml (added) >+++ beehive/trunk/netui/test/ant/struts-imports.xml Wed Nov 30 08:54:17 2005 >@@ -0,0 +1,125 @@ >+<?xml version="1.0"?> >+ >+<!-- >+ Copyright 2004 The Apache Software Foundation. >+ >+ Licensed under the Apache License, Version 2.0 (the "License"); >+ you may not use this file except in compliance with the License. >+ You may obtain a copy of the License at >+ >+ http://www.apache.org/licenses/LICENSE-2.0 >+ >+ Unless required by applicable law or agreed to in writing, software >+ distributed under the License is distributed on an "AS IS" BASIS, >+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. >+ See the License for the specific language governing permissions and >+ limitations under the License. >+ >+ $Header:$ >+--> >+ >+<project name="Beehive/NetUI/Test/Struts" default="" basedir="."> >+ >+ <macrodef name="deploy-struts11"> >+ <attribute name="webappdir" description="The root directory of a web >appliction into which Struts should be deployed"/> >+ <attribute name="strutsdir" description="The root directory of the >Struts libraries"/> >+ <sequential> >+ <available property="webapp.dir.available" file="@{webappdir}" >type="dir"/> >+ <fail unless="webapp.dir.available" message="Can't deploy the >Struts runtime to a @{webappdir} that does not exist."/> >+ >+ <available property="struts.dir.available" file="@{strutsdir}" >type="dir"/> >+ <fail unless="struts.dir.available" message="Can't find Struts in >@{strutsdir}"/> >+ >+ <echo>Deploy Struts 1.1</echo> >+ >+ <copy todir="@{webappdir}/WEB-INF/lib"> >+ <fileset dir="@{strutsdir}"> >+ <patternset refid="struts11.jars"/> >+ </fileset> >+ </copy> >+ <copy todir="@{webappdir}/WEB-INF"> >+ <fileset dir="@{strutsdir}"> >+ <patternset refid="struts11.webinf"/> >+ </fileset> >+ </copy> >+ </sequential> >+ </macrodef> >+ >+ <macrodef name="deploy-struts12"> >+ <attribute name="webappdir" description="The root directory of a web >appliction into which Struts should be deployed"/> >+ <attribute name="strutsdir" description="The root directory of the >Struts libraries"/> >+ <sequential> >+ <available property="webapp.dir.available" file="@{webappdir}" >type="dir"/> >+ <fail unless="webapp.dir.available" message="Can't deploy the >Struts runtime to a @{webappdir} that does not exist."/> >+ >+ <available property="struts.dir.available" file="@{strutsdir}" >type="dir"/> >+ <fail unless="struts.dir.available" message="Can't find Struts in >@{strutsdir}"/> >+ >+ <echo>Deploy Struts 1.2</echo> >+ >+ <copy todir="@{webappdir}/WEB-INF/lib"> >+ <fileset dir="@{strutsdir}"> >+ <patternset refid="struts12.jars"/> >+ </fileset> >+ </copy> >+ <copy todir="@{webappdir}/WEB-INF"> >+ <fileset dir="@{strutsdir}"> >+ <patternset refid="struts12.webinf"/> >+ </fileset> >+ </copy> >+ </sequential> >+ </macrodef> >+ >+ <macrodef name="undeploy-struts12"> >+ <attribute name="webappdir" description="The root directory of a web >appliction into which Struts should be deployed"/> >+ <sequential> >+ <available property="webapp.dir.available" file="@{webappdir}" >type="dir"/> >+ <fail unless="webapp.dir.available" message="Can't deploy the >Struts runtime to a @{webappdir} that does not exist."/> >+ >+ <echo>Undeploy Struts 1.2</echo> >+ >+ <delete> >+ <fileset dir="@{webappdir}/WEB-INF/lib"> >+ <patternset refid="struts12.jars"/> >+ </fileset> >+ </delete> >+ <delete> >+ <fileset dir="@{webappdir}/WEB-INF"> >+ <patternset refid="struts12.webinf"/> >+ </fileset> >+ </delete> >+ </sequential> >+ </macrodef> >+ >+ <patternset id="struts11.jars"> >+ <include name="commons-beanutils.jar"/> >+ <include name="commons-collections.jar"/> >+ <include name="commons-digester.jar"/> >+ <include name="commons-fileupload.jar"/> >+ <include name="commons-lang.jar"/> >+ <include name="commons-logging.jar"/> >+ <include name="commons-validator.jar"/> >+ <include name="jakarta-oro.jar"/> >+ <include name="struts-legacy.jar"/> >+ <include name="struts.jar"/> >+ </patternset> >+ >+ <patternset id="struts11.webinf"> >+ <include name="validator-rules.xml"/> >+ </patternset> >+ >+ <patternset id="struts12.jars"> >+ <include name="commons-beanutils.jar"/> >+ <include name="commons-digester.jar"/> >+ <include name="commons-fileupload.jar"/> >+ <include name="commons-logging.jar"/> >+ <include name="commons-validator.jar"/> >+ <include name="jakarta-oro.jar"/> >+ <include name="struts.jar"/> >+ </patternset> >+ >+ <patternset id="struts12.webinf"> >+ <include name="validator-rules.xml"/> >+ </patternset> >+ >+</project> > >Propchange: beehive/trunk/netui/test/ant/struts-imports.xml >------------------------------------------------------------------------------ > svn:eol-style = native > >Modified: beehive/trunk/netui/test/dist-test/build.xml >URL: >http://svn.apache.org/viewcvs/beehive/trunk/netui/test/dist-test/build.xml?rev=349985&r1=349984&r2=349985&view=diff >============================================================================== >--- beehive/trunk/netui/test/dist-test/build.xml (original) >+++ beehive/trunk/netui/test/dist-test/build.xml Wed Nov 30 08:54:17 2005 >@@ -47,6 +47,7 @@ > > <!-- Copy the shared Ant build infrastructure --> > <copy todir="${netui.test.dist.dir}/ant" > file="${test.dir}/ant/junitCore.xml"/> >+ <copy todir="${netui.test.dist.dir}/ant" >file="${test.dir}/ant/struts-imports.xml"/> > <copy todir="${netui.test.dist.dir}/ant" > file="${test.dir}/ant/compiler-test.properties"/> > > <!-- Copy the NetUI test webapps --> >@@ -88,17 +89,14 @@ > </copy> > > <!-- Struts 1.1 --> >- <ant dir="${netui.home}/ant" antfile="webappTemplate.xml" >target="deploy.struts" inheritAll="false"> >- <property name="struts.version" value="1.1"/> >- <property name="webapp.dir" >value="${netui.test.dist.dir}/external/struts/struts1.1"/> >- </ant> >- >- <!-- Struts 1.2 --> >- <ant dir="${netui.home}/ant" antfile="webappTemplate.xml" >target="deploy.struts" inheritAll="false"> >- <property name="struts.version" value="1.2"/> >- <property name="webapp.dir" >value="${netui.test.dist.dir}/external/struts/struts1.2"/> >- </ant> >+ <copy todir="${netui.test.dist.dir}/external/struts/struts1.1"> >+ <fileset dir="${struts11.dir}"/> >+ </copy> > >+ <copy todir="${netui.test.dist.dir}/external/struts/struts1.2"> >+ <fileset dir="${struts12.dir}"/> >+ </copy> >+ > <!-- StrutsTestCase --> > <copy todir="${netui.test.dist.dir}/external/strutstestcase"> > <fileset dir="${netui.home}/test/external/strutstestcase"/> > >Modified: beehive/trunk/netui/test/dist-test/files/build.xml >URL: >http://svn.apache.org/viewcvs/beehive/trunk/netui/test/dist-test/files/build.xml?rev=349985&r1=349984&r2=349985&view=diff >============================================================================== >--- beehive/trunk/netui/test/dist-test/files/build.xml (original) >+++ beehive/trunk/netui/test/dist-test/files/build.xml Wed Nov 30 08:54:17 2005 >@@ -45,10 +45,6 @@ > > <fail unless="dist.home" message="Could not run tests on distribution > archive; please dist.home was not specified"/> > >- <ant dir="webapps/jsf" antfile="build.xml" target="bvt" >inheritAll="false"> >- <property name="beehive.home" location="${dist.home}"/> >- </ant> >- > <antcall target="junit.drt"/> > > <ant dir="webapps/drt" antfile="build.xml" target="drt" > inheritAll="false"> >@@ -67,6 +63,11 @@ > </ant> > > <!-- coreWeb + Struts 1.1 BVT --> >+ <ant dir="webapps/drt" antfile="build.xml" target="bvt.struts11" >inheritAll="false"> >+ <property name="beehive.home" location="${dist.home}"/> >+ <property name="xbean.jar" >location="../external/apache-xbean.jar"/> >+ <property name="jsr173.jar" >location="../external/jsr173_1.0_api.jar"/> >+ </ant> > > <!-- jsfWeb + Struts 1.2 BVT --> > <ant dir="webapps/jsf" antfile="build.xml" target="bvt" > inheritAll="false"> >@@ -74,6 +75,7 @@ > </ant> > > <!-- jsfWeb + Struts 1.1 BVT --> >+ <!-- todo --> > > <!-- urlTemplates + Struts 1.1 BVT --> > <ant dir="webapps/urlTemplates" antfile="build.xml" target="bvt" > inheritAll="false"> >@@ -81,128 +83,6 @@ > </ant> > </target> > >-<!-- >- <target name="dist.bvt.struts12" description="Run the core BVT tests"> >- <antcall target="junit.bvt"/> >- >- <antcall target="prepare.netui.testweb"> >- <param name="webapp.name" value="coreWeb"/> >- </antcall> >- <antcall target="clean.testWeb"> >- <param name="webapp.name" value="coreWeb"/> >- </antcall> >- <antcall target="build.testWeb"> >- <param name="struts.version" value="1.2"/> >- <param name="webapp.name" value="coreWeb"/> >- </antcall> >- <antcall target="testRecorder.bvt"> >- <param name="webapp.name" value="coreWeb"/> >- <param name="suite.name" value="bvt"/> >- <param name="testRecorder.testResults.dir" >value="${netui.testResults.dir}/coreWeb/bvt-struts12/testRecorder"/> > >- </antcall> >- </target> >- >- <target name="dist.bvt.struts11" description="Run the core BVT tests with >Struts 1.1"> >- <antcall target="prepare.netui.testweb"> >- <param name="webapp.name" value="coreWeb"/> >- </antcall> >- <antcall target="clean.testWeb"> >- <param name="webapp.name" value="coreWeb"/> >- </antcall> >- <antcall target="build.testWeb"> >- <param name="struts.version" value="1.1"/> >- <param name="webapp.name" value="coreWeb"/> >- </antcall> >- <antcall target="testRecorder.bvt"> >- <param name="webapp.name" value="coreWeb"/> >- <param name="suite.name" value="bvt.struts11"/> >- <param name="testRecorder.testResults.dir" >value="${netui.testResults.dir}/coreWeb/bvt-struts11/testRecorder"/> >- </antcall> >- </target> >- >- <target name="dist.jsf.bvt.struts12" description="Run the JSF BVT tests"> >- <antcall target="prepare.netui.testweb"> >- <param name="webapp.name" value="jsfWeb"/> >- </antcall> >- <antcall target="clean.testWeb"> >- <param name="webapp.name" value="jsfWeb"/> >- </antcall> >- <antcall target="build.testWeb"> >- <param name="struts.version" value="1.2"/> >- <param name="webapp.name" value="jsfWeb"/> >- <param name="test.jsf" value="true"/> >- </antcall> >- <antcall target="testRecorder.bvt"> >- <param name="webapp.name" value="jsfWeb"/> >- <param name="suite.name" value="bvt"/> >- <param name="testRecorder.testResults.dir" >value="${netui.testResults.dir}/jsfWeb/struts12/testRecorder"/> >- </antcall> >- </target> >- >- <target name="dist.jsf.bvt.struts11" description="Run the JSF BVTs with >Struts 1.1"> >- <antcall target="prepare.netui.testweb"> >- <param name="webapp.name" value="jsfWeb"/> >- </antcall> >- <antcall target="clean.testWeb"> >- <param name="webapp.name" value="jsfWeb"/> >- </antcall> >- <antcall target="build.testWeb"> >- <param name="struts.version" value="1.1"/> >- <param name="webapp.name" value="jsfWeb"/> >- <param name="test.jsf" value="true"/> >- </antcall> >- <antcall target="testRecorder.bvt"> >- <param name="webapp.name" value="jsfWeb"/> >- <param name="suite.name" value="bvt"/> >- <param name="testRecorder.testResults.dir" >value="${netui.testResults.dir}/jsfWeb/struts11/testRecorder"/> >- </antcall> >- </target> >- >- <target name="dist.urltemplates.bvt" description="Run the urlTemplates >BVT tests"> >- <antcall target="prepare.netui.testweb"> >- <param name="webapp.name" value="urlTemplates"/> >- </antcall> >- <antcall target="clean.testWeb"> >- <param name="webapp.name" value="urlTemplates"/> >- </antcall> >- <antcall target="build.testWeb"> >- <param name="struts.version" value="1.2"/> >- <param name="webapp.name" value="urlTemplates"/> >- </antcall> >- <antcall target="testRecorder.bvt"> >- <param name="webapp.name" value="urlTemplates"/> >- <param name="suite.name" value="bvt"/> >- <param name="testRecorder.testResults.dir" >value="${netui.testResults.dir}/urlTemplates/testRecorder"/> >- </antcall> >- </target> >---> >- >- <!-- ================================================================ --> >- <!-- --> >- <!-- Targets for preparing test webs --> >- <!-- --> >- <!-- ================================================================ --> >-<!-- >- <target name="prepare.netui.testweb" unless="prepare.notRequired" >description="Prepare netui test web in the build area"> >- <copy todir="${build.dir}/webapps/${webapp.name}"> >- <fileset dir="${test.dir}/webapps/${webapp.name}"/> >- </copy> >- </target> >- >- <target name="clean.testWeb" unless="clean.notRequired" >description="Clean out the testWeb"> >- <ant dir="ant" antfile="testWebBuild.xml" inheritAll="false" >target="clean"> >- <property name="webapp.name" value="${webapp.name}"/> >- </ant> >- </target> >- >- <target name="build.testWeb" unless="build.notRequired" >description="build the testWeb"> >- <ant dir="ant" antfile="testWebBuild.xml" inheritAll="false" >target="build"> >- <property name="webapp.name" value="${webapp.name}"/> >- <property name="struts.version" value="${struts.version}"/> >- </ant> >- </target> >---> >- > <!-- ================================================================ --> > <!-- --> > <!-- Targets for running JUnit test suites --> >@@ -234,32 +114,4 @@ > </ant> > </target> > >- <!-- ================================================================ --> >- <!-- --> >- <!-- Targets for running test recorder test suites --> >- <!-- --> >- <!-- ================================================================ --> >-<!-- >- <target name="testRecorder.drt" description="Run the testRecorder drt >test with full server start / stop support."> >- <ant dir="ant" antfile="testWebBuild.xml" inheritAll="false" >target="bvt"> >- <property name="webapp.name" value="${webapp.name}"/> >- <property name="test.home" location="${test.home}"/> >- <property name="suite.name" value="${suite.name}"/> >- <property name="test.dir" location="${test.dir}"/> >- <property name="_report.root.dir" >location="${testRecorder.testResults.dir}"/> >- <property name="_testRecorder.base.dir" >location="${build.dir}/testRecorder/${webapp.name}"/> >- </ant> >- </target> >- >- <target name="testRecorder.bvt" description="Run the testRecorder bvt >test with full server start / stop support."> >- <ant dir="ant" antfile="testWebBuild.xml" inheritAll="false" >target="bvt"> >- <property name="webapp.name" value="${webapp.name}"/> >- <property name="test.home" location="${test.home}"/> >- <property name="suite.name" value="${suite.name}"/> >- <property name="test.dir" location="${test.dir}"/> >- <property name="_report.root.dir" >location="${testRecorder.testResults.dir}"/> >- <property name="_testRecorder.base.dir" >location="${build.dir}/testRecorder/${webapp.name}"/> >- </ant> >- </target> >---> > </project> > >Modified: beehive/trunk/netui/test/webapps/drt/build.properties >URL: >http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/build.properties?rev=349985&r1=349984&r2=349985&view=diff >============================================================================== >--- beehive/trunk/netui/test/webapps/drt/build.properties (original) >+++ beehive/trunk/netui/test/webapps/drt/build.properties Wed Nov 30 08:54:17 >2005 >@@ -3,7 +3,8 @@ > # > beehive.home=../../../.. > >-testrecorder.dir=../../ant/ >+testrecorder.dir=../../ant >+struts-imports.dir=../../ant > > servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar > jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar > >Modified: beehive/trunk/netui/test/webapps/drt/build.xml >URL: >http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/build.xml?rev=349985&r1=349984&r2=349985&view=diff >============================================================================== >--- beehive/trunk/netui/test/webapps/drt/build.xml (original) >+++ beehive/trunk/netui/test/webapps/drt/build.xml Wed Nov 30 08:54:17 2005 >@@ -1,5 +1,23 @@ > <?xml version="1.0"?> > >+<!-- >+ Copyright 2004 The Apache Software Foundation. >+ >+ Licensed under the Apache License, Version 2.0 (the "License"); >+ you may not use this file except in compliance with the License. >+ You may obtain a copy of the License at >+ >+ http://www.apache.org/licenses/LICENSE-2.0 >+ >+ Unless required by applicable law or agreed to in writing, software >+ distributed under the License is distributed on an "AS IS" BASIS, >+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. >+ See the License for the specific language governing permissions and >+ limitations under the License. >+ >+ $Header:$ >+--> >+ > <!-- > --> > <project name="Beehive/NetUI/Test/coreWeb" default="usage" basedir="."> >@@ -19,6 +37,7 @@ > <property name="webapp.waitfor.url" > value="${server.root.url}/${webapp.name}"/> > > <import file="${testrecorder.dir}/testRecorder.xml"/> >+ <import file="${struts-imports.dir}/struts-imports.xml"/> > <import file="${beehive.home}/beehive-imports.xml"/> > <import file="${beehive.home}/ant/beehive-tools.xml"/> > >@@ -111,6 +130,16 @@ > sourcepathref="webapp.sourcepath" > classpathref="webapp.classpath"/> > >+<!-- >+note, this javac call is used when the above build-* macros are used to >generate >+source files but not compile them. >+ --> >+<!-- >+ <javac srcdir="${src.dir}:${web.dir}:${sourcegen.dir}" >+ destdir="${webapp.build.dir}/WEB-INF/classes" >+ classpathref="webapp.classpath" >+ debug="true"/> >+--> > > <echo message="--------------------------------------------------"/> > <echo message="| NetUI coreWeb DRT webapp build ending |"/> >@@ -125,17 +154,20 @@ > values include "1.1" and "1.2". > --> > <target name="update.runtime" description="Update the NetUI runtime in > the webapp without building the resources"> >- <property name="struts.version" value="1.2"/> >+ <property name="struts.version" value="12"/> > > <echo>Struts version: ${struts.version}</echo> > > <deploy-netui webappdir="${webapp.build.dir}"/> > >+ <!-- adjust the runtime if building against Struts 1.1 --> >+ <antcall target="use.struts11"/> >+ > <testrecorder-config > testfile="${basedir}/testRecorder/config/testRecorder-tests.xml" > > configfile="testRecorder/config/testRecorder-config.xml" > > webappfile="testRecorder/config/testRecorder-webapp.xml" > appdir="${basedir}" >- outputdir="${webapp.build.dir}/WEB-INF/classes"/> >+ outputdir="${webapp.build.dir}/WEB-INF/classes"/> > > <testrecorder-deploy webappdir="${webapp.build.dir}"/> > >@@ -146,6 +178,11 @@ > </copy> > </target> > >+ <target name="use.struts11" if="struts11"> >+ <undeploy-struts12 webappdir="${webapp.build.dir}"/> >+ <deploy-struts11 webappdir="${webapp.build.dir}" >strutsdir="${struts11.dir}"/> >+ </target> >+ > <target name="clean" description="Clean webapp" unless="nobuild"> > <echo message="--------------------------------------------------"/> > <echo message="| NetUI coreWeb DRT webapp clean starting |"/> >@@ -212,17 +249,21 @@ > </target> > > <target name="bvt.struts11" description="Run the bvt suite using Struts > 1.1 libraries with full server start / stop support"> >- <property name="struts.version" value="1.1"/> >+ <property name="struts11" value="true"/> > <antcall target="clean"/> > <antcall target="build"/> >- <!-- This is the documented workaround for using declarative >validation with Struts 1.1. >- We need to copy the resources so they can be loaded from >*servlet context* as >- /_pageflow/pageflow-validation-*.xml. --> >+ >+ <!-- >+ This is the documented workaround for using declarative validation >with Struts 1.1. >+ We need to copy the resources so they can be loaded from *servlet >context* as >+ /_pageflow/pageflow-validation-*.xml. >+ --> > <delete dir="${webapp.build.dir}/_pageflow"/> > <mkdir dir="${webapp.build.dir}/_pageflow"/> > <copy todir="${webapp.build.dir}/_pageflow"> > <fileset dir="${webapp.build.dir}/WEB-INF/classes/_pageflow" > includes="*-validation*.xml"/> > </copy> >+ > <ant dir="${testrecorder.dir}" antfile="testRecorder.xml" > inheritAll="false" target="server.test"> > <property name="app.build.dir" location="${basedir}"/> > <property name="waitfor.url" value="${server.root.url}"/> > > > > >
