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 01:18:08 UTC
svn commit: r290006 [2/2] - in /beehive/trunk: ./ controls/test/
controls/test/dist-test/ controls/test/dist-test/common/
controls/test/infra/milton/
controls/test/src/drivers/org/apache/beehive/controls/test/driver/property/
controls/test/src/units/or...
Modified: beehive/trunk/netui/test/webapps/drt/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/build.xml?rev=290006&r1=290005&r2=290006&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/build.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/build.xml Sun Sep 18 16:17:49 2005
@@ -44,8 +44,7 @@
<build-webapp webappDir="${webapp.dir}"/>
- <!-- Copy a META-INF reference to our test.TestServletContainerAdapter (see
- /WEB-INF/src/test/TestServletContainerAdapter.java for more details). -->
+ <!-- Copy a META-INF reference to our test.TestServletContainerAdapter (see /WEB-INF/src/test/TestServletContainerAdapter.java for more details). -->
<copy todir="${webapp.dir}/WEB-INF/classes">
<fileset dir="${webapp.dir}/WEB-INF/src" includes="META-INF/**"/>
</copy>
Modified: beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml?rev=290006&r1=290005&r2=290006&view=diff
==============================================================================
--- beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml (original)
+++ beehive/trunk/samples/netui-jsf/WEB-INF/src/build.xml Sun Sep 18 16:17:49 2005
@@ -44,7 +44,6 @@
<target name="deploy-beehive" description="Copy the Beehive webapp rutime into the netui-jsf webapp">
<deploy-netui webappDir="${webapp.dir}"/>
- <deploy-wsm webappDir="${webapp.dir}"/>
</target>
<target name="init">
@@ -81,9 +80,6 @@
<delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
<mkdir dir="${webapp.dir}/WEB-INF/classes"/>
-
- <!-- compile XSDs -->
- <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas" destdir="${webapp.dir}/WEB-INF/classes"/>
<!-- compile controls -->
<build-controls srcdir="${webapp.dir}/WEB-INF/src"
Modified: beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml?rev=290006&r1=290005&r2=290006&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml (original)
+++ beehive/trunk/samples/netui-samples/WEB-INF/src/build.xml Sun Sep 18 16:17:49 2005
@@ -59,9 +59,6 @@
<mkdir dir="${webapp.dir}/WEB-INF/classes"/>
- <!-- compile XSDs -->
- <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas" destdir="${webapp.dir}/WEB-INF/classes"/>
-
<!-- compile controls -->
<build-controls srcdir="${webapp.dir}/WEB-INF/src"
destdir="${webapp.dir}/WEB-INF/classes"
Modified: beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=290006&r1=290005&r2=290006&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build-dist.xml Sun Sep 18 16:17:49 2005
@@ -66,7 +66,6 @@
<copy todir="${build.dir}/WEB-INF/lib" file="${derby.jar}"/>
<deploy-netui webappDir="${build.dir}"/>
- <deploy-wsm webappDir="${build.dir}"/>
</target>
<!-- ========================================= -->
@@ -88,12 +87,8 @@
</fileset>
</copy>
- <echo>Building XML Schemas</echo>
- <build-schemas srcdir="${basedir}/schemas"
- destDir="${build.dir}/WEB-INF/classes"/>
-
<echo>Building Controls</echo>
- <build-controls srcdir="${basedir}/src"
+ <build-controls srcdir="${src.dir}"
destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathRef="webapp.classpath"/>
@@ -104,12 +99,6 @@
destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
-
- <echo>Building Web Services</echo>
- <build-webservices srcdir="${ws.dir}"
- destdir="${build.dir}/WEB-INF/classes"
- tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
- classpathref="webapp.classpath"/>
</target>
<target name="copy.jsps"
Modified: beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build.xml?rev=290006&r1=290005&r2=290006&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build.xml Sun Sep 18 16:17:49 2005
@@ -59,7 +59,6 @@
<copy todir="${build.dir}/WEB-INF/lib" file="${beehive.home}/system-controls/build/jars/beehive-jdbc-control.jar"/>
<deploy-netui webappDir="${build.dir}"/>
- <deploy-wsm webappDir="${build.dir}"/>
</target>
<!-- ========================================= -->
@@ -87,10 +86,6 @@
</fileset>
</copy>
- <echo>Building XML Schemas</echo>
- <build-schemas srcdir="${basedir}/schemas"
- destDir="${build.dir}/WEB-INF/classes"/>
-
<echo>Building Controls</echo>
<build-controls srcdir="${basedir}/src"
destdir="${build.dir}/WEB-INF/classes"
@@ -103,12 +98,6 @@
destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
-
- <echo>Building Web Services</echo>
- <build-webservices srcdir="${ws.dir}"
- destdir="${build.dir}/WEB-INF/classes"
- tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
- classpathref="webapp.classpath"/>
</target>
<target name="copy.jsps"
Modified: beehive/trunk/test/dist-test/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/test/dist-test/build.xml?rev=290006&r1=290005&r2=290006&view=diff
==============================================================================
--- beehive/trunk/test/dist-test/build.xml (original)
+++ beehive/trunk/test/dist-test/build.xml Sun Sep 18 16:17:49 2005
@@ -1,8 +1,22 @@
<?xml version="1.0"?>
<!--
+ Copyright 2004-2005 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/BuildTestDist" default="build" basedir=".">
<import file="../../beehive-imports.xml"/>
@@ -11,7 +25,6 @@
<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">
@@ -31,84 +44,69 @@
<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"/>
+ <fail unless="dist.name" message="Unable to build distribution test archives; no dist.name specified"/>
- <!-- Build netui tests here -->
+ <!-- Build / Assemble NetUI tests here -->
<antcall target = "build.netui.tests"/>
-
- <!-- Build Controls tests here -->
- <antcall target = "build.controls.tests"/>
-
- <!-- Build JWS tests here -->
-
- <!-- Assemble the tests for distribution -->
- <!-- Assemble netui tests -->
<antcall target="assemble.netui.tests"/>
- <!-- Assemble controls tests here -->
+ <!-- Build / Assemble Controls tests here -->
+ <antcall target = "build.controls.tests"/>
<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>
<copy todir="${test.dist.base.dir}/${test.dist.name}">
- <fileset dir="${beehive.home}/test/dist-test/ant">
+ <fileset dir="${beehive.home}/test/dist-test/files">
<include name="build.xml"/>
</fileset>
</copy>
<copy todir="${test.dist.base.dir}/${test.dist.name}">
- <fileset dir="${beehive.home}/test/dist-test/ant" includes="test-imports.xml"/>
+ <fileset dir="${beehive.home}/test/dist-test/files" includes="test-imports.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"/>
+ <fileset file="${beehive.home}/ant/tomcat-imports.xml"/>
+ <fileset file="${beehive.home}/test/dist-test/files/testdist-buildWebapp.xml"/>
</copy>
+ <!-- temporary hacks for adding XMLBeans support to the distribution tests -->
+ <copy todir="${test.dist.base.dir}/${test.dist.name}/external">
+ <fileset refid="xbean.fileset"/>
+ <fileset refid="jsr173.fileset"/>
+ </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 dir="${beehive.home}/netui/test/dist-test" antfile="build.xml" target="build.tests" inheritAll="false"/>
</target>
- <target name="build.controls.tests" description="Build controls tests">
- <ant dir="${beehive.home}/controls/test/dist-test" antfile="build.xml" target="build.tests" inheritAll="false">
+ <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" 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" location="${test.dist.base.dir}"/>
- </ant>
- </target>
-
<target name="assemble.controls.tests" description="Assemble the controls 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" location="${test.dist.base.dir}"/>
</ant>
</target>
+ <target name="build.controls.tests" description="Build controls tests">
+ <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>
+
<!--
prereq: must run build.dist and build.test.dist before calling this,
and define the props beehive.dist.dir & beehive.dist.name
@@ -117,15 +115,13 @@
<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"/>
+ <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.exec.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.exec.dir}/${beehive.dist.name}">
@@ -149,10 +145,26 @@
</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" >
+ <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>
+
<macrodef name="undeploy-webapps">
<sequential>
<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/jsfWeb"/>
+ <delete file="${os.CATALINA_HOME}/conf/Catalina/localhost/jsfWeb.xml"/>
+ <delete dir="${os.CATALINA_HOME}/work/Catalina/localhost/urlTemplates"/>
+ <delete file="${os.CATALINA_HOME}/conf/Catalina/localhost/urlTemplates.xml"/>
<delete dir="${os.CATALINA_HOME}/work/Catalina/localhost/controlsWeb"/>
<delete file="${os.CATALINA_HOME}/conf/Catalina/localhost/controlsWeb.xml"/>
</sequential>
Modified: beehive/trunk/test/dist-test/files/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/test/dist-test/files/build.xml?rev=290006&r1=289648&r2=290006&view=diff
==============================================================================
--- beehive/trunk/test/dist-test/files/build.xml (original)
+++ beehive/trunk/test/dist-test/files/build.xml Sun Sep 18 16:17:49 2005
@@ -28,18 +28,16 @@
<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}"/>
+ <fail unless="dist.home" message="Could not run tests on distribution archive; please dist.home was not specified"/>
<antcall target="clean"/>
- <antcall target="prepare.build"/>
+ <antcall target="prepare"/>
<antcall target="netui.tests"/>
- <echo message="waiting for the server to shutdown completely."/>
+ <echo message="Ensuring that the server shuts down completely. Sleeping for 2 minutes"/>
<sleep minutes="2"/>
+
<antcall target="controls.tests"/>
</target>
@@ -55,12 +53,11 @@
</ant>
</target>
- <target name="clean" if="build.present" description="Clean webapp">
+ <target name="clean" description="Clean the build directory">
<delete dir="${build.dir}"/>
</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"/> -->
+ <target name="prepare" description="Prepare the build directory">
<mkdir dir="build"/>
<mkdir dir="build/webapps"/>
<mkdir dir="build/testResults"/>
Modified: beehive/trunk/test/dist-test/files/test-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/test/dist-test/files/test-imports.xml?rev=290006&r1=289648&r2=290006&view=diff
==============================================================================
--- beehive/trunk/test/dist-test/files/test-imports.xml (original)
+++ beehive/trunk/test/dist-test/files/test-imports.xml Sun Sep 18 16:17:49 2005
@@ -40,9 +40,11 @@
<patternset id="commons-logging.patternset">
<include name="commons-logging-1.0.4.jar" />
</patternset>
+
<fileset id="commons-logging.fileset" dir="${dist.home}/lib/common">
<patternset refid="commons-logging.patternset" />
</fileset>
+
<path id="commons-logging.dependency.path">
<fileset refid="commons-logging.fileset"/>
</path>
Modified: beehive/trunk/test/dist-test/files/testdist-buildWebapp.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/test/dist-test/files/testdist-buildWebapp.xml?rev=290006&r1=289648&r2=290006&view=diff
==============================================================================
--- beehive/trunk/test/dist-test/files/testdist-buildWebapp.xml (original)
+++ beehive/trunk/test/dist-test/files/testdist-buildWebapp.xml Sun Sep 18 16:17:49 2005
@@ -47,14 +47,32 @@
<mkdir dir="${webapp.dir}/WEB-INF/classes"/>
- <!-- compile XSDs -->
- <build-schemas srcdir="${webapp.dir}/WEB-INF/schemas" destdir="${webapp.dir}/WEB-INF/classes"/>
+ <!-- compile XSDs if present -->
+ <path id="test-xbean.dependency.path">
+ <pathelement location="../external/apache-xbean.jar"/>
+ <pathelement location="../external/jsr173_1.0_api.jar"/>
+ </path>
+
+ <taskdef name="xmlbeanbuild"
+ classname="org.apache.xmlbeans.impl.tool.XMLBean"
+ classpathref="test-xbean.dependency.path"
+ onerror="report"/>
+
+ <xmlbeanbuild classpathref="test-xbean.dependency.path"
+ schema="${webapp.dir}/WEB-INF/schemas"
+ classgendir="${webapp.dir}/WEB-INF/classes"
+ failonerror="true"/>
<!-- compile controls -->
- <build-controls srcdir="${webapp.dir}/WEB-INF/src" destdir="${webapp.dir}/WEB-INF/classes" tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" classpathref="webapp.build.classpath"/>
+ <build-controls srcdir="${webapp.dir}/WEB-INF/src"
+ destdir="${webapp.dir}/WEB-INF/classes"
+ tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="webapp.build.classpath"/>
<!-- compile JPFs -->
- <build-pageflows srcdir="${webapp.dir}" tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" classpathref="webapp.build.classpath"/>
+ <build-pageflows srcdir="${webapp.dir}"
+ tempdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="webapp.build.classpath"/>
<!-- copy META-INF reference to a Test ServletContainerAdapter
such as /WEB-INF/src/test/TestServletContainerAdapter.java
Modified: beehive/trunk/user/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/user/beehive-imports.xml?rev=290006&r1=290005&r2=290006&view=diff
==============================================================================
--- beehive/trunk/user/beehive-imports.xml (original)
+++ beehive/trunk/user/beehive-imports.xml Sun Sep 18 16:17:49 2005
@@ -40,10 +40,12 @@
<pathelement location="${this.dir}/lib/common/velocity-dep-1.4.jar"/>
</path>
+<!--
<path id="xbean.dependency.path">
<pathelement location="${this.dir}/lib/common/apache-xbean.jar"/>
<pathelement location="${this.dir}/lib/common/jsr173_1.0_api.jar"/>
</path>
+-->
<macrodef name="deploy-netui">
<attribute name="webappDir"/>
Modified: beehive/trunk/user/netui-blank/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/user/netui-blank/build.xml?rev=290006&r1=290005&r2=290006&view=diff
==============================================================================
--- beehive/trunk/user/netui-blank/build.xml (original)
+++ beehive/trunk/user/netui-blank/build.xml Sun Sep 18 16:17:49 2005
@@ -45,6 +45,11 @@
</fileset>
</path>
+ <path id="webapp.sourcepath">
+ <pathelement location="${web.dir}"/>
+ <pathelement location="${src.dir}"/>
+ </path>
+
<target name="deploy-beehive" description="Copy the Beehive Page Flow rutime into the target webapp">
<mkdir dir="${build.dir}"/>
<deploy-netui webappDir="${build.dir}"/>
@@ -68,11 +73,6 @@
</fileset>
</copy>
- <!-- compile XSDs -->
- <echo>Building XML Schemas</echo>
- <build-schemas srcdir="${basedir}/schemas"
- destDir="${build.dir}/WEB-INF/classes"/>
-
<!-- compile controls -->
<echo>Building Controls</echo>
<build-controls srcdir="${basedir}/src"
@@ -82,10 +82,11 @@
<!-- compile JPFs -->
<echo>Building Page Flows</echo>
- <build-pageflows srcdir="${web.dir}"
+ <build-pageflows srcdir="${basedir}"
webcontentdir="${web.dir}"
destdir="${build.dir}/WEB-INF/classes"
- tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ sourcepathref="webapp.sourcepath"
classpathref="webapp.classpath"/>
<!-- copy resources -->