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 2006/03/19 23:26:09 UTC
svn commit: r387047 - in /beehive/trunk/netui: build.xml
test/webapps/drt/build.xml test/webapps/jsf/build.xml
test/webapps/urlTemplates/build.xml
Author: ekoneil
Date: Sun Mar 19 14:26:08 2006
New Revision: 387047
URL: http://svn.apache.org/viewcvs?rev=387047&view=rev
Log:
Add incremental build support to the rest of the (working) NetUI test web applications.
Also add a target "test.server" that will run the coreWeb, urlTemplates, and jsfWeb tests together.
BB: self
Test: NetUI pass, distribution test pass
Modified:
beehive/trunk/netui/build.xml
beehive/trunk/netui/test/webapps/drt/build.xml
beehive/trunk/netui/test/webapps/jsf/build.xml
beehive/trunk/netui/test/webapps/urlTemplates/build.xml
Modified: beehive/trunk/netui/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/build.xml?rev=387047&r1=387046&r2=387047&view=diff
==============================================================================
--- beehive/trunk/netui/build.xml (original)
+++ beehive/trunk/netui/build.xml Sun Mar 19 14:26:08 2006
@@ -118,6 +118,16 @@
</ant>
</target>
+ <target name="test.server" description="Run all of the server tests">
+ <antcall target="bvt.server"/>
+ <ant dir="${beehive.home}/netui/test/webapps/jsf" antfile="build.xml" target="bvt" inheritAll="false">
+ <property name="drt.cc.mode" value="true"/>
+ </ant>
+ <ant dir="${beehive.home}/netui/test/webapps/urlTemplates" antfile="build.xml" target="bvt" inheritAll="false">
+ <property name="drt.cc.mode" value="true"/>
+ </ant>
+ </target>
+
<target name="drt" description="Runs the NetUI DRTs">
<echo message="--------------------------------------------------"/>
<echo message="| NetUI DRT starting |"/>
Modified: beehive/trunk/netui/test/webapps/drt/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/build.xml?rev=387047&r1=387046&r2=387047&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/build.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/build.xml Sun Mar 19 14:26:08 2006
@@ -32,7 +32,6 @@
<property name="web.dir" location="web"/>
<property name="webapp.name" value="coreWeb"/>
- <property name="testRecorder.config.name" value="netui-server-drt-config"/>
<property name="server.root.url" value="http://localhost:8080"/>
<property name="webapp.waitfor.url" value="${server.root.url}/${webapp.name}"/>
Modified: beehive/trunk/netui/test/webapps/jsf/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/jsf/build.xml?rev=387047&r1=387046&r2=387047&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/jsf/build.xml (original)
+++ beehive/trunk/netui/test/webapps/jsf/build.xml Sun Mar 19 14:26:08 2006
@@ -1,5 +1,23 @@
<?xml version="1.0"?>
+<!--
+ Copyright 2004-2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<!--
-->
<project name="Beehive/NetUI/JSFTests" default="usage" basedir=".">
@@ -9,17 +27,21 @@
<property name="webapp.build.dir" location="build"/>
<property name="classes.dir" location="${webapp.build.dir}/WEB-INF/classes"/>
+ <property name="sourcegen.dir" location="${webapp.build.dir}/WEB-INF/.tmpbeansrc"/>
<property name="src.dir" location="src"/>
<property name="web.dir" location="web"/>
<property name="webapp.name" value="jsfWeb"/>
- <property name="testRecorder.config.name" value="netui-server-jsf-config"/>
<property name="server.root.url" value="http://localhost:8080"/>
<property name="webapp.waitfor.url" value="${server.root.url}/${webapp.name}"/>
<import file="${testrecorder.dir}/testRecorder.xml"/>
<import file="${beehive.home}/beehive-imports.xml"/>
- <import file="${beehive.home}/ant/beehive-tools.xml"/>
+
+ <path id="webapp.classpath">
+ <fileset dir="${webapp.build.dir}/WEB-INF/lib" includes="*.jar"/>
+ <pathelement location="${classes.dir}"/>
+ </path>
<!-- ================================================================ -->
<!-- -->
@@ -48,7 +70,7 @@
failonerror="true"/>
<mkdir dir="${webapp.build.dir}"/>
- <mkdir dir="${webapp.build.dir}/WEB-INF/classes"/>
+ <mkdir dir="${classes.dir}"/>
<mkdir dir="${webapp.build.dir}/WEB-INF/lib"/>
<copy todir="${webapp.build.dir}">
@@ -57,26 +79,30 @@
</fileset>
</copy>
- <path id="webapp.classpath">
+ <path id="build.classpath">
+ <path refid="webapp.classpath"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="netui-compiler.dependency.path"/>
+
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
- <pathelement location="${webapp.build.dir}/WEB-INF/classes"/>
- <fileset dir="${webapp.build.dir}/WEB-INF/lib" includes="*.jar"/>
</path>
- <build-controls srcdir="${src.dir}"
- destdir="${classes.dir}"
- classpathref="webapp.classpath"
- tempdir="${webapp.build.dir}/WEB-INF/.tmpbeansrc"/>
-
- <build-pageflows srcdir="${web.dir}:${src.dir}"
- webcontentdir="${web.dir}"
- destdir="${webapp.build.dir}/WEB-INF/classes"
- tempdir="${webapp.build.dir}/WEB-INF/.tmpbeansrc"
- classpathref="webapp.classpath"/>
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="build.classpath"
+ onerror="fail"/>
+
+ <apt srcdir="${src.dir}:${web.dir}"
+ destdir="${classes.dir}"
+ gendir="${sourcegen.dir}"
+ classpathref="build.classpath"
+ debug="true"
+ processorOptions="web.content.root=${web.dir}"
+ nocompile="false"/>
- <echo>Copying all .properties and .xml files to ${webapp.dir}/WEB-INF/classes</echo>
- <copy todir="${webapp.build.dir}/WEB-INF/classes">
+ <echo>Copying all .properties and .xml files to ${classes.dir}</echo>
+ <copy todir="${classes.dir}">
<fileset dir="${src.dir}" includes="**/*.properties"/>
<fileset dir="${src.dir}" includes="**/*.xml"/>
</copy>
Modified: beehive/trunk/netui/test/webapps/urlTemplates/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/urlTemplates/build.xml?rev=387047&r1=387046&r2=387047&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/urlTemplates/build.xml (original)
+++ beehive/trunk/netui/test/webapps/urlTemplates/build.xml Sun Mar 19 14:26:08 2006
@@ -1,14 +1,33 @@
<?xml version="1.0"?>
+<!--
+ Copyright 2004-2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
+
<!--
-->
-<project name="Beehive/NetUI/URLTemplatesTests" default="usage" basedir=".">
+<project name="Beehive/NetUI/Test/urlTemplates" default="usage" basedir=".">
<property environment="os"/>
<property file="build.properties"/>
<property name="webapp.build.dir" location="build"/>
<property name="classes.dir" location="${webapp.build.dir}/WEB-INF/classes"/>
+ <property name="sourcegen.dir" location="${webapp.build.dir}/WEB-INF/.tmpbeansrc"/>
<property name="src.dir" location="src"/>
<property name="web.dir" location="web"/>
@@ -18,7 +37,11 @@
<import file="${testrecorder.dir}/testRecorder.xml"/>
<import file="${beehive.home}/beehive-imports.xml"/>
- <import file="${beehive.home}/ant/beehive-tools.xml"/>
+
+ <path id="webapp.classpath">
+ <pathelement location="${classes.dir}"/>
+ <fileset dir="${webapp.build.dir}/WEB-INF/lib" includes="*.jar"/>
+ </path>
<!-- ================================================================ -->
<!-- -->
@@ -42,23 +65,27 @@
</fileset>
</copy>
- <path id="webapp.classpath">
+ <path id="build.classpath">
+ <path refid="webapp.classpath"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="netui-compiler.dependency.path"/>
+
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
- <pathelement location="${webapp.build.dir}/WEB-INF/classes"/>
- <fileset dir="${webapp.build.dir}/WEB-INF/lib" includes="*.jar"/>
</path>
- <build-controls srcdir="${src.dir}"
- destdir="${classes.dir}"
- classpathref="webapp.classpath"
- tempdir="${webapp.build.dir}/WEB-INF/.tmpbeansrc"/>
-
- <build-pageflows srcdir="${src.dir}:${web.dir}"
- webcontentdir="${web.dir}"
- destdir="${webapp.build.dir}/WEB-INF/classes"
- tempdir="${webapp.build.dir}/WEB-INF/.tmpbeansrc"
- classpathref="webapp.classpath"/>
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="build.classpath"
+ onerror="fail"/>
+
+ <apt srcdir="${src.dir}:${web.dir}"
+ destdir="${classes.dir}"
+ gendir="${sourcegen.dir}"
+ classpathref="build.classpath"
+ debug="true"
+ processorOptions="web.content.root=${web.dir}"
+ nocompile="false"/>
<!--
Copy a META-INF reference to our test.TestServletContainerAdapter (see