You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/09/19 15:26:13 UTC
svn commit: r290151 - in /beehive/trunk/controls/test: build.xml
dist-test/build.xml dist-test/common/controls-test-web.xml
dist-test/common/path.properties dist-test/common/run-test-build.xml
webapps/build.xml
Author: ekoneil
Date: Mon Sep 19 06:26:10 2005
New Revision: 290151
URL: http://svn.apache.org/viewcvs?rev=290151&view=rev
Log:
Start cleaning up the Controls test distribution infrastructure.
This just removes unused Ant.
BB: self
Test: dist tests pass
Modified:
beehive/trunk/controls/test/build.xml
beehive/trunk/controls/test/dist-test/build.xml
beehive/trunk/controls/test/dist-test/common/controls-test-web.xml
beehive/trunk/controls/test/dist-test/common/path.properties
beehive/trunk/controls/test/dist-test/common/run-test-build.xml
beehive/trunk/controls/test/webapps/build.xml
Modified: beehive/trunk/controls/test/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/build.xml?rev=290151&r1=290150&r2=290151&view=diff
==============================================================================
--- beehive/trunk/controls/test/build.xml (original)
+++ beehive/trunk/controls/test/build.xml Mon Sep 19 06:26:10 2005
@@ -511,4 +511,5 @@
</java>
</sequential>
</macrodef>
+
</project>
Modified: beehive/trunk/controls/test/dist-test/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/dist-test/build.xml?rev=290151&r1=290150&r2=290151&view=diff
==============================================================================
--- beehive/trunk/controls/test/dist-test/build.xml (original)
+++ beehive/trunk/controls/test/dist-test/build.xml Mon Sep 19 06:26:10 2005
@@ -5,7 +5,6 @@
<property environment="os"/>
<property file="common/path.properties"/>
- <!--import file="common/controls-test-imports.xml"/-->
<target name="usage">
<echo message=""/>
@@ -21,7 +20,6 @@
<echo message=""/>
</target>
-
<!-- ========================================= -->
<!-- Targets for building the standalone test -->
<!-- package for testing Beehive distribution. -->
@@ -31,23 +29,12 @@
<ant dir="../" antfile="build.xml" target="build" inheritAll="false"/>
</target>
- <target name="dirs">
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/external"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/common"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/infra"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/jars"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/cases"/>
- <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps"/>
- </target>
-
<target name="assemble.tests"
description="Assemble all components for controls test distribution"
depends="dirs">
<!-- Copy external jars required by controls tests to beehive-test-dist/controls/external -->
+
<!-- beehive-antext jars -->
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
<fileset dir="../../../external/beehive-antext">
@@ -55,15 +42,6 @@
</fileset>
</copy>
- <!-- derby jars -->
-<!--
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
- <fileset dir="../../../external/derby">
- <include name="*.jar" />
- </fileset>
- </copy>
--->
-
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external/axis">
<fileset dir="../../../wsm/external">
<include name="*.jar" />
@@ -79,45 +57,38 @@
<include name="*.jar" />
</fileset>
</copy>
+
<!-- jakarta.jar -->
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
<fileset dir="../../../external/jakarta">
<include name="*.jar" />
</fileset>
</copy>
+
<!-- junit jars -->
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
<fileset dir="../../../external/junit">
<include name="*.jar" />
</fileset>
</copy>
+
<!-- servlet jars -->
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
<fileset dir="../../../external/servlet">
<include name="*.jar" />
</fileset>
</copy>
+
<!-- velocity jars -->
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
<fileset dir="../../../external/velocity">
<include name="*.jar" />
</fileset>
</copy>
- <!-- xmlbean jars -->
-<!--
- <copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
- <fileset dir="../../../external/xmlbeans">
- <include name="*.jar" />
- </fileset>
- <fileset dir="../../../installed/jsr173">
- <include name="jsr173_1.0_api.jar" />
- </fileset>
- </copy>
--->
<!-- Copy internal tools from controls/test/infra to beehive-test-dist/controls/test/infra-->
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/test/infra">
- <fileset dir="../infra" />
+ <fileset dir="../infra" />
</copy>
<!-- Copy test jars -->
@@ -195,6 +166,18 @@
<mkdir dir="build"/>
<mkdir dir="build/webapps"/>
<mkdir dir="build/testResults"/>
+ </target>
+
+ <target name="dirs">
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist"/>
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls"/>
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/external"/>
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test"/>
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/common"/>
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/infra"/>
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/jars"/>
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/cases"/>
+ <mkdir dir="${test.dist.base.dir}/beehive-test-dist/controls/test/webapps"/>
</target>
</project>
Modified: beehive/trunk/controls/test/dist-test/common/controls-test-web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/dist-test/common/controls-test-web.xml?rev=290151&r1=290150&r2=290151&view=diff
==============================================================================
--- beehive/trunk/controls/test/dist-test/common/controls-test-web.xml (original)
+++ beehive/trunk/controls/test/dist-test/common/controls-test-web.xml Mon Sep 19 06:26:10 2005
@@ -3,7 +3,7 @@
===========================================================================
This project consists of targets to build/clean a web appplication with
- the latest Beehive NETUI artifacts, start/stop Tomcat server, and deploy
+ the latest Beehive NetUI artifacts, start/stop Tomcat server, and deploy
the web application to a started Tomcat server.
============================================================================
@@ -18,82 +18,13 @@
<property name="webapp.name" value="controlsWeb"/>
<property name="server.root.url" value="http://localhost:8080"/>
<property name="webapp.waitfor.url" value="${server.root.url}/${webapp.name}"/>
-<!--
- <property name="dbControl.jar" location="${dist.home}/samples/controls-db/build/dbControl.jar"/>
- <property name="derby.jar" location="../external/derby_46005.jar"/>
--->
-
- <target name="-init">
-
- <property name="webapp.build.dir" location="${build.dir}/webapps"/>
- <property name="webapp.dir" location="${webapp.build.dir}/${webapp.name}"/>
-
- <available file="${webapp.dir}" property="webapp.dir.present"/>
-
- <mkdir dir="${webapp.build.dir}"/>
-
- <property file="${controls.test.webapp.root}/${webapp.name}/app.properties"/>
-
- <condition property="do.inject.netui">
- <istrue value="${app.inject.netui}"/>
- </condition>
- <condition property="do.inject.wsm">
- <istrue value="${app.inject.wsm}"/>
- </condition>
- <condition property="do.inject.milton">
- <istrue value="${app.inject.milton}"/>
- </condition>
- <condition property="do.inject.test.controls">
- <isset property="app.inject.test.controls"/>
- </condition>
- <condition property="do.inject.test.controls.src">
- <equals arg1="${app.inject.test.controls}" arg2="src"/>
- </condition>
- <condition property="do.inject.test.controls.jar">
- <equals arg1="${app.inject.test.controls}" arg2="jar"/>
- </condition>
- <condition property="do.inject.test.drivers">
- <isset property="app.inject.test.drivers"/>
- </condition>
- <condition property="do.inject.test.drivers.src">
- <equals arg1="${app.inject.test.drivers}" arg2="src"/>
- </condition>
- <condition property="do.inject.test.drivers.jar">
- <equals arg1="${app.inject.test.drivers}" arg2="jar"/>
- </condition>
- <condition property="do.inject.test.systemcontrol.jars">
- <istrue value="${app.inject.systemcontrol.jars}"/>
- </condition>
- </target>
-<!--
- <target name="stage.webapp" depends="-init">
- <copy todir="${webapp.dir}" overwrite="true">
- <fileset dir="${controls.test.webapp.root}/${webapp.name}"/>
- </copy>
- </target>
- <target name="clean" description="Clean webapp" depends="-init" if="webapp.dir.present">
- <echo message="| Controls ${webapp.name} clean starting |"/>
-
- <undeploy-netui webappDir="${webapp.dir}"/>
-
- <delete dir="${webapp.build.dir}"/>
- <delete file="velocity.log"/>
-
- <echo message="| Controls ${webapp.name} clean ending |"/>
- </target>
-
- <target name="scrub" depends="clean" description="Scrub webapp">
- <delete dir="${tomcat.dir}/work/Catalina/localhost/${webapp.name}" includeEmptyDirs="true"/>
- <delete file="${tomcat.dir}/conf/Catalina/localhost/${webapp.name}.xml"/>
- </target>
--->
<!-- ================================================================ -->
<!-- -->
<!-- Targets for deploying the webapp on a server -->
<!-- -->
<!-- ================================================================ -->
- <target name="deploy" description="Deploy webapp" depends="-init">
+ <target name="deploy" description="Deploy webapp"> <!-- depends="-init">-->
<deploy-webapp webappDir="${webapp.dir}" contextPath="${webapp.name}"/>
</target>
Modified: beehive/trunk/controls/test/dist-test/common/path.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/dist-test/common/path.properties?rev=290151&r1=290150&r2=290151&view=diff
==============================================================================
--- beehive/trunk/controls/test/dist-test/common/path.properties (original)
+++ beehive/trunk/controls/test/dist-test/common/path.properties Mon Sep 19 06:26:10 2005
@@ -1,4 +1,10 @@
-#need to do <property environment="os"/> before loading this property file
+#
+#
+#
+#
+#
+
+# Be sure to define <property environment="os"/> before loading this property file
controls.test.home=${test.home}/controls
Modified: beehive/trunk/controls/test/dist-test/common/run-test-build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/dist-test/common/run-test-build.xml?rev=290151&r1=290150&r2=290151&view=diff
==============================================================================
--- beehive/trunk/controls/test/dist-test/common/run-test-build.xml (original)
+++ beehive/trunk/controls/test/dist-test/common/run-test-build.xml Mon Sep 19 06:26:10 2005
@@ -116,6 +116,7 @@
<property name="test.freq" value="detailed"/>
<delete dir="${build.dir}/testResults/controls/${test.freq}"/>
<mkdir dir="${build.dir}/testResults/controls/${test.freq}"/>
+
<antcall target="run.test"/>
</target>
@@ -152,9 +153,8 @@
<property name="test-suite" value="${test.home}/controls/test/cases/root.xml"/>
<property name="tch.base-logfile-name" value="tch"/>
- <property name="cp" refid="tch.run.classpath"/>
- <echo>cp: ${cp}</echo>
-
+ <property name="cp" refid="tch.run.classpath"/>
+ <echo>cp: ${cp}</echo>
<tch tchHome="${tch.home}"
testfile="${test-suite}"
@@ -183,35 +183,13 @@
</ant>
</target>
-
- <!-- =========================================================== -->
- <!-- targets to run junit tests -->
- <!-- =========================================================== -->
-
+ <!-- =========================================================== -->
+ <!-- targets to run junit tests -->
+ <!-- =========================================================== -->
<target name="clean" >
<delete dir="${build.dir}/testResults/controls/${test.freq}"/>
<delete dir="${webapp.dir}"/>
- <!--delete dir="${test.logs}"/>
- <delete dir="${mantis.tch.log.dir}"/>
- <delete dir="${mantis.tch.cases.dir}"/>
- <delete dir="${mantis.milton.log.dir}"/>
- <delete dir="${mantis.milton.cases.dir}"/>
-
- <delete file="velocity.log"/>
- <delete><fileset dir="." includes="tch*.*"/></delete-->
- <!--ant dir="webapps" target="clean"/-->
- </target>
-<!--
- <target name="run.junit.java">
- <property name="tch.test.names" value="org-apache-beehive-Controls-test-java*.*"/>
- <antcall target="run"/>
- </target>
-
- <target name="run.junit.jpf">
- <property name="tch.test.names" value="org-apache-beehive-controls-test-jpf*.*"/>
- <antcall target="run"/>
</target>
--->
<target name="tomcat.start">
<echo message="starting tomcat"/>
Modified: beehive/trunk/controls/test/webapps/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/build.xml?rev=290151&r1=290150&r2=290151&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/build.xml (original)
+++ beehive/trunk/controls/test/webapps/build.xml Mon Sep 19 06:26:10 2005
@@ -137,6 +137,7 @@
<target name="-inject.netui" if="do.inject.netui">
<echo message="Injecting NetUI in ${controls.test.webapp.name}"/>
+
<deploy-netui webappDir="${webapp.dir}"/>
</target>