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 2004/11/02 17:57:51 UTC
svn commit: rev 56384 - in incubator/beehive/branches/v1/alpha/netui: ant external/jstl src/bootstrap src/bootstrap/org/apache/beehive/netui/tools/ant src/compiler src/pageflow src/scoping src/tags-databinding src/tags-html src/tags-template src/tomcat-common src/tomcat-common/4x src/tomcat-server src/tomcat-server/4x src/tomcat-webapp src/tomcat-webapp/4x src/util test/ant test/ant/junitStyles test/src/fauxServlet test/src/junitTests test/src/testBeans test/src/testRecorder test/src/testRecorderQA test/src/tools test/webapps/drt test/webapps/jsf test/webapps/testRecorder-test test/webapps/webappBuild-test
Author: ekoneil
Date: Tue Nov 2 08:57:50 2004
New Revision: 56384
Added:
incubator/beehive/branches/v1/alpha/netui/ant/netui.properties (props changed)
- copied unchanged from rev 56282, incubator/beehive/trunk/netui/ant/netui.properties
incubator/beehive/branches/v1/alpha/netui/external/jstl/
- copied from rev 56282, incubator/beehive/trunk/netui/external/jstl/
incubator/beehive/branches/v1/alpha/netui/external/jstl/jstl.jar (props changed)
- copied unchanged from rev 56282, incubator/beehive/trunk/netui/external/jstl/jstl.jar
incubator/beehive/branches/v1/alpha/netui/external/jstl/standard.jar (props changed)
- copied unchanged from rev 56282, incubator/beehive/trunk/netui/external/jstl/standard.jar
Removed:
incubator/beehive/branches/v1/alpha/netui/ant/bootstrap.properties
incubator/beehive/branches/v1/alpha/netui/ant/buildModules.xml
incubator/beehive/branches/v1/alpha/netui/ant/common.properties
incubator/beehive/branches/v1/alpha/netui/src/bootstrap/org/apache/beehive/netui/tools/ant/
incubator/beehive/branches/v1/alpha/netui/test/ant/junit.xml
incubator/beehive/branches/v1/alpha/netui/test/ant/junitDrt.properties
incubator/beehive/branches/v1/alpha/netui/test/ant/junitReport.xml
incubator/beehive/branches/v1/alpha/netui/test/ant/junitStyles/
incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorderJunit.properties
incubator/beehive/branches/v1/alpha/netui/test/src/tools/
incubator/beehive/branches/v1/alpha/netui/test/webapps/webappBuild-test/
Modified:
incubator/beehive/branches/v1/alpha/netui/ant/build.xml
incubator/beehive/branches/v1/alpha/netui/ant/webappTemplate.xml
incubator/beehive/branches/v1/alpha/netui/ant/xmlBean.xml
incubator/beehive/branches/v1/alpha/netui/src/bootstrap/build.xml
incubator/beehive/branches/v1/alpha/netui/src/compiler/build.xml
incubator/beehive/branches/v1/alpha/netui/src/pageflow/build.xml
incubator/beehive/branches/v1/alpha/netui/src/scoping/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tags-databinding/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tags-html/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tags-template/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tomcat-common/4x/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tomcat-common/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tomcat-server/4x/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tomcat-server/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tomcat-webapp/4x/build.xml
incubator/beehive/branches/v1/alpha/netui/src/tomcat-webapp/build.xml
incubator/beehive/branches/v1/alpha/netui/src/util/build.xml
incubator/beehive/branches/v1/alpha/netui/test/ant/build.xml
incubator/beehive/branches/v1/alpha/netui/test/ant/buildWebapp.xml
incubator/beehive/branches/v1/alpha/netui/test/ant/test.properties
incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorder.xml
incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorderCore.xml
incubator/beehive/branches/v1/alpha/netui/test/src/fauxServlet/build.xml
incubator/beehive/branches/v1/alpha/netui/test/src/junitTests/build.xml
incubator/beehive/branches/v1/alpha/netui/test/src/testBeans/build.xml
incubator/beehive/branches/v1/alpha/netui/test/src/testRecorder/build.xml
incubator/beehive/branches/v1/alpha/netui/test/src/testRecorderQA/build.xml
incubator/beehive/branches/v1/alpha/netui/test/webapps/drt/build.xml
incubator/beehive/branches/v1/alpha/netui/test/webapps/jsf/build.xml
incubator/beehive/branches/v1/alpha/netui/test/webapps/testRecorder-test/build.xml
Log:
SVN merge change 56282 into v1/alpha
BB: self
DRT: Beehive pass
Modified: incubator/beehive/branches/v1/alpha/netui/ant/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/ant/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/ant/build.xml Tue Nov 2 08:57:50 2004
@@ -4,8 +4,7 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="bootstrap.properties"/>
- <property file="common.properties"/>
+ <property file="netui.properties"/>
<!-- ============================================= -->
<!-- Dev Build Targets -->
@@ -15,10 +14,7 @@
<echo message="| NetUI clean starting |"/>
<echo message="--------------------------------------------------"/>
- <ant antfile="buildModules.xml" target="clean.modules" inheritAll="false">
- <property name="source.root" location="${src.dir}"/>
- <property name="module.list" value="${modules}"/>
- </ant>
+ <antcall target="clean.modules"/>
<antcall target="undeploy"/>
<echo message="--------------------------------------------------"/>
@@ -31,10 +27,7 @@
<echo message="| NetUI build starting |"/>
<echo message="--------------------------------------------------"/>
- <ant antfile="buildModules.xml" target="build.modules" inheritAll="false">
- <property name="source.root" location="${src.dir}"/>
- <property name="module.list" value="${modules}"/>
- </ant>
+ <antcall target="build.modules"/>
<echo message="--------------------------------------------------"/>
<echo message="| NetUI build ending |"/>
@@ -42,15 +35,11 @@
</target>
<target name="build.module" depends="prepare" description="Build a single source module">
- <ant antfile="buildModules.xml" target="build.module" inheritAll="false">
- <property name="source.root" location="${src.dir}"/>
- </ant>
+ <ant dir="${src.dir}/${module.name}" target="build" inheritAll="false"/>
</target>
<target name="clean.module" description="Clean a single source module">
- <ant antfile="buildModules.xml" target="clean.module" inheritAll="false">
- <property name="source.root" location="${src.dir}"/>
- </ant>
+ <ant dir="${src.dir}/${module.name}" target="clean" inheritAll="false"/>
<antcall target="undeploy"/>
</target>
@@ -97,16 +86,44 @@
</copy>
</target>
- <!-- ============================================= -->
- <!-- JavaDoc Targets -->
- <!-- ============================================= -->
- <target name="javadoc.all" description="Generate Javadoc for all core server and tags">
- <ant antfile="javadoc.xml" target="javadoc.all" inheritAll="false"/>
- </target>
-
- <target name="clean.javadoc.all">
- <ant antfile="javadoc.xml" target="clean.javadoc.all" inheritAll="false"/>
- </target>
+ <!-- Build all modules. A module is defined as a subdirectory of files in src/ targeted to
+ live in a single JAR file called <prefix>-moduleName.jar
+
+ The build for the module is left to the module to accomplish. The ForEach task below
+ will call the given target in each of the build.xml files located in src/<module name>.
+
+ The name of the module is passed under the property value of module.name.
+ -->
+ <target name="build.modules" description="Build NetUI source modules">
+ <antcall target="do.subant">
+ <param name="target.name" value="build"/>
+ </antcall>
+ </target>
+
+ <!-- Clean all modules. Cleaning a module should remove its JAR file and its classes directory. -->
+ <target name="clean.modules" description="Clean NetUI source modules">
+ <antcall target="do.subant">
+ <param name="target.name" value="clean"/>
+ </antcall>
+ </target>
+
+ <target name="do.subant">
+ <subant target="${target.name}">
+ <filelist dir="${src.dir}">
+ <file name="bootstrap"/>
+ <file name="compiler"/>
+ <file name="scoping"/>
+ <file name="tomcat-common"/>
+ <file name="tomcat-server"/>
+ <file name="util"/>
+ <file name="pageflow"/>
+ <file name="tomcat-webapp"/>
+ <file name="tags-html"/>
+ <file name="tags-databinding"/>
+ <file name="tags-template"/>
+ </filelist>
+ </subant>
+ </target>
<target name="usage">
<java fork="no" classname="org.apache.tools.ant.Main">
Modified: incubator/beehive/branches/v1/alpha/netui/ant/webappTemplate.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/ant/webappTemplate.xml Tue Nov 2 08:57:50 2004
@@ -4,8 +4,7 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="bootstrap.properties"/>
- <property file="common.properties"/>
+ <property file="netui.properties"/>
<property name="template.root.dir" location="${src.dir}/webapp-template/"/>
<property name="resource.dir.name" value="resources/beehive/version1"/>
Modified: incubator/beehive/branches/v1/alpha/netui/ant/xmlBean.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/ant/xmlBean.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/ant/xmlBean.xml Tue Nov 2 08:57:50 2004
@@ -4,8 +4,7 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="bootstrap.properties"/>
- <property file="common.properties"/>
+ <property file="netui.properties"/>
<target name="ant.build.xmlbean" description="Compile a set of XSDs using the XMLBean Ant task">
<fail unless="xsd.root.dir"
Modified: incubator/beehive/branches/v1/alpha/netui/src/bootstrap/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/bootstrap/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/bootstrap/build.xml Tue Nov 2 08:57:50 2004
@@ -1,24 +1,28 @@
<?xml version="1.0"?>
-<project name="NetUI/Bootstrap" default="compile" basedir=".">
+<project name="Beehive/NetUI/Bootstrap" default="build" basedir=".">
- <property name="this.dir" location="${src.dir}/${bootstrap.module.name}"/>
- <property name="this.output.dir" location="${classes.dir}/${bootstrap.module.name}"/>
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.name" value="bootstrap"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
+ <property name="this.output.dir" location="${classes.dir}/${module.name}"/>
<property name="xdoclet.metainf.dir" location="${this.output.dir}/META-INF"/>
- <property name="xdoclet.template" location="${this.dir}/xdoclet-xml.xdt"/>
+ <property name="xdoclet.template" location="${module.dir}/xdoclet-xml.xdt"/>
<!-- Bootstrap JAR dependencies -->
<property name="module.classpath" value="${ant.jar};${tools.xdoclet.gen.classpath}"/>
- <target name="compile">
-
- <echo>compile module: ${bootstrap.module.name}</echo>
+ <target name="build">
+ <echo>compile module: ${module.name}</echo>
<echo>module.classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${this.output.dir}"/>
- <javac srcdir="${this.dir}/"
+ <javac srcdir="${module.dir}/"
destdir="${this.output.dir}"
classpath="${module.classpath}"
debug="${compile.debug}"
@@ -29,17 +33,17 @@
</javac>
<copy todir="${this.output.dir}">
- <fileset dir="${this.dir}" includes="**/*.properties"/>
- <fileset dir="${this.dir}" includes="**/*.xml"/>
- <fileset dir="${this.dir}" includes="**/*.xdt"/>
- <fileset dir="${this.dir}" includes="**/*.xdoclet"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.xml"/>
+ <fileset dir="${module.dir}" includes="**/*.xdt"/>
+ <fileset dir="${module.dir}" includes="**/*.xdoclet"/>
</copy>
<echo>tools.xdoclet.gen.classpath: ${tools.xdoclet.gen.classpath}</echo>
<taskdef name="xdoclet" classname="xdoclet.DocletTask" classpath="${tools.xdoclet.gen.classpath}"/>
<mkdir dir="${xdoclet.metainf.dir}"/>
<xdoclet destdir="${xdoclet.metainf.dir}" verbose="true">
- <fileset dir="${this.dir}">
+ <fileset dir="${module.dir}">
<include name="org/apache/beehive/netui/tools/**/*TagsHandler.java" />
<include name="org/apache/beehive/netui/tools/**/*SubTask.java" />
</fileset>
@@ -50,25 +54,8 @@
</target>
<target name="clean">
- <delete dir="${classes.dir}/${bootstrap.module.name}"/>
+ <delete dir="${classes.dir}/${module.name}"/>
<delete dir="${dist.dir}/${bootstrap.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <echo>Packages: ${javadoc.packages}</echo>
- <mkdir dir="${javadoc.dir}/${bootstrap.module.name}"/>
- <javadoc packagenames="${javadoc.packages}"
- sourcepath="."
- destdir="${javadoc.dir}/${bootstrap.module.name}"
- version="true"
- windowtitle="${javadoc.windowtitle}"
- >
- <link href="${j2ee.docs}"/>
- </javadoc>
- </target>
-
- <target name="clean.javadoc">
- <delete dir="${javadoc.dir}/${bootstrap.module.name}" includeEmptyDirs="true"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/compiler/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/compiler/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/compiler/build.xml Tue Nov 2 08:57:50 2004
@@ -1,31 +1,38 @@
<?xml version="1.0"?>
-<project name="Beehive/NetUI/Compiler" default="compile" basedir=".">
+<project name="Beehive/NetUI/Compiler" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.name" value="compiler"/>
<property name="module.classpath" location="${xbean.jar};${jsr173.jar}"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
-
+ <echo>module classpath: ${module.classpath}</echo>
+ <echo>basedir: ${basedir}</echo>
+
<mkdir dir="${classes.dir}/${module.name}"/>
<antcall target="compile.schemas"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source.1.5}">
+ source="${compile.source}">
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
- <fileset dir="." includes="**/*.xml"/>
- <fileset dir="." includes="META-INF/**"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.xml"/>
+ <fileset dir="${module.dir}" includes="META-INF/**"/>
</copy>
<jar jarfile="${build.lib.dir}/${compiler.jar.name}" basedir="${classes.dir}/${module.name}">
@@ -38,17 +45,17 @@
<target name="compile.schemas">
<!-- run the XMLBean compiler for the struts-config schema -->
<ant antfile="${netui.ant.dir}/xmlBean.xml">
- <property name="xsd.root.dir" value="schema/struts-config"/>
+ <property name="xsd.root.dir" value="${module.dir}/schema/struts-config"/>
<property name="class.output.dir" value="${classes.dir}/${module.name}"/>
- <property name="xbean.inputs" value="${src.dir}/${module.name}/schema/struts-config/*.xsd*"/>
+ <property name="xbean.inputs" value="${module.dir}/schema/struts-config/*.xsd*"/>
<property name="xbean.output" value="${build.lib.dir}/${compiler.jar.name}"/>
</ant>
<!-- run the XMLBean compiler for the struts-validator schema -->
<ant antfile="${netui.ant.dir}/xmlBean.xml">
- <property name="xsd.root.dir" value="schema/struts-validator"/>
+ <property name="xsd.root.dir" value="${module.dir}/schema/struts-validator"/>
<property name="class.output.dir" value="${classes.dir}/${module.name}"/>
- <property name="xbean.inputs" value="schema/struts-validator/*.xsd*"/>
+ <property name="xbean.inputs" value="${module.dir}/schema/struts-validator/*.xsd*"/>
<property name="xbean.output" value="${build.lib.dir}/${compiler.jar.name}"/>
</ant>
</target>
@@ -56,16 +63,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
<delete file="${build.lib.dir}/${compiler.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Compiler"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/pageflow/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/pageflow/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/pageflow/build.xml Tue Nov 2 08:57:50 2004
@@ -1,35 +1,41 @@
<?xml version="1.0"?>
-<project name="NetUI/PageFlow" default="compile" basedir=".">
+<project name="Beehive/NetUI/PageFlow" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.name" value="pageflow"/>
<property name="module.classpath" value="${struts.jar};${servlet24.jar};${jsp20.jar};${util.jar};${commons-beanutils.jar};${commons-logging.jar};${commons-collections.jar};${commons-digester.jar};${commons-validator.jar};${log4j.jar};${scoping.jar};${xbean.jar};${controls.jar};${jsf-api.jar};${commons-el.jar}"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
<!-- run the XMLBean compiler for the webapp schema -->
<ant antfile="${netui.ant.dir}/xmlBean.xml">
- <property name="xsd.root.dir" value="schema/"/>
+ <property name="xsd.root.dir" value="${module.dir}/schema/"/>
<property name="class.output.dir" value="${classes.dir}/${module.name}"/>
- <property name="xbean.inputs" value="schema/*.xsd*"/>
+ <property name="xbean.inputs" value="${module.dir}/schema/*.xsd*"/>
<property name="xbean.output" value="${build.lib.dir}/${pageflow.jar.name}"/>
</ant>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source.1.5}">
+ source="${compile.source}">
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
@@ -48,16 +54,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
<delete file="${build.lib.dir}/${pageflow.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Page Flow"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/scoping/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/scoping/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/scoping/build.xml Tue Nov 2 08:57:50 2004
@@ -1,17 +1,23 @@
<?xml version="1.0"?>
-<project name="NetUI/Scoping" default="compile" basedir=".">
+<project name="Beehive/NetUI/Scoping" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.name" value="scoping"/>
<property name="module.classpath" value="${struts.jar};${util.jar};${commons-beanutils.jar};${commons-logging.jar};${commons-collections.jar};${commons-digester.jar};${log4j.jar};${servlet24.jar}"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
@@ -21,10 +27,9 @@
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
-
<jar jarfile="${build.lib.dir}/${scoping.jar.name}">
<fileset dir="${classes.dir}/${module.name}">
<include name="**/*.class"/>
@@ -36,16 +41,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
<delete dir="${build.lib.dir}/${scoping.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Scoping"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tags-databinding/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tags-databinding/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tags-databinding/build.xml Tue Nov 2 08:57:50 2004
@@ -1,33 +1,39 @@
<?xml version="1.0"?>
-<project name="Beehive/NetUI/Tags-Databinding" default="compile" basedir=".">
+<project name="Beehive/NetUI/Tags-Databinding" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.name" value="tags-databinding"/>
<property name="module.classpath" value="${servlet24.jar};${jsp20.jar};${struts.jar};${util.jar};${tags.html.jar};${pageflow.jar};${scoping.jar};${log4j.jar};${commons-logging.jar};${xbean.jar};${jsr173.jar}"/>
<property name="module.classes.dir" location="${classes.dir}/${module.name}"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${module.classes.dir}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
classpath="${module.classpath}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source.1.5}">
+ source="${compile.source}">
<include name="**/*.java"/>
</javac>
<copy todir="${module.classes.dir}">
- <fileset dir="." includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
<echo>Generate TLD and TLDx</echo>
- <echo>tools.xdoclet.run.classpath=${tools.xdoclet.run.classpath}</echo>
+ <echo>tools.xdoclet.run.classpath: ${tools.xdoclet.run.classpath}</echo>
<taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask" classpath="${tools.xdoclet.run.classpath}"/>
<webdoclet
destdir="${build.lib.dir}"
@@ -73,16 +79,6 @@
<delete dir="${build.lib.dir}/${tags-databinding.jar.name}"/>
<delete dir="${build.lib.dir}/${netui-tags-databinding.tldx.name}"/>
<delete dir="${build.lib.dir}/${netui-tags-databinding.tld.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Databinding Tags"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tags-html/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tags-html/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tags-html/build.xml Tue Nov 2 08:57:50 2004
@@ -1,31 +1,37 @@
<?xml version="1.0"?>
-<project name="Beehive/NetUI/Tags-HTML" default="compile" basedir=".">
+<project name="Beehive/NetUI/Tags-HTML" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.name" value="tags-html"/>
<property name="module.classpath"
value="${servlet24.jar};${jsp20.jar};${struts.jar};${commons-beanutils.jar};${util.jar};${pageflow.jar};${scoping.jar};${log4j.jar};${commons-logging.jar};${xbean.jar}"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source.1.5}"
+ source="${compile.source}"
>
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
- <fileset dir="." includes="**/*.gif"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.gif"/>
</copy>
<echo>Generate TLD and TLDx</echo>
@@ -70,16 +76,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
<delete dir="${build.lib.dir}/${tags-html.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI HTML Tags"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tags-template/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tags-template/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tags-template/build.xml Tue Nov 2 08:57:50 2004
@@ -1,29 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Beehive/NetUI/Tags-Template" default="compile" basedir=".">
+<project name="Beehive/NetUI/Tags-Template" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.name" value="tags-template"/>
<property name="module.classpath"
value="${servlet24.jar};${jsp20.jar};${struts.jar};${util.jar};${tags.html.jar};${tags.databinding.jar};${pageflow.jar};${log4j.jar};${commons-logging.jar}"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source}"
- >
+ source="${compile.source}">
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
<echo>Generate TLD and TLDx</echo>
@@ -73,16 +78,6 @@
<delete dir="${build.lib.dir}/${tags-template.jar.name}"/>
<delete dir="${build.lib.dir}/${netui-tags-template.tld.name}"/>
<delete dir="${build.lib.dir}/${netui-tags-template.tldx.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Template Tags"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tomcat-common/4x/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tomcat-common/4x/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tomcat-common/4x/build.xml Tue Nov 2 08:57:50 2004
@@ -1,17 +1,22 @@
<?xml version="1.0"?>
-<project name="Beehive/NetUI/Tomcat Common" default="compile" basedir=".">
+<project name="Beehive/NetUI/Tomcat Common" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.dir" location="${src.dir}/${module.name}/4x"/>
<property name="module.classpath" location="${servlet23.jar}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
@@ -21,7 +26,7 @@
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
<jar jarfile="${build.lib.dir}/${netui-tomcat-common.4x.jar.name}" basedir="${classes.dir}/${module.name}"/>
@@ -30,16 +35,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
<delete dir="${build.lib.dir}/${netui-tomcat-common.4x.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Tomcat 4.x Common"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tomcat-common/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tomcat-common/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tomcat-common/build.xml Tue Nov 2 08:57:50 2004
@@ -1,21 +1,24 @@
<?xml version="1.0"?>
-<project name="NetUI/Tomcat Common" default="compile" basedir=".">
+<project name="Beehive/NetUI/TomcatCommon" default="build" basedir=".">
- <target name="compile">
- <ant antfile="build.xml" target="compile" dir="4x" />
- </target>
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
- <target name="clean">
- <ant antfile="build.xml" target="clean" dir="4x" />
- </target>
+ <property name="module.name" value="tomcat-common"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="javadoc">
- <ant antfile="build.xml" target="javadoc" dir="4x" />
+ <target name="build">
+ <ant antfile="build.xml" target="build" dir="${module.dir}/4x" inheritAll="false">
+ <property name="module.name" value="${module.name}"/>
+ </ant>
</target>
- <target name="clean.javadoc">
- <ant antfile="build.xml" target="clean.javadoc" dir="4x" />
+ <target name="clean">
+ <ant antfile="build.xml" target="clean" dir="${module.dir}/4x" inheritAll="false">
+ <property name="module.name" value="${module.name}"/>
+ </ant>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tomcat-server/4x/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tomcat-server/4x/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tomcat-server/4x/build.xml Tue Nov 2 08:57:50 2004
@@ -1,17 +1,22 @@
<?xml version="1.0"?>
-<project name="NetUI/Tomcat Server" default="compile" basedir=".">
+<project name="Beehive/NetUI/TomcatServer" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.dir" location="${src.dir}/${module.name}/4x"/>
<property name="module.classpath" location="${servlet23.jar};${netui-tomcat-common.4x.jar};${log4j.jar};${commons-logging.jar};${catalina.4x.jar};${coyote.4x.jar}"/>
- <target name="compile">
+ <target name="build">
<echo>dompile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
@@ -21,8 +26,8 @@
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
- <fileset dir="." includes="**/mbeans-descriptors.xml"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/mbeans-descriptors.xml"/>
</copy>
<jar jarfile="${build.lib.dir}/${netui-tomcat-server.4x.jar.name}" basedir="${classes.dir}/${module.name}"/>
@@ -31,16 +36,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
<delete dir="${build.lib.dir}/${netui-tomcat-server.4x.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Tomcat 4.x Common"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tomcat-server/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tomcat-server/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tomcat-server/build.xml Tue Nov 2 08:57:50 2004
@@ -1,21 +1,24 @@
<?xml version="1.0"?>
-<project name="NetUI/Tomcat Server" default="compile" basedir=".">
+<project name="Beehive/NetUI/TomcatServer" default="build" basedir=".">
- <target name="compile">
- <ant antfile="build.xml" target="compile" dir="4x"/>
- </target>
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
- <target name="clean">
- <ant antfile="build.xml" target="clean" dir="4x" />
- </target>
+ <property name="module.name" value="tomcat-server"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="javadoc">
- <ant antfile="build.xml" target="javadoc" dir="4x" />
+ <target name="build">
+ <ant antfile="build.xml" target="build" dir="${module.dir}/4x" inheritAll="false">
+ <property name="module.name" value="${module.name}"/>
+ </ant>
</target>
- <target name="clean.javadoc">
- <ant antfile="build.xml" target="clean.javadoc" dir="4x" />
+ <target name="clean">
+ <ant antfile="build.xml" target="clean" dir="${module.dir}/4x" inheritAll="false">
+ <property name="module.name" value="${module.name}"/>
+ </ant>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tomcat-webapp/4x/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tomcat-webapp/4x/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tomcat-webapp/4x/build.xml Tue Nov 2 08:57:50 2004
@@ -1,17 +1,22 @@
<?xml version="1.0"?>
-<project name="NetUI/Tomcat Webapp" default="compile" basedir=".">
+<project name="NetUI/Tomcat Webapp" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.dir" location="${src.dir}/${module.name}/4x"/>
<property name="module.classpath" location="${servlet23.jar};${netui-tomcat-common.4x.jar};${scoping.jar};${pageflow.jar}"/>
- <target name="compile">
- <echo>Compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <target name="build">
+ <echo>compile module: ${module.name}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
@@ -21,7 +26,7 @@
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
<jar jarfile="${build.lib.dir}/${netui-tomcat-webapp.4x.jar.name}" basedir="${classes.dir}/${module.name}"/>
@@ -30,16 +35,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
<delete dir="${build.lib.dir}/${netui-tomcat-webapp.4x.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Tomcat 4.x Webapp"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/tomcat-webapp/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/tomcat-webapp/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/tomcat-webapp/build.xml Tue Nov 2 08:57:50 2004
@@ -1,21 +1,24 @@
<?xml version="1.0"?>
-<project name="NetUI/Tomcat Webapp" default="compile" basedir=".">
+<project name="Beehive/NetUI/TomcatCommon" default="build" basedir=".">
- <target name="compile">
- <ant antfile="build.xml" target="compile" dir="4x" />
- </target>
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
- <target name="clean">
- <ant antfile="build.xml" target="clean" dir="4x" />
- </target>
+ <property name="module.name" value="tomcat-webapp"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="javadoc">
- <ant antfile="build.xml" target="javadoc" dir="4x" />
+ <target name="build">
+ <ant antfile="build.xml" target="build" dir="${module.dir}/4x" inheritAll="false">
+ <property name="module.name" value="${module.name}"/>
+ </ant>
</target>
- <target name="clean.javadoc">
- <ant antfile="build.xml" target="clean.javadoc" dir="4x" />
+ <target name="clean">
+ <ant antfile="build.xml" target="clean" dir="${module.dir}/4x" inheritAll="false">
+ <property name="module.name" value="${module.name}"/>
+ </ant>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/src/util/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/src/util/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/src/util/build.xml Tue Nov 2 08:57:50 2004
@@ -1,36 +1,42 @@
<?xml version="1.0"?>
-<project name="NetUI/Util" default="compile" basedir=".">
+<project name="Beehive/NetUI/Util" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+
+ <property name="module.name" value="util"/>
<property name="module.classpath" location="${servlet24.jar};${struts.jar};${log4j.jar};${commons-logging.jar};${xbean.jar};${jsr173.jar}"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
<!-- run the XMLBean compiler for the webapp schema -->
<ant antfile="${netui.ant.dir}/xmlBean.xml">
- <property name="xsd.root.dir" value="schema/"/>
+ <property name="xsd.root.dir" value="${module.dir}/schema/"/>
<property name="class.output.dir" value="${classes.dir}/${module.name}"/>
- <property name="xbean.inputs" value="schema/*.xsd*"/>
+ <property name="xbean.inputs" value="${module.dir}/schema/*.xsd*"/>
<property name="xbean.output" value="${build.lib.dir}/${util.jar.name}"/>
</ant>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
classpath="${module.classpath}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source.1.5}">
+ source="${compile.source}">
<include name="**/*.java"/>
</javac>
<copy todir="${classes.dir}/${module.name}">
- <fileset dir="." includes="**/*.properties"/>
- <fileset dir="." includes="**/*.xml"/>
+ <fileset dir="${module.dir}" includes="**/*.properties"/>
+ <fileset dir="${module.dir}" includes="**/*.xml"/>
</copy>
<!-- copy the default config file used when one isn't found in /WEB-INF/netui-config.xml -->
@@ -42,16 +48,6 @@
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
<delete file="${build.lib.dir}/${util.jar.name}"/>
- </target>
-
- <target name="javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="javadoc.callback">
- <property name="window.title" value="NetUI Utilities"/>
- </ant>
- </target>
-
- <target name="clean.javadoc">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="cleanjavadoc.callback"/>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/test/ant/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/ant/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/ant/build.xml Tue Nov 2 08:57:50 2004
@@ -4,84 +4,143 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/bootstrap.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/common.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
<property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
- <!-- ============================================= -->
- <!-- Tomcat Start/Stop Targets -->
- <!-- ============================================= -->
- <target name="start" description="Start Tomcat.">
- <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
- </target>
-
- <target name="stop" description="Stop Tomcat.">
- <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
- </target>
-
- <!-- ============================================= -->
- <!-- Test Suite Targets -->
- <!-- ============================================= -->
- <target name="drt" depends="prepare" description="">
- <antcall target="junit.drt"/>
- </target>
-
- <target name="junit.drt" depends="prepare" description="Runs the JUnit DRTs.">
- <ant antfile="junit.xml" target="drt" inheritAll="false"/>
- </target>
-
- <target name="run.test" depends="prepare" description="Run a single test with the name specified as -Dtest.name on the command line.">
- <fail unless="test.name" message="No test specified, set the -Dtest.name=<name> property"/>
- <ant antfile="junit.xml" target="run.test" inheritAll="false">
- <property name="test.name" value="${test.name}"/>
- </ant>
- </target>
-
<target name="prepare">
- <mkdir dir="${qa.lib.dir}"/>
+ <mkdir dir="${test.lib.dir}"/>
</target>
<!-- ============================================= -->
<!-- Build Targets -->
<!-- ============================================= -->
- <target name="test.build" depends="prepare" description="Build the QA modules">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="build.modules">
- <property name="source.root" location="${qa.src.dir}"/>
- <property name="module.list" value="${qa.modules}"/>
- </ant>
- </target>
-
- <target name="test.clean" description="Clean the QA modules">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="clean.modules">
- <property name="source.root" location="${qa.src.dir}"/>
- <property name="module.list" value="${qa.modules}"/>
- </ant>
+ <target name="build" depends="prepare" description="Build the QA modules">
+ <antcall target="do.subant">
+ <param name="target.name" value="build"/>
+ </antcall>
+ </target>
+
+ <target name="clean" description="Clean the QA modules">
+ <antcall target="do.subant">
+ <param name="target.name" value="clean"/>
+ </antcall>
+ </target>
+
+ <target name="do.subant">
+ <subant target="${target.name}">
+ <filelist dir="${test.src.dir}">
+ <file name="fauxServlet"/>
+ <file name="testBeans"/>
+ <file name="junitTests"/>
+ <file name="testRecorder"/>
+ <file name="testRecorderQA"/>
+ </filelist>
+ </subant>
</target>
- <target name="test.build.module" depends="prepare">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="build.module">
- <property name="source.root" location="${qa.src.dir}"/>
- </ant>
+ <!-- ============================================= -->
+ <!-- Test Suite Targets -->
+ <!-- ============================================= -->
+ <path id="test.classpath">
+ <pathelement path="${junit-tests.jar}"/>
+ <fileset dir="${webappTemplate.webinf.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${junit.jar}"/>
+ <pathelement path="${servlet24.jar}"/>
+ <pathelement path="${jsp20.jar}"/>
+ <pathelement path="${testBeans.jar}"/>
+ <pathelement path="${fauxServlet.jar}"/>
+ </path>
+
+ <!-- Internal target used to clean and build the QA modules -->
+ <target name="test.rebuild">
+ <ant target="clean" inheritAll="false"/>
+ <ant target="build" inheritAll="false"/>
+ </target>
+
+ <!-- Run the NetUI DRTs -->
+ <target name="drt" depends="test.rebuild,junit.drt" description="Run the NetUI JUnit DRTs"/>
+
+ <target name="junit.drt">
+ <property name="formatter.type" value="xml"/>
+ <property name="testout.dir" value="${drt.testResults.dir}"/>
+ <property name="fail" value="true"/>
+
+ <antcall target="run.tests"/>
+ </target>
+
+ <target name="junit.bvt">
+ <property name="formatter.type" value="xml"/>
+ <property name="testout.dir" value="${bvt.testResults.dir}"/>
+ <property name="fail" value="false"/>
+
+ <antcall target="run.tests"/>
+ </target>
+
+ <target name="run.tests">
+ <property name="show.output" value="false"/>
+
+ <condition property="log4j.config" value="${log4jconfig.verbose.junit}">
+ <not><isset property="log4j.quiet"/></not>
+ </condition>
+ <condition property="log4j.config" value="${log4jconfig.junit}">
+ <and><isset property="log4j.quiet"/></and>
+ </condition>
+
+ <echo>log4j.config: ${log4j.config}</echo>
+ <echo>testout.dir: ${testout.dir}</echo>
+
+ <mkdir dir="${testout.dir}"/>
+
+ <junit printsummary="${fail}" fork="${fail}" haltonfailure="${fail}" haltonerror="${fail}" showOutput="${show.output}">
+ <jvmarg value="-ea"/>
+ <classpath refid="test.classpath"/>
+ <formatter type="${formatter.type}"/>
+ <sysproperty key="log4j.configuration" value="file:${log4j.config}"/>
+ <sysproperty key="netuidrt.logdir" path="${testout.dir}"/>
+ <test name="org.apache.beehive.netui.test.util.type.TypeUtilsTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.netui.test.util.config.ConfigTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.netui.test.util.config.ConfigTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.netui.test.databinding.expression.IndexedNameTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.netui.test.script.simpleaction.InternalExpressionUtilsTest" todir="${testout.dir}"/>
+ <batchtest fork="yes" todir="${testout.dir}">
+ <fileset dir="${test.src.dir}/junitTests">
+ <include name="org/apache/beehive/netui/test/script/el/**/*Test.java"/>
+ <exclude name="org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <antcall target="make.report">
+ <param name="test.report.dir" location="${testout.dir}"/>
+ </antcall>
</target>
- <target name="test.clean.module">
- <ant antfile="${netui.ant.dir}/buildModules.xml" target="clean.module">
- <property name="source.root" location="${qa.src.dir}"/>
- </ant>
+ <target name="run.test">
+ <fail unless="test.name" message="No test specified, set the -Dtest.name=<name> property"/>
+ <java classpathref="test.classpath" classname="${test.name}"/>
</target>
- <target name="test.rebuild.module" description="Clean and build a single NetUI module">
- <antcall target="test.clean.module"/>
- <antcall target="test.build.module"/>
- </target>
+ <!--
+ Produce a JUnit test repoort from the XML results of a test run.
- <target name="rebuild.all" description="Clean and build the dev and QA code">
- <antcall target="test.clean"/>
- <antcall target="test.build"/>
- </target>
-
- <target name="test.deploy" description="">
- <!-- todo: need to deploy the test infrastructure to the build/webappTemplate/test directory -->
+ Params:
+ test.report.dir == the directory in which the XML test run results exist
+ the HTML for the repots will be produced in ${test.report.dir}/html
+ -->
+ <target name="make.report">
+ <echo>test.report.dir: ${test.report.dir}</echo>
+
+ <mkdir dir="${test.report.dir}/html"/>
+
+ <!-- build a report -->
+ <junitreport todir="${test.report.dir}/">
+ <fileset dir="${test.report.dir}/">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" todir="${test.report.dir}/html"/>
+ </junitreport>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/test/ant/buildWebapp.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/ant/buildWebapp.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/ant/buildWebapp.xml Tue Nov 2 08:57:50 2004
@@ -5,8 +5,7 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
<property file="test.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/bootstrap.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/common.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
<!-- ================================================================ -->
<!-- -->
Modified: incubator/beehive/branches/v1/alpha/netui/test/ant/test.properties
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/ant/test.properties (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/ant/test.properties Tue Nov 2 08:57:50 2004
@@ -1,27 +1,28 @@
-# ---------------------------------------------------------------------------------
#
-# Test Properties
#
-# ---------------------------------------------------------------------------------
+# NetUI Test Properties
+#
+#
-# QA directories
-qa.lib.dir=${build.dir}/test-lib
-qa.classes.dir=${build.dir}/test-classes
-qa.src.dir=${webui.home}/test/src
+test.lib.dir=${build.dir}/test-lib
+test.classes.dir=${build.dir}/test-classes
+test.src.dir=${webui.home}/test/src
test.external.dir=${test.dir}/external
+# ---------------------------------------------------------------------------------
#
-# External JAR dependencies
+# External JAR names / paths
#
+# ---------------------------------------------------------------------------------
junit.jar.name=junit.jar
httpClient.jar.name=commons-httpclient-2.0.jar
-deployed.httpClient.jar=${test.external.dir}/${httpClient.jar.name}
+httpClient.jar=${test.external.dir}/${httpClient.jar.name}
ant-junit.jar=${ant.home}/lib/ant-junit.jar
# ---------------------------------------------------------------------------------
#
-# NetUI QA JARs.
+# NetUI Test JAR names / paths
#
# ---------------------------------------------------------------------------------
test-tools.jar.name=beehive-netui-test-tools.jar
@@ -31,67 +32,25 @@
fauxServlet.jar.name=fauxServlet.jar
testBeans.jar.name=testBeans.jar
-test-tools.jar=${qa.lib.dir}/${test-tools.jar.name}
-test-recorder.jar=${qa.lib.dir}/${test-recorder.jar.name}
-test.recorder.qa.jar=${qa.lib.dir}/${test.recorder.qa.jar.name}
-junit-tests.jar=${qa.lib.dir}/${junit-tests.jar.name}
-testBeans.jar=${qa.lib.dir}/${testBeans.jar.name}
-fauxServlet.jar=${qa.lib.dir}/${fauxServlet.jar.name}
-deployed.test-recorder.jar=${qa.lib.dir}/${test-recorder.jar.name}
-
-qa.modules=\
-tools,\
-fauxServlet,\
-testBeans,\
-junitTests,\
-testRecorder,\
-testRecorderQA
-
-# Test classpath is used to import QA classes directly into the module builds as
-# the modules are where the test cases are stored.
-test.classpath=${junit.jar}
-
-junit.classpath=\
-${deployed.commons-logging.jar};\
-${deployed.commons-beanutils.jar};\
-${deployed.commons-collections.jar};\
-${deployed.commons-validator.jar};\
-${deployed.jakarta-oro.jar};\
-${deployed.tags.databinding.jar};\
-${deployed.tags.datagrid.jar};\
-${deployed.tags.html.jar};\
-${deployed.pageflow.jar};\
-${deployed.scoping.jar};\
-${deployed.util.jar};\
-${deployed.struts.jar};\
-${deployed.commons-el.jar};\
-${junit.jar};\
-${log4j.jar};\
-${testBeans.jar};\
-${fauxServlet.jar};\
-${xbean.jar};\
-${ant.jar};\
-${ant-junit.jar};\
-${jsr173.jar};\
-${servlet24.jar};\
-${jsp20.jar};\
-${controls.jar}
-
-test.recorder.QA.classpath=\
-${test.recorder.classpath};\
-${test.recorder.qa.jar}
+test-tools.jar=${test.lib.dir}/${test-tools.jar.name}
+test-recorder.jar=${test.lib.dir}/${test-recorder.jar.name}
+test.recorder.qa.jar=${test.lib.dir}/${test.recorder.qa.jar.name}
+junit-tests.jar=${test.lib.dir}/${junit-tests.jar.name}
+testBeans.jar=${test.lib.dir}/${testBeans.jar.name}
+fauxServlet.jar=${test.lib.dir}/${fauxServlet.jar.name}
+# ---------------------------------------------------------------------------------
+#
+# NetUI Test JAR names / paths
+#
+# ---------------------------------------------------------------------------------
# DRT / BVT -- JUnit / client side properties. These parameterize the time and URL used
# in waiting for the server to start
-drt.testResults.dir=${webui.home}/build/drt.testResults
-bvt.testResults.dir=${webui.home}/build/bvt.testResults
+drt.testResults.dir=${build.dir}/drt.testResults
+bvt.testResults.dir=${build.dir}/bvt.testResults
drtbvt.jraRecordingSeconds=150
drtbvt.maxWait=300
-# pass debugging options to tomcat
-tomcat.debug.opts=
-
log4jconfig.verbose.junit=${test.dir}/conf/junitLogCfgVerbose.xml
-log4jconfig.junit=${test.dir}/conf/junitLogCfg.xml
-
+log4jconfig.junit=${test.dir}/conf/junitLogCfg.xml
\ No newline at end of file
Modified: incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorder.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorder.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorder.xml Tue Nov 2 08:57:50 2004
@@ -4,13 +4,12 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/bootstrap.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/common.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
<property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
<property name="_junitReport.ant" location="${test.dir}/ant/junitReport.xml"/>
<property name="_testRecorder.base.dir" location="${build.dir}/testRecorder"/>
- <property name="_testRecorder.resource.dir" location="${qa.src.dir}/testRecorder/jsp"/>
+ <property name="_testRecorder.resource.dir" location="${test.src.dir}/testRecorder/jsp"/>
<property name="_junit.jar" location="${junit.jar}"/>
<property name="_ant-junit.jar" location="${ant-junit.jar}"/>
@@ -19,8 +18,8 @@
<property name="_xbean.jar" location="${xbean.jar}"/>
<property name="_jsr173.jar" location="${jsr173.jar}"/>
<property name="_test.config.dir" location="${test.dir}/conf"/>
- <property name="_httpClient.jar" location="${deployed.httpClient.jar}"/>
- <property name="_testRecorder.jar" location="${deployed.test-recorder.jar}"/>
+ <property name="_httpClient.jar" location="${httpClient.jar}"/>
+ <property name="_testRecorder.jar" location="${test-recorder.jar}"/>
<property name="_commons-logging.jar" location="${deployed.commons-logging.jar}"/>
<property name="_testRecorder.jar.name" value="${test-recorder.jar.name}"/>
@@ -30,7 +29,7 @@
<property name="_log4j.config.verbose" location="${log4jconfig.verbose.junit}"/>
<property name="_log4j.config" location="${log4jconfig.junit}"/>
- <property name="testRecorder.build.dir" location="${test.dir}/ant"/>
+ <property name="testRecorder.build.dir" location="${test.dir}/src/testRecorder"/>
<import file="testRecorderCore.xml"/>
Modified: incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorderCore.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorderCore.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorderCore.xml Tue Nov 2 08:57:50 2004
@@ -22,7 +22,6 @@
<property name="_report.root.dir" location="${_testRecorder.base.dir}/junit"/>
<property name="_testRecorder.config.dir" location="${_testRecorder.base.dir}/config"/>
<property name="_testRecorder.scratch.dir" location="${_testRecorder.base.dir}/scratch"/>
- <property name="_testRecorder.output" value="TEST-org.apache.beehive.netui.tools.testrecorder.client.MasterTestRecorderJUnitTest"/>
<taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
<classpath>
@@ -138,7 +137,7 @@
<target name="drt.errors" if="drt.errors.stop">
<echo>!!!!! Errors or failures occurred running test recorder tests !!!!!</echo>
<antcall target="stop.server"/>
- <fail message="NetUI Server DRTs Failed"/>
+ <fail message="NetUI Server Tests Failed"/>
</target>
<!--
@@ -179,13 +178,6 @@
all categories.
</fail>
- <!-- remove old junit output -->
- <delete>
- <fileset dir=".">
- <include name="${_testRecorder.output}.*"/>
- </fileset>
- </delete>
-
<condition property="_log4j.config" value="${_log4j.config.verbose}">
<not>
<isset property="log4j.quiet"/>
@@ -224,31 +216,59 @@
</or>
</condition>
+ <property name="_report.dir" location="${_report.root.dir}/${_categories}"/>
+
+ <!-- remove old junit output -->
+ <delete failOnError="false">
+ <fileset dir="${_report.dir}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ </delete>
+
+ <mkdir dir="${_report.dir}"/>
+
<echo>log4j.config: ${_log4j.config}</echo>
<echo>playback list: ${_list}</echo>
<echo>playback categories: ${_categories}</echo>
<echo>playback webapps: ${playback.webapps}</echo>
<echo>delete results: ${_results.delete}</echo>
+ <echo>junit output directory: ${_report.dir}</echo>
- <junit dir="${netui.ant.dir}" fork="true" errorproperty="playback.drt.error" failureproperty="playback.drt.failure" showoutput="true">
+ <junit dir="${netui.ant.dir}"
+ fork="true"
+ errorproperty="playback.drt.error"
+ failureproperty="playback.drt.failure"
+ showoutput="true">
<classpath refid="test.recorder.classpath"/>
- <sysproperty key="test.recorder.run.webapps" value="${playback.webapps}"/>
<formatter type="${formatter.type}" usefile="${formatter.usefile}"/>
+ <sysproperty key="test.recorder.run.webapps" value="${playback.webapps}"/>
<sysproperty key="test.recorder.run.tests" value="${_list}"/>
<sysproperty key="test.recorder.run.categories" value="${_categories}"/>
<sysproperty key="test.recorder.run.results.delete" value="${_results.delete}"/>
<sysproperty key="netuidrt.logdir" path="${_testRecorder.base.dir}"/>
<sysproperty key="log4j.configuration" value="file:${_log4j.config}"/>
- <test name="org.apache.beehive.netui.tools.testrecorder.client.MasterTestRecorderJUnitTest"/>
+ <test name="org.apache.beehive.netui.tools.testrecorder.client.MasterTestRecorderJUnitTest"
+ todir="${_report.dir}"/>
</junit>
- <!-- Create a JUnit report based on the results of executing the test recorder test cases -->
- <antcall target="make.report">
- <param name="test.report.dir" value="${_report.root.dir}/${_categories}"/>
- </antcall>
+ <mkdir dir="${_report.dir}/html"/>
+
+ <!-- build a report -->
+ <junitreport todir="${_report.dir}/">
+ <fileset dir="${_report.dir}/">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" todir="${_report.dir}/html"/>
+ </junitreport>
+
+ <delete>
+ <fileset dir="${_report.dir}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ </delete>
<!-- Determine if the tests have an error or failure -->
<condition property="drt.errors.found">
@@ -257,6 +277,7 @@
<isset property="playback.drt.failure"/>
</or>
</condition>
+
<echo>drt.errors.found: ${drt.errors.found}</echo>
<!--
@@ -286,28 +307,6 @@
</antcall>
</target>
- <!--
- Param:
- test.report.dir == the directory into which to generate the report. This value is provided by the caller.
- -->
- <target name="make.report">
- <property name="html.report.dir" location="${test.report.dir}/html"/>
-
- <mkdir dir="${test.report.dir}" />
- <mkdir dir="${html.report.dir}"/>
-
- <ant dir="${basedir}" antfile="${_junitReport.ant}" target="run">
- <property name="test.report.dir" location="${test.report.dir}"/>
- <property name="type" value="testrecorder"/>
- </ant>
-
- <delete>
- <fileset dir=".">
- <include name="${_testRecorder.output}.*"/>
- </fileset>
- </delete>
- </target>
-
<!-- Deploy the Test Recorder to the given webapp
Params:
@@ -361,17 +360,12 @@
<!-- Build the test recorder -->
<target name="build" description="build the Test Recorder module">
- <echo>basedir: ${basedir}</echo>
- <ant dir="${testRecorder.build.dir}" antfile="build.xml" target="test.build.module" inheritAll="false">
- <property name="module.name" value="testRecorder"/>
- </ant>
+ <ant dir="${testRecorder.build.dir}" antfile="build.xml" target="build" inheritAll="false"/>
</target>
<!-- Clean the test recorder -->
<target name="clean" description="clean the Test Recorder module">
- <ant dir="${testRecorder.build.dir}" antfile="build.xml" target="test.clean.module" inheritAll="false">
- <property name="module.name" value="testRecorder"/>
- </ant>
+ <ant dir="${testRecorder.build.dir}" antfile="build.xml" target="clean" inheritAll="false"/>
</target>
<!--
Modified: incubator/beehive/branches/v1/alpha/netui/test/src/fauxServlet/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/src/fauxServlet/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/src/fauxServlet/build.xml Tue Nov 2 08:57:50 2004
@@ -1,38 +1,42 @@
<?xml version="1.0"?>
-<project name="NetUI/FauxServlet" default="compile" basedir=".">
+<project name="Beehive/NetUI/FauxServlet" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
+
+ <property name="module.name" value="fauxServlet"/>
+ <property name="module.dir" location="${test.src.dir}/${module.name}"/>
<property name="module.classpath" location="${servlet24.jar};${jsp20.jar};${util.jar}"/>
- <property name="module.classes.dir" location="${qa.classes.dir}/${module.name}"/>
+ <property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/>
<property name="module.jar.name" value="${fauxServlet.jar.name}"/>
- <property name="module.jar" location="${qa.lib.dir}/${module.jar.name}"/>
+ <property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath:=${module.classpath}</echo>
- <echo>debug=${compile.debug}</echo>
+ <echo>module.classpath: ${module.classpath}</echo>
+ <echo>debug ${compile.debug}</echo>
<mkdir dir="${module.classes.dir}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
classpath="${module.classpath}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="1.4">
+ source="${compile.source}">
<include name="**/*.java"/>
</javac>
<copy todir="${module.classes.dir}">
- <fileset dir="./">
- <exclude name="./build.xml"/>
- <exclude name="**/*.java"/>
- </fileset>
+ <fileset dir="${module.dir}">
+ <exclude name="./build.xml"/>
+ <exclude name="**/*.java"/>
+ </fileset>
</copy>
-
- <!-- todo: remove this once there is a test/build.xml file -->
- <mkdir dir="${qa.lib.dir}"/>
<jar jarfile="${module.jar}" basedir="${module.classes.dir}"/>
</target>
Modified: incubator/beehive/branches/v1/alpha/netui/test/src/junitTests/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/src/junitTests/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/src/junitTests/build.xml Tue Nov 2 08:57:50 2004
@@ -1,23 +1,40 @@
<?xml version="1.0"?>
-<project name="NetUI/JUnitTests" default="compile" basedir=".">
+<project name="Beehive/NetUI/JUnitTests" default="build" basedir=".">
- <property name="module.classes.dir" location="${qa.classes.dir}/${module.name}"/>
- <property name="module.classpath" location="${junit.classpath}"/>
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
+
+ <property name="module.name" value="junitTests"/>
+ <property name="module.dir" location="${test.src.dir}/${module.name}"/>
+ <property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/>
<property name="module.jar.name" value="${junit-tests.jar.name}"/>
- <property name="module.jar" location="${qa.lib.dir}/${module.jar.name}"/>
+ <property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/>
- <target name="compile">
- <echo>Compile module: ${module.name}</echo>
- <echo>Classpath: ${module.classpath}</echo>
- <echo>Output directory: ${qa.lib.dir}</echo>
- <echo>Debug: ${compile.debug}</echo>
+ <path id="junit.classpath">
+ <pathelement path="${junit-tests.jar}"/>
+ <fileset dir="${webappTemplate.webinf.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${junit.jar}"/>
+ <pathelement path="${servlet24.jar}"/>
+ <pathelement path="${jsp20.jar}"/>
+ <pathelement path="${testBeans.jar}"/>
+ <pathelement path="${fauxServlet.jar}"/>
+ </path>
+
+ <target name="build">
+ <echo>compile module: ${module.name}</echo>
+ <echo>output directory: ${test.lib.dir}</echo>
+ <echo>debug: ${compile.debug}</echo>
<mkdir dir="${module.classes.dir}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
- classpath="${module.classpath}"
+ classpathref="junit.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
@@ -26,7 +43,7 @@
</javac>
<copy todir="${module.classes.dir}">
- <fileset dir="./">
+ <fileset dir="${module.dir}">
<exclude name="./build.xml"/>
<exclude name="**/*.java"/>
</fileset>
@@ -38,7 +55,6 @@
</target>
<target name="clean">
- <echo>Clean JUnit Tests</echo>
<delete dir="${module.classes.dir}"/>
<delete file="${module.jar}"/>
</target>
Modified: incubator/beehive/branches/v1/alpha/netui/test/src/testBeans/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/src/testBeans/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/src/testBeans/build.xml Tue Nov 2 08:57:50 2004
@@ -1,34 +1,41 @@
<?xml version="1.0"?>
-<project name="NetUI/TestBeans" default="compile" basedir=".">
+<project name="Beehive/NetUI/TestBeans" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
+
+ <property name="module.name" value="testBeans"/>
+ <property name="module.dir" location="${test.src.dir}/${module.name}"/>
<property name="module.classpath" location="${util.jar};${struts.jar};${servlet24.jar};${jsp20.jar}"/>
- <property name="module.classes.dir" location="${qa.classes.dir}/${module.name}"/>
+ <property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/>
<property name="module.jar.name" value="${testBeans.jar.name}"/>
- <property name="module.jar" location="${qa.lib.dir}/${module.jar.name}"/>
+ <property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath:=${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug=${compile.debug}</echo>
<mkdir dir="${module.classes.dir}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
classpath="${module.classpath}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="1.4">
+ source="${compile.source}">
<include name="**/*.java"/>
</javac>
<copy todir="${module.classes.dir}">
- <fileset dir="./">
- <exclude name="./build.xml"/>
- <exclude name="**/*.java"/>
- </fileset>
+ <fileset dir="${module.dir}">
+ <exclude name="build.xml"/>
+ <exclude name="**/*.java"/>
+ </fileset>
</copy>
<jar jarfile="${module.jar}" basedir="${module.classes.dir}"/>
Modified: incubator/beehive/branches/v1/alpha/netui/test/src/testRecorder/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/src/testRecorder/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/src/testRecorder/build.xml Tue Nov 2 08:57:50 2004
@@ -1,14 +1,21 @@
<?xml version="1.0"?>
-<project name="Beehive/NetUI/testRecorder" default="compile" basedir=".">
+<project name="Beehive/NetUI/testRecorder" default="build" basedir=".">
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
+
+ <property name="module.name" value="testRecorder"/>
+ <property name="module.dir" location="${test.src.dir}/${module.name}"/>
<property name="module.classpath"
- location=";${deployed.httpClient.jar};${deployed.commons-logging.jar};${log4j.jar};${servlet24.jar};${jsp20.jar};${xbean.jar};${junit.jar};${jsr173.jar}"/>
- <property name="module.classes.dir" location="${qa.classes.dir}/${module.name}"/>
+ location="${httpClient.jar};${deployed.commons-logging.jar};${log4j.jar};${servlet24.jar};${jsp20.jar};${xbean.jar};${junit.jar};${jsr173.jar}"/>
+ <property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/>
<property name="module.jar.name" value="${test-recorder.jar.name}"/>
- <property name="module.jar" location="${qa.lib.dir}/${module.jar.name}"/>
+ <property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
<echo>module.classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
@@ -16,13 +23,13 @@
<mkdir dir="${module.classes.dir}"/>
<ant antfile="${netui.ant.dir}/xmlBean.xml" target="ant.build.xmlbean">
- <property name="xsd.root.dir" value="schema/"/>
+ <property name="xsd.root.dir" value="${module.dir}/schema/"/>
<property name="class.output.dir" value="${module.classes.dir}"/>
<property name="xbean.inputs" value="schema/*.xsd*"/>
<property name="xbean.output" value="${module.jar}"/>
</ant>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
classpath="${module.classpath}"
debug="${compile.debug}"
@@ -34,8 +41,8 @@
<jar jarfile="${module.jar}" basedir="${module.classes.dir}"/>
- <copy todir="${qa.lib.dir}/testRecorder-jsp">
- <fileset dir="./jsp"/>
+ <copy todir="${test.lib.dir}/testRecorder-jsp">
+ <fileset dir="${module.dir}/jsp"/>
</copy>
</target>
Modified: incubator/beehive/branches/v1/alpha/netui/test/src/testRecorderQA/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/src/testRecorderQA/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/src/testRecorderQA/build.xml Tue Nov 2 08:57:50 2004
@@ -1,20 +1,27 @@
<?xml version="1.0"?>
-<project name="NetUI/testRecorderQa" default="compile" basedir=".">
+<project name="Beehive/NetUI/testRecorderQa" default="build" basedir=".">
- <property name="module.classpath" location="${junit.jar};${test-recorder.jar};${xbean.jar};${deployed.httpClient.jar}"/>
- <property name="module.classes.dir" location="${qa.classes.dir}/${module.name}"/>
+ <property environment="os"/>
+ <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
+
+ <property name="module.name" value="testRecorderQA"/>
+ <property name="module.dir" location="${test.src.dir}/${module.name}"/>
+ <property name="module.classpath" location="${junit.jar};${test-recorder.jar};${xbean.jar};${httpClient.jar}"/>
+ <property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/>
<property name="module.jar.name" value="${test.recorder.qa.jar.name}"/>
- <property name="module.jar" location="${qa.lib.dir}/${module.jar.name}"/>
+ <property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/>
- <target name="compile">
+ <target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${module.classes.dir}"/>
- <javac srcdir="."
+ <javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
classpath="${module.classpath}"
debug="${compile.debug}"
@@ -27,9 +34,25 @@
</target>
<target name="clean">
- <echo>Clean Test Recorder QA</echo>
<delete dir="${module.classes.dir}"/>
<delete file="${module.jar}"/>
+ </target>
+
+ <path id="tr.test.classpath">
+ <pathelement path="${junit.jar}"/>
+ <pathelement path="${test.recorder.qa.jar}"/>
+ <pathelement path="${test-recorder.jar}"/>
+ <pathelement path="${commons-logging.jar}"/>
+ <pathelement path="${log4j.jar}"/>
+ </path>
+
+ <target name="testrecorder.test">
+ <junit printsummary="true" fork="true" haltonfailure="true" haltonerror="true">
+ <jvmarg value="-ea"/>
+ <classpath refid="tr.test.classpath"/>
+ <test name="org.apache.beehive.netui.tools.testrecorder.qa.SchemaTest" todir="${tr.results.dir}"/>
+ <test name="org.apache.beehive.netui.tools.testrecorder.qa.SessionSchemaTest" todir="${tr.results.dir}"/>
+ </junit>
</target>
</project>
Modified: incubator/beehive/branches/v1/alpha/netui/test/webapps/drt/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/webapps/drt/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/webapps/drt/build.xml Tue Nov 2 08:57:50 2004
@@ -16,8 +16,7 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
<property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/bootstrap.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/common.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
<property name="webapp.name" value="coreWeb"/>
<property name="testRecorder.config.name" value="netui-server-drt-config"/>
Modified: incubator/beehive/branches/v1/alpha/netui/test/webapps/jsf/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/webapps/jsf/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/webapps/jsf/build.xml Tue Nov 2 08:57:50 2004
@@ -7,8 +7,7 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
<property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/bootstrap.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/common.properties"/>
+ <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
<property name="webapp.name" value="jsfWeb"/>
<property name="testRecorder.config.name" value="netui-server-jsf-config"/>
Modified: incubator/beehive/branches/v1/alpha/netui/test/webapps/testRecorder-test/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/webapps/testRecorder-test/build.xml (original)
+++ incubator/beehive/branches/v1/alpha/netui/test/webapps/testRecorder-test/build.xml Tue Nov 2 08:57:50 2004
@@ -16,8 +16,7 @@
<property environment="os"/>
<property file="../../../../beehive.properties"/>
<property file="../../ant/test.properties"/>
- <property file="../../../ant/bootstrap.properties"/>
- <property file="../../../ant/common.properties"/>
+ <property file="../../../ant/netui.properties"/>
<property name="webapp.name" value="testRecorder-test"/>
<property name="testRecorder.config.name" value="${webapp.name}-config"/>