Author: ekoneil
Date: Sat Apr 30 14:30:07 2005
New Revision: 165421
URL: http://svn.apache.org/viewcvs?rev=165421&view=rev
Log:
Nightly build work.
This change includes significant rework of the entry points to the distribution
test infrastructure. In order to build and run a test distribution, the
distribution location and name must be passed to the Ant in test/dist-test
which starts the whole process. This allows arbitrary distribution names to be
used.
Also includes cleanup of the NetUI distribution test infastructure.
Nightlies are almost done. :)
BB: self
DRT: Beehive pass / distribution tests pass
Added:
incubator/beehive/trunk/ant/nightly.xml
Modified:
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/netui/netui-imports.xml
incubator/beehive/trunk/netui/test/ant/junitCore.xml
incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml
incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties
incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml
incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml
incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml
incubator/beehive/trunk/netui/test/dist-test/ant/webapp.properties
incubator/beehive/trunk/netui/test/dist-test/build.xml
incubator/beehive/trunk/netui/test/src/junitTests/build.xml
incubator/beehive/trunk/netui/test/webapps/projectModel/build.xml
incubator/beehive/trunk/test/dist-test/ant/build.xml
incubator/beehive/trunk/test/dist-test/ant/test-imports.xml
incubator/beehive/trunk/test/dist-test/build.xml
Added: incubator/beehive/trunk/ant/nightly.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/nightly.xml?rev=165421&view=auto
==============================================================================
--- incubator/beehive/trunk/ant/nightly.xml (added)
+++ incubator/beehive/trunk/ant/nightly.xml Sat Apr 30 14:30:07 2005
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+
+<!--
+ Ant build file used to product Beehive nightlies
+-->
+<project name="Beehive Nightly Build" default="usage" basedir=".">
+
+ <tstamp>
+ <!-- todo: change to yyyyddMM -->
+ <format property="date" pattern="yyyyMMdd"/>
+ </tstamp>
+
+ <echo>Get SVN revision</echo>
+ <exec executable="svnversion" dir=".." failifexecutionfails="false"
outputproperty="beehive.svn.revision">
+ <arg value="."/>
+ </exec>
+
+ <property name="ftp.root"
value="http://cvs.apache.org/dist/incubator/beehive/nightlies"/>
+ <property name="ftp.dir" value="incubator/beehive/${date}"/>
+ <property name="url" value="${ftp.root}/${ftp.dir}"/>
+ <property name="beehive.version"
value="${date}-svn${beehive.svn.revision}"/>
+
+ <import file="../beehive-imports.xml"/>
+
+ <echo>Date: ${date}</echo>
+ <echo>Beehive SVN revision: ${beehive.svn.revision}</echo>
+ <echo>Beehive distribution name: ${dist.name}</echo>
+ <echo>FTP URL: ${url}</echo>
+
+ <target name="echo"/>
+
+ <target name="run">
+
+ <antcall target="scrub.tomcat"/>
+
+<!--
+ <ant antfile="../build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="../build.xml" target="deploy" inheritAll="false"/>
+ <ant antfile="../build.xml" target="drt" inheritAll="false"/>
+-->
+ <ant antfile="../build.xml" target="build.dist" inheritAll="false">
+ <property name="beehive.version" value="${beehive.version}"/>
+ </ant>
+
+ <ant antfile="../build.xml" target="build.dist.src" inheritAll="false">
+ <property name="beehive.version" value="${beehive.version}"/>
+ </ant>
+
+ <ant antfile="../build.xml" target="build.dist.lib" inheritAll="false">
+ <property name="beehive.version" value="${beehive.version}"/>
+ </ant>
+
+ <ant antfile="../build.xml" target="build.dist.archives"
inheritAll="false">
+ <property name="beehive.version" value="${beehive.version}"/>
+ </ant>
+
+ <antcall target="scrub.tomcat"/>
+
+ <ant dir="${beehive.home}/test/dist-test" antfile="build.xml"
target="build" inheritall="false">
+ <property name="dist.name" value="${dist.name}"/>
+ </ant>
+
+ <ant dir="${beehive.home}/test/dist-test" antfile="build.xml"
target="run" inheritall="false">
+ <property name="beehive.dist.dir"
location="${beehive.home}/build/dist/${dist.name}"/>
+ <property name="beehive.dist.name" value="${dist.name}"/>
+ </ant>
+
+ <!-- ftp to Apache -->
+ <echo></echo>
+ <echo></echo>
+ <echo>FTP to Beehive distribution to Apache</echo>
+ <echo></echo>
+ <echo></echo>
+ </target>
+
+ <target name="scrub.tomcat">
+ <delete dir="${os.CATALINA_HOME}/work/Catalina/localhost/coreWeb"/>
+ <delete
file="${os.CATALINA_HOME}/conf/Catalina/localhost/coreWeb.xml"/>
+ <delete dir="${os.CATALINA_HOME}/work/Catalina/localhost/controlsWeb"/>
+ <delete
file="${os.CATALINA_HOME}/conf/Catalina/localhost/controlsWeb.xml"/>
+ </target>
+
+</project>
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Sat Apr 30 14:30:07 2005
@@ -860,18 +860,19 @@
<!-- -->
<!-- =========================================== -->
<target name="build.test.dist" description="Build and package the test
module for testing distribution">
- <ant dir="${beehive.home}/test/dist-test"
- antfile="build.xml"
- target="build.test.dist"
- inheritall="false"/>
+ <echo>distribution name: ${dist.name}</echo>
+
+ <ant dir="${beehive.home}/test/dist-test" antfile="build.xml"
target="build" inheritall="false">
+ <property name="dist.name" value="${dist.name}"/>
+ </ant>
</target>
- <!-- prereq: before doing this, you will need to do a build.dist -->
+ <!-- prereq: before doing this, you will need to do a build.dist and
build.test.dist -->
<target name="run.test.dist" description="Run the beehive tests against
the archive files">
- <!-- keep it simple - build the tests and run them together -->
- <antcall target="build.test.dist"/>
+ <echo>distribution directory: ${dist.dir}</echo>
+ <echo>distribution name: ${dist.name}</echo>
- <ant dir="${beehive.home}/test/dist-test" antfile="build.xml"
target="run.test.dist" inheritall="false">
+ <ant dir="${beehive.home}/test/dist-test" antfile="build.xml"
target="run" inheritall="false">
<property name="beehive.dist.dir" value="${dist.dir}"/>
<property name="beehive.dist.name" value="${dist.name}"/>
</ant>
Modified: incubator/beehive/trunk/netui/netui-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/netui-imports.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/netui-imports.xml (original)
+++ incubator/beehive/trunk/netui/netui-imports.xml Sat Apr 30 14:30:07 2005
@@ -61,7 +61,7 @@
<fileset file="${beehive.home}/netui/build/lib/bootstrap.jar"/>
</path>
- <path id="webapp.classpath">
+ <path id="webapp.dependency.path">
<fileset dir="${beehive.home}/netui/build/dist/webapp/WEB-INF/lib">
<include name="*.jar"/>
</fileset>
Modified: incubator/beehive/trunk/netui/test/ant/junitCore.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/junitCore.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/junitCore.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/junitCore.xml Sat Apr 30 14:30:07
2005
@@ -6,7 +6,7 @@
<path id="test.classpath">
<path refid="junit-tests.dependency.path"/>
- <path refid="webapp.classpath"/>
+ <path refid="webapp.dependency.path"/>
<path refid="junit.dependency.path"/>
<path refid="servlet.dependency.path"/>
</path>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/netui-build.xml Sat Apr 30
14:30:07 2005
@@ -1,11 +1,9 @@
<?xml version="1.0"?>
-<!-- ================================================================
-
- This project is a test for Beehive distribution using the test
- recorder against a Tomcat web application.
-
-================================================================ -->
+<!--
+ This Ant file is the top-level build support for running NetUI tests against
+ a Beehive distribution.
+-->
<project name="Beehive/NetUI/distribution-test" default="usage" basedir=".">
<import file="../test-imports.xml"/>
@@ -17,167 +15,145 @@
<!-- -->
<!-- ================================================================ -->
<target name="run.tests" description="Run all tests">
- <sequential>
- <antcall target="dist.drt"/>
- <antcall target="dist.bvt">
- <param name="prepare.notRequired"
value="true"></param>
- <param name="clean.notRequired" value="true"></param>
- <param name="build.notRequired" value="true"></param>
- </antcall>
- <antcall target="dist.bvt.struts11">
- <param name="prepare.notRequired"
value="true"></param>
- </antcall>
- <antcall target="dist.jsf.bvt"></antcall>
- <antcall target="dist.jsf.bvt.struts11">
- <param name="prepare.notRequired"
value="true"></param>
- </antcall>
- </sequential>
+
+ <antcall target="dist.drt"/>
+
+ <antcall target="dist.bvt">
+ <param name="prepare.notRequired" value="true"/>
+ <param name="clean.notRequired" value="true"/>
+ <param name="build.notRequired" value="true"/>
+ </antcall>
+
+ <antcall target="dist.bvt.struts11">
+ <param name="prepare.notRequired" value="true"/>
+ </antcall>
+
+ <antcall target="dist.jsf.bvt"/>
+
+ <antcall target="dist.jsf.bvt.struts11">
+ <param name="prepare.notRequired" value="true"/>
+ </antcall>
</target>
<target name="dist.drt" description="Run the drt tests - coreWeb with
struts12">
- <antcall target="prepare.netui.testweb">
- <param name="webapp.name" value="coreWeb"></param>
- </antcall>
- <antcall target="clean.testWeb">
- <param name="webapp.name" value="coreWeb"></param>
- </antcall>
- <antcall target="build.testWeb">
- <param name="struts.version" value="1.2"></param>
- <param name="webapp.name" value="coreWeb"></param>
- </antcall>
- <antcall target="junit.test">
- <param name="webapp.name" value="coreWeb"></param>
- <param name="testResults.dir"
value="${netui.testResults.dir}/coreWeb/drt.testResults"></param>
- <param name="fail" value="true"></param>
- </antcall>
- <antcall target="testRecorder.drt">
- <param name="webapp.name" value="coreWeb"></param>
- <param name="suite.name" value="drt"></param>
- <param name="testRecorder.testResults.dir"
value="${netui.testResults.dir}/coreWeb/testRecorder"/>
- </antcall>
+ <antcall target="junit.test">
+ <param name="testResults.dir"
value="${netui.testResults.dir}/drt.testResults"/>
+ <param name="fail" value="true"/>
+ </antcall>
+
+ <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.drt">
+ <param name="webapp.name" value="coreWeb"/>
+ <param name="suite.name" value="drt"/>
+ <param name="testRecorder.testResults.dir"
value="${netui.testResults.dir}/coreWeb/testRecorder"/>
+ </antcall>
</target>
<target name="dist.bvt" description="Run the bvt tests - coreWeb with
struts12">
- <antcall target="prepare.netui.testweb">
- <param name="webapp.name"
value="coreWeb"></param>
- </antcall>
- <antcall target="clean.testWeb">
- <param name="webapp.name"
value="coreWeb"></param>
- </antcall>
- <antcall target="build.testWeb">
- <param name="struts.version" value="1.2"></param>
- <param name="webapp.name" value="coreWeb"></param>
- </antcall>
- <antcall target="junit.test">
- <param name="webapp.name" value="coreWeb"></param>
- <param name="testResults.dir"
value="${netui.testResults.dir}/coreWeb/bvt.testResults"></param>
- <param name="fail" value="false"></param>
- </antcall>
- <antcall target="testRecorder.bvt">
- <param name="webapp.name" value="coreWeb"></param>
- <param name="suite.name" value="bvt"></param>
- <param name="testRecorder.testResults.dir"
value="${netui.testResults.dir}/coreWeb/testRecorder"/>
- </antcall>
- </target>
-
- <target name="dist.jsf.bvt" description="Run the jsf bvt tests - jsfWeb
with struts12">
- <antcall target="prepare.netui.testweb">
- <param name="webapp.name" value="jsfWeb"></param>
- </antcall>
- <antcall target="clean.testWeb">
- <param name="webapp.name" value="jsfWeb"></param>
- </antcall>
- <antcall target="build.testWeb">
- <param name="struts.version" value="1.2"></param>
- <param name="webapp.name" value="jsfWeb"></param>
- <param name="test.jsf" value="true"></param>
- </antcall>
- <antcall target="junit.test">
- <param name="webapp.name" value="jsfWeb"></param>
- <param name="testResults.dir"
value="${netui.testResults.dir}/jsfWeb/bvt.testResults"></param>
- <param name="fail" value="false"></param>
- </antcall>
- <antcall target="testRecorder.bvt">
- <param name="webapp.name" value="jsfWeb"></param>
- <param name="suite.name" value="bvt"></param>
- <param name="testRecorder.testResults.dir"
value="${netui.testResults.dir}/jsfWeb/testRecorder"/>
- </antcall>
- </target>
-
- <target name="dist.bvt.struts11" description="Run the bvt tests against
struts11">
- <antcall target="prepare.netui.testweb">
- <param name="webapp.name" value="coreWeb"></param>
- </antcall>
- <antcall target="clean.testWeb">
- <param name="webapp.name" value="coreWeb"></param>
- </antcall>
- <antcall target="build.testWeb">
- <param name="struts.version" value="1.1"></param>
- <param name="webapp.name" value="coreWeb"></param>
- </antcall>
- <antcall target="junit.test">
- <param name="webapp.name" value="coreWeb"></param>
- <param name="testResults.dir"
value="${netui.testResults.dir}/coreWeb/struts11/bvt.testResults"></param>
- <param name="fail" value="false"></param>
- </antcall>
- <antcall target="testRecorder.bvt">
- <param name="webapp.name" value="coreWeb"></param>
- <param name="suite.name" value="bvt.struts11"/>
- <param name="testRecorder.testResults.dir"
value="${netui.testResults.dir}/coreWeb/struts11/testRecorder"/>
- </antcall>
- </target>
-
- <target name="dist.jsf.bvt.struts11" description="Run the jsf bvt tests
against struts11">
- <antcall target="prepare.netui.testweb">
- <param name="webapp.name" value="jsfWeb"></param>
- </antcall>
- <antcall target="clean.testWeb">
- <param name="webapp.name" value="jsfWeb"></param>
- </antcall>
- <antcall target="build.testWeb">
- <param name="struts.version" value="1.1"></param>
- <param name="webapp.name" value="jsfWeb"></param>
- <param name="test.jsf" value="true"></param>
- </antcall>
- <antcall target="junit.test">
- <param name="webapp.name" value="jsfWeb"></param>
- <param name="testResults.dir"
value="${netui.testResults.dir}/jsfWeb/struts11/bvt.testResults"></param>
- <param name="fail" value="false"></param>
- </antcall>
- <antcall target="testRecorder.bvt">
- <param name="webapp.name" value="jsfWeb"></param>
- <param name="suite.name" value="bvt"/>
- <param name="testRecorder.testResults.dir"
value="${netui.testResults.dir}/jsfWeb/struts11/testRecorder"/>
- </antcall>
- </target>
+ <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/testRecorder"/>
+ </antcall>
+ </target>
+
+ <target name="dist.jsf.bvt" description="Run the jsf bvt tests - jsfWeb
with struts12">
+ <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/testRecorder"/>
+ </antcall>
+ </target>
+
+ <target name="dist.bvt.struts11" description="Run the bvt tests against
struts11">
+ <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/struts11/testRecorder"/>
+ </antcall>
+ </target>
+
+ <target name="dist.jsf.bvt.struts11" description="Run the jsf bvt tests
against struts11">
+ <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>
-
-
- <!-- ================================================================
-->
+ <!-- ================================================================ -->
<!-- -->
<!-- Targets for preparing test webs -->
<!-- -->
<!-- ================================================================ -->
-
- <target name="prepare.netui.testweb" unless="prepare.notRequired"
- description="Prepare netui
test web in the build area">
+
+ <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">
+ </target>
+
+ <target name="clean.testWeb" unless="clean.notRequired"
description="Clean out the testWeb">
<ant antfile="${test.dir}/ant/testWebBuild.xml" inheritAll="false"
target="clean">
- <property name="webapp.name" value="${webapp.name}"/>
+ <property name="webapp.name" value="${webapp.name}"/>
</ant>
- </target>
-
- <target name="build.testWeb" unless="build.notRequired"
- description="build the testWeb">
+ </target>
+
+ <target name="build.testWeb" unless="build.notRequired"
description="build the testWeb">
<ant antfile="${test.dir}/ant/testWebBuild.xml" inheritAll="false"
target="build">
- <property name="webapp.name" value="${webapp.name}"/>
- <property name="struts.version"
value="${struts.version}"/>
+ <property name="webapp.name" value="${webapp.name}"/>
+ <property name="struts.version" value="${struts.version}"/>
</ant>
</target>
@@ -188,25 +164,13 @@
<!-- ================================================================ -->
<target name="junit.test" description="Run JUnit test suite">
- <path id="test.classpath">
- <pathelement path="${test.classes.dir}/junitTests"/>
- <fileset dir="${build.dir}/webapps/${webapp.name}/WEB-INF/lib">
- <include name="**/*.jar"/>
- </fileset>
- <pathelement path="${junit.jar}"/>
- <pathelement path="${servlet24.jar}"/>
- <pathelement path="${jsp20.jar}"/>
- </path>
-
- <ant dir="${test.dir}/ant" antfile="junitCore.xml" target="run.tests"
inheritAll="false">
- <property name="webapp.name" value="${webapp.name}"/>
- <property name="test.home" value="${test.home}"/>
- <property name="test.dir" value="${test.dir}"/>
- <property name="testout.dir" value="${testResults.dir}"/>
- <reference refid="test.classpath"/>
- <property name="formatter.type" value="xml"/>
- <property name="fail" value="${fail}"/>
- </ant>
+<!--
+ <ant dir="ant" antfile="junitCore.xml" target="run.tests"
inheritAll="false">
+ <property name="testout.dir" location="${testResults.dir}"/>
+ <property name="formatter.type" value="xml"/>
+ <property name="fail" value="${fail}"/>
+ </ant>
+-->
</target>
<!-- ================================================================ -->
@@ -217,24 +181,23 @@
<target name="testRecorder.drt" description="Run the testRecorder drt test
with full server start / stop support.">
<ant antfile="${test.dir}/ant/testWebBuild.xml" inheritAll="false"
target="drt">
- <property name="webapp.name" value="${webapp.name}"/>
- <property name="test.home" value="${test.home}"/>
- <property name="suite.name" value="${suite.name}"/>
- <property name="test.dir" value="${test.dir}"/>
- <property name="_report.root.dir"
value="${testRecorder.testResults.dir}"/>
- <property name="_testRecorder.base.dir"
value="${build.dir}/testRecorder/${webapp.name}"/>
+ <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.">
+
+ <target name="testRecorder.bvt" description="Run the testRecorder bvt test
with full server start / stop support.">
<ant antfile="${test.dir}/ant/testWebBuild.xml" inheritAll="false"
target="bvt">
- <property name="webapp.name" value="${webapp.name}"/>
- <property name="test.home" value="${test.home}"/>
- <property name="suite.name" value="${suite.name}"/>
- <property name="test.dir" value="${test.dir}"/>
- <property name="_report.root.dir"
value="${testRecorder.testResults.dir}"/>
- <property name="_testRecorder.base.dir"
value="${build.dir}/testRecorder/${webapp.name}"/>
+ <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: incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties
(original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties Sat
Apr 30 14:30:07 2005
@@ -4,51 +4,33 @@
#
#
-# Netui test root dir
-test.dir=${test.home}/netui
-
-# netui tests
-test.classes.dir=${test.dir}/junit
+log4jconfig.verbose.junit=${test.dir}/conf/junitLogCfgVerbose.xml
+log4jconfig.junit=${test.dir}/conf/junitLogCfg.xml
+#todo: why are these even here?
+#_testRecorder.base.dir=${build.dir}/testRecorder
+#testRecorder.dir=${test.dir}/testRecorder
# Webapp build properties
-netuiconfig.xml.name=netui-config.xml
-
-buildWebapp.ant=${dist.home}/ant/buildWebapp.xml
-
-app.build.file=${test.dir}/ant/testWebBuild.xml
-
+#netuiconfig.xml.name=netui-config.xml
+#buildWebapp.ant=${dist.home}/ant/buildWebapp.xml
+#test-recorder.jar.name=testRecorder.jar
+#test-recorder.jar=${testRecorder.dir}/lib/${test-recorder.jar.name}
+#httpClient.jar.name=commons-httpclient-2.0.jar
+#httpClient.jar=${testRecorder.dir}/lib/${httpClient.jar.name}
+#netui.ant.dir=${test.dir}/ant
+#drtbvt.maxWait=300
+#app.build.file=${test.dir}/ant/testWebBuild.xml
# External JARs
-junit.jar.name=junit.jar
-junit.jar=${test.dir}/junit/lib/${junit.jar.name}
-
-ant-junit.jar=${os.ANT_HOME}/lib/ant-junit.jar
-
-struts11.dir=${test.dir}/struts/struts1.1
-struts12.dir=${test.dir}/struts/struts1.2
-
-jsf.dir=${test.dir}/jsf/myfaces-1.0.7
-jsf.dist=myfaces
-
+#junit.jar.name=junit.jar
+#junit.jar=${test.dir}/junit/lib/${junit.jar.name}
+#ant-junit.jar=${os.ANT_HOME}/lib/ant-junit.jar
+#jsf.dir=${test.dir}/jsf/myfaces-1.0.7
+#jsf.dist=myfaces
+#struts11.dir=${test.dir}/struts/struts1.1
+#struts12.dir=${test.dir}/struts/struts1.2
+# netui tests
+#test.classes.dir=${test.dir}/junit
+#netui.testResults.dir=${test.result.root}/netui
+# Netui test root dir
# Netui test JARs/resources
-testRecorder.config.name=netui-server-drt-config
-_testRecorder.base.dir=${build.dir}/testRecorder
-testRecorder.dir=${test.dir}/testRecorder
-
-test-recorder.jar.name=testRecorder.jar
-test-recorder.jar=${testRecorder.dir}/lib/${test-recorder.jar.name}
-
-httpClient.jar.name=commons-httpclient-2.0.jar
-httpClient.jar=${testRecorder.dir}/lib/${httpClient.jar.name}
-
-netui.testResults.dir=${test.result.root}/netui
-
-netui.ant.dir=${test.dir}/ant
-
-drtbvt.maxWait=300
-
-log4jconfig.verbose.junit=${test.dir}/conf/junitLogCfgVerbose.xml
-log4jconfig.junit=${test.dir}/conf/junitLogCfg.xml
-
-
-
-
+#testRecorder.config.name=netui-server-drt-config
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml Sat Apr
30 14:30:07 2005
@@ -3,7 +3,19 @@
<project name="Beehive/NetUI/distribution-test-import" default="usage"
basedir=".">
<property environment="os"/>
- <property file="${test.home}/netui/ant/netui-test.properties"/>
+ <import file="../../test-imports.xml"/>
+
+ <property name="test.dir" location="${test.home}/netui"/>
+
+ <property file="netui-test.properties"/>
+
+ <property name="netui.ant.dir" location="${test.dir}/ant"/>
+ <property name="jsf.dir" location="${test.dir}/jsf/myfaces-1.0.7"/>
+ <property name="struts11.dir" location="${test.dir}/struts/struts1.1"/>
+ <property name="struts12.dir" location="${test.dir}/struts/struts1.2"/>
+ <property name="test.classes.dir" location="${test.dir}/junit"/>
+ <property name="netui.testResults.dir"
location="${test.result.root}/netui"/>
+ <property name="app.build.file"
location="${test.dir}/ant/testWebBuild.xml"/>
<path id="junit-tests.dependency.path">
<pathelement path="${test.classes.dir}/junitTests"/>
@@ -22,7 +34,7 @@
</path>
<path id="junit.dependency.path">
- <pathelement path="${junit.jar}"/>
+ <pathelement path="${test.dir}/junit/lib/junit.jar"/>
</path>
<path id="log4j.dependency.path">
@@ -44,8 +56,8 @@
<pathelement path="${servlet24.jar}"/>
<pathelement path="${jsp20.jar}"/>
</path>
-
- <patternset id="struts11.jars">
+
+ <patternset id="struts11.jars">
<include name="commons-beanutils.jar"/>
<include name="commons-collections.jar"/>
<include name="commons-digester.jar"/>
@@ -68,9 +80,8 @@
<include name="jakarta-oro.jar"/>
<include name="struts.jar"/>
</patternset>
-
-
- <patternset id="struts11.webinf">
+
+ <patternset id="struts11.webinf">
<include name="validator-rules.xml"/>
</patternset>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml Sat Apr
30 14:30:07 2005
@@ -21,4 +21,4 @@
<report format="noframes" todir="${report.dir}/html"/>
</junitreport>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml Sat Apr
30 14:30:07 2005
@@ -1,18 +1,17 @@
<?xml version="1.0"?>
<!--
-================================================================
-
This project has the dummy build/clean targets and the tomcat
start/deploy/redeploy/stop targets to work with testRecorder
build files from SVN
-================================================================
-->
<project name="Beehive/NetUI/TestRecorder-webapp" default="usage" basedir=".">
<import file="../../test-imports.xml"/>
<import file="test-imports.xml"/>
- <property file="${test.home}/netui/ant/webapp.properties"/>
+
+ <property file="${test.home}/netui/ant/webapp.properties"/>
+ <property name="testRecorder.config.name" value="netui-server-drt-config"/>
<!-- ================================================================ -->
<!-- -->
@@ -27,19 +26,19 @@
<antcall target="prepare.testRecorder"/>
<antcall target="update.runtime"/>
-
- <!-- Clean out existing struts resources -->
- <antcall target="struts.clean">
- <param name="struts.version" value="1.1"/>
- </antcall>
- <antcall target="struts.clean">
- <param name="struts.version" value="1.2"/>
- </antcall>
-
- <!-- Deploy required resources -->
- <antcall target="deploy.struts"/>
+
+ <!-- Clean out existing struts resources -->
+ <antcall target="struts.clean">
+ <param name="struts.version" value="1.1"/>
+ </antcall>
+ <antcall target="struts.clean">
+ <param name="struts.version" value="1.2"/>
+ </antcall>
+
+ <!-- Deploy required resources -->
+ <antcall target="deploy.struts"/>
<antcall target="deploy.testrecorder"/>
- <antcall target="deploy.jsf"/>
+ <antcall target="deploy.jsf"/>
<build-webapp webappDir="${webapp.dir}"/>
<!-- Touch all JSPs to ensure that they're compiled. -->
@@ -54,68 +53,60 @@
<echo message="--------------------------------------------------"/>
</target>
- <target name="prepare.testRecorder" description="prepare test recorder
in the build area">
- <copy todir="${_testRecorder.base.dir}/${webapp.name}/config">
- <fileset
dir="${test.dir}/testRecorder/${webapp.name}/config"/>
- <filterset>
+ <target name="prepare.testRecorder" description="prepare test recorder in
the build area">
+ <copy todir="${_testRecorder.base.dir}/${webapp.name}/config">
+ <fileset dir="${test.dir}/testRecorder/${webapp.name}/config"/>
+ <filterset>
<filter token="BASE_DIR"
value="${_testRecorder.base.dir}/${webapp.name}"/>
- <!-- Still correct location for DOMAIN? -->
- <filter token="DOMAIN_DIR" value="${test.dir}"/>
+ <filter token="DOMAIN_DIR" value="${test.dir}"/>
</filterset>
- </copy>
- <antcall target="build.config.jar"/>
- </target>
-
- <target name="build.config.jar" description="Package test recorder
config jar file">
+ </copy>
+ <antcall target="build.config.jar"/>
+ </target>
+
+ <target name="build.config.jar" description="Package test recorder config
jar file">
<jar
jarfile="${_testRecorder.base.dir}/${webapp.name}/config/${testRecorder.config.name}.jar">
<fileset dir="${_testRecorder.base.dir}/${webapp.name}/config"
includes="*.xml"/>
</jar>
<delete>
- <fileset dir="${_testRecorder.base.dir}/${webapp.name}/config"
includes="*.xml"/>
+ <fileset dir="${_testRecorder.base.dir}/${webapp.name}/config"
includes="*.xml"/>
</delete>
- </target>
+ </target>
<target name="deploy.testrecorder" description="Deploy the test recorder
to the test webapp - coreWeb at this time">
<echo>Deploying the test recorder to webapp at root:
${webapp.dir}</echo>
<ant antfile="${test.dir}/ant/testRecorder.xml"
target="deployTestRecorder" inheritAll="false">
- <property name="_testRecorder.base.dir"
value="${build.dir}/testRecorder/${webapp.name}"/>
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
- </target>
-
- <target name="deploy.jsf" if="test.jsf"
- description="deploy jsf to testWeb --
jsfWeb">
+ <property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
+ <property name="_testRecorder.base.dir"
location="${build.dir}/testRecorder/${webapp.name}"/>
+ <property name="webapp.dir" location="${webapp.dir}"/>
+ </ant>
+ </target>
+
+ <target name="deploy.jsf" if="test.jsf" description="deploy jsf to testWeb
-- jsfWeb">
<echo>Deploying the myFaces to webapp at root: ${webapp.dir}</echo>
<property name="jsf.dist" value="myfaces"/>
- <copy todir="${webapp.dir}/WEB-INF/lib" overwrite="true"
failonerror="true">
+ <copy todir="${webapp.dir}/WEB-INF/lib" overwrite="true"
failonerror="true">
<fileset dir="${jsf.dir}/lib">
<include name="*.jar"/>
</fileset>
</copy>
-
- <copy file="${webapp.dir}/WEB-INF/web.xml.${jsf.dist}"
+
+ <copy file="${webapp.dir}/WEB-INF/web.xml.${jsf.dist}"
tofile="${webapp.dir}/WEB-INF/web.xml"
overwrite="true" failonerror="true"/>
-
+
</target>
<target name="update.runtime" description="Update the NetUI runtime in the
webapp without building the resources">
-
<deploy-netui webappDir="${webapp.dir}"/>
- <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml"
- tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}"
- overwrite="true" failonerror="false"/>
-
<copy todir="${webapp.dir}/WEB-INF">
<fileset dir="${dist.home}/samples/netui-blank/WEB-INF"
includes="*.xml"/>
</copy>
-
</target>
-
- <target name="deploy.struts"
- description="Deploy struts lib to testWeb">
- <echo>struts version: ${struts.version}</echo>
+
+ <target name="deploy.struts" description="Deploy struts lib to testWeb">
+ <echo>struts version: ${struts.version}</echo>
<condition property="struts11" value="true">
<equals arg1="${struts.version}" arg2="1.1"/>
</condition>
@@ -125,30 +116,27 @@
<not><isset property="struts.version"/></not>
</or>
</condition>
- <antcall target="deploy.struts11"/>
- <antcall target="deploy.struts12"/>
+ <antcall target="deploy.struts11"/>
+ <antcall target="deploy.struts12"/>
</target>
-
- <target name="deploy.struts11" if="struts11"
- description="Deploy struts11 lib to testWeb">
- <copy todir="${webapp.dir}" overwrite="true">
+
+ <target name="deploy.struts11" if="struts11" description="Deploy struts11
lib to testWeb">
+ <copy todir="${webapp.dir}" overwrite="true">
<fileset dir="${struts11.dir}">
</fileset>
</copy>
</target>
-
- <target name="deploy.struts12" if="struts12"
- description="Deploy struts12 lib to testWeb">
- <copy todir="${webapp.dir}" overwrite="true">
+
+ <target name="deploy.struts12" if="struts12" description="Deploy struts12
lib to testWeb">
+ <copy todir="${webapp.dir}" overwrite="true">
<fileset dir="${struts12.dir}">
</fileset>
</copy>
</target>
-
- <target name="struts.clean"
- description="Remove struts resources from test webapp">
+
+ <target name="struts.clean" description="Remove struts resources from test
webapp">
<echo>Clean struts resource from: ${webapp.dir}</echo>
-
+
<property name="webinf.dir" location="${webapp.dir}/WEB-INF"/>
<echo>struts version: ${struts.version}</echo>
@@ -161,7 +149,7 @@
<not><isset property="struts.version"/></not>
</or>
</condition>
-
+
<echo>struts.fileset: ${struts.fileset}</echo>
<delete quiet="true">
@@ -171,8 +159,8 @@
<fileset dir="${webapp.dir}/WEB-INF/lib">
<patternset refid="${struts.fileset}.jars"/>
</fileset>
- </delete>
- </target>
+ </delete>
+ </target>
<target name="clean" description="Clean the test web">
<echo message="Cleaning ${webapp.name}!"/>
@@ -197,26 +185,26 @@
<property name="playback.webapps" value="${webapp.name}"/>
<property name="drt.mode" value="true"/>
<property name="drt.cc.mode" value="true"/>
- <property name="test.dir" value="${test.dir}"/>
- <property name="os.CATALINA_HOME" value="${tomcat.dir}"/>
- <property name="dist.home" value="${dist.home}"/>
- <property name="_report.root.dir" value="${_report.root.dir}"/>
- <property name="_testRecorder.base.dir"
value="${build.dir}/testRecorder/${webapp.name}"/>
+ <property name="test.dir" location="${test.dir}"/>
+ <property name="os.CATALINA_HOME" location="${tomcat.dir}"/>
+ <property name="dist.home" location="${dist.home}"/>
+ <property name="_report.root.dir" location="${_report.root.dir}"/>
+ <property name="_testRecorder.base.dir"
location="${build.dir}/testRecorder/${webapp.name}"/>
</ant>
</target>
-
- <target name="bvt" description="Run the test suite with full server
start / stop support.">
+
+ <target name="bvt" description="Run the test suite with full server start
/ stop support.">
<echo message="Test.dir: ${test.dir}"/>
<ant dir="${test.dir}" antfile="${test.dir}/ant/testRecorder.xml"
inheritAll="false" target="server.test">
<property name="waitfor.url" value="${server.root.url}"/>
<property name="suite.name" value="${suite.name}"/>
<property name="playback.webapps" value="${webapp.name}"/>
<property name="cc.mode" value="true"/>
- <property name="test.dir" value="${test.dir}"/>
- <property name="os.CATALINA_HOME" value="${tomcat.dir}"/>
- <property name="dist.home" value="${dist.home}"/>
- <property name="_report.root.dir" value="${_report.root.dir}"/>
- <property name="_testRecorder.base.dir"
value="${build.dir}/testRecorder/${webapp.name}"/>
+ <property name="test.dir" location="${test.dir}"/>
+ <property name="os.CATALINA_HOME" location="${tomcat.dir}"/>
+ <property name="dist.home" location="${dist.home}"/>
+ <property name="_report.root.dir" location="${_report.root.dir}"/>
+ <property name="_testRecorder.base.dir"
location="${build.dir}/testRecorder/${webapp.name}"/>
</ant>
</target>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/webapp.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/webapp.properties?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/webapp.properties
(original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/webapp.properties Sat Apr
30 14:30:07 2005
@@ -1,11 +1,16 @@
+#
+#
# netui Test Webapp properties
-webapp.name=coreWeb
-webapp.dir=${build.dir}/webapps/${webapp.name}
-webapp.waitfor.url=${server.root.url}/${webapp.name}
+#
+#
+webapp.dir=${build.dir}/webapps/${webapp.name}
webapp.waitfor.url=http://localhost:8080/${webapp.name}
+_testRecorder.base.dir=${build.dir}/testRecorder
-log4j.jar=${webapp.dir}/WEB-INF/lib/log4j-1.2.8.jar
-jsr173.jar=${webapp.dir}/WEB-INF/lib/jsr173_1.0_api.jar
-xbean.jar=${webapp.dir}/WEB-INF/lib/apache-xbean.jar
-commons-logging.jar=${webapp.dir}/WEB-INF/lib/commons-logging-1.0.4.jar
+#webapp.waitfor.url=${server.root.url}/${webapp.name}
+# log4j.jar=${webapp.dir}/WEB-INF/lib/log4j-1.2.8.jar
+#jsr173.jar=${webapp.dir}/WEB-INF/lib/jsr173_1.0_api.jar
+#xbean.jar=${webapp.dir}/WEB-INF/lib/apache-xbean.jar
+#commons-logging.jar=${webapp.dir}/WEB-INF/lib/commons-logging-1.0.4.jar
+#webapp.name=coreWeb
Modified: incubator/beehive/trunk/netui/test/dist-test/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/build.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/build.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/build.xml Sat Apr 30 14:30:07
2005
@@ -26,11 +26,8 @@
<mkdir dir="${test.dist.base.dir}/beehive-test-dist"/>
<mkdir dir="${test.dist.base.dir}/beehive-test-dist/netui"/>
<mkdir dir="${test.dist.base.dir}/beehive-test-dist/netui/struts"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/wsm"/>
- <copy file="${test.dir}/dist-test/ant/netui-build.xml"
- tofile="${test.dist.base.dir}/beehive-test-dist/netui/build.xml"/>
+ <copy file="${test.dir}/dist-test/ant/netui-build.xml"
tofile="${test.dist.base.dir}/beehive-test-dist/netui/build.xml"/>
<copy todir="${test.dist.base.dir}/beehive-test-dist/netui/ant">
<fileset dir="${test.dir}/dist-test/ant"
includes="webapp.properties,netui-test.properties,testRecorder.xml,test-imports.xml,testWebBuild.xml"/>
Modified: incubator/beehive/trunk/netui/test/src/junitTests/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/build.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/build.xml (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/build.xml Sat Apr 30
14:30:07 2005
@@ -10,7 +10,7 @@
<property name="module.jar"
location="${test.lib.dir}/beehive-netui-junitTests.jar"/>
<path id="junit.classpath">
- <path refid="webapp.classpath"/>
+ <path refid="webapp.dependency.path"/>
<path refid="junit.dependency.path"/>
<path refid="servlet.dependency.path"/>
</path>
Modified: incubator/beehive/trunk/netui/test/webapps/projectModel/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/projectModel/build.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/projectModel/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/projectModel/build.xml Sat Apr
30 14:30:07 2005
@@ -22,7 +22,6 @@
<property name="temp.gen.dir"
location="${web.output.dir}/WEB-INF/.tmpbeansrc"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
-
<!-- ================================================================ -->
<!-- -->
<!-- Targets for building a webapp -->
Modified: incubator/beehive/trunk/test/dist-test/ant/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/dist-test/ant/build.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/test/dist-test/ant/build.xml (original)
+++ incubator/beehive/trunk/test/dist-test/ant/build.xml Sat Apr 30 14:30:07
2005
@@ -1,43 +1,59 @@
<?xml version="1.0"?>
+<!--
+ Copyright 2004 The Apache Software Foundation.
-<!-- ================================================================
-
- This project is a test for Beehive distribution using the test
- recorder against a Tomcat web application.
-
-================================================================ -->
-<project name="Beehive/distribution-test" default="usage" basedir=".">
+ 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:$
+ -->
+
+<!--
+ This project is used to run the Beehive tests against a Beehive distribution
+ -->
+<project name="Beehive/TestDistribution" default="usage" basedir=".">
<import file="test-imports.xml"/>
- <!-- ================================================================ -->
- <!-- -->
- <!-- Target to run all drt/bvt tests -->
- <!-- -->
- <!-- ================================================================ -->
<target name="run.tests" description="Run all tests">
- <available property="build.present" file="${build.dir}"/>
- <antcall target="clean"/>
- <antcall target="prepare.build"/>
-
- <antcall target="netui.tests" />
- <echo message="waiting for the server to shutdown completely."/>
- <sleep minutes="2"/>
- <antcall target="controls.tests" />
- <!-- antcall target="wsm.tests"/ -->
+ <echo>Running Beehive distribution tests against a Beehive
distribution located at:</echo>
+ <echo> ${dist.home}</echo>
+
+ <fail unless="dist.home"
+ message="Could not run tests on distribution archive; dist.home
was not specified"/>
+
+ <available property="build.present" file="${build.dir}"/>
+
+ <antcall target="clean"/>
+ <antcall target="prepare.build"/>
+
+ <antcall target="netui.tests"/>
+
+ <echo message="waiting for the server to shutdown completely."/>
+ <sleep minutes="2"/>
+
+ <antcall target="controls.tests"/>
+ <!-- antcall target="wsm.tests"/ -->
</target>
<target name="netui.tests" description="Run netui tests">
- <!-- netui tests here -->
<ant dir="${test.home}/netui" antfile="build.xml" inheritAll="false"
target="run.tests">
- <property name="test.home" value="${test.home}"/>
+ <property name="test.home" location="${test.home}"/>
</ant>
</target>
<target name="controls.tests" description="Run controls tests">
- <!-- controls tests here -->
<ant dir="${test.home}/controls/test" antfile="build.xml"
inheritAll="false" target="run.tests">
- <property name="test.home" value="${test.home}"/>
+ <property name="test.home" location="${test.home}"/>
</ant>
</target>
@@ -46,8 +62,7 @@
</target>
<target name="prepare.build" if="build.present" description="Prepare test
build area">
- <copy todir="${dist.home}/ant"
file="${test.home}/ant/testdist-buildWebapp.xml"/>
-
+<!-- <copy todir="${dist.home}/ant"
file="${test.home}/ant/testdist-buildWebapp.xml"/> -->
<mkdir dir="build"/>
<mkdir dir="build/webapps"/>
<mkdir dir="build/testResults"/>
Modified: incubator/beehive/trunk/test/dist-test/ant/test-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/dist-test/ant/test-imports.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/test/dist-test/ant/test-imports.xml (original)
+++ incubator/beehive/trunk/test/dist-test/ant/test-imports.xml Sat Apr 30
14:30:07 2005
@@ -20,21 +20,21 @@
<!--
A build file that needs to be imported by all beehive distribution test
modules.
-->
-<project name="test-imports" default="" basedir=".">
+<project name="distribution-test-imports" default="" basedir=".">
<property environment="os"/>
- <dirname property="test.home" file="${ant.file.test-imports}"/>
- <property name="dist.home"
value="${test.home}/../apache-beehive-incubating-svn-snapshot"/>
- <property name="build.dir" value="${test.home}/build"/>
- <property name="test.result.root" value="${build.dir}/testResults"/>
- <property name="test.webapp.root" value="${build.dir}/webapps"/>
+ <dirname property="test.home"
file="${ant.file.distribution-test-imports}"/>
+
+ <property name="build.dir" location="${test.home}/build"/>
+ <property name="test.result.root" location="${build.dir}/testResults"/>
+ <property name="test.webapp.root" location="${build.dir}/webapps"/>
+
<property name="servlet.runtime" value="tomcat"/>
<property name="server.root.url" value="http://localhost:8080"/>
- <property name="tomcat.dir" value="${os.CATALINA_HOME}"/>
- <property name="ant-junit.jar" value="${os.ANT_HOME}/lib/ant-junit.jar"/>
- <property name="servlet24.jar"
value="${tomcat.dir}/common/lib/servlet-api.jar"/>
- <property name="jsp20.jar" value="${tomcat.dir}/common/lib/jsp-api.jar"/>
-
+ <property name="tomcat.dir" location="${os.CATALINA_HOME}"/>
+ <property name="ant-junit.jar"
location="${os.ANT_HOME}/lib/ant-junit.jar"/>
+ <property name="servlet24.jar"
location="${tomcat.dir}/common/lib/servlet-api.jar"/>
+ <property name="jsp20.jar"
location="${tomcat.dir}/common/lib/jsp-api.jar"/>
<!-- define commons-logging location -->
<patternset id="commons-logging.patternset">
@@ -99,8 +99,7 @@
<attribute name="webappDir"/>
<attribute name="contextPath"/>
<sequential>
- <ant dir="${test.home}/ant"
antfile="${servlet.runtime}-imports.xml" target="deploy"
- inheritAll="false">
+ <ant dir="${test.home}/ant"
antfile="${servlet.runtime}-imports.xml" target="deploy" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
<property name="context.path" value="@{contextPath}"/>
</ant>
Modified: incubator/beehive/trunk/test/dist-test/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/dist-test/build.xml?rev=165421&r1=165420&r2=165421&view=diff
==============================================================================
--- incubator/beehive/trunk/test/dist-test/build.xml (original)
+++ incubator/beehive/trunk/test/dist-test/build.xml Sat Apr 30 14:30:07 2005
@@ -1,177 +1,161 @@
<?xml version="1.0"?>
-<project name="Beehive/BuildTestDist" default="build.test.dist" basedir=".">
+<!--
+
+ -->
+<project name="Beehive/BuildTestDist" default="build" basedir=".">
- <!-- ========================================= -->
- <!-- Targets for building the standalone test -->
- <!-- package for testing Beehive distribution. -->
- <!-- ========================================= -->
<import file="../../beehive-imports.xml"/>
- <property name="build.dir" value="${beehive.home}/build"/>
- <property name="build.tmp.dir" value="${build.dir}/tmp"/>
- <property name="test.dist.base.dir" value="${build.tmp.dir}/test-dist"/>
- <property name="test.dist.run.dir" value="${test.dist.base.dir}/run"/>
-
+ <property name="build.dir" location="${beehive.home}/build"/>
+ <property name="test.dist.base.dir" location="${build.dir}/test-dist"/>
+ <property name="test.dist.exec.dir" location="${test.dist.base.dir}/run"/>
+
+ <!-- todo: need to set this to the value of the dist.name -->
+ <property name="test.dist.name" value="beehive-test-dist"/>
<target name="prep" description="Prepare the test-distribution assembling
area">
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/netui"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/wsm"/>
+ <mkdir dir="${test.dist.base.dir}/${test.dist.name}"/>
+ <mkdir dir="${test.dist.base.dir}/${test.dist.name}/netui"/>
+ <mkdir dir="${test.dist.base.dir}/${test.dist.name}/controls"/>
+ <mkdir dir="${test.dist.base.dir}/${test.dist.name}/wsm"/>
+ </target>
+
+ <target name="clean" description="Cleans the test distribution
directories">
+ <delete dir="${test.dist.base.dir}"/>
+ <delete dir="${test.dist.exec.dir}"/>
+ <delete dir="${beehive.home}/build/testDistArchives"/>
</target>
- <target name="build.test.dist" depends="prep"
- description="Build the test package for Beehive distribution test">
+ <target name="build" depends="prep" description="Build the test package
for Beehive distribution test">
+
+ <echo>beehive.dist.home.dir:
${test.dist.base.dir}/${test.dist.name}</echo>
+ <echo>dist.name: ${dist.name}</echo>
+ <fail unless="dist.name"
+ message="Unable to build distribution test archives; no
dist.name specified"/>
- <!-- Build the tests -->
- <!-- Build netui tests here -->
- <antcall target = "build.netui.tests"/>
+ <!-- Build netui tests here -->
+ <antcall target = "build.netui.tests"/>
- <!-- Build Controls tests here -->
- <antcall target = "build.controls.tests"/>
+ <!-- Build Controls tests here -->
+ <antcall target = "build.controls.tests"/>
- <!-- Build JWS tests here -->
+ <!-- Build JWS tests here -->
<!-- Assemble the tests for distribution -->
- <!-- Assemble netui tests -->
- <antcall target="assemble.netui.tests"/>
+ <!-- Assemble netui tests -->
+ <antcall target="assemble.netui.tests"/>
+
+ <!-- Assemble controls tests here -->
+ <antcall target="assemble.controls.tests"/>
+
+ <!-- Assemble wsm tests here -->
+
+ <!-- Assemble resources for all tests -->
+ <copy todir="${test.dist.base.dir}/${test.dist.name}">
+ <fileset dir="${beehive.home}/test/dist-test"
includes="README.txt"/>
+ </copy>
- <!-- Assemble controls tests here -->
- <antcall target="assemble.controls.tests"/>
+ <copy todir="${test.dist.base.dir}/${test.dist.name}">
+ <fileset dir="${beehive.home}/test/dist-test/ant">
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
- <!-- Assemble wsm tests here -->
+ <copy todir="${test.dist.base.dir}/${test.dist.name}">
+ <fileset dir="${beehive.home}/test/dist-test/ant"
includes="test-imports.xml"/>
+ </copy>
- <!-- Assemble resources for all tests -->
- <copy todir="${test.dist.base.dir}/beehive-test-dist">
- <fileset dir="${beehive.home}/test/dist-test"
- includes="README.txt"/>
- </copy>
-
- <copy todir="${test.dist.base.dir}/beehive-test-dist">
- <fileset dir="${beehive.home}/test/dist-test/ant">
- <include name="build.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${test.dist.base.dir}/beehive-test-dist">
- <fileset dir="${beehive.home}/test/dist-test/ant"
- includes="test-imports.xml"/>
- <filterset>
- <filter token="DIST-NAME" value="${dist.name}"/>
- </filterset>
- </copy>
-
- <copy todir="${test.dist.base.dir}/beehive-test-dist/ant">
- <fileset file="${beehive.home}/ant/*-imports.xml"/>
- <fileset
file="${beehive.home}/test/dist-test/ant/testdist-buildWebapp.xml"/>
- </copy>
+ <copy todir="${test.dist.base.dir}/${test.dist.name}/ant">
+ <fileset file="${beehive.home}/ant/*-imports.xml"/>
+ <fileset
file="${beehive.home}/test/dist-test/ant/testdist-buildWebapp.xml"/>
+ </copy>
<!-- Package the test distribution -->
<antcall target="package.test.dist"/>
</target>
+ <target name="package.test.dist" description="Package beehive test
distribution into archive files">
+ <mkdir dir="${beehive.home}/build/testDistArchives"/>
+ <zip
destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.zip" >
+ <fileset dir="${test.dist.base.dir}" excludes="**/*.gz,**/*.sh"/>
+ </zip>
+
+ <tar
destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.tar.gz"
compression="gzip">
+ <tarfileset dir="${test.dist.base.dir}"
excludes="**/*.zip,**/*.cmd"/>
+ </tar>
+ </target>
+
<target name="build.netui.tests" description="Build netui tests">
- <ant dir="${beehive.home}/netui/test/dist-test" antfile="build.xml"
- target="build.tests" inheritAll="false">
- </ant>
+ <ant dir="${beehive.home}/netui/test/dist-test" antfile="build.xml"
target="build.tests" inheritAll="false"/>
</target>
<target name="build.controls.tests" description="Build netui tests">
- <ant dir="${beehive.home}/controls/test/dist-test" antfile="build.xml"
- target="build.tests">
- <property name="test.dist.base.dir"
value="${test.dist.base.dir}"/>
- <property name="beehive.home" value="${beehive.home}"/>
- </ant>
+ <ant dir="${beehive.home}/controls/test/dist-test" antfile="build.xml"
target="build.tests" inheritAll="false">
+ <property name="test.dist.base.dir"
location="${test.dist.base.dir}"/>
+ <property name="beehive.home" location="${beehive.home}"/>
+ </ant>
</target>
<target name="assemble.netui.tests" description="Assemble the netui tests
for the distribution">
- <ant dir="${beehive.home}/netui/test/dist-test" antfile="build.xml"
- target="assemble.tests" inheritAll="false">
- <property name="test.dist.base.dir"
value="${test.dist.base.dir}"/>
+ <ant dir="${beehive.home}/netui/test/dist-test" antfile="build.xml"
target="assemble.tests" inheritAll="false">
+ <property name="test.dist.base.dir"
location="${test.dist.base.dir}"/>
</ant>
</target>
<target name="assemble.controls.tests" description="Assemble the netui
tests for the distribution">
- <ant dir="${beehive.home}/controls/test/dist-test" antfile="build.xml"
- target="assemble.tests" inheritAll="false">
- <property name="test.dist.base.dir"
value="${test.dist.base.dir}"/>
- </ant>
+ <ant dir="${beehive.home}/controls/test/dist-test" antfile="build.xml"
target="assemble.tests" inheritAll="false">
+ <property name="test.dist.base.dir"
location="${test.dist.base.dir}"/>
+ </ant>
</target>
- <target name="package.test.dist" description="Package beehive test
distribution into archive files">
- <mkdir dir="${beehive.home}/build/testDistArchives"/>
- <zip
destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.zip" >
- <!-- Not to include beehive dist into the test distribution -->
- <!--
- <fileset dir="${beehive.home}/build/dist"/>
- -->
- <fileset dir="${test.dist.base.dir}" excludes="**/*.gz,**/*.sh"/>
- </zip>
-
- <tar
destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.tar.gz"
compression="gzip">
- <!-- Not to include beehive dist into the test distribution -->
- <!--
- <tarfileset dir="${beehive.home}/build/dist"/>
- -->
- <tarfileset dir="${test.dist.base.dir}"
excludes="**/*.zip,**/*.cmd"/>
- </tar>
- </target>
- <target name="clean" description="Cleans the test distribution
directories">
- <delete dir="${test.dist.base.dir}"/>
- <delete dir="${test.dist.run.dir}"/>
- <delete dir="${beehive.home}/build/testDistArchives"/>
- </target>
-
- <!-- prereq: caller must run build.dist and build.test.dist before calling
this, and define the props beehive.dist.dir & beehive.dist.name -->
- <target name="run.test.dist">
- <fail unless="beehive.dist.dir" message="Could not run tests on
distribution archive; beehive.dist.dir was not specified"/>
- <fail unless="beehive.dist.name" message="Could not run tests on
distribution archive; beehive.dist.name was not specified"/>
+ <!--
+ prereq: must run build.dist and build.test.dist before calling this,
+ and define the props beehive.dist.dir & beehive.dist.name
+ -->
+ <target name="run">
+ <echo>Distribution directory: ${beehive.dist.dir}</echo>
+ <echo>Distribution name: ${beehive.dist.name}</echo>
+
+ <fail unless="beehive.dist.dir"
+ message="Could not run tests on distribution archive;
beehive.dist.dir was not specified"/>
+ <fail unless="beehive.dist.name"
+ message="Could not run tests on distribution archive;
beehive.dist.name was not specified"/>
<available property="dist.dir.available" file="${beehive.dist.dir}"
type="dir"/>
<fail unless="dist.dir.available" message="Can't find the required
dist directory ${beehive.dist.dir}"/>
- <delete dir="${test.dist.run.dir}" />
+ <delete dir="${test.dist.exec.dir}" />
<!-- copy the beehive dist and the test dist into a new directory for
testing -->
- <copy todir="${test.dist.run.dir}/${beehive.dist.name}">
+ <copy todir="${test.dist.exec.dir}/${beehive.dist.name}">
<fileset dir="${beehive.dist.dir}" includes="**/*"/>
</copy>
- <unzip
src="${beehive.home}/build/testDistArchives/${dist.name}-test.zip"
dest="${test.dist.run.dir}"/>
+ <unzip
src="${beehive.home}/build/testDistArchives/${beehive.dist.name}-test.zip"
dest="${test.dist.exec.dir}"/>
+
+ <!-- Tomcat has trouble deploying a webapp with an existing context
path whose content root is different
+ from the currently deployed webapp. Thus, the distribution test
infrastructure needs to scrub
+ the webapps that could exist under $CATALINA_HOME before starting
to run tests
+
+ Note, this is a *huge* hack and makes it more difficult to run
the distribution tests against other app containers.
- <!-- if coreweb is deployed, undeploy it before running the tests -->
- <property name="waitfor.url" value="http://localhost:8080/coreWeb"/>
- <undeploy-coreweb/>
+ We should try to tackle this work after Beehive 1.0.
+ -->
+ <undeploy-webapps/>
- <ant dir="${test.dist.run.dir}/beehive-test-dist" target="run.tests"
inheritAll="false"/>
+ <ant dir="${test.dist.exec.dir}/${test.dist.name}" target="run.tests"
inheritAll="false">
+ <property name="dist.home" location="${beehive.dist.dir}"/>
+ </ant>
</target>
- <!-- Undeploys coreweb from tomcat else the tests will fail.
- NOTE - this is something temporary as whatever is leaving the coreweb
app deployed should be undeploying coreweb itself.
- -->
- <macrodef name="undeploy-coreweb">
+ <macrodef name="undeploy-webapps">
<sequential>
- <parallel>
- <echo message="Starting tomcat server."/>
- <start-server shmem="false" javaOptions=""/>
- <sequential>
- <echo>Waiting for server to start...</echo>
- <waitfor maxwait="60" maxwaitunit="second"
timeoutproperty="server.timedOut" checkevery="500">
- <http url="${waitfor.url}"/>
- </waitfor>
-
- <antcall target="undeploy.coreweb.timeoutchk"/>
-
- <echo>Stopping tomcat server.</echo>
- <stop-server/>
- </sequential>
- </parallel>
+ <delete dir="${os.CATALINA_HOME}/work/Catalina/localhost/coreWeb"/>
+ <delete
file="${os.CATALINA_HOME}/conf/Catalina/localhost/coreWeb.xml"/>
+ <delete
dir="${os.CATALINA_HOME}/work/Catalina/localhost/controlsWeb"/>
+ <delete
file="${os.CATALINA_HOME}/conf/Catalina/localhost/controlsWeb.xml"/>
</sequential>
</macrodef>
- <target name="undeploy.coreweb.timeoutchk" unless="server.timedOut">
- <echo>Undeploying coreweb...</echo>
- <undeploy-webapp contextPath="coreWeb"/>
- </target>
</project>
