Author: ekoneil
Date: Tue Jan 18 13:02:36 2005
New Revision: 125545
URL: http://svn.apache.org/viewcvs?view=rev&rev=125545
Log:
Significant rework of the Beehive build.
The BUILDING.txt file has the best description of how to setup a new build
environment.
Major changes:
- remove Ant from the build
- remove Tomcat from the build
- note, this is still required as it's the default Servlet container, but
Beehive doesn't install this
- remove the BEEHIVE_HOME environment variables from the SVN and distribution
builds
- remove all *.cmd / *.sh scripts for initializing an environment from the SVN
and distribution builds
- remove the beehive.properties file and change to the Ant <import> model that
Bob proposed. Paths and filesets are now defined at the top-level and shared
among all sub-projects.
- move Ant used for testing from test/ant to /ant. This puts the webapp build
files in the same place as the distribution and makes it easier to target an
application against either SVN or a distribution.
- no longer force copying of junit.jar to $ANT_HOME/lib
- this is now an install step
- no longer force copying tomcat-users.xml to $CATALINA_HOME/conf
- this is now an install step
- remove isJDKOver5 checks from nested builds. this is a requirement for
Beehive.
- implement Java / Ant version checking in /beehive-imports.xml
- move the definition of an XMLBean schema task from sub-projects to
beehive-imports.xml
- start isolating WS / app container dependencies in:
ant/axis-imports.xml
ant/tomcat-imports.xml
These files expose <target>s that are referenced in Ant macros defined in
beehive-imports.xml. To plug-in a new server, implement one of these files and
change the correct "webservice.runtime" or "servlet.runtime" property in
beehive-imports.xml
- switch NetUI coreWeb tests off of using explicitly registered Struts TLDs to
using the ones in struts.jar
- move the targets for building a distribution into distribution.xml
- update BUILDING.txt
What's broken / undone:
- running the controls performance tests
- re-wiring the builds for all of the code in samples/. The Ant build file
shipped in the distribution need work before
the next ship date, and these can be fixed as the distribution builds shake out.
- running the JSF tests for NetUI
- removing Axis from the samples. Seems that this should be like Tomcat --
something that the user installs and Beehive references.
I'm sure that there are other things that aren't completed or wired up, but
hopefully with this checked in, others can pitch-in and help make all of this
better.
If you've got an existing Beehive build environment, you'll need to make the
following changes:
1) install Tomcat 5.0.x and set CATALINA_HOME in your shell
2) install Ant 1.6.2 and set ANT_HOME in your shell
3) copy trunk/external/junit/junit.jar to $ANT_HOME/lib
4) ensure that the following is defined in $CATALINA_HOME/conf/tomcat-users.xml
<user username="manager" password="manager" roles="manager"/>
5) ensure your PATH contains $JAVA_HOME/bin:$ANT_HOME/bin
To test your install, run:
ant check.setup
BB: self
Tests: Beehive DRT, build.dist / test.dist / NetUI dist test
Added:
incubator/beehive/trunk/ant/
incubator/beehive/trunk/ant/axis-import.xml (contents, props changed)
incubator/beehive/trunk/ant/buildWebapp.xml (contents, props changed)
incubator/beehive/trunk/ant/buildWebappCore.xml
- copied, changed from r124897,
incubator/beehive/trunk/test/ant/buildWebappCore.xml
incubator/beehive/trunk/ant/tomcat-imports.xml (contents, props changed)
incubator/beehive/trunk/ant/webappRuntimeCore.xml
- copied, changed from r124897,
incubator/beehive/trunk/test/ant/webappRuntimeCore.xml
incubator/beehive/trunk/beehive-imports.xml (contents, props changed)
incubator/beehive/trunk/distribution.xml (contents, props changed)
incubator/beehive/trunk/netui/netui-imports.xml (contents, props changed)
incubator/beehive/trunk/netui/src/util/netui-config-default.xml
- copied unchanged from r125190,
incubator/beehive/trunk/netui/src/webapp-template/config/netui-config-default.xml
incubator/beehive/trunk/netui/test/ant/test-imports.xml (contents, props
changed)
incubator/beehive/trunk/netui/test/ant/webapp-imports.xml (contents, props
changed)
incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml
(contents, props changed)
incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml
(contents, props changed)
incubator/beehive/trunk/netui/test/external/commons-logging.jar (contents,
props changed)
incubator/beehive/trunk/samples/controls-db/build-svn.xml (contents, props
changed)
incubator/beehive/trunk/user/beehive-imports.xml (contents, props changed)
incubator/beehive/trunk/user/buildWebapp.xml (contents, props changed)
Removed:
incubator/beehive/trunk/beehive.properties
incubator/beehive/trunk/beehiveEnv.cmd
incubator/beehive/trunk/beehiveEnv.sh
incubator/beehive/trunk/netui/src/webapp-template/config/netui-config-default.xml
incubator/beehive/trunk/netui/test/ant/test.properties
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-bean.tld
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-html.tld
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-logic.tld
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-tiles.tld
incubator/beehive/trunk/test/ant/
Modified:
incubator/beehive/trunk/BUILDING.txt
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/controls/build.xml
incubator/beehive/trunk/controls/test/build.xml
incubator/beehive/trunk/controls/test/common/path.properties
incubator/beehive/trunk/controls/test/infra/gtlf/xsl/build.xml
incubator/beehive/trunk/controls/test/infra/tch/runtime/build.xml
incubator/beehive/trunk/controls/test/perf/build.xml
incubator/beehive/trunk/controls/test/perf/webapps/build.xml
incubator/beehive/trunk/controls/test/tools/mantis/build.xml
incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml
incubator/beehive/trunk/controls/test/tools/milton/build.xml
incubator/beehive/trunk/controls/test/tools/tch/build.xml
incubator/beehive/trunk/controls/test/webapps/build.xml
incubator/beehive/trunk/controls/test/webapps/common.properties
incubator/beehive/trunk/docs/build.xml
incubator/beehive/trunk/netui/ant/build.xml
incubator/beehive/trunk/netui/ant/javadoc.xml
incubator/beehive/trunk/netui/ant/netui.properties
incubator/beehive/trunk/netui/ant/webappTemplate.xml
incubator/beehive/trunk/netui/ant/xmlBean.xml
incubator/beehive/trunk/netui/build.xml
incubator/beehive/trunk/netui/src/bootstrap/build.xml
incubator/beehive/trunk/netui/src/compiler/build.xml
incubator/beehive/trunk/netui/src/pageflow/build.xml
incubator/beehive/trunk/netui/src/scoping/build.xml
incubator/beehive/trunk/netui/src/tags-databinding/build.xml
incubator/beehive/trunk/netui/src/tags-html/build.xml
incubator/beehive/trunk/netui/src/tags-template/build.xml
incubator/beehive/trunk/netui/src/tomcat-common/5x/build.xml
incubator/beehive/trunk/netui/src/tomcat-common/build.xml
incubator/beehive/trunk/netui/src/tomcat-server/5x/build.xml
incubator/beehive/trunk/netui/src/tomcat-server/build.xml
incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml
incubator/beehive/trunk/netui/src/tomcat-webapp/build.xml
incubator/beehive/trunk/netui/src/util/build.xml
incubator/beehive/trunk/netui/test/ant/build.xml
incubator/beehive/trunk/netui/test/ant/buildWebapp.xml
incubator/beehive/trunk/netui/test/ant/junitCore.xml
incubator/beehive/trunk/netui/test/ant/testRecorder.xml
incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml
incubator/beehive/trunk/netui/test/dist-test/ant/build.xml
incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml
incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties
incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml
incubator/beehive/trunk/netui/test/src/junitTests/build.xml
incubator/beehive/trunk/netui/test/src/testRecorder/build.xml
incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
incubator/beehive/trunk/netui/test/webapps/drt/build.xml
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp3.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test1/Struts1/Struts1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test2/Struts1/Struts1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test3/Struts1/Struts1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test4/Struts1/Struts1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.blank.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.panel1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.struts-body.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternate.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternateBody.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.default.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.mainBody.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug30303/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp2.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/test13/submit.jsp
incubator/beehive/trunk/netui/test/webapps/jsf/build.xml
incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml
incubator/beehive/trunk/samples/controls-blank/build.xml
incubator/beehive/trunk/samples/controls-db/build.xml
incubator/beehive/trunk/test/testDistro.cmd
incubator/beehive/trunk/test/testDistro.sh
incubator/beehive/trunk/user/beehive.properties
incubator/beehive/trunk/user/webappRuntimeCore.xml
incubator/beehive/trunk/wsm/build.xml
incubator/beehive/trunk/wsm/drt/build.xml
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/security/MemoryUserListTest.java
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Modified: incubator/beehive/trunk/BUILDING.txt
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/BUILDING.txt?view=diff&rev=125545&p1=incubator/beehive/trunk/BUILDING.txt&r1=125544&p2=incubator/beehive/trunk/BUILDING.txt&r2=125545
==============================================================================
--- incubator/beehive/trunk/BUILDING.txt (original)
+++ incubator/beehive/trunk/BUILDING.txt Tue Jan 18 13:02:36 2005
@@ -1,76 +1,143 @@
Welcome to Beehive
==================
-To build Beehive, you need to have Java version 5 (or later) installed
-with the JAVA_HOME environment variable defined to point to this JDK.
-The JDK is available here:
+To build Beehive, you will first need to check the source out from
+Apache SVN and then install / configure required external software and
+your shell environment.
- http://java.sun.com/j2se/1.5.0/download.jsp
+Checkout Beehive from SVN
+=========================
-Set the BEEHIVE_HOME environment variable to point to the root of the branch
in your
-Beehive working copy that you want to work with. Typically you will be
interested in
-the trunk, where mainline work goes on. For example, if you ran
+To do this, run the command:
-svn checkout https://svn.apache.org/repos/asf/incubator/beehive/trunk
+ svn checkout https://svn.apache.org/repos/asf/incubator/beehive/trunk
-from within "C:\MyProjects\beehive", BEEHIVE_HOME will be
"C:\MyProjects\beehive\trunk",
-since you explicitly only checked out the trunk.
+After running this command, you should have a directory "trunk/" which
+contains the current Beehive source. If you ran this command in:
-However, if you had run
+ d:\java\beeinve
-svn checkout https://svn.apache.org/repos/asf/incubator/beehive
+you should have the directory:
-from within "C:\MyProjects\beehive", BEEHIVE_HOME will be
"C:\MyProjects\beehive\beehive\trunk".
+ d:\java\beehive\trunk
-In addition, you'll need to install Ant in $BEEHIVE_HOME/installed/ from
-the archive in $BEEHIVE_HOME/external/ant/apache-ant-1.6.2-bin.(zip|tar.gz).
-The installed Ant distribution should end up here:
+In the following steps, we'll refer to this as ${beehive.home}.
- $BEEHIVE_HOME/installed/apache-ant-1.6.2/...
+Install / configure external software and setup your shell
+==========================================================
-In the following examples, '$>' is your propmpt at $BEEHIVE_HOME, so if
-you see '$>ant', type 'ant' (without the quotes) and press [enter].
+1) Java 5
+
+ Download: http://java.sun.com/j2se/1.5.0/download.jsp
+
+ Install Java 5 and set the JAVA_HOME environment variable to
+refernce the JDK install directory. Ensure that $JAVA_HOME/bin is
+available in your $PATH.
+
+2) Ant 1.6.2
+
+ Download: http://ant.apache.org/bindownload.cgi
+
+ Ant 1.6.2 is the minimum version required to build Beehive. Install
+Ant 1.6.2 and set the ANT_HOME environment variable to reference the
+Ant install directory. Ensure that $ANT_HOME/bin is available in your
+$PATH.
+
+3) Tomcat 5.0.x
+
+ Download: http://jakarta.apache.org/site/binindex.cgi#tomcat
+
+ Tomcat is used as the default test environment for Beehive. Install
+Tomcat and set the CATALINA_HOME environment variable to reference the
+Tomcat install directory.
-To initialize the Beehive build environment, run beehiveEnv for your platform:
+ If you installed these into d:\java, your environment variables
+might look something like:
-Windows:
+ JAVA_HOME=d:\java\jdk1.5.0
+ CATALINA_HOME=d:\java\jakarta-tomcat-5.0.25
+ ANT_HOME=d:\java\apache-ant-1.6.2
- C:\MyProjects\beehive>beehiveEnv.cmd
+Configure installed products
-UNIX:
- $>source beehiveEnv.sh
+In order to run the Beehive tests, the software installed above must
+be setup as follows.
-Because Beehive depends on a set of external software, these dependencies need
-to be installed before a build can be successful. You will need a network
-connection for this step because jsr173_api.jar needs to be downloaded from a
-website; if you need to use a proxy for this downolad, see the "Using Proxies"
-instructions below. Once this has been downloaded, the build and tests can
-be run successfully without a network connection. To install the external
-dependencies, run:
+1) Copy junit.jar is available in $ANT_HOME/lib. This step is
+required in order for the Ant <junit> tasks to work correctly.
- $>ant bootstrap
+2) Ensure that Tomcat has the the "manager" role is defined in
+${CATALINA_HOME}/conf/tomcat-users.xml with a username/password of
+manager/manager. This step is required in order to use the Tomcat Ant
+tasks to deploy applications to Tomcat. An example of this file is
+available in ${beehive.home}/test/conf/tomcat-users.xml
-which will unzip the Tomcat installer file.
+In the following examples, '$>' is your propmpt at $BEEHIVE_HOME, so if
+you see '$>ant', type 'ant' (without the quotes) and press [enter].
+
+To check your Beehive build setup, run:
+
+ $>ant check.setup
+
+This should end with "BUILD SUCCESSFUL" if you see any failures, be
+sure to re-check your setup steps above.
+
+In addition to the external software installed above, Beehive requires
+one additional JAR to provide JSR 173 support for StAX. This JAR is
+downloaded from the network the first time you build Beehive. Be sure
+to have a network connection for your first build. A network
+connection is not required for any subsequent builds.
To build Beehive, run:
$>ant clean deploy
-To run Beehive tests, run:
+To run the Beehive tests, run:
$>ant drt
+Using Proxies With a Beehive Build
+====================================
-Installation of Apache Forrest
-==============================
-The following documentation-related targets require that you have Apache
Forrest 0.6 installed on your machine.
+If you need to use proxies you can setup additional environment variables
+so that the Ant "bootstrap" target is successful in downloading the
+JSR 173 API JAR file.
+
+PROXYHOST=<name of proxy host>
+PROXYPORT=<port used for proxying>
+PROXYUSER=<username for proxy authentication>
+PROXYPASSWORD=<password for proxy authentication>
+NONPROXYHOSTS=<hosts that should not be proxied>
+SOCKSPROXYHOST=<socks proxy host name>
+SOCKSPROXYPORT=<socks proxy port>
+
+At a minimum, you will need to set PROXYHOST and PROXYPORT if your
+network environment requires a proxy connection. To set these
+environment variables in your shell, run:
+
+ set PROXYHOST=<name of proxy host>
+
+in a Windows shell and
+
+ export PROXYHOST=<name of proxy host>
+
+in a UNIX shell.
+
+For information on proxy support using the <setproxy> task, please
+visit http://ant.apache.org/manual/OptionalTasks/setproxy.html
+
+Building Beehive documentation
+=============================
+In order to build the Beehive documentation, you will need to have
+Apache Forrest installed locally. The following targets in
+${beehive.home}/build.xml have this requirement:
$>ant docs
$>ant build.dist
Before running these targets, complete the following steps.
-(1) Download a Forrest 0.6 archive from one of the following locations:
+1) Download a Forrest 0.6 archive from one of the following locations:
For Windows machines:
http://mirrors.ccs.neu.edu/Apache/dist/forrest/apache-forrest-0.6.zip
@@ -78,9 +145,9 @@
For Unix machines:
http://mirrors.ccs.neu.edu/Apache/dist/forrest/apache-forrest-0.6.tar.gz
-(2) Unzip the archive onto your machine. You may unzip to any location.
+2) Unzip the archive onto your machine. You may unzip to any location.
-(3) Copy the JAR file
+3) Copy the JAR file
apache-forrest-0.6/lib/core/xml-commons-resolver-1.1.jar
@@ -90,7 +157,7 @@
(This allows the Ant targets to call Forrest tasks.)
-(4) In the command shell (where you have already run beehiveEnv.cmd|.sh) set
FORREST_HOME as follows.
+4) In the command shell (where you have already run beehiveEnv.cmd|.sh) set
FORREST_HOME as follows.
On Windows machines:
set FORREST_HOME=C:\MyApacheStuff\apache-forrest-0.6\src\core
@@ -98,7 +165,7 @@
On Unix machines:
export FORREST_HOME=/MyApacheStuff/apache-forrest-0.6/src/core
-(5) Set the PATH as follows:
+5) Set the PATH as follows:
On Windows machines:
set PATH=%FORREST_HOME%\bin;%PATH%
@@ -110,35 +177,3 @@
$>ant docs
$>ant build.dist
-
-
-Using Proxies With a Beehive Build
-====================================
-
-If you need to use proxies you can setup additional environment variables
-so that the Ant "bootstrap" target is successful in downloading the
-JSR 173 API JAR file.
-
-PROXYHOST=<name of proxy host>
-PROXYPORT=<port used for proxying>
-PROXYUSER=<username for proxy authentication>
-PROXYPASSWORD=<password for proxy authentication>
-NONPROXYHOSTS=<hosts that should not be proxied>
-SOCKSPROXYHOST=<socks proxy host name>
-SOCKSPROXYPORT=<socks proxy port>
-
-At a minimum, you will need to set PROXYHOST and PROXYPORT if your
-network environment requires a proxy connection. To set these
-environment variables in your shell, run:
-
- set PROXYHOST=<name of proxy host>
-
-in a Windows shell and
-
- export PROXYHOST=<name of proxy host>
-
-in a UNIX shell.
-
-For information on proxy support using the <setproxy> task, please
-visit http://ant.apache.org/manual/OptionalTasks/setproxy.html
-
Added: incubator/beehive/trunk/ant/axis-import.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/axis-import.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/ant/axis-import.xml Tue Jan 18 13:02:36 2005
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<project name="axis-imports" default="" basedir=".">
+
+ <import file="../beehive-imports.xml"/>
+
+ <path id="webservice.classpath">
+ <fileset id="webservice.jars" dir="${beehive.home}/wsm/external">
+ <include name="wsdl4j.jar"/>
+ <include name="saaj.jar"/>
+ <include name="jaxrpc.jar"/>
+ <include name="commons-logging.jar"/>
+ <include name="commons-discovery.jar"/>
+ <include name="axis-ant.jar"/>
+ <include name="axis.jar"/>
+ </fileset>
+ </path>
+
+ <macrodef name="deploy-webservice-runtime">
+ <attribute name="appdir"/>
+ <sequential>
+ <copy todir="@{appdir}" failOnError="true">
+ <fileset refid="webservice.jars"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Added: incubator/beehive/trunk/ant/buildWebapp.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/buildWebapp.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/ant/buildWebapp.xml Tue Jan 18 13:02:36 2005
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<project name="Beehive/WebappBuild" default="usage">
+
+ <property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
+
+ <import file="../beehive-imports.xml"/>
+ <import file="buildWebappCore.xml"/>
+ <import file="${servlet.runtime}-imports.xml"/>
+
+ <target name="build">
+ <available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
+ <fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
+
+ <path id="appserver.build.classpath">
+ <fileset dir="${tomcat.home}/common/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- this is the classpath to include when building webapp sources -->
+ <path id="webapp.build.classpath">
+ <pathelement location="${webapp.dir}/WEB-INF/classes"/>
+ <fileset dir="${webapp.dir}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!--
+ this directory needs to get whacked before every build so
+ that control interface repackagings don't cause stale
+ files to be compiled
+ -->
+ <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
includeEmptyDirs="true"/>
+
+ <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
+
+ <!-- compile XSDs -->
+ <build-schemas sourceDir="${webapp.dir}/WEB-INF/schemas"
destDir="${webapp.dir}/WEB-INF/classes"/>
+
+ <!-- compile controls -->
+ <build-controls sourceDir="${webapp.dir}/WEB-INF/src"
destdir="${webapp.dir}/WEB-INF/classes"
tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"/>
+
+ <!-- compile JPFs -->
+ <build-pageflows sourceDir="${webapp.dir}"
destdir="${webapp.dir}/WEB-INF/classes"
tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"/>
+
+ <!-- copy resources -->
+ <echo>Copy all .properties files</echo>
+ <copy todir="${webapp.dir}/WEB-INF/classes">
+ <fileset dir="${webapp.dir}/WEB-INF/src"
includes="**/*.properties"/>
+ </copy>
+
+ <echo>Copy all .xml files</echo>
+ <copy todir="${webapp.dir}/WEB-INF/classes/" failonerror="false">
+ <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.xml"/>
+ </copy>
+
+ </target>
+
+ <target name="clean">
+ <available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
+ <fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
+
+ <delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
+ <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
includeEmptyDirs="true"/>
+ </target>
+
+ <target name="usage" description="">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-projecthelp"/>
+ </java>
+ </target>
+
+</project>
\ No newline at end of file
Copied: incubator/beehive/trunk/ant/buildWebappCore.xml (from r124897,
incubator/beehive/trunk/test/ant/buildWebappCore.xml)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/buildWebappCore.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/test/ant/buildWebappCore.xml&r1=124897&p2=incubator/beehive/trunk/ant/buildWebappCore.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/test/ant/buildWebappCore.xml (original)
+++ incubator/beehive/trunk/ant/buildWebappCore.xml Tue Jan 18 13:02:36 2005
@@ -11,126 +11,76 @@
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
- <!-- ================================================================ -->
- <!-- -->
- <!-- Target for building a test web application -->
- <!-- -->
- <!-- The build process includes several steps: -->
- <!-- - build src in WEB-INF/src into WEB-INF/classes -->
- <!-- - build XSDs anywhere in the webapp into WEB-INF/classes -->
- <!-- - build all controls in the webapp -->
- <!-- - build all JPFs in the webapp -->
- <!-- - copy all .properties files in WEB-INF/src to WEB-INF/classes -->
- <!-- - copy all .xml files in WEB-INF/src to WEB-INF/classes -->
- <!-- -->
- <!-- ================================================================ -->
- <!-- params (location webapp.dir) -->
- <target name="build.webapp">
- <available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
- <fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
-
- <!-- this is the classpath to include when building webapp sources -->
- <path id="webapp.build.classpath">
- <pathelement location="${webapp.dir}/WEB-INF/classes"/>
- <fileset dir="${webapp.dir}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- this path is separate for now because it includes the velocity
JARs used in the control compiler -->
- <path id="controls.build.classpath">
- <path refid="webapp.build.classpath"/>
- <path refid="appserver.build.classpath"/>
- <path refid="velocity.classpath"/>
- </path>
-
- <!-- JPF build -->
- <!-- apt generates intermediate files Java files into a tmp directory;
WEB-INF/${tmp.sourcegen.dir} here -->
- <path id="pageflow.build.classpath">
- <path refid="controls.build.classpath"/>
- <fileset file="${netui-compiler.jar}"/>
- </path>
-
- <!--
- this directory needs to get whacked before every build so
- that control interface repackagings don't cause stale
- files to be compiled
- -->
- <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
includeEmptyDirs="true"/>
-
- <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
-
- <!-- XMLBean build -->
+ <!-- required paths:
+ appserver.build.classpath
+ velocity.dependency.path
+ controls.dependency.path
+ netui-compiler.dependency.path
+ -->
+ <path id="controls.build.classpath">
+ <path refid="webapp.build.classpath"/>
+ <path refid="appserver.build.classpath"/>
+ <path refid="velocity.dependency.path"/>
+ </path>
+
+ <path id="beehive-apt.dependency.path">
+ <path refid="controls.dependency.path"/>
+ <path refid="netui-compiler.dependency.path"/>
+ </path>
+
+ <path id="pageflow.build.classpath">
+ <path refid="controls.build.classpath"/>
+ <path refid="beehive-apt.dependency.path"/>
+ </path>
+
+ <macrodef name="build-schemas">
+ <attribute name="sourceDir"/>
+ <attribute name="destDir"/>
+ <sequential>
<taskdef name="xmlbeanbuild"
classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpath="${xbean.jar};${jsr173.jar}"/>
- <!--
- for schemas to be compiled in the webapp, they must reside in
- the WEB-INF/schemas directory. this is an artifical limitation
- as it's possible for them to exist anywhere below the webapp root
- but the XMLBean schema compilation task doesn't seem to handle
- .java files correctly during compilation of XSDs (ie by ignoring
them).
-
- @todo: Need to file an Apache bug for this.
- -->
- <xmlbeanbuild classpath="${xbean.jar};${jsr173.jar}"
- schema="${webapp.dir}/WEB-INF/schemas"
- classgendir="${webapp.dir}/WEB-INF/classes"
+ classpathref="xbean.dependency.path"/>
+
+ <xmlbeanbuild classpathref="xbean.dependency.path"
+ schema="@{sourceDir}"
+ classgendir="@{destDir}"
failonerror="true"/>
+ </sequential>
+ </macrodef>
- <!-- Java and Controls build -->
- <!-- Since some .java files have annotations, we want to make sure we
compile them using apt. -->
- <!-- apt generates intermediate files Java files into a tmp directory;
WEB-INF/${tmp.sourcegen.dir} here -->
- <echo>========== Compile Java sources in WEB-INF/src, including
controls ==========</echo>
- <echo>netui-compiler.jar: ${netui-compiler.jar}</echo>
- <echo>controls.jar: ${controls.jar}</echo>
+ <macrodef name="build-controls">
+ <attribute name="sourceDir"/>
+ <attribute name="destDir"/>
+ <attribute name="tmpDir"/>
+ <sequential>
<taskdef name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="${controls.jar};${netui-compiler.jar}"
+ classpathref="beehive-apt.dependency.path"
onerror="report"/>
- <mkdir dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"/>
- <apt srcdir="${webapp.dir}/WEB-INF/src"
- destdir="${webapp.dir}/WEB-INF/classes"
- gendir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ <apt srcdir="@{sourceDir}"
+ destdir="@{destDir}"
+ gendir="@{tmpDir}"
classpathref="controls.build.classpath"
compileByExtension="true"
srcExtensions="*.java,*.jcx,*.jcs,*.jws"
debug="true"/>
+ </sequential>
+ </macrodef>
- <echo>========== Compile Page Flows ==========</echo>
- <apt srcdir="${webapp.dir}"
- destdir="${webapp.dir}/WEB-INF/classes"
- gendir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
- classpathref="pageflow.build.classpath"
- srcExtensions="*.jpf,*.jpfs,*.app,*.jsfb"
- debug="true"/>
-
- <echo>Copy all .properties files</echo>
- <copy todir="${webapp.dir}/WEB-INF/classes">
- <fileset dir="${webapp.dir}/WEB-INF/src"
includes="**/*.properties"/>
- </copy>
-
- <echo>Copy all .xml files</echo>
- <copy todir="${webapp.dir}/WEB-INF/classes/" failonerror="false">
- <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.xml"/>
- </copy>
-
- </target>
-
- <target name="clean.webapp">
- <available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
- <fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
-
- <delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
- <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
includeEmptyDirs="true"/>
- </target>
-
- <target name="usage" description="">
- <java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-projecthelp"/>
- </java>
- </target>
+ <macrodef name="build-pageflows">
+ <attribute name="sourceDir"/>
+ <attribute name="destDir"/>
+ <attribute name="tmpDir"/>
+ <sequential>
+ <apt srcdir="@{sourceDir}"
+ destdir="@{destDir}"
+ gendir="@{tmpDir}"
+ classpathref="pageflow.build.classpath"
+ srcExtensions="*.jpf,*.jpfs,*.app,*.jsfb"
+ debug="true"/>
+ </sequential>
+ </macrodef>
</project>
Added: incubator/beehive/trunk/ant/tomcat-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/tomcat-imports.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/ant/tomcat-imports.xml Tue Jan 18 13:02:36 2005
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+
+<project name="tomcat-imports" default="" basedir=".">
+
+ <property environment="os"/>
+ <property name="tomcat.home" location="${os.CATALINA_HOME}"/>
+
+ <!-- Properties used to run Tomcat -->
+ <!--
+ In the long run, there probably needs to be a tomcat.properties file
that is imported here
+ which defines the username / password / port number so that they can
be overridden
+ in a user's environment
+ -->
+ <property name="catalina.username" value="manager"/>
+ <property name="catalina.password" value="manager"/>
+ <property name="catalina-ant.jar"
location="${tomcat.home}/server/lib/catalina-ant.jar"/>
+
+ <path id="appserver.build.classpath">
+ <fileset dir="${tomcat.home}/common/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="deploy" description="Deploy a webapp to a running Tomcat
server">
+ <fail unless="context.path" message="Can't deploy webapp; the value
${context.path} was unspecified"/>
+ <fail unless="webapp.dir" message="Can't deploy webapp; the value
${webapp.dir} was unspecified"/>
+
+ <available property="webapp.available" file="${webapp.dir}"
type="dir"/>
+ <fail unless="webapp.available" message="The webapp at ${webapp.dir}
does not exist."/>
+
+ <property name="_url" value="file://${webapp.dir}"/>
+ <echo>deploy webapp from ${_url} with context path
${context.path}</echo>
+
+ <taskdef name="tomcatdeploy"
classname="org.apache.catalina.ant.DeployTask" classpath="${catalina-ant.jar}"/>
+ <tomcatdeploy path="/${context.path}" localWar="${_url}"
username="${catalina.username}" password="${catalina.password}"/>
+ </target>
+
+ <target name="undeploy" description="Undeploy a webapp running on a Tomcat
server">
+ <fail unless="context.path" message="Can't undeploy webapp; the value
${context.path} was unspecified"/>
+
+ <taskdef name="tomcatundeploy"
classname="org.apache.catalina.ant.UndeployTask"
classpath="${catalina-ant.jar}"/>
+ <tomcatundeploy path="/${context.path}"
username="${catalina.username}" password="${catalina.password}"/>
+ </target>
+
+ <target name="redeploy" description="Redeploy a webapp already running on
a Tomcat server">
+ <fail unless="context.path" message="Can't undeploy webapp; the value
${context.path} was unspecified"/>
+
+ <taskdef name="tomcatreload"
classname="org.apache.catalina.ant.ReloadTask" classpath="${catalina-ant.jar}"/>
+ <tomcatreload path="/${context.path}" username="${catalina.username}"
password="${catalina.password}"/>
+ </target>
+
+ <target name="start" description="Start a Tomcat instance.">
+
+ <condition property="cmdline.options" value="">
+ <not><isset property="cmdline.options"/></not>
+ </condition>
+
+ <condition property="java.options" value="">
+ <not><isset property="java.options"/></not>
+ </condition>
+
+ <echo>startup.dir: ${tomcat.home}/bin</echo>
+ <echo>cmdline.options: ${cmdline.options}</echo>
+ <echo>java.options: ${java.options}</echo>
+
+ <echo>Start Tomcat</echo>
+ <exec os="Windows 2000,Windows 2003,Windows XP"
dir="${tomcat.home}\bin" executable="cmd.exe">
+ <env key="JAVA_OPTS" value="${java.options}"/>
+ <arg line="/c startup.bat ${cmdline.options}"/>
+ </exec>
+ <exec os="Linux,SunOS,Solaris,Mac OS X" dir="${tomcat.home}/bin"
executable="sh">
+ <env key="JAVA_OPTS" value="${java.options}"/>
+ <arg line="startup.sh ${cmdline.options}"/>
+ </exec>
+ </target>
+
+ <target name="start.with.shmem" description="Start a Tomcat instance with
shared memory debugging.">
+
+ <condition property="cmdline.options" value="">
+ <not><isset property="cmdline.options"/></not>
+ </condition>
+
+ <condition property="java.options" value="">
+ <not><isset property="java.options"/></not>
+ </condition>
+
+ <echo>startup.dir: ${tomcat.home}/bin</echo>
+ <echo>cmdline.options: ${cmdline.options}</echo>
+ <echo>java.options: ${java.options}</echo>
+
+ <echo>Start Tomcat</echo>
+ <exec os="Windows 2000,Windows 2003,Windows XP"
dir="${tomcat.home}\bin" executable="cmd.exe">
+ <env key="JAVA_OPTS" value="${java.options}"/>
+ <arg line="/c catalina.bat jpda start ${cmdline.options}"/>
+ </exec>
+ <exec os="Linux,SunOS,Solaris,Mac OS X" dir="${tomcat.home}/bin"
executable="sh">
+ <env key="JAVA_OPTS" value="${java.options}"/>
+ <arg line="startup.sh jpda start ${cmdline.options}"/>
+ </exec>
+ </target>
+
+ <target name="stop" description="Stop the NetUI server">
+ <echo>Stop Tomcat in: ${tomcat.home}</echo>
+ <exec os="Windows 2000,Windows 2003,Windows XP"
dir="${tomcat.home}\bin" executable="cmd.exe">
+ <arg line=" /c shutdown"/>
+ </exec>
+
+ <exec os="Linux,SunOS,Solaris,Mac OS X" dir="${tomcat.home}/bin"
executable="sh">
+ <arg line="shutdown.sh"/>
+ </exec>
+ </target>
+
+</project>
\ No newline at end of file
Copied: incubator/beehive/trunk/ant/webappRuntimeCore.xml (from r124897,
incubator/beehive/trunk/test/ant/webappRuntimeCore.xml)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/webappRuntimeCore.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/test/ant/webappRuntimeCore.xml&r1=124897&p2=incubator/beehive/trunk/ant/webappRuntimeCore.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/test/ant/webappRuntimeCore.xml (original)
+++ incubator/beehive/trunk/ant/webappRuntimeCore.xml Tue Jan 18 13:02:36 2005
@@ -1,38 +1,40 @@
-<?xml version="1.0"?>
-
-<project name="Beehive/DeployWebappRuntime" default="usage" basedir=".">
-
- <!-- ================================================================ -->
- <!-- -->
- <!-- Targets for deploying the NetUI runtime into a web application -->
- <!-- -->
- <!-- ================================================================ -->
- <!-- params (location webapp.dir) -->
- <target name="deploy.beehive.webapp.runtime" description="Deploy the
Beehive webapp runtime into a webapp rooted at ${webapp.dir}">
- <ant target="deploy.netui" dir="${os.BEEHIVE_HOME}/netui/"
inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
- </target>
-
- <!-- params (location webapp.dir) -->
- <target name="undeploy.beehive.webapp.runtime" description="Clean the
Beehive webapp runtime from a webapp rooted at ${webapp.dir}">
- <ant target="undeploy.netui" dir="${os.BEEHIVE_HOME}/netui/"
inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
- </target>
-
- <!-- params (location webapp.dir) -->
- <!-- todo: temporary addition; this should be in a new build-file:
webserviceRuntimeCore; web services should not depend on webapps -->
- <target name="deploy.wsm.webapp.runtime" description="Deploy the Beehive
web services runtime into a webapp rooted at ${webapp.dir}">
- <ant target="deploy.webservice.runtime" dir="${os.BEEHIVE_HOME}/wsm/"
inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
- </target>
-
- <target name="usage" description="">
- <java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-projecthelp"/>
- </java>
- </target>
-
-</project>
+<?xml version="1.0"?>
+
+<project name="Beehive/DeployWebappRuntime" default="usage" basedir=".">
+
+ <import file="../beehive-imports.xml"/>
+
+ <!-- ================================================================ -->
+ <!-- -->
+ <!-- Targets for deploying the NetUI runtime into a web application -->
+ <!-- -->
+ <!-- ================================================================ -->
+ <!-- params (location webapp.dir) -->
+ <target name="deploy.beehive.webapp.runtime" description="Deploy the
Beehive webapp runtime into a webapp rooted at ${webapp.dir}">
+ <ant target="deploy.netui" dir="${beehive.home}/netui/"
inheritAll="false">
+ <property name="webapp.dir" value="${webapp.dir}"/>
+ </ant>
+ </target>
+
+ <!-- params (location webapp.dir) -->
+ <target name="undeploy.beehive.webapp.runtime" description="Clean the
Beehive webapp runtime from a webapp rooted at ${webapp.dir}">
+ <ant target="undeploy.netui" dir="${beehive.home}/netui/"
inheritAll="false">
+ <property name="webapp.dir" value="${webapp.dir}"/>
+ </ant>
+ </target>
+
+ <!-- params (location webapp.dir) -->
+ <!-- todo: temporary addition; this should be in a new build-file:
webserviceRuntimeCore; web services should not depend on webapps -->
+ <target name="deploy.wsm.webapp.runtime" description="Deploy the Beehive
web services runtime into a webapp rooted at ${webapp.dir}">
+ <ant target="deploy.webservice.runtime" dir="${beehive.home}/wsm/"
inheritAll="false">
+ <property name="webapp.dir" value="${webapp.dir}"/>
+ </ant>
+ </target>
+
+ <target name="usage" description="">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-projecthelp"/>
+ </java>
+ </target>
+
+</project>
Added: incubator/beehive/trunk/beehive-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/beehive-imports.xml Tue Jan 18 13:02:36 2005
@@ -0,0 +1,358 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2004 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:$
+ -->
+
+<!--
+ A build file that needs to be imported by all sub-projects.
+-->
+<project name="beehive-imports" default="" basedir=".">
+
+ <property environment="os"/>
+ <dirname property="beehive.home" file="${ant.file.beehive-imports}"/>
+
+ <property name="ant.dir" location="${os.ANT_HOME}"/>
+ <property name="forrest.dir" location="${os.FORREST_HOME}"/>
+
+ <property name="beehive.version" value="svn-snapshot"/>
+ <property name="dist.base.name" value="apache-beehive-incubating-"/>
+ <property name="dist.name" value="${dist.base.name}${beehive.version}"/>
+
+ <property name="webservice.runtime" value="axis"/>
+ <property name="servlet.runtime" value="tomcat"/>
+
+ <!--
======================================================================== -->
+ <!-- Common Beehive paths
-->
+ <!--
======================================================================== -->
+
+ <fileset id="controls.fileset"
file="${beehive.home}/controls/build/jars/controls.jar"/>
+ <fileset id="velocity.fileset" dir="${beehive.home}/external/velocity">
+ <include name="velocity-1.4.jar"/>
+ <include name="velocity-dep-1.4.jar"/>
+ </fileset>
+ <fileset id="commons-codec.fileset"
file="${beehive.home}/external/commons-codec/commons-codec-1.3.jar"/>
+ <fileset id="log4j.fileset"
file="${beehive.home}/external/log4j/log4j-1.2.8.jar"/>
+ <fileset id="xbean.fileset"
file="${beehive.home}/external/xmlbeans/apache-xbean.jar"/>
+ <fileset id="jsr173.fileset"
file="${beehive.home}/installed/jsr173/jsr173_1.0_api.jar"/>
+
+ <path id="controls.dependency.path">
+ <pathelement
location="${beehive.home}/controls/build/jars/controls.jar"/>
+ </path>
+
+ <path id="netui-compiler.dependency.path">
+ <pathelement
location="${beehive.home}/netui/build/lib/beehive-netui-compiler.jar"/>
+ </path>
+
+ <path id="velocity.dependency.path">
+ <fileset refid="velocity.fileset"/>
+ </path>
+
+ <path id="xbean.dependency.path">
+ <fileset refid="xbean.fileset"/>
+ <fileset refid="jsr173.fileset"/>
+ </path>
+
+ <path id="commons-codec.dependency.path">
+ <fileset refid="commons-codec.fileset"/>
+ </path>
+
+ <path id="log4j.dependency.path">
+ <fileset refid="log4j.fileset"/>
+ </path>
+
+ <path id="servlet.dependency.path">
+ <pathelement
location="${beehive.home}/external/servlet/servlet-api-2.4.jar"/>
+ <pathelement
location="${beehive.home}/external/servlet/jsp-api-2.0.jar"/>
+ </path>
+
+ <path id="tools.dependency.path">
+ <pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
+ </path>
+
+ <path id="ant-all.dependency.path">
+ <fileset dir="${ant.home}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="ant-jar.dependency.path">
+ <fileset file="${ant.home}/lib/ant.jar"/>
+ </path>
+
+ <!-- test classpaths-->
+ <path id="junit.dependency.path">
+ <pathelement location="${beehive.home}/external/junit/junit.jar"/>
+ </path>
+
+ <!-- controls test classpaths; these should move down into the
controls/test/external directory -->
+ <path id="regexp.dependency.path">
+ <pathelement
location="${beehive.home}/external/jakarta-regexp-1.3.jar"/>
+ </path>
+
+ <path id="httpunit.dependency.path">
+ <pathelement
location="${beehive.home}/external/httpunit/httpunit.jar"/>
+ <pathelement
location="${beehive.home}/external/httpunit/nekohtml.jar"/>
+ <pathelement
location="${beehive.home}/external/httpunit/xercesImpl.jar"/>
+ </path>
+
+ <path id="beehive-antext.dependency.path">
+ <pathelement
location="${beehive.home}/external/beehive-antext/beehive-antext.jar"/>
+ </path>
+
+ <!--
======================================================================== -->
+ <!-- Common Beehive Ant macros
-->
+ <!--
======================================================================== -->
+
+ <macrodef name="copy-junit">
+ <attribute name="todir"/>
+ <sequential>
+ <copy todir="@{todir}">
+ <fileset file="${beehive.home}/external/junit/junit.jar"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="copy-log4j">
+ <attribute name="todir"/>
+ <sequential>
+ <copy todir="@{todir}">
+ <fileset refid="log4j.fileset"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="copy-xbean">
+ <attribute name="todir"/>
+ <sequential>
+ <copy todir="@{todir}">
+ <fileset refid="xbean.fileset"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="copy-controls">
+ <attribute name="todir"/>
+ <sequential>
+ <copy todir="@{todir}">
+ <fileset refid="controls.fileset"/>
+ <fileset refid="velocity.fileset"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="build-webapp">
+ <attribute name="webappDir"/>
+ <sequential>
+ <echo>Build webapp ${webapp.dir}</echo>
+ <ant antfile="${beehive.home}/ant/buildWebapp.xml" target="build"
inheritAll="false">
+ <property name="webapp.dir" location="@{webappDir}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="clean-webapp">
+ <attribute name="webappDir"/>
+ <sequential>
+ <echo>Clean webapp ${webapp.dir}</echo>
+ <ant antfile="${beehive.home}/ant/buildWebapp.xml" target="clean"
inheritAll="false">
+ <property name="webapp.dir" location="@{webappDir}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="deploy-netui">
+ <attribute name="webappDir"/>
+ <sequential>
+ <echo>Deploy NetUI to webapp ${webapp.dir}</echo>
+ <ant antfile="${beehive.home}/ant/webappRuntimeCore.xml"
target="deploy.beehive.webapp.runtime" inheritAll="false">
+ <property name="webapp.dir" location="@{webappDir}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="deploy-wsm">
+ <attribute name="webappDir"/>
+ <sequential>
+ <echo>Deploy WSM to webapp ${webapp.dir}</echo>
+ <ant antfile="${beehive.home}/ant/webappRuntimeCore.xml"
target="deploy.wsm.webapp.runtime" inheritAll="false">
+ <property name="webapp.dir" location="@{webappDir}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="undeploy-netui">
+ <attribute name="webappDir"/>
+ <sequential>
+ <ant antfile="${beehive.home}/ant/webappRuntimeCore.xml"
target="undeploy.beehive.webapp.runtime" inheritAll="false">
+ <property name="webapp.dir" location="@{webappDir}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="deploy-webapp">
+ <attribute name="webappDir"/>
+ <attribute name="contextPath"/>
+ <sequential>
+ <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml"
target="deploy" inheritAll="false">
+ <property name="webapp.dir" location="@{webappDir}"/>
+ <property name="context.path" value="@{contextPath}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="undeploy-webapp">
+ <attribute name="contextPath"/>
+ <sequential>
+ <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml"
target="undeploy" inheritAll="false">
+ <property name="context.path" value="@{contextPath}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="redeploy-webapp">
+ <attribute name="contextPath"/>
+ <sequential>
+ <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml"
target="redeploy" inheritAll="false">
+ <property name="context.path" value="@{contextPath}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="start-server">
+ <attribute name="shmem"/>
+ <attribute name="javaOptions"/>
+ <sequential>
+ <!-- if shmem, set target to "start.shmem" -->
+ <condition property="start.target" value="start.with.shmem">
+ <istrue value="@{shmem}"/>
+ </condition>
+ <condition property="start.target" value="start">
+ <isfalse value="@{shmem}"/>
+ </condition>
+
+ <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml"
target="${start.target}" inheritAll="false">
+ <property name="java.options" value="@{javaOptions}"/>
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="stop-server">
+ <sequential>
+ <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml"
target="stop" inheritAll="false"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="build-xbean">
+ <attribute name="schemaDir"/>
+ <attribute name="classgenDir"/>
+ <attribute name="xbeanBuildClasspathRef"
default="xbean.dependency.path"/>
+ <sequential>
+ <taskdef name="xmlbeanbuild"
+ classname="org.apache.xmlbeans.impl.tool.XMLBean"
+ classpathref="xbean.dependency.path"/>
+
+ <xmlbeanbuild
+ schema="@{schemaDir}"
+ classgendir="@{classgenDir}"
+ failonerror="true"
+ classpathref="@{xbeanBuildClasspathRef}"/>
+ </sequential>
+ </macrodef>
+
+ <!--
======================================================================== -->
+ <!-- Common Beehive tasks
-->
+ <!--
======================================================================== -->
+ <taskdef name="gethostname"
+ classname="org.apache.beehive.test.tools.antext.GetHostName"
+ classpathref="beehive-antext.dependency.path"/>
+
+ <!--
======================================================================== -->
+ <!-- Verify JDK version
-->
+ <!--
======================================================================== -->
+ <condition property="jdk.version.okay">
+ <contains string="${java.version}" substring="1.5"/>
+ </condition>
+
+ <fail unless="jdk.version.okay">
+Newer JDK required.
+
+Building the project requires JDK 1.5.
+
+You are currently using the following JDK:
+
+java.home = ${java.home}
+java.version = ${java.version}
+java.vendor = ${java.vendor}
+
+You may obtain a newer version of the JDK from
+
+http://java.sun.com/
+
+If you have JDK 1.5 installed on your system, you may need to
+adjust your JAVA_HOME environment variable.
+ </fail>
+
+ <echo>JDK version is okay.</echo>
+
+ <!--
======================================================================== -->
+ <!-- Verify ANT version
-->
+ <!--
======================================================================== -->
+
+ <condition property="ant.version.okay">
+ <contains string="${ant.version}" substring="1.6"/>
+ </condition>
+
+ <fail unless="ant.version.okay">
+Newer Ant required.
+
+Building the project required Apache Ant 1.6.
+
+You are currently using the following apache-ant:
+
+ant.home = ${ant.home}
+ant.version = ${ant.version}
+
+You may obtain a newer version of ant from
+
+http://ant.apache.org/
+
+If you have Ant 1.6 installed on your system, you may need to
+adjust your ANT_HOME environment variable.
+ </fail>
+
+ <echo>Apache Ant version is okay.</echo>
+
+ <mkdir dir="${beehive.home}/build/lib/"/>
+
+ <!--
======================================================================== -->
+ <!-- Output a summary
-->
+ <!--
======================================================================== -->
+
+ <echo>
+java.home = ${java.home}
+ant.home = ${ant.home}
+beehive.home = ${beehive.home}
+beehive.version = ${beehive.version}
+ </echo>
+
+ <target name="usage" description="Print the usage for this build.xml">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-projecthelp"/>
+ </java>
+ </target>
+
+</project>
Deleted: /incubator/beehive/trunk/beehive.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive.properties?view=auto&rev=125544
==============================================================================
Deleted: /incubator/beehive/trunk/beehiveEnv.cmd
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehiveEnv.cmd?view=auto&rev=125544
==============================================================================
Deleted: /incubator/beehive/trunk/beehiveEnv.sh
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehiveEnv.sh?view=auto&rev=125544
==============================================================================
Modified: incubator/beehive/trunk/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/build.xml&r1=125544&p2=incubator/beehive/trunk/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Tue Jan 18 13:02:36 2005
@@ -5,22 +5,13 @@
-->
<project name="Beehive Build" default="usage" basedir=".">
- <property environment="os"/>
- <property file="beehive.properties"/>
+ <import file="beehive-imports.xml"/>
<!-- Local properties used to specify the installers and the directories
into which they should be installed -->
- <property name="tomcat.installer"
location="${beehive.external.dir}/tomcat/jakarta-tomcat-5.0.25.zip"/>
- <property name="ant.installer"
location="${beehive.external.dir}/ant/apache-ant-1.6.2-bin.zip"/>
- <property name="jsr173.installer"
location="${beehive.external.dir}/xmlbeans/jsr173_api.jar"/>
+ <property name="beehive.installed.dir"
location="${beehive.home}/installed"/>
<target name="bootstrap" depends="ensure.proxysettings"
description="Install external dependencies to the installed/ directory">
<antcall target="install.deps"/>
- <ant dir="test/ant" antfile="runTomcat.xml" target="reset.config"/>
- <!--
- in order to run JUnit tests that use the <junit> Ant task,
- the junit.jar file needs to be available in $ANT_HOME/lib
- -->
- <copy file="${junit.jar}" todir="${os.ANT_HOME}/lib"/>
</target>
<!-- ============================================= -->
@@ -28,16 +19,15 @@
<!-- Build targets -->
<!-- -->
<!-- ============================================= -->
-
<target name="clean" description="Clean Beehive">
<ant dir="controls" target="clean" inheritAll="false"/>
<ant dir="netui" target="clean" inheritAll="false"/>
<ant dir="wsm" target="clean" inheritAll="false"/>
- <delete dir="${os.BEEHIVE_HOME}/build"/>
+ <delete dir="${beehive.home}/build"/>
</target>
- <target name="deploy" description="Deploy Beehive">
+ <target name="deploy" depends="bootstrap" description="Deploy Beehive">
<ant dir="controls" target="build" inheritAll="false"/>
<ant dir="netui" target="deploy" inheritAll="false"/>
<ant dir="wsm" target="deploy" inheritAll="false"/>
@@ -48,7 +38,6 @@
<!-- Test targets -->
<!-- -->
<!-- ============================================= -->
-
<target name="drt" description="Run the Beehive DRT suite">
<antcall target="controls.drt"/>
<antcall target="netui.drt"/>
@@ -74,10 +63,7 @@
<!-- depends on to build or test. -->
<!-- -->
<!-- ============================================= -->
-
- <target name="install.deps" description="Ensure that the external
dependencies (Tomcat, etc) have been installed locally">
- <antcall target="ensure.ant"/>
- <antcall target="ensure.tomcat"/>
+ <target name="install.deps" description="Ensure that any external
dependencies have been installed locally">
<antcall target="ensure.jsr173"/>
</target>
@@ -87,57 +73,19 @@
<!-- ============================================= -->
<!-- -->
- <!-- Tomcat -->
- <!-- -->
- <!-- ============================================= -->
-
- <target name="ensure.tomcat">
- <echo>Ensuring Tomcat present in directory:
${beehive.installed.dir}</echo>
- <available file="${tomcat.dir}" type="dir" property="tomcat.present"/>
- <echo>tomcat.present: ${tomcat.present}</echo>
- <antcall target="unzip.tomcat"/>
- </target>
-
- <target name="unzip.tomcat" unless="tomcat.present">
- <echo>Unzipping Tomcat to directory: ${beehive.installed.dir} from
installer ${tomcat.installer}</echo>
- <unzip src="${tomcat.installer}" dest="${beehive.installed.dir}"/>
- <chmod dir="${tomcat.dir}/bin" perm="755" includes="**/*.sh"/>
- </target>
-
- <!-- ============================================= -->
- <!-- -->
- <!-- Ant -->
- <!-- -->
- <!-- ============================================= -->
-
- <target name="ensure.ant">
- <echo>Ensuring Ant present in directory:
${beehive.installed.dir}</echo>
- <available file="${ant.dir}" type="dir" property="ant.present"/>
- <echo>ant.present: ${ant.present}</echo>
- <antcall target="unzip.ant"/>
- </target>
-
- <target name="unzip.ant" unless="ant.present">
- <echo>Unzipping Ant to directory: ${beehive.installed.dir} from
installer ${ant.installer}</echo>
- <unzip src="${ant.installer}" dest="${beehive.installed.dir}"/>
- <chmod dir="${beehive.installed.dir}/apache-ant-1.6.2/bin" perm="755"
includes="**/*.sh"/>
- </target>
-
- <!-- ============================================= -->
- <!-- -->
<!-- JSR 173 == this is required by XMLBeans and -->
<!-- needs to be downloaded from the net. -->
<!-- -->
<!-- ============================================= -->
-
<target name="ensure.jsr173">
- <echo>Ensuring JSR 173 present in directory:
${beehive.installed.dir}</echo>
+ <property name="jsr173.installer"
location="${beehive.home}/installed/jsr173/jsr173_1.0_api.jar"/>
<available file="${jsr173.jar}" type="file" property="jsr173.present"/>
- <echo>jsr173.present: ${jsr173.present}</echo>
<antcall target="get.jsr173"/>
</target>
<target name="get.jsr173" unless="jsr173.present">
+ <echo>JSR 173 API JAR not found in directory:
${beehive.installed.dir}</echo>
+ <property name="jsr173.installer"
location="${beehive.home}/external/xmlbeans/jsr173_api.jar"/>
<mkdir dir="${beehive.external.dir}/xmlbeans"/>
<get dest="${jsr173.installer}"
src="http://workshop.bea.com/xmlbeans/jsr173v1/jsr173.jar";
@@ -157,7 +105,6 @@
<!-- for more information. -->
<!-- -->
<!-- ============================================= -->
-
<target name="ensure.proxysettings">
<echo>Check to see if proxy setup is required</echo>
@@ -201,12 +148,10 @@
<!-- Documentation targets -->
<!-- -->
<!-- ============================================= -->
-
<target name="docs" description="Generate the Beehive documentation">
<echo>Ensuring Forrest present in directory: ${forrest.dir}</echo>
<available file="${forrest.dir}" type="dir"
property="forrest.present"/>
- <echo>forrest.present: ${forrest.present}</echo>
- <echo>You must have Apache Forrest 0.6 installed to execute this
target. For instructions on installing Forrest 0.6, see the file
beehive/trunk/Building.txt, the section called "Installation of Apache
Forrest".</echo>
+ <fail unless="forrest.present" message="You must have Apache Forrest
0.6 installed to execute this target. For instructions on installing Forrest
0.6, see the file ${beehive.home}/BUILDING.txt under the section called
Building Beehive Documentation"/>
<ant target="build-site"/>
<ant dir="controls" target="docs" inheritAll="false"/>
<ant dir="netui" target="docs" inheritAll="false"/>
@@ -222,269 +167,38 @@
<!-- Distribution targets -->
<!-- -->
<!-- ============================================= -->
+ <target name="build.dist">
+ <ant antfile="distribution.xml" target="build.dist"
inheritAll="false"/>
+ </target>
- <target name="build.dist" depends="deploy" description="Builds a Beehive
distribution">
- <mkdir dir="${dist.dir}"/>
+ <target name="test.dist">
+ <ant antfile="distribution.xml" target="test.dist" inheritAll="false"/>
+ </target>
+
+ <target name="check.setup">
+ <!-- check to see if the JUnit classes are available -->
+ <available classname="junit.framework.TestCase"
property="junit.available"/>
+ <fail unless="junit.available"
+ message="The classes in junit.jar do not seem to be avaialble.
Please ensure junit.jar is available in ${os.ANT_home}/lib"/>
+ <echo>junit.jar appears to be available since the class
"junit.framework.TestCase" was successfully loaded</echo>
+
+ <!-- note, to ease the transition when removing Tomcat from the build,
this will check a hard reference to CATALINA_HOME -->
+ <available file="${os.CATALINA_HOME}" type="dir"
property="tomcat.available"/>
+ <fail unless="tomcat.available"
+ message="The directory ${os.CATALINA_HOME} does not appear to be
available. Plese define CATALINA_HOME"/>
+ <echo>Tomcat appears to be available in ${os.CATALINA_HOME}</echo>
+
+ <!-- note, to ease the transition when removing Tomcat from the build,
this will check a hard reference to CATALINA_HOME -->
+ <loadfile srcFile="${os.CATALINA_HOME}/conf/tomcat-users.xml"
property="tomcat.users.file" failOnError="true"/>
+ <condition property="tomcat.manager.defined">
+ <contains string="${tomcat.users.file}"
substring="username="manager""/>
+ </condition>
+ <fail unless="tomcat.manager.defined"
+ message="The manager role may not be defined in
${os.CATALINA_HOME}/conf/tomcat-users.xml. Please ensure that there is a
manager role defined with username/password of manager/manager"/>
+ <echo>manager role appears to be defined in
${os.CATALINA_HOME}/conf/tomcat-users.xml</echo>
- <antcall target="build.dist.core"/>
- <antcall target="build.dist.samples"/>
- <antcall target="build.dist.docs"/>
- </target>
-
- <target name="build.dist.core">
- <!-- copy the required libraries into dist/ -->
- <copy todir="${dist.dir}/lib/common" failOnError="true">
- <fileset file="${commons-codec.jar}"/>
- <fileset file="${log4j.jar}"/>
- <fileset file="${xbean.jar}"/>
- <fileset file="${jsr173.jar}"/>
-
- <!-- these are required by Controls and WSM -->
- <fileset file="${velocity14.jar}"/>
- <fileset file="${velocitydep14.jar}"/>
- </copy>
-
- <copy todir="${dist.dir}/lib/controls" failOnError="true">
- <fileset file="${controls.jar}"/>
- </copy>
-
- <copy todir="${dist.dir}/lib/wsm" failOnError="true">
- <fileset dir="${os.BEEHIVE_HOME}/wsm/external"
includes="**/*.jar"/>
- <fileset dir="${os.BEEHIVE_HOME}/wsm/lib" includes="**/*.jar"/>
- <fileset dir="${os.BEEHIVE_HOME}/wsm/build/jars"
includes="**/*.jar"/>
- </copy>
-
- <copy todir="${dist.dir}/lib/netui" failOnError="true" flatten="true">
- <fileset dir="${os.BEEHIVE_HOME}/netui/build/dist/compiler">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${os.BEEHIVE_HOME}/netui/build/dist/webapp">
- <include name="WEB-INF/lib/*.jar"/>
- <exclude name="WEB-INF/lib/apache-xbean.jar"/>
- <exclude name="WEB-INF/lib/controls.jar"/>
- <exclude name="WEB-INF/lib/jsr173*.jar"/>
- <exclude name="WEB-INF/lib/log4j*.jar"/>
- <include name="WEB-INF/*.tld"/>
- <include name="WEB-INF/*.tldx"/>
- </fileset>
- </copy>
-
- <!-- this directory structure can't be flattened -->
- <copy todir="${dist.dir}/lib/netui/resources" failOnError="true">
- <fileset
dir="${os.BEEHIVE_HOME}/netui/build/dist/webapp/resources">
- <include name="**/*"/>
- </fileset>
- </copy>
-
- <!-- copy the required Ant build files dist/ -->
- <copy todir="${dist.dir}/ant" failOnError="true">
- <fileset file="${beehive.user.dir}/webappRuntimeCore.xml"/>
- <fileset file="${beehive.test.dir}/ant/buildWebapp.xml"/>
- <fileset file="${beehive.test.dir}/ant/buildWebappCore.xml"/>
- <fileset file="${beehive.test.dir}/ant/run*Core.xml"/>
- <fileset file="${beehive.test.dir}/ant/beehive.*.properties"/>
- </copy>
-
- <copy todir="${dist.dir}" failOnError="true">
- <fileset dir="${beehive.user.dir}">
- <include name="*.*"/>
- <exclude name="*.xml"/>
- </fileset>
- <filterset>
- <filter token="BEEHIVE_HOME" value="${dist.dir}"/>
- <filter token="JAVA_HOME" value="${os.JAVA_HOME}"/>
- <filter token="ANT_HOME" value="${os.ANT_HOME}"/>
- <filter token="CATALINA_HOME"
value="${beehive.installed.dir}/jakarta-tomcat-5.0.25"/>
- </filterset>
- </copy>
-
- <copy todir="${dist.dir}" failOnError="true">
- <fileset dir="${os.BEEHIVE_HOME}">
- <include name="LICENSE.TXT"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </copy>
-
- <property name="webapp.name" value="netui-blank"/>
-
- <!-- build the project templates in dist/ -->
- <echo>Create the Beehive webapp template</echo>
- <copy todir="build/tmp-dist/${webapp.name}">
- <fileset dir="${os.BEEHIVE_HOME}/netui/build/dist/webapp">
- <exclude name="WEB-INF/lib/*.jar"/>
- <exclude name="WEB-INF/*.tld"/>
- <exclude name="WEB-INF/*.tldx"/>
- </fileset>
- </copy>
-
- <copy todir="${dist.dir}/samples/netui-blank">
- <fileset dir="build/tmp-dist/${webapp.name}"/>
- </copy>
- </target>
-
- <target name="build.dist.samples">
- <!-- Build the petstore dashboard distro -->
- <copy todir="${dist.dir}/samples/PetStoreDashboard" failOnError="true">
- <fileset dir="samples/PetStoreDashboard"/>
- </copy>
-
- <!-- Build the petstore distro -->
- <!-- copy the webapp itself -->
- <ant antfile="${buildWebapp.ant}" target="clean.webapp">
- <property name="webapp.dir"
location="${os.BEEHIVE_HOME}/samples/petstoreWeb"/>
- </ant>
-
- <copy todir="${dist.dir}/samples/petstoreWeb" failOnError="true">
- <fileset dir="samples/petstoreWeb">
- <exclude name="WEB-INF/src/petstore-build.xml"/>
- <exclude name="WEB-INF/lib/*.jar"/>
- <exclude name="WEB-INF/*.tld"/>
- <exclude name="WEB-INF/*.tldx"/>
- </fileset>
- </copy>
-
- <!-- Build the controls blank template app distro -->
- <copy todir="${dist.dir}/samples/controls-blank" failOnError="true">
- <fileset dir="samples/controls-blank"/>
- </copy>
-
- <!-- Build the controls database template app distro -->
- <copy todir="${dist.dir}/samples/controls-db" failOnError="true">
- <fileset dir="samples/controls-db"/>
- </copy>
-
- <!-- Build the WSM/template -->
- <copy todir="${dist.dir}/samples/wsm-blank" failOnError="true">
- <fileset dir="samples/wsm-blank">
- <exclude name="WEB-INF/build.xml"/>
- </fileset>
- </copy>
-
- <!-- Build the WSM/AddressBookWS sample -->
- <copy todir="${dist.dir}/samples/AddressBookWS" failOnError="true">
- <fileset dir="samples/AddressBookWS">
- <exclude name="WEB-INF/build.xml"/>
- </fileset>
- </copy>
-
- <!-- Build the WSM/EmployeeWS sample -->
- <!-- todo: depends on dbControls.jar; controls-db, which produces that
file and copies it into WEB-INF/lib needs be merged back from alpha -->
- <copy todir="${dist.dir}/samples/EmployeeWS" failOnError="true">
- <fileset dir="samples/EmployeeWS">
- <exclude name="WEB-INF/build.xml"/>
- </fileset>
- </copy>
- <ant
- dir="${dist.dir}/samples/controls-db"
- antfile="build.xml"
- target="build"
- inheritall="false"/>
- <copy todir="${dist.dir}/samples/EmployeeWS/WEB-INF/lib"
failOnError="true">
- <fileset dir="${dist.dir}/samples/controls-db/build">
- <include name="dbControl.jar"/>
- </fileset>
- </copy>
- <ant
- dir="${dist.dir}/samples/controls-db"
- antfile="build.xml"
- target="clean"
- inheritall="false"/>
-
- </target>
-
- <target name="build.dist.docs" depends="docs" description="Builds
documentation for a Beehive distribution">
- <mkdir dir="${dist.dir}"/>
- <!-- copy javadocs to dist -->
- <copy todir="${dist.dir}/docs/apidocs" failOnError="true">
- <fileset dir="controls/build/docs/apidocs"/>
- <fileset dir="netui/build/docs/apidocs"/>
- <fileset dir="wsm/build/docs/apidocs"/>
- </copy>
- <copy todir="${dist.dir}/docs" failOnError="">
- <fileset dir="docs/forrest/build/site"/>
- </copy>
- </target>
-
- <target name="build.dist.archives" description="Builds all Beehive
distribution archives (.zip, .tar.gz, etc)">
- <fail unless="beehive.version" message="Could not build distribution
archives; beehive.version property not specified!"/>
- <antcall target="build.dist.zip"/>
- <antcall target="build.dist.tgz"/>
- <!--
- <antcall target="build.dist.docs.jar"/>
- -->
- </target>
-
- <target name="build.dist.zip" description="Builds a Beehive distribution
zipfile">
-<!-- <fail unless="beehive.version" message="Could not build
distribution archive; beehive.version was not specified"/> -->
-
- <mkdir dir="build/jars"/>
- <zip destfile="build/jars/${dist.name}.zip"
basedir="${dist.base.dir}"/>
- </target>
-
- <target name="build.dist.tgz" description="Builds a Beehive distribution
tarball (.tar.gz)">
-<!-- <fail unless="beehive.version" message="Could not build
distribution archive; beehive.version was not specified"/> -->
-
- <mkdir dir="build/jars"/>
- <tar destfile="build/jars/${dist.name}.tar.gz"
basedir="${dist.base.dir}" compression="gzip"/>
- </target>
-
- <target name="build.dist.docs.jar" depends="build.dist"
description="Builds a Beehive distribution docs JAR">
-<!-- <fail unless="beehive.version" message="Could not build
distribution archive; beehive.version was not specified"/> -->
-
- <mkdir dir="build/jars"/>
- <jar destfile="build/jars/${dist.name}-docs.jar"
basedir="${dist.dir}/docs"/>
- </target>
-
- <target name="clean.dist">
- <delete dir="build/dist"/>
- <delete dir="build/tmp-dist"/>
- </target>
-
- <target name="test.dist" description="Tests a Beehive distribution">
- <echo>Testing distribution at ${dist.dir}</echo>
- <property name="distroStdout.file"
location="${beehive.dir}/build/testDistro.output"/>
-
- <unzip src="${tomcat.installer}" dest="${dist.dir}"/>
- <exec executable="cmd" dir="${dist.dir}" newenvironment="true"
os="Windows XP,Windows 2000" outputproperty="testDistro.output">
- <arg line="/c ${os.BEEHIVE_HOME}/test/testDistro.cmd"/>
- <env key="dummy" value="value"/>
- </exec>
- <exec executable="sh" dir="${dist.dir}" newenvironment="true"
os="Linux,SunOS,Solaris" outputproperty="testDistro.output">
- <arg line="${os.BEEHIVE_HOME}/test/testDistro.sh"/>
- <env key="dummy" value="value"/>
- </exec>
- <fail message="${testDistro.output}">
- <condition>
- <contains string="${testDistro.output}" substring="BUILD
FAILED"/>
- </condition>
- </fail>
- <echo message="${testDistro.output}"/>
-
- <echo message="${testDistro.output}" file="${distroStdout.file}"/>
- </target>
-
- <!-- =========================================== -->
- <!-- -->
- <!-- Build Test Module for Distribution Test -->
- <!-- -->
- <!-- =========================================== -->
- <target name="build.test.dist" depends="build.dist"
- description="Build and package the test module for testing
distribution">
- <ant dir="${os.BEEHIVE_HOME}/netui/test/dist-test/ant"
- antfile="buildTestDist.xml"
- target="build.test.dist"
- inheritall="false"/>
- </target>
-
- <!-- ============================================= -->
- <!-- -->
- <!-- Default usage target -->
- <!-- -->
- <!-- ============================================= -->
- <target name="usage" description="Print the usage for this build.xml">
- <java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-projecthelp"/>
- </java>
+ <echo>PATH: ${os.PATH}</echo>
+ <echo>CLASSPATH: ${os.CLASSPATH}</echo>
</target>
</project>
Modified: incubator/beehive/trunk/controls/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/build.xml (original)
+++ incubator/beehive/trunk/controls/build.xml Tue Jan 18 13:02:36 2005
@@ -17,33 +17,32 @@
-->
<project name="controls" default="usage" basedir=".">
<property environment="os"/>
- <property file="../beehive.properties"/>
- <!-- THE CONTROL BUILD REQUIRES JDK5 AND LATER. ATTEMPTS TO BUILD ON JDK
EALRIER THAN 5.0 WILL BE A NOOP -->
- <condition property="isJDKOver5">
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </condition>
- <property name="build.dir" value="build"/>
- <property name="classes.dir" value="${build.dir}/classes"/>
- <property name="jars.dir" value="${build.dir}/jars"/>
- <property name="docs.dir" value="${build.dir}/docs"/>
- <property name="api.dir" value="src/api"/>
- <property name="api.classes" value="${classes.dir}/api"/>
- <property name="spi.dir" value="src/spi"/>
- <property name="spi.classes" value="${classes.dir}/spi"/>
- <property name="runtime.dir" value="src/runtime"/>
- <property name="runtime.classes" value="${classes.dir}/runtime"/>
- <property name="controls.jar" value="${jars.dir}/controls.jar"/>
+ <import file="../beehive-imports.xml"/>
+
+ <property name="build.dir" location="build"/>
+ <property name="classes.dir" location="${build.dir}/classes"/>
+ <property name="jars.dir" location="${build.dir}/jars"/>
+ <property name="docs.dir" location="${build.dir}/docs"/>
+ <property name="api.dir" location="src/api"/>
+ <property name="api.classes" location="${classes.dir}/api"/>
+ <property name="spi.dir" location="src/spi"/>
+ <property name="spi.classes" location="${classes.dir}/spi"/>
+ <property name="runtime.dir" location="src/runtime"/>
+ <property name="runtime.classes" location="${classes.dir}/runtime"/>
+ <property name="controls.jar" location="${jars.dir}/controls.jar"/>
+
<path id="api.classpath">
</path>
+
<path id="spi.classpath">
<pathelement location="${api.classes}"/>
</path>
+
<path id="runtime.classpath">
- <pathelement location="${ant.jar}"/>
- <pathelement location="${servlet24.jar}"/>
- <pathelement location="${tools.jar}"/>
- <pathelement location="${velocity14.jar}"/>
- <pathelement location="${velocitydep14.jar}"/>
+ <path refid="ant-all.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="tools.dependency.path"/>
<pathelement location="${api.classes}"/>
<pathelement location="${spi.classes}"/>
<path id="${api.classpath}"/>
@@ -99,7 +98,7 @@
<!-- ====================================================================
-->
<!-- Compiles the source code of the project. -->
<!-- ====================================================================
-->
- <target name="classes" depends="dirs" if="isJDKOver5">
+ <target name="classes" depends="dirs">
<!-- Build the API classes -->
<javac destdir="${api.classes}" classpathref="api.classpath"
debug="on">
<src path="${api.dir}"/>
@@ -124,7 +123,7 @@
<!-- ====================================================================
-->
<!-- Jars up the classes, libraries, and resources. -->
<!-- ====================================================================
-->
- <target name="build" depends="classes" if="isJDKOver5">
+ <target name="build" depends="classes">
<echo message="--------------------------------------------------"/>
<echo message="| controls build starting |"/>
<echo message="--------------------------------------------------"/>
@@ -175,7 +174,7 @@
<!-- ====================================================================
-->
<!-- deploy -->
<!-- ====================================================================
-->
- <target name="deploy" depends="build" if="isJDKOver5">
+ <target name="deploy" depends="build">
<echo message="--------------------------------------------------"/>
<echo message="| controls deploy starting |"/>
<echo message="--------------------------------------------------"/>
@@ -205,7 +204,7 @@
<!-- ====================================================================
-->
<!-- docs -->
<!-- ====================================================================
-->
- <target name="docs" if="isJDKOver5">
+ <target name="docs">
<javadoc destdir="${docs.dir}/apidocs/classref_controls"
maxmemory="256M" windowtitle="Controls Documentation" doctitle="Java Controls"
version="true" author="false" use="true" additionalparam="-breakiterator
-noqualifier all -notimestamp" useexternalfile="true"
classpathref="runtime.classpath">
<packageset dir="${api.dir}" defaultexcludes="yes">
<include name="org/apache/beehive/controls/**/*"/>
Modified: incubator/beehive/trunk/controls/test/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/build.xml Tue Jan 18 13:02:36 2005
@@ -3,20 +3,19 @@
<project name="beehive_test" default="usage">
<property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="common/path.properties"/>
- <property name="dev.root" value="${os.DEV_ROOT}"/>
+ <import file="../../beehive-imports.xml"/>
+ <import file="../../ant/axis-import.xml"/>
+
+ <property file="${beehive.home}/controls/test/common/path.properties"/>
- <taskdef name="gethostname"
classname="org.apache.beehive.test.tools.antext.GetHostName"
- classpath="${beehive-antext.jar}" />
<taskdef name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="../build/jars/controls.jar" onerror="report" />
+ classpathref="controls.dependency.path" onerror="report" />
<taskdef name="assemble"
classname="org.apache.beehive.controls.runtime.assembly.AssembleTask"
- classpath="../build/jars/controls.jar" onerror="report" />
+ classpathref="controls.dependency.path" onerror="report" />
<taskdef name="control-jar"
classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpath="../build/jars/controls.jar" onerror="report" />
+ classpathref="controls.dependency.path" onerror="report" />
<!-- BeeHive test specific properties -->
<property name="controls.test.root" location="${basedir}"/>
@@ -42,6 +41,10 @@
<property name="db.control.dir" location="../../samples/controls-db"/>
<property name="db.control.jar"
location="${db.control.dir}/build/dbControl.jar"/>
+ <path id="derby.dependency.path">
+ <pathelement
location="${beehive.home}/external/derby/derby_46005.jar"/>
+ </path>
+
<condition property="test.os" value="windows" >
<os family="windows" />
</condition>
@@ -57,51 +60,49 @@
</condition>
<path id="test.classpath">
- <pathelement location="${junit.jar}"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="tools.dependency.path"/>
+ <path refid="derby.dependency.path"/>
<pathelement location="${milton.jar}"/>
- <pathelement location="${tools.jar}"/>
- <pathelement location="${velocity14.jar}"/>
- <pathelement location="${velocitydep14.jar}"/>
- <pathelement location="${servlet24.jar}"/>
- <pathelement location="${derby.jar}"/>
<pathelement location="${db.control.jar}"/>
- <pathelement path="../build/jars/controls.jar"/>
<pathelement path="${build.beans}"/>
</path>
<path id="tch.run.classpath">
+ <!-- todo: there should be a common milton.dependency.path -->
<pathelement location="${tch.jar}"/>
<pathelement location="${tch.schema.jar}"/>
<pathelement location="${tch.xbean.jar}"/>
<pathelement location="${milton.jar}"/>
- <pathelement location="${ant.jar}"/>
- <pathelement path="${os.ANT_HOME}/lib/ant-launcher.jar"/>
-
- <pathelement location="${junit.jar}"/>
- <pathelement location="${tools.jar}"/>
- <pathelement location="${velocity14.jar}"/>
- <pathelement location="${velocitydep14.jar}"/>
- <pathelement location="${servlet24.jar}"/>
- <pathelement location="${derby.jar}"/>
+
+ <path refid="ant-all.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="tools.dependency.path"/>
+ <path refid="derby.dependency.path"/>
+
<pathelement location="${db.control.jar}"/>
- <pathelement location="../build/jars/controls.jar"/>
<pathelement path="${build.beans}"/>
<pathelement path="${build.drivers}"/>
<pathelement location="${build.tests}" />
+ <!-- todo: these JARs live in trunk/external and should be moved into
controls/test/external
+ they are used only under that sub-directory. there should also
be a common path defined
+ for them
+ -->
<pathelement location="${jakarta.jar}"/>
<pathelement location="${httpunit.jar}"/>
<pathelement location="${httpunit-xerces.jar}"/>
<pathelement location="${nekohtml.jar}"/>
<!-- the following are needed for axis clients -->
- <pathelement location="${axis.jar}"/>
- <pathelement location="${jaxrpc.jar}"/>
- <pathelement location="${saaj.jar}"/>
- <pathelement location="${wsdl4j.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-discovery.jar}"/>
+ <path refid="webservice.classpath"/>
</path>
@@ -160,18 +161,22 @@
<mkdir dir="${test.logs}" />
</target>
+ <!--
+ Note that properties are passed to dbControl manually. The reason for
+ doing it is: in a dev environment, there is no BEEHIVE_HOME. We don't
+ want to change the sample since it is used as part of the distribution.
+ -->
<target name="dbControl">
- <ant
- dir="${db.control.dir}"
- antfile="build.xml"
- target="build"
- inheritall="false"/>
+ <ant dir="${db.control.dir}"
+ antfile="build-svn.xml"
+ target="build"
+ inheritall="false"/>
</target>
<target name="dbControl-clean">
<ant
dir="${db.control.dir}"
- antfile="build.xml"
+ antfile="build-svn.xml"
target="clean"
inheritall="false"/>
</target>
@@ -181,6 +186,9 @@
<!-- Build the InnerControl controls used by composition tests. This
is only
necessary because the bean types are needed to compile a public
interface -->
<echo message="** Phase One **"/>
+ <property name="cp" refid="test.classpath"/>
+ <echo message="classpath=${cp}"/>
+
<apt srcdir="${controls.test.controls}" destdir="${build.beans}"
gendir="${build.beansrc}"
debug="on"
classpathref="test.classpath" compileByExtension="true"
@@ -269,6 +277,7 @@
verbose="false"
failonerror="true">
<classpath>
+<!-- todo:eko -->
<pathelement location="${milton.jar}"/>
<pathelement location="${mantis.jar}"/>
<pathelement location="${httpunit.jar}"/>
@@ -444,16 +453,15 @@
<property name="mantis.bingen.dir" location="${basedir}/mantis-bingen"/>
<property name="mantis.log.dir" location="${basedir}/mantis-logs"/>
<path id="mantis.classpath">
- <pathelement path="${mantis.tools.jar}"/>
- <pathelement path="${ant.jar}"/>
- <pathelement path="${junit.jar}"/>
- <pathelement path="${servlet24.jar}"/>
+ <path refid="tools.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="ant-jar.dependency.path"/>
<pathelement path="${milton.jar}"/>
<pathelement path="${tch.schema.jar}"/>
<pathelement path="${mantis.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${jsr173.jar}"/>
- <pathelement path="../build/jars/controls.jar"/>
<pathelement path="${build.beans}"/>
<pathelement path="${build.drivers}"/>
</path>
Modified: incubator/beehive/trunk/controls/test/common/path.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/common/path.properties?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/common/path.properties&r1=125544&p2=incubator/beehive/trunk/controls/test/common/path.properties&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/common/path.properties
(original)
+++ incubator/beehive/trunk/controls/test/common/path.properties Tue Jan
18 13:02:36 2005
@@ -2,14 +2,12 @@
#directories
-beehive.home=${os.BEEHIVE_HOME}
controls.dir=${beehive.home}/controls
controls.test.dir=${controls.dir}/test
controls.test.infra.dir=${controls.test.dir}/infra
external.dir=${beehive.home}/external
-
#locations of built tools
tch.home=${controls.test.infra.dir}/tch
tch.jar=${tch.home}/tchx.jar
@@ -23,17 +21,13 @@
jakarta.jar=${external.dir}/jakarta/jakarta-regexp-1.2.jar
jaxp.jar=${external.dir}/jaxp/jaxp.jar
xerces.jar=${external.dir}/xerces/xerces-1.4.4.jar
-xbean.jar=${external.dir}/xmlbeans/apache-xbeans.jar
httpunit.jar=${external.dir}/httpunit/httpunit.jar
httpunit-xerces.jar=${external.dir}/httpunit/xercesImpl.jar
nekohtml.jar=${external.dir}/httpunit/nekohtml.jar
-junit.jar=${external.dir}/junit/junit.jar
-beehive-antext.jar=${external.dir}/beehive-antext/beehive-antext.jar
#properties for mantis
mantis.home=${controls.test.infra.dir}/mantis
mantis.jar=${mantis.home}/mantis.jar
tchschema.jar=${mantis.home}/tchschema.jar
-mantis.tools.jar=${os.JAVA_HOME}/lib/tools.jar
mantis.xbean.jar=${mantis.home}/xbean-1.0.2.jar
mantis.config=${mantis.home}/mantis.properties
Modified: incubator/beehive/trunk/controls/test/infra/gtlf/xsl/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/infra/gtlf/xsl/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/infra/gtlf/xsl/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/infra/gtlf/xsl/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/infra/gtlf/xsl/build.xml
(original)
+++ incubator/beehive/trunk/controls/test/infra/gtlf/xsl/build.xml Tue Jan
18 13:02:36 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="test" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/controls/test/common/path.properties"/>
+ <import file="../../../../../beehive-imports.xml"/>
+ <property file="${beehive.home}/controls/test/common/path.properties"/>
<!-- properties for customizing to diff environment -->
<property name="xsl.root.dir" value="${controls.test.infra.dir}/gtlf/xsl"/>
Modified: incubator/beehive/trunk/controls/test/infra/tch/runtime/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/infra/tch/runtime/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/infra/tch/runtime/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/infra/tch/runtime/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/infra/tch/runtime/build.xml
(original)
+++ incubator/beehive/trunk/controls/test/infra/tch/runtime/build.xml Tue Jan
18 13:02:36 2005
@@ -1,174 +1,175 @@
-<project name="tch-project" default="usage">
-
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/controls/test/common/path.properties"/>
-
- <!-- the default base name for the logfiles Blackhawk generates -->
- <property name="tch.base-logfile-name" value="tch"/>
-
- <!-- the tch logs go into the dir ant is run from by default -->
- <property name="log.basedir.default" location="${controls.test.dir}"/>
-
- <!-- the tch logs go into the dir ant is run from -->
- <property name="tch.log.basedir" value="${log.basedir.default}"/>
-
- <!-- may be overridden from the top, a single (lame) system property that -->
- <!-- should be set -->
- <property name="test.sysproperty.name" value=""/>
- <property name="test.sysproperty.value" value=""/>
-
- <!-- if enabled, at the end of the run, generated an html file -->
- <!-- from the GTLF log -->
- <property name="gtlf.transform" value="false"/>
-
- <!-- if true, generates a valid GTLF header, as far as that's possible -->
- <property name="gtlf.prepare" value="false"/>
-
-
- <!-- default for html log file generation, may be overridden from the top -->
- <property
- name="gtlf.base.file"
- location="${tch.log.basedir}/${tch.base-logfile-name}"
- />
-
- <!-- A few defaults for GTLF -->
- <property name="gtlf.headerfile" value="gtlf-header-values.txt"/>
-
-
-
- <!-- public generate html target -->
- <target name="generate-html-log">
- <antcall target="-generate-html-log">
- <param name="_gtlf.transform" value="true"/>
- </antcall>
- </target>
-
- <!-- private generate html target -->
- <target name="-generate-html-log" if="_gtlf.transform">
- <property name="gtlf.file" value="${gtlf.base.file}.xml"/>
- <property name="output.file" value="${gtlf.base.file}.html"/>
-
- <echo message="gtlf.file: ${gtlf.file}"/>
- <!-- fork Ant because I could not find a more elegant way to get -->
- <!-- reportutils.jar onto the classpath -->
- <java classname="org.apache.tools.ant.Main" fork="true">
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement
location="${controls.test.infra.dir}/gtlf/xsl/reportutils.jar"/>
- </classpath>
- <sysproperty key="gtlf.file" value="${gtlf.file}"/>
- <sysproperty key="output.file" value="${output.file}"/>
-
- <!-- html customization -->
- <sysproperty key="show.success.in.error.summary" value="false"/>
- <sysproperty
- key="report.sections"
- value="result-summary,result-detail,error-summary,error-detail"
- />
- <!--sysproperty key="report.section.order" value="error-focus"/ -->
- <sysproperty key="report.navigation.tools" value="toolbar,top"/>
- <sysproperty key="show.filters" value="false"/>
- <arg value="-f"/>
- <arg value="${controls.test.infra.dir}/gtlf/xsl/build.xml"/>
- <arg value="test.report"/>
- <arg value="-emacs"/>
- </java>
- </target>
-
- <target name="-init" unless="_init.complete">
-
- <!-- set up system prop that my be passed from top-->
- <condition
- property="_test.sysproperty.line"
- value="${test.sysproperty.name}=${test.sysproperty.value}"
- >
- <not><equals arg1="${test.sysproperty.name}" arg2=""/></not>
- </condition>
- <!-- else set it to empty string -->
- <property name="_test.sysproperty.line" value=""/>
-
- <!-- for the message at the end of run, only print dir of logs
- if it has been reset -->
- <condition property="_logs.dir" value="${tch.log.basedir}/">
- <not><equals
- arg1="${tch.log.basedir}"
- arg2="${log.basedir.default}"
- casesensitive="false"
- /></not>
- </condition>
- <!-- else empty string -->
- <property name="_logs.dir" value=""/>
-
- <condition property="_gtlf.transform">
- <and>
- <equals
- arg1="${gtlf.transform}"
- arg2="true"
- casesensitive="false"
- />
- <!-- don't generate html log if init-mode-only is on -->
- <equals
- arg1="${tch.init-mode-only}"
- arg2="false"
- casesensitive="false"
- />
- </and>
- </condition>
-
- <!-- if gtlf logging is disabled explicitly, no need to prepare gtlf -->
- <!-- however, if upload is enbled, then force prepare also -->
- <!-- meaning: -->
- <!-- if ((gtlf.upload || gtlf.prepare) && !tch.log-gtlf==false) -->
- <condition property="_gtlf.prepare">
- <and>
- <or>
- <equals
- arg1="${gtlf.upload}"
- arg2="true"
- casesensitive="false"
- />
- <equals
- arg1="${gtlf.prepare}"
- arg2="true"
- casesensitive="false"
- />
- </or>
- <not>
- <equals
- arg1="${tch.log-gtlf}"
- arg2="false"
- casesensitive="false"
- />
- </not>
- </and>
- </condition>
-
- <condition property="_gtlf.upload">
- <equals
- arg1="${gtlf.upload}"
- arg2="true"
- casesensitive="false"
- />
- </condition>
-
- <property name="_init.complete" value="true"/>
-
- </target>
-
- <target name="-write-gtlf-header" if="_gtlf.prepare">
- <ant dir="${testinfra.gtlf.home}" antfile="build.xml" target="run"/>
- </target>
-
- <target name="-validate">
- <available property="test-suite.exists" file="${test-suite}"/>
- <fail unless="test-suite.exists" message="Cannot find test-suite with name
"${test-suite}". Set the test-suite Ant property (-Dtest-suite) to
the testfile you want to run."/>
- </target>
-
-</project>
-
-
-
-
-
-
-
+<project name="tch-project" default="usage">
+
+ <property environment="os"/>
+ <import file="../../../../../beehive-imports.xml"/>
+ <property file="${beehive.home}/controls/test/common/path.properties"/>
+
+ <!-- the default base name for the logfiles Blackhawk generates -->
+ <property name="tch.base-logfile-name" value="tch"/>
+
+ <!-- the tch logs go into the dir ant is run from by default -->
+ <property name="log.basedir.default" location="${controls.test.dir}"/>
+
+ <!-- the tch logs go into the dir ant is run from -->
+ <property name="tch.log.basedir" value="${log.basedir.default}"/>
+
+ <!-- may be overridden from the top, a single (lame) system property that -->
+ <!-- should be set -->
+ <property name="test.sysproperty.name" value=""/>
+ <property name="test.sysproperty.value" value=""/>
+
+ <!-- if enabled, at the end of the run, generated an html file -->
+ <!-- from the GTLF log -->
+ <property name="gtlf.transform" value="false"/>
+
+ <!-- if true, generates a valid GTLF header, as far as that's possible -->
+ <property name="gtlf.prepare" value="false"/>
+
+
+ <!-- default for html log file generation, may be overridden from the top -->
+ <property
+ name="gtlf.base.file"
+ location="${tch.log.basedir}/${tch.base-logfile-name}"
+ />
+
+ <!-- A few defaults for GTLF -->
+ <property name="gtlf.headerfile" value="gtlf-header-values.txt"/>
+
+
+
+ <!-- public generate html target -->
+ <target name="generate-html-log">
+ <antcall target="-generate-html-log">
+ <param name="_gtlf.transform" value="true"/>
+ </antcall>
+ </target>
+
+ <!-- private generate html target -->
+ <target name="-generate-html-log" if="_gtlf.transform">
+ <property name="gtlf.file" value="${gtlf.base.file}.xml"/>
+ <property name="output.file" value="${gtlf.base.file}.html"/>
+
+ <echo message="gtlf.file: ${gtlf.file}"/>
+ <!-- fork Ant because I could not find a more elegant way to get -->
+ <!-- reportutils.jar onto the classpath -->
+ <java classname="org.apache.tools.ant.Main" fork="true">
+ <classpath>
+ <pathelement path="${java.class.path}"/>
+ <pathelement
location="${controls.test.infra.dir}/gtlf/xsl/reportutils.jar"/>
+ </classpath>
+ <sysproperty key="gtlf.file" value="${gtlf.file}"/>
+ <sysproperty key="output.file" value="${output.file}"/>
+
+ <!-- html customization -->
+ <sysproperty key="show.success.in.error.summary" value="false"/>
+ <sysproperty
+ key="report.sections"
+ value="result-summary,result-detail,error-summary,error-detail"
+ />
+ <!--sysproperty key="report.section.order" value="error-focus"/ -->
+ <sysproperty key="report.navigation.tools" value="toolbar,top"/>
+ <sysproperty key="show.filters" value="false"/>
+ <arg value="-f"/>
+ <arg value="${controls.test.infra.dir}/gtlf/xsl/build.xml"/>
+ <arg value="test.report"/>
+ <arg value="-emacs"/>
+ </java>
+ </target>
+
+ <target name="-init" unless="_init.complete">
+
+ <!-- set up system prop that my be passed from top-->
+ <condition
+ property="_test.sysproperty.line"
+ value="${test.sysproperty.name}=${test.sysproperty.value}"
+ >
+ <not><equals arg1="${test.sysproperty.name}" arg2=""/></not>
+ </condition>
+ <!-- else set it to empty string -->
+ <property name="_test.sysproperty.line" value=""/>
+
+ <!-- for the message at the end of run, only print dir of logs
+ if it has been reset -->
+ <condition property="_logs.dir" value="${tch.log.basedir}/">
+ <not><equals
+ arg1="${tch.log.basedir}"
+ arg2="${log.basedir.default}"
+ casesensitive="false"
+ /></not>
+ </condition>
+ <!-- else empty string -->
+ <property name="_logs.dir" value=""/>
+
+ <condition property="_gtlf.transform">
+ <and>
+ <equals
+ arg1="${gtlf.transform}"
+ arg2="true"
+ casesensitive="false"
+ />
+ <!-- don't generate html log if init-mode-only is on -->
+ <equals
+ arg1="${tch.init-mode-only}"
+ arg2="false"
+ casesensitive="false"
+ />
+ </and>
+ </condition>
+
+ <!-- if gtlf logging is disabled explicitly, no need to prepare gtlf -->
+ <!-- however, if upload is enbled, then force prepare also -->
+ <!-- meaning: -->
+ <!-- if ((gtlf.upload || gtlf.prepare) && !tch.log-gtlf==false) -->
+ <condition property="_gtlf.prepare">
+ <and>
+ <or>
+ <equals
+ arg1="${gtlf.upload}"
+ arg2="true"
+ casesensitive="false"
+ />
+ <equals
+ arg1="${gtlf.prepare}"
+ arg2="true"
+ casesensitive="false"
+ />
+ </or>
+ <not>
+ <equals
+ arg1="${tch.log-gtlf}"
+ arg2="false"
+ casesensitive="false"
+ />
+ </not>
+ </and>
+ </condition>
+
+ <condition property="_gtlf.upload">
+ <equals
+ arg1="${gtlf.upload}"
+ arg2="true"
+ casesensitive="false"
+ />
+ </condition>
+
+ <property name="_init.complete" value="true"/>
+
+ </target>
+
+ <target name="-write-gtlf-header" if="_gtlf.prepare">
+ <ant dir="${testinfra.gtlf.home}" antfile="build.xml" target="run"/>
+ </target>
+
+ <target name="-validate">
+ <available property="test-suite.exists" file="${test-suite}"/>
+ <fail unless="test-suite.exists" message="Cannot find test-suite with name
"${test-suite}". Set the test-suite Ant property (-Dtest-suite) to
the testfile you want to run."/>
+ </target>
+
+</project>
+
+
+
+
+
+
+
Modified: incubator/beehive/trunk/controls/test/perf/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/perf/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/perf/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/build.xml Tue Jan 18
13:02:36 2005
@@ -19,11 +19,10 @@
<property environment="os"/>
<!-- standard beehive jars come from these prop files -->
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property
file="${os.BEEHIVE_HOME}/controls/test/common/path.properties"/>
+ <import file="../../../beehive-imports.xml"/>
+ <property file="${beehive.home}/controls/test/common/path.properties"/>
<!-- root dirs for finding everything -->
- <property name="beehive.home" value="${os.BEEHIVE_HOME}"/>
<property name="control.perf.root"
value="${beehive.home}/controls/test/perf"/>
<!-- control perf dirs -->
@@ -46,8 +45,9 @@
<!-- classpaths -->
<path id="build.classpath">
- <pathelement path="${controls.jar}"/>
+ <path refid="controls.dependency.path"/>
<pathelement path="${tch.jar}"/>
+ <!-- todo: there should be a common milton.dependency.path -->
<pathelement path="${milton.jar}"/>
<pathelement path="${httpunit.jar}"/>
<pathelement path="${control.perf.build}"/>
@@ -56,21 +56,26 @@
<path id="control.build.classpath">
<pathelement path="${control.perf.external}/perf-results.jar"/>
- <pathelement path="${jsr173.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${controls.jar}"/>
- <pathelement path="${velocitydep14.jar}"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
<pathelement path="${control.perf.ctlbuild}"/>
<pathelement path="${control.perf.temp}"/>
</path>
<path id="tch.run.classpath">
- <pathelement path="${jsr173.jar}"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="ant-all.dependency.path"/>
+
<pathelement path="${tch.jar}"/>
<pathelement path="${tch.schema.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${ant.jar}"/>
- <pathelement path="${ant.home}/lib/ant-launcher.jar"/>
+
+ <!-- todo: these JARs live in trunk/external and should be
moved into controls/test/external
+ they are used only under that sub-directory. there
should also be a common path defined
+ for them
+ -->
<pathelement path="${jakarta.jar}"/>
<pathelement path="${httpunit.jar}"/>
<pathelement path="${httpunit-xerces.jar}"/>
@@ -79,12 +84,12 @@
</path>
<!-- task definitions -->
- <taskdef name="apt"
-
classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpathref="control.build.classpath"
- onerror="report" />
+ <taskdef name="apt"
+
classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="control.build.classpath"
+ onerror="report"/>
- <taskdef name="tch"
+ <taskdef name="tch"
classname="org.apache.beehive.test.tools.tch.TchVMTask"
classpathref="tch.run.classpath"/>
Modified: incubator/beehive/trunk/controls/test/perf/webapps/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/perf/webapps/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/perf/webapps/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/build.xml
(original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/build.xml Tue Jan
18 13:02:36 2005
@@ -13,12 +13,13 @@
-->
<project name="Beehive/Controls/Perf-webapp" default="usage" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="${os.BEEHIVE_HOME}/controls/test/common/path.properties"/>
- <property name="controls.perf.root"
value="${os.BEEHIVE_HOME}/controls/test/perf"/>
- <property name="buildWebapp.xml"
value="${os.BEEHIVE_HOME}/test/ant/buildWebapp.xml"/>
- <property name="runTomcat.xml"
value="${os.BEEHIVE_HOME}/test/ant/runTomcat.xml"/>
+ <import file="../../../../beehive-imports.xml"/>
+
+ <property file="${beehive.home}/controls/test/common/path.properties"/>
+
+ <property name="controls.perf.root"
value="${beehive.home}/controls/test/perf"/>
+ <property name="buildWebapp.xml"
value="${beehive.home}/test/ant/buildWebapp.xml"/>
+ <property name="runTomcat.xml"
value="${beehive.home}/test/ant/runTomcat.xml"/>
<property name="webapp.stage.dir"
value="${controls.perf.root}/webapps/stage"/>
<property name="webapp.name" value="controlsPerfWeb"/>
<property name="webapp.dir"
location="${controls.perf.root}/webapps/${webapp.name}"/>
@@ -55,29 +56,20 @@
<echo message="-----------------------------------------------------"/>
<echo message="| ${webapp.name} build starting |"/>
<echo message="-----------------------------------------------------"/>
- <antcall target="${webapp.name}.stage"/>
+ <antcall target="${webapp.name}.stage"/>
- <ant antfile="${buildWebapp.xml}"
target="deploy.beehive.webapp.runtime" inheritAll="false">
- <property name="webapp.dir"
value="${webapp.stage.dir}/${webapp.name}" />
- </ant>
-
- <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml"
-
tofile="${webapp.stage.dir}/${webapp.name}/WEB-INF/${netuiconfig.xml.name}"
- overwrite="true" failonerror="false"/>
+ <deploy-netui webappDir="${webapp.stage.dir}/${webapp.name}"/>
<!-- TODO: remove this copy once milton.jar is
not deleted by the updeploy.netui call -->
<!--copy
file="${beehive.dir}/controls/test/infra/milton/milton.jar"
todir="${webapp.name}/WEB-INF/lib"/-->
- <ant antfile="${buildWebapp.xml}" target="build.webapp"
inheritAll="false">
- <property name="webapp.dir"
location="${webapp.stage.dir}/${webapp.name}"/>
- </ant>
+ <build-webapp webappDir="${webapp.stage.dir}/${webapp.name}"/>
<echo message="----------------------------------------------"/>
<echo message="| ${webapp.name} build ending |"/>
<echo message="----------------------------------------------"/>
</target>
-
<!-- staging targets -->
<target name="controlsPerfWeb.stage" depends="clean">
<copy todir="${webapp.stage.dir}/${webapp.name}">
@@ -118,9 +110,7 @@
<echo message="| ${webapp.name} clean starting |"/>
<echo message="----------------------------------------------"/>
- <ant antfile="${buildWebapp.xml}"
target="undeploy.beehive.webapp.runtime" inheritAll="false">
- <property name="webapp.dir"
location="${webapp.stage.dir}/${webapp.name}"/>
- </ant>
+ <build-webapp webappDir="${webapp.stage.dir}/${webapp.name}"/>
<delete
dir="${webapp.stage.dir}/${webapp.name}"/>
@@ -141,29 +131,15 @@
<!-- -->
<!-- ================================================================ -->
<target name="deploy" description="Deploy webapp">
- <ant antfile="${runTomcat.xml}" target="deploy" inheritAll="false">
- <property name="catalina.username" value="manager"/>
- <property name="catalina.password" value="manager"/>
- <property name="context.path" value="${webapp.name}"/>
- <property name="webapp.dir"
value="${webapp.stage.dir}/${webapp.name}"/>
- <property name="webapp.root"
value="${webapp.stage.dir}/${webapp.name}"/>
- </ant>
+ <deploy-webapp webappDir="${webapp.stage.dir}/${webapp.name}"
contextPath="${webapp.name}"/>
</target>
<target name="undeploy" description="Undeploy webapp">
- <ant antfile="${runTomcat.xml}" target="undeploy" inheritAll="false">
- <property name="catalina.username" value="manager"/>
- <property name="catalina.password" value="manager"/>
- <property name="context.path" value="${webapp.name}"/>
- </ant>
+ <undeploy-webapp contextPath="${webapp.name}"/>
</target>
<target name="redeploy" description="Redeploy webapp">
- <ant antfile="${runTomcat.xml}" target="redeploy" inheritAll="false">
- <property name="catalina.username" value="manager"/>
- <property name="catalina.password" value="manager"/>
- <property name="context.path" value="${webapp.name}"/>
- </ant>
+ <redeploy-webapp contextPath="${webapp.name}"/>
</target>
<!-- ================================================================ -->
@@ -172,11 +148,11 @@
<!-- -->
<!-- ================================================================ -->
<target name="start" description="Start server">
- <ant antfile="${runTomcat.xml}" target="start" inheritAll="false"/>
+ <start-server shmem="false" javaOptions=""/>
</target>
<target name="stop" description="Stop server">
- <ant antfile="${runTomcat.xml}" target="stop" inheritAll="false"/>
+ <stop-server/>
</target>
<!-- todo: this needs to compost down into runTomcat.xml; until we're sure
it works, it stays here -->
Modified: incubator/beehive/trunk/controls/test/tools/mantis/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/mantis/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/tools/mantis/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/tools/mantis/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/mantis/build.xml
(original)
+++ incubator/beehive/trunk/controls/test/tools/mantis/build.xml Tue Jan
18 13:02:36 2005
@@ -1,6 +1,8 @@
<!-- build file -->
<project name="mantis-build" default="usage">
+ <import file="../../beehive-imports.xml"/>
+
<target name="usage">
<echo>
Usage:
@@ -16,8 +18,7 @@
<!-- load up shared beehive properties -->
<property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property
file="${os.BEEHIVE_HOME}/controls/test/common/path.properties"/>
+ <property file="${beehive.home}/controls/test/common/path.properties"/>
<!-- mantis properties -->
<property name="mantis.root" value="${basedir}"/>
@@ -34,10 +35,10 @@
<!--************-->
<path id="classpath">
<pathelement path="${tch.schema.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${ant.jar}"/>
- <pathelement path="${junit.jar}"/>
- <pathelement path="${tools.jar}"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="ant-jar.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="tools.dependency.path"/>
</path>
<!--************************-->
Modified: incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml
(original)
+++ incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml Tue Jan
18 13:02:36 2005
@@ -8,10 +8,8 @@
</echo>
</target>
- <!-- load up shared beehive properties -->
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property
file="${os.BEEHIVE_HOME}/controls/test/common/path.properties"/>
+ <import file="../../beehive-imports.xml"/>
+ <property file="${beehive.home}/controls/test/common/path.properties"/>
<!-- mantis properties -->
<property name="mantis.root" value="."/>
@@ -29,23 +27,20 @@
<path id="mantis.run.classpath">
<pathelement path="${mantis.local.deploy.jar}"/>
<pathelement path="${tch.schema.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${ant.jar}"/>
- <pathelement path="${junit.jar}"/>
- <pathelement path="${jsr173.jar}"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="ant-jar.dependency.path"/>
+ <path refid="junit.dependency.path"/>
</path>
<path id="tch.run.classpath">
<pathelement path="${mantis.build.dir}"/>
- <pathelement path="${junit.jar}"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="ant-all.dependency.path"/>
<pathelement path="${tch.jar}"/>
<pathelement path="${tch.schema.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${ant.jar}"/>
- <pathelement path="${ant.home}/lib/ant-launcher.jar"/>
<pathelement path="${jakarta.jar}"/>
<pathelement path="${xerces.jar}"/>
- <pathelement path="${jsr173.jar}"/>
</path>
<!--********-->
Modified: incubator/beehive/trunk/controls/test/tools/milton/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/milton/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/tools/milton/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/tools/milton/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/milton/build.xml
(original)
+++ incubator/beehive/trunk/controls/test/tools/milton/build.xml Tue Jan
18 13:02:36 2005
@@ -1,19 +1,17 @@
<project name="beehive-tools-milton" default="deploy" basedir=".">
-
- <property environment="os"/>
+ <import file="../../beehive-imports.xml"/>
+ <import file="../../ant/axis-import.xml"/>
<property name="src.dir" value="${basedir}/src"/>
<property name="build.dir" value="${basedir}/build"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
<property file="../../common/path.properties"/>
<path id="milton.build.classpath">
- <pathelement location="${junit.jar}"/>
+ <path refid="junit.dependency.path"/>
<pathelement location="${httpunit.jar}"/>
- <pathelement location="${axis.jar}"/>
- <pathelement location="${jaxrpc.jar}"/>
+ <path refid="webservice.jars"/>
</path>
<target name="usage">
Modified: incubator/beehive/trunk/controls/test/tools/tch/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/tch/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/tools/tch/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/tools/tch/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/tch/build.xml (original)
+++ incubator/beehive/trunk/controls/test/tools/tch/build.xml Tue Jan 18
13:02:36 2005
@@ -1,274 +1,273 @@
-<project name="tch" default="all">
-
- <property name="buildenv-props" value="buildenv.properties"/>
- <property file="${buildenv-props}"/>
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
-
- <property file="common.props"/>
-
- <property name="java-src" value="${branch-home}/src/java"/>
- <property name="classes" value="${builddir}/classes"/>
- <property name="nativedir" value="${branch-home}/native"/>
- <property name="nativegendir" value="${nativedir}/gen"/>
-
- <property name="nop4" value="false"/>
-
- <!-- Stuff for schema compilation -->
- <property name="schema.compiler"
value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
- <property name="schema.jar.file" location="deploy/schema.jar"/>
-
- <path id="classpath">
- <pathelement path="3rdparty/xbean-1.0.2.jar"/>
- </path>
-
-
-
- <target name="all" depends="build, jar, gen-root"/>
-
- <target name="clean">
- <delete quiet="true" dir="${classes}"/>
- <delete quiet="true" file="${core-jar-location}"/>
- <delete quiet="true" file="${root-file}"/>
- <antcall target="jar.util.clean"/>
- <antcall target="jar.gtlf-utils.clean"/>
- </target>
-
- <target name="build">
- <!-- check buildenv.properties has been generated -->
- <available file="${buildenv-props}" property="${propfile-found}"/>
- <fail unless="${propfile-found}" message="Cannot load ${buildenv-props}"/>
-
- <antcall target="compile.schema"/>
-
- <mkdir dir="${classes}"/>
- <echo message="java-src is: ${java-src}"/>
- <javac
- debug="${debug}" srcdir="${java-src}" destdir="${classes}"
- excludes="tch/version.java,
- tch/**"
- >
- <classpath>
- <pathelement path="${os.CLASSPATH}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement location="${schema.jar.file}"/>
- </classpath>
- </javac>
-
- <!-- rmic -->
-
- <rmic
- base="${classes}"
- sourcebase="${branch-home}/stubs"
-
includes="org/apache/beehive/test/tools/tch/core/remote/RemoteTaskRunnerImpl.class,
-
org/apache/beehive/test/tools/tch/core/remote/RemoteResultHandlerAdapter.class
-
org/apache/beehive/test/tools/tch/core/remote/RemoteProcessStateImpl.class,
-
org/apache/beehive/test/tools/tch/core/remote/RemoteExecTaskRunnerImpl.class,
-
org/apache/beehive/test/tools/tch/core/remote/RemoteProcessEngineWrapperImpl.class,
-
org/apache/beehive/test/tools/tch/core/remote/RemoteTchManagerImpl.class,
- org/apache/beehive/test/tools/tch/tool/ThreadDumperImpl.class,
-
org/apache/beehive/test/tools/tch/util/io/RemoteOutputStreamSubscriberAdapter.class"
- />
-
- <!-- generate version class -->
- <echo message="nop4 is set to: ${nop4}"/>
- <echo>
----------------------------
-running VersionGenerator
----------------------------
- </echo>
- <java
- classname="org.apache.beehive.test.tools.tch.core.VersionGenerator"
- fork="true" dir="${java-src}/org/apache/beehive/test/tools/tch/"
- >
- <classpath>
- <pathelement path="${classes}"/>
- </classpath>
- <sysproperty key="nop4" value="${nop4}"/>
- </java>
- <javac debug="${debug}" srcdir="${java-src}" destdir="${classes}"
- includes="org/apache/beehive/test/tools/tch/core/version.java,
- tch/version.java"/>
- <delete
file="${java-src}/org/apache/beehive/test/tools/tch/core/version.java"/>
- <delete
file="${classes}/org/apache/beehive/test/tools/tch/core/VersionGenerator.class"/>
- </target>
-
- <!-- generate tch-root.xml -->
- <target name="gen-root">
- <delete file="${root-file}"/>
- <copy file="${root-template}" tofile="${root-file}">
- <filterset>
- <filter token="TASKDEFS" value=""/>
- <filter token="INIT-ANONYMOUS-PROCESS" value=""/>
- <filter token="INIT-TEST-VEHICLE" value=""/>
- <filter token="ENV-PROP-MAPPING" value=""/>
- <filter token="PRODUCTION-EXEC-TASKDEFS" value=""/>
- </filterset>
- </copy>
- </target>
-
- <!-- javah -->
- <target name="native">
- <mkdir dir="${nativegendir}"/>
- <javah destdir="${nativegendir}"
class="org.apache.beehive.test.tools.tch.test.NativeTest"/>
- </target>
-
- <target name="native.clean">
- <delete quiet="true" dir="${nativegendir}"/>
- </target>
-
- <target name="jar" depends="manifest-file.write">
- <mkdir dir="${deploydir}"/>
- <echo message="Getting dtds from ${dtd-location}"/>
- <jar
- jarfile="${core-jar-location}"
- basedir="${classes}"
- manifest="pkg-manifest.mf"
- >
- <fileset
- dir="${dtd-location}"
- includes="valid-values-1-0.dtd"
- />
- <fileset
- dir="${dtd-location}"
- includes="gtlf-config-1-0.dtd"
- />
- <fileset
- dir="${dtd-location}"
- includes="gtlf-config-2-0.dtd"
- />
- </jar>
- <delete file="pkg-manifest.mf" />
- </target>
-
- <target name="manifest-file.write">
- <delete file="pkg-manifest.mf" quiet="true" />
- <!-- tch-ext.jar is for any optional tch extensions that are required at
run time, such as additional execution tasks, custom loggers, etc -->
- <echo file="pkg-manifest.mf">Manifest-Version: 1.0
-Class-Path: jakarta-regexp-1.2.jar j2ee12.jar jrexec.jar xerces.jar xerces.jar
jaxp.jar tch-ext.jar
- </echo>
- </target>
-
- <!-- This is for packaging stand alone utilities -->
- <target name="jar.util.clean">
- <delete file="${deploydir}/${util-jar-name}" quiet="true"/>
- </target>
- <target name="jar.util">
- <mkdir dir="${deploydir}"/>
- <jar
- jarfile="${deploydir}/${util-jar-name}"
- basedir="${classes}"
- includes="org/apache/beehive/test/tools/tch/util/**,
- org/apache/beehive/test/tools/tch/tool/**,
- org/apache/beehive/test/tools/tch/util/ant/**"
- />
- </target>
-
- <!-- Packages all classes related to GTLF logging/uploading
- Some of these are standalone (not used by Blackhawk internally),
- and should be moved out of blackhawk entirely -->
- <target name="jar.gtlf-utils.clean">
- <delete file="${deploydir}/${util-jar-name}" quiet="true"/>
- </target>
- <target name="jar.gtlf-utils">
- <mkdir dir="${deploydir}"/>
- <echo>
- Packaging GTLF Utils
- FIXME -- These classes should be moved out of Blackhawk.
- </echo>
- <jar
- jarfile="${deploydir}/${gtlf-tools-jar-name}"
- basedir="${classes}"
-
includes="org/apache/beehive/test/tools/tch/core/configuration/NonfatalValidationException.class,
-
org/apache/beehive/test/tools/tch/core/remote/ProcessSummary.class,
- org/apache/beehive/test/tools/tch/logger/**,
- org/apache/beehive/test/tools/tch/tool/GTLFGenerator.class,
-
org/apache/beehive/test/tools/tch/util/AbstractResultProcessor.class,
- org/apache/beehive/test/tools/tch/util/ant/**,
- org/apache/beehive/test/tools/tch/util/AntProperties.class,
-
org/apache/beehive/test/tools/tch/util/AntProperties$AntPropertiesNotInitializedException.class,
- org/apache/beehive/test/tools/tch/util/TchConstants.class,
- org/apache/beehive/test/tools/tch/util/TchUtils.class,
- org/apache/beehive/test/tools/tch/util/DomAsMap.class,
- org/apache/beehive/test/tools/tch/util/GeneralUtil.class,
-
org/apache/beehive/test/tools/tch/util/GeneralUtil$ParsingException.class,
- org/apache/beehive/test/tools/tch/util/NestedException.class,
-
org/apache/beehive/test/tools/tch/util/NestedRuntimeException.class,
- org/apache/beehive/test/tools/tch/util/OrderedMap.class,
- org/apache/beehive/test/tools/tch/util/OrderedSet.class,
- org/apache/beehive/test/tools/tch/util/ParamValidator.class,
-
org/apache/beehive/test/tools/tch/util/ParamValidator$MessageHolder.class,
- org/apache/beehive/test/tools/tch/util/ParamWrapper.class,
- org/apache/beehive/test/tools/tch/util/ResultProcessor.class,
- org/apache/beehive/test/tools/tch/util/StringUtils.class,
- org/apache/beehive/test/tools/tch/util/TestResult.class,
- org/apache/beehive/test/tools/tch/util/TestResultAdapter.class,
- org/apache/beehive/test/tools/tch/util/TestResultBean.class,
- org/apache/beehive/test/tools/tch/util/TestResultType.class
- org/apache/beehive/test/tools/tch/util/gtlf/**,
- org/apache/beehive/test/tools/tch/util/xml/**"
- >
-
- <!-- also need the dtds for local GTLFEntityResolver -->
- <fileset
- dir="${dtd-location}"
- includes="valid-values-1-0.dtd"
- />
- <fileset
- dir="${dtd-location}"
- includes="gtlf-config-1-0.dtd"
- />
- <fileset
- dir="${dtd-location}"
- includes="gtlf-config-2-0.dtd"
- />
- </jar>
- </target>
-
- <!-- package tch src -->
- <target name="package.src">
- <mkdir dir="${packagedir}"/>
- <zip
- destfile="${packagedir}/${src-core-zip}"
- update="true"
- >
- <zipfileset
- dir="${java-src}"
- includes="org/**/*.java"
- />
- </zip>
- </target>
-
-
-
- <!-- compiles the schema using xbeans -->
- <target name="compile.schema">
- <echo message="Using compiler from: ${schema.compiler}"/>
-
- <property name="schema.file"
location="deploy/schema/everything-suite.xsd"/>
- <property name="temp.dir" location="temp"/>
-
- <echo message="schema.file: ${schema.file}"/>
-
- <delete file="${schema.jar.file}"/>
- <delete dir="${temp.dir}"/>
- <mkdir dir="${temp.dir}"/>
-
-
- <java classname="${schema.compiler}"
- classpathref="classpath"
- fork="true">
- <arg line="-out ${schema.jar.file}"/>
- <arg line="-d ${temp.dir}"/>
- <arg line="${schema.file}"/>
- </java>
-
- <echo message="schema.jar.file: ${schema.jar.file}"/>
- <delete dir="${temp.dir}"/>
- </target>
-
-
-</project>
-
-
-
+<project name="tch" default="all">
+
+ <property name="buildenv-props" value="buildenv.properties"/>
+ <property file="${buildenv-props}"/>
+ <import file="../../../../beehive-imports.xml"/>
+
+ <property file="common.props"/>
+
+ <property name="java-src" value="${branch-home}/src/java"/>
+ <property name="classes" value="${builddir}/classes"/>
+ <property name="nativedir" value="${branch-home}/native"/>
+ <property name="nativegendir" value="${nativedir}/gen"/>
+
+ <property name="nop4" value="false"/>
+
+ <!-- Stuff for schema compilation -->
+ <property name="schema.compiler"
value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
+ <property name="schema.jar.file" location="deploy/schema.jar"/>
+
+ <path id="classpath">
+ <pathelement path="3rdparty/xbean-1.0.2.jar"/>
+ </path>
+
+
+
+ <target name="all" depends="build, jar, gen-root"/>
+
+ <target name="clean">
+ <delete quiet="true" dir="${classes}"/>
+ <delete quiet="true" file="${core-jar-location}"/>
+ <delete quiet="true" file="${root-file}"/>
+ <antcall target="jar.util.clean"/>
+ <antcall target="jar.gtlf-utils.clean"/>
+ </target>
+
+ <target name="build">
+ <!-- check buildenv.properties has been generated -->
+ <available file="${buildenv-props}" property="${propfile-found}"/>
+ <fail unless="${propfile-found}" message="Cannot load ${buildenv-props}"/>
+
+ <antcall target="compile.schema"/>
+
+ <mkdir dir="${classes}"/>
+ <echo message="java-src is: ${java-src}"/>
+ <javac
+ debug="${debug}" srcdir="${java-src}" destdir="${classes}"
+ excludes="tch/version.java,
+ tch/**"
+ >
+ <classpath>
+ <pathelement path="${os.CLASSPATH}"/>
+ <path refid="xbean.dependency.path"/>
+ <pathelement location="${schema.jar.file}"/>
+ </classpath>
+ </javac>
+
+ <!-- rmic -->
+
+ <rmic
+ base="${classes}"
+ sourcebase="${branch-home}/stubs"
+
includes="org/apache/beehive/test/tools/tch/core/remote/RemoteTaskRunnerImpl.class,
+
org/apache/beehive/test/tools/tch/core/remote/RemoteResultHandlerAdapter.class
+
org/apache/beehive/test/tools/tch/core/remote/RemoteProcessStateImpl.class,
+
org/apache/beehive/test/tools/tch/core/remote/RemoteExecTaskRunnerImpl.class,
+
org/apache/beehive/test/tools/tch/core/remote/RemoteProcessEngineWrapperImpl.class,
+
org/apache/beehive/test/tools/tch/core/remote/RemoteTchManagerImpl.class,
+ org/apache/beehive/test/tools/tch/tool/ThreadDumperImpl.class,
+
org/apache/beehive/test/tools/tch/util/io/RemoteOutputStreamSubscriberAdapter.class"
+ />
+
+ <!-- generate version class -->
+ <echo message="nop4 is set to: ${nop4}"/>
+ <echo>
+---------------------------
+running VersionGenerator
+---------------------------
+ </echo>
+ <java
+ classname="org.apache.beehive.test.tools.tch.core.VersionGenerator"
+ fork="true" dir="${java-src}/org/apache/beehive/test/tools/tch/"
+ >
+ <classpath>
+ <pathelement path="${classes}"/>
+ </classpath>
+ <sysproperty key="nop4" value="${nop4}"/>
+ </java>
+ <javac debug="${debug}" srcdir="${java-src}" destdir="${classes}"
+ includes="org/apache/beehive/test/tools/tch/core/version.java,
+ tch/version.java"/>
+ <delete
file="${java-src}/org/apache/beehive/test/tools/tch/core/version.java"/>
+ <delete
file="${classes}/org/apache/beehive/test/tools/tch/core/VersionGenerator.class"/>
+ </target>
+
+ <!-- generate tch-root.xml -->
+ <target name="gen-root">
+ <delete file="${root-file}"/>
+ <copy file="${root-template}" tofile="${root-file}">
+ <filterset>
+ <filter token="TASKDEFS" value=""/>
+ <filter token="INIT-ANONYMOUS-PROCESS" value=""/>
+ <filter token="INIT-TEST-VEHICLE" value=""/>
+ <filter token="ENV-PROP-MAPPING" value=""/>
+ <filter token="PRODUCTION-EXEC-TASKDEFS" value=""/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- javah -->
+ <target name="native">
+ <mkdir dir="${nativegendir}"/>
+ <javah destdir="${nativegendir}"
class="org.apache.beehive.test.tools.tch.test.NativeTest"/>
+ </target>
+
+ <target name="native.clean">
+ <delete quiet="true" dir="${nativegendir}"/>
+ </target>
+
+ <target name="jar" depends="manifest-file.write">
+ <mkdir dir="${deploydir}"/>
+ <echo message="Getting dtds from ${dtd-location}"/>
+ <jar
+ jarfile="${core-jar-location}"
+ basedir="${classes}"
+ manifest="pkg-manifest.mf"
+ >
+ <fileset
+ dir="${dtd-location}"
+ includes="valid-values-1-0.dtd"
+ />
+ <fileset
+ dir="${dtd-location}"
+ includes="gtlf-config-1-0.dtd"
+ />
+ <fileset
+ dir="${dtd-location}"
+ includes="gtlf-config-2-0.dtd"
+ />
+ </jar>
+ <delete file="pkg-manifest.mf" />
+ </target>
+
+ <target name="manifest-file.write">
+ <delete file="pkg-manifest.mf" quiet="true" />
+ <!-- tch-ext.jar is for any optional tch extensions that are required at
run time, such as additional execution tasks, custom loggers, etc -->
+ <echo file="pkg-manifest.mf">Manifest-Version: 1.0
+Class-Path: jakarta-regexp-1.2.jar j2ee12.jar jrexec.jar xerces.jar xerces.jar
jaxp.jar tch-ext.jar
+ </echo>
+ </target>
+
+ <!-- This is for packaging stand alone utilities -->
+ <target name="jar.util.clean">
+ <delete file="${deploydir}/${util-jar-name}" quiet="true"/>
+ </target>
+ <target name="jar.util">
+ <mkdir dir="${deploydir}"/>
+ <jar
+ jarfile="${deploydir}/${util-jar-name}"
+ basedir="${classes}"
+ includes="org/apache/beehive/test/tools/tch/util/**,
+ org/apache/beehive/test/tools/tch/tool/**,
+ org/apache/beehive/test/tools/tch/util/ant/**"
+ />
+ </target>
+
+ <!-- Packages all classes related to GTLF logging/uploading
+ Some of these are standalone (not used by Blackhawk internally),
+ and should be moved out of blackhawk entirely -->
+ <target name="jar.gtlf-utils.clean">
+ <delete file="${deploydir}/${util-jar-name}" quiet="true"/>
+ </target>
+ <target name="jar.gtlf-utils">
+ <mkdir dir="${deploydir}"/>
+ <echo>
+ Packaging GTLF Utils
+ FIXME -- These classes should be moved out of Blackhawk.
+ </echo>
+ <jar
+ jarfile="${deploydir}/${gtlf-tools-jar-name}"
+ basedir="${classes}"
+
includes="org/apache/beehive/test/tools/tch/core/configuration/NonfatalValidationException.class,
+
org/apache/beehive/test/tools/tch/core/remote/ProcessSummary.class,
+ org/apache/beehive/test/tools/tch/logger/**,
+ org/apache/beehive/test/tools/tch/tool/GTLFGenerator.class,
+
org/apache/beehive/test/tools/tch/util/AbstractResultProcessor.class,
+ org/apache/beehive/test/tools/tch/util/ant/**,
+ org/apache/beehive/test/tools/tch/util/AntProperties.class,
+
org/apache/beehive/test/tools/tch/util/AntProperties$AntPropertiesNotInitializedException.class,
+ org/apache/beehive/test/tools/tch/util/TchConstants.class,
+ org/apache/beehive/test/tools/tch/util/TchUtils.class,
+ org/apache/beehive/test/tools/tch/util/DomAsMap.class,
+ org/apache/beehive/test/tools/tch/util/GeneralUtil.class,
+
org/apache/beehive/test/tools/tch/util/GeneralUtil$ParsingException.class,
+ org/apache/beehive/test/tools/tch/util/NestedException.class,
+
org/apache/beehive/test/tools/tch/util/NestedRuntimeException.class,
+ org/apache/beehive/test/tools/tch/util/OrderedMap.class,
+ org/apache/beehive/test/tools/tch/util/OrderedSet.class,
+ org/apache/beehive/test/tools/tch/util/ParamValidator.class,
+
org/apache/beehive/test/tools/tch/util/ParamValidator$MessageHolder.class,
+ org/apache/beehive/test/tools/tch/util/ParamWrapper.class,
+ org/apache/beehive/test/tools/tch/util/ResultProcessor.class,
+ org/apache/beehive/test/tools/tch/util/StringUtils.class,
+ org/apache/beehive/test/tools/tch/util/TestResult.class,
+ org/apache/beehive/test/tools/tch/util/TestResultAdapter.class,
+ org/apache/beehive/test/tools/tch/util/TestResultBean.class,
+ org/apache/beehive/test/tools/tch/util/TestResultType.class
+ org/apache/beehive/test/tools/tch/util/gtlf/**,
+ org/apache/beehive/test/tools/tch/util/xml/**"
+ >
+
+ <!-- also need the dtds for local GTLFEntityResolver -->
+ <fileset
+ dir="${dtd-location}"
+ includes="valid-values-1-0.dtd"
+ />
+ <fileset
+ dir="${dtd-location}"
+ includes="gtlf-config-1-0.dtd"
+ />
+ <fileset
+ dir="${dtd-location}"
+ includes="gtlf-config-2-0.dtd"
+ />
+ </jar>
+ </target>
+
+ <!-- package tch src -->
+ <target name="package.src">
+ <mkdir dir="${packagedir}"/>
+ <zip
+ destfile="${packagedir}/${src-core-zip}"
+ update="true"
+ >
+ <zipfileset
+ dir="${java-src}"
+ includes="org/**/*.java"
+ />
+ </zip>
+ </target>
+
+
+
+ <!-- compiles the schema using xbeans -->
+ <target name="compile.schema">
+ <echo message="Using compiler from: ${schema.compiler}"/>
+
+ <property name="schema.file"
location="deploy/schema/everything-suite.xsd"/>
+ <property name="temp.dir" location="temp"/>
+
+ <echo message="schema.file: ${schema.file}"/>
+
+ <delete file="${schema.jar.file}"/>
+ <delete dir="${temp.dir}"/>
+ <mkdir dir="${temp.dir}"/>
+
+
+ <java classname="${schema.compiler}"
+ classpathref="classpath"
+ fork="true">
+ <arg line="-out ${schema.jar.file}"/>
+ <arg line="-d ${temp.dir}"/>
+ <arg line="${schema.file}"/>
+ </java>
+
+ <echo message="schema.jar.file: ${schema.jar.file}"/>
+ <delete dir="${temp.dir}"/>
+ </target>
+
+
+</project>
+
+
+
Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/webapps/build.xml&r1=125544&p2=incubator/beehive/trunk/controls/test/webapps/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml Tue Jan 18
13:02:36 2005
@@ -1,340 +1,309 @@
-<?xml version="1.0"?>
-<!--
-===========================================================================
-
- This project consists of targets to build/clean a web appplication with
- the latest Beehive NETUI artifacts, start/stop Tomcat server, and deploy
- the web application to a started Tomcat server.
-
- This project originates from trunk/netui/test/webapps/drt/build.xml for
- code reusing.
-
-============================================================================
--->
-<project name="Beehive/Controls/TestControls-webapp" default="usage"
basedir=".">
-
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="../common/path.properties"/>
-
- <property name="webapp.name" value="controlsWeb"/>
- <property name="webapp.waitfor.url"
value="http://localhost:8080/${webapp.name}"/>
- <property name="dbControl.jar"
location="../../../samples/controls-db/build/dbControl.jar"/>
-
-
- <target name="usage">
- <echo message="" />
- <echo message="" />
- <echo message="web app build scripts for controls testing" />
- <echo
message="================================================================" />
- <echo message="| Usage
|" />
- <echo
message="================================================================" />
- <echo message="" />
- <echo
message="-------------------------------------------------------------------" />
- <echo message="| Standard Targets
|" />
- <echo
message="-------------------------------------------------------------------" />
- <echo message="build - inject latest netui artifacts and build
controlsWeb, " />
- <echo message=" build controlsWeb includes compiling controls
in the " />
- <echo message=" web app.
" />
- <echo message="start - start Tomcat server"/>
- <echo message="stop - stop Tomcat server"/>
- <echo message="deploy - deploys a built webapp to a started Tomcat" />
- <echo message="" />
- <echo message="" />
- </target>
-
- <target name="-init">
-
- <property name="staging.dir" location="stage"/>
- <property name="webapp.dir" location="${staging.dir}/${webapp.name}"/>
-
- <available file="${webapp.dir}" property="webapp.dir.present"/>
-
- <mkdir dir="${staging.dir}"/>
-
- <property file="${webapp.name}/app.properties"/>
-
- <condition property="do.inject.netui">
- <istrue value="${app.inject.netui}"/>
- </condition>
- <condition property="do.inject.wsm">
- <istrue value="${app.inject.wsm}"/>
- </condition>
- <condition property="do.inject.milton">
- <istrue value="${app.inject.milton}"/>
- </condition>
- <condition property="do.inject.derby">
- <istrue value="${app.inject.derby}"/>
- </condition>
- <condition property="do.inject.dbControl">
- <istrue value="${app.inject.dbControl}"/>
- </condition>
- <condition property="do.inject.test.controls">
- <isset property="app.inject.test.controls"/>
- </condition>
- <condition property="do.inject.test.controls.src">
- <equals arg1="${app.inject.test.controls}" arg2="src"/>
- </condition>
- <condition property="do.inject.test.controls.jar">
- <equals arg1="${app.inject.test.controls}" arg2="jar"/>
- </condition>
- <condition property="do.inject.test.drivers">
- <isset property="app.inject.test.drivers"/>
- </condition>
- <condition property="do.inject.test.drivers.src">
- <equals arg1="${app.inject.test.drivers}" arg2="src"/>
- </condition>
- <condition property="do.inject.test.drivers.jar">
- <equals arg1="${app.inject.test.drivers}" arg2="jar"/>
- </condition>
- </target>
-
- <!-- ================================================================ -->
- <!-- -->
- <!-- Targets for building a webapp -->
- <!-- -->
- <!-- ================================================================ -->
- <target name="build" description="Build webapp" depends="-init">
- <echo message="-----------------------------------------------------"/>
- <echo message="| Beehive Controls controlsWeb build starting |"/>
- <echo message="-----------------------------------------------------"/>
-
- <!-- webapps are copied into a staging directory where additional
build steps
- can be performed -->
- <copy todir="${staging.dir}/${webapp.name}" overwrite="true">
- <fileset dir="${webapp.name}"/>
- </copy>
-
- <antcall target="-inject.netui"/>
- <antcall target="-inject.wsm"/>
- <antcall target="-inject.milton"/>
- <antcall target="-inject.derby"/>
- <antcall target="-inject.dbControl"/>
- <antcall target="-inject.test.controls"/>
- <antcall target="-inject.test.drivers"/>
- <antcall target="-build.webapp"/>
-
- <echo message="----------------------------------------------"/>
- <echo message="| Controls controlsWeb build ending |"/>
- <echo message="----------------------------------------------"/>
- </target>
-
- <target name="-build.webapp">
- <ant antfile="${buildWebapp.ant}" target="build.webapp"
inheritAll="false">
- <property name="webapp.dir" location="${webapp.dir}"/>
- </ant>
- </target>
-
- <target name="-inject.netui" if="do.inject.netui">
- <echo message="Injecting Netui in ${webapp.name}"/>
- <ant antfile="${buildWebapp.ant}"
target="deploy.beehive.webapp.runtime" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}" />
- </ant>
-
- <copy file="${webapp.dir}/WEB-INF/local-netui-config.xml"
- tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}"
- overwrite="true" failonerror="false"/>
- </target>
-
- <target name="-inject.wsm" if="do.inject.wsm">
- <echo message="Injecting WSM in ${webapp.name}"/>
- <ant antfile="${buildWebapp.ant}" target="deploy.wsm.webapp.runtime"
inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}" />
- </ant>
-
- <!--copy file="${webapp.dir}/WEB-INF/local-netui-config.xml"
- tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}"
- overwrite="true" failonerror="false"/-->
- </target>
-
- <target name="-inject.milton" if="do.inject.milton">
- <echo message="Injecting ${milton.jar} to ${webapp.name}"/>
- <mkdir dir="${webapp.dir}/WEB-INF/lib"/>
-
- <copy file="${milton.jar}" todir="${webapp.dir}/WEB-INF/lib"
- overwrite="true" verbose="true"/>
-
- <copy todir="${webapp.dir}/WEB-INF" verbose="true" overwrite="true">
- <fileset dir="${milton.templates}">
- <include name="src/**"/>
- </fileset>
- </copy>
-
- <copy todir="${webapp.dir}" verbose="true" overwrite="true">
- <fileset dir="${milton.templates}">
- <include name="resources/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="-inject.derby" if="do.inject.derby">
- <echo message="Injecting ${derby.jar} to ${webapp.name}"/>
- <copy todir="${webapp.dir}/WEB-INF/lib"
- file="${derby.jar}" verbose="true"
- overwrite="true" failonerror="true"/>
- </target>
-
- <target name="-inject.dbControl" if="do.inject.dbControl">
- <echo message="Injecting ${dbControl.jar} to ${webapp.name}"/>
- <copy todir="${webapp.dir}/WEB-INF/lib"
- file="${dbControl.jar}" verbose="true"
- overwrite="true" failonerror="true"/>
- </target>
-
- <target name="-inject.test.controls" if="do.inject.test.controls">
- <antcall target="-inject.test.controls.src"/>
- <antcall target="-inject.test.controls.jar"/>
- </target>
-
- <target name="-inject.test.controls.src" if="do.inject.test.controls.src">
- <echo message="Injecting Controls Source"/>
- <copy todir="${webapp.dir}/WEB-INF/src" verbose="true"
overwrite="true">
- <fileset dir="${controls.test.controls}">
- <include name="*/**"/>
- <exclude name="*/.svn/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="-inject.test.controls.jar" if="do.inject.test.controls.jar">
- <echo message="Injecting Controls Jar"/>
- <copy todir="${webapp.dir}/WEB-INF/lib"
- file="${controlstestbeans.jar}" verbose="true"
- overwrite="true"/>
- </target>
-
- <target name="-inject.test.drivers" if="do.inject.test.drivers">
- <antcall target="-inject.test.drivers.src"/>
- <antcall target="-inject.test.drivers.jar"/>
- </target>
-
- <target name="-inject.test.drivers.src" if="do.inject.test.drivers.src">
- <echo message="Injecting Drivers Source"/>
- <copy todir="${webapp.dir}/WEB-INF/src" overwrite="true"
verbose="true">
- <fileset dir="${controls.test.drivers}">
- <include name="*/**"/>
- <exclude name="*/.svn/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="-inject.test.drivers.jar" if="do.inject.test.drivers.jar">
- <echo message="Injecting Drivers Jar"/>
- <copy todir="${webapp.dir}/WEB-INF/lib"
- file="${controlstestdrivers.jar}"
- verbose="true" overwrite="true"/>
- </target>
-
- <target name="clean" description="Clean webapp" depends="-init"
if="webapp.dir.present">
- <echo message="----------------------------------------------"/>
- <echo message="| Controls controlsWeb clean starting |"/>
- <echo message="----------------------------------------------"/>
-
- <ant antfile="${buildWebapp.ant}"
target="undeploy.beehive.webapp.runtime" inheritAll="false">
- <property name="webapp.dir" location="${webapp.dir}"/>
- </ant>
-
- <delete dir="${staging.dir}"/>
- <delete file="velocity.log"/>
-
- <echo message="----------------------------------------------"/>
- <echo message="| Controls controlsWeb clean ending |"/>
- <echo message="----------------------------------------------"/>
- </target>
-
- <target name="scrub" depends="clean" description="Scrub webapp">
- <delete dir="${tomcat.dir}/work/Catalina/localhost/${webapp.name}"
includeEmptyDirs="true"/>
- <delete
file="${tomcat.dir}/conf/Catalina/localhost/${webapp.name}.xml"/>
- </target>
-
- <!-- ================================================================ -->
- <!-- -->
- <!-- Targets for deploying the webapp on a server -->
- <!-- -->
- <!-- ================================================================ -->
- <target name="deploy" description="Deploy webapp" depends="-init">
- <ant antfile="${buildWebapp.ant}" target="deploy" inheritAll="false">
- <property name="context.path" value="${webapp.name}"/> <!-- whats
this for? -->
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
- </target>
-
- <target name="undeploy" description="Undeploy webapp">
- <ant antfile="${buildWebapp.ant}" target="undeploy" inheritAll="false">
- <property name="context.path" value="${webapp.name}"/>
- </ant>
- </target>
-
- <target name="redeploy" description="Redeploy webapp">
- <ant antfile="${buildWebapp.ant}" target="redeploy" inheritAll="false">
- <property name="context.path" value="${webapp.name}"/>
- </ant>
- </target>
-
- <!-- ================================================================ -->
- <!-- -->
- <!-- Targets for starting / stopping a server -->
- <!-- -->
- <!-- ================================================================ -->
- <target name="start" description="Start server">
- <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
- </target>
-
- <target name="start.with.shmem" description="Start server">
- <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false"/>
- </target>
-
- <target name="start.with.asserts" description="Start server with asserts
enabled for org.apache.beehive.netui">
- <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false">
- <property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
- </ant>
- </target>
-
- <target name="start.with.shmem.asserts" description="Start server with
asserts enabled for org.apache.beehive.netui">
- <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false">
- <property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
- </ant>
- </target>
-
- <target name="stop" description="Stop server">
- <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
- </target>
-
- <!-- todo: this needs to compost down into buildWebapp.xml; until we're
sure it works, it stays here -->
- <target name="ensure.deployed" description="Deploy webapp for the test
recorder">
- <echo>Ensuring that the webapp ${webapp.name} is deployed on a running
server at the url ${webapp.waitfor.url}</echo>
-
- <waitfor maxwait="5" maxwaitunit="second"
timeoutproperty="unavailable">
- <http url="${webapp.waitfor.url}"/>
- </waitfor>
- <antcall target="do.deploy"/>
- <antcall target="do.redeploy"/>
- <fail if="still.unavailable" message="Couldn't find webapp with path
${webapp.waitfor.url}"/>
- </target>
-
- <target name="do.deploy" if="unavailable">
- <echo>Webapp is not deployed; deploying</echo>
-
- <antcall target="deploy"/>
- <echo>...deploy complete</echo>
-
- <waitfor maxwait="120" maxwaitunit="second"
timeoutproperty="still.unavailable">
- <http url="${webapp.waitfor.url}"/>
- </waitfor>
- </target>
-
- <target name="do.redeploy" unless="unavailable">
- <echo>Webapp is deployed; undeploy and redeploy</echo>
-
- <antcall target="undeploy"/>
- <echo>...undeploy complete</echo>
-
- <antcall target="deploy"/>
- <echo>...deploy complete</echo>
-
- <waitfor maxwait="120" maxwaitunit="second"
timeoutproperty="still.unavailable">
- <http url="${webapp.waitfor.url}"/>
- </waitfor>
- </target>
-
-</project>
+<?xml version="1.0"?>
+<!--
+===========================================================================
+
+ This project consists of targets to build/clean a web appplication with
+ the latest Beehive NETUI artifacts, start/stop Tomcat server, and deploy
+ the web application to a started Tomcat server.
+
+============================================================================
+-->
+<project name="Beehive/Controls/TestControls-webapp" default="usage"
basedir=".">
+
+ <import file="../../../beehive-imports.xml"/>
+ <property file="../common/path.properties"/>
+
+ <property name="webapp.name" value="controlsWeb"/>
+ <property name="server.root.url" value="http://localhost:8080"/>
+ <property name="webapp.waitfor.url"
value="${server.root.url}/${webapp.name}"/>
+ <property name="dbControl.jar"
location="${beehive.home}/samples/controls-db/build/dbControl.jar"/>
+ <property name="derby.jar"
location="${beehive.home}/external/derby/derby_46005.jar"/>
+
+ <target name="usage">
+ <echo message="" />
+ <echo message="" />
+ <echo message="web app build scripts for controls testing" />
+ <echo
message="================================================================" />
+ <echo message="| Usage
|" />
+ <echo
message="================================================================" />
+ <echo message="" />
+ <echo
message="-------------------------------------------------------------------" />
+ <echo message="| Standard Targets
|" />
+ <echo
message="-------------------------------------------------------------------" />
+ <echo message="build - inject latest netui artifacts and build
controlsWeb, " />
+ <echo message=" build controlsWeb includes compiling controls
in the " />
+ <echo message=" web app.
" />
+ <echo message="start - start Tomcat server"/>
+ <echo message="stop - stop Tomcat server"/>
+ <echo message="deploy - deploys a built webapp to a started Tomcat" />
+ <echo message="" />
+ <echo message="" />
+ </target>
+
+ <target name="-init">
+
+ <property name="staging.dir" location="stage"/>
+ <property name="webapp.dir" location="${staging.dir}/${webapp.name}"/>
+
+ <available file="${webapp.dir}" property="webapp.dir.present"/>
+
+ <mkdir dir="${staging.dir}"/>
+
+ <property file="${webapp.name}/app.properties"/>
+
+ <condition property="do.inject.netui">
+ <istrue value="${app.inject.netui}"/>
+ </condition>
+ <condition property="do.inject.wsm">
+ <istrue value="${app.inject.wsm}"/>
+ </condition>
+ <condition property="do.inject.milton">
+ <istrue value="${app.inject.milton}"/>
+ </condition>
+ <condition property="do.inject.derby">
+ <istrue value="${app.inject.derby}"/>
+ </condition>
+ <condition property="do.inject.dbControl">
+ <istrue value="${app.inject.dbControl}"/>
+ </condition>
+ <condition property="do.inject.test.controls">
+ <isset property="app.inject.test.controls"/>
+ </condition>
+ <condition property="do.inject.test.controls.src">
+ <equals arg1="${app.inject.test.controls}" arg2="src"/>
+ </condition>
+ <condition property="do.inject.test.controls.jar">
+ <equals arg1="${app.inject.test.controls}" arg2="jar"/>
+ </condition>
+ <condition property="do.inject.test.drivers">
+ <isset property="app.inject.test.drivers"/>
+ </condition>
+ <condition property="do.inject.test.drivers.src">
+ <equals arg1="${app.inject.test.drivers}" arg2="src"/>
+ </condition>
+ <condition property="do.inject.test.drivers.jar">
+ <equals arg1="${app.inject.test.drivers}" arg2="jar"/>
+ </condition>
+ </target>
+
+ <!-- ================================================================ -->
+ <!-- -->
+ <!-- Targets for building a webapp -->
+ <!-- -->
+ <!-- ================================================================ -->
+ <target name="build" description="Build webapp" depends="-init">
+ <echo message="-----------------------------------------------------"/>
+ <echo message="| Beehive Controls controlsWeb build starting |"/>
+ <echo message="-----------------------------------------------------"/>
+
+ <!-- webapps are copied into a staging directory where additional
build steps
+ can be performed -->
+ <copy todir="${staging.dir}/${webapp.name}" overwrite="true">
+ <fileset dir="${webapp.name}"/>
+ </copy>
+
+ <antcall target="-inject.netui"/>
+ <antcall target="-inject.wsm"/>
+ <antcall target="-inject.milton"/>
+ <antcall target="-inject.derby"/>
+ <antcall target="-inject.dbControl"/>
+ <antcall target="-inject.test.controls"/>
+ <antcall target="-inject.test.drivers"/>
+ <antcall target="-build.webapp"/>
+
+ <echo message="----------------------------------------------"/>
+ <echo message="| Controls controlsWeb build ending |"/>
+ <echo message="----------------------------------------------"/>
+ </target>
+
+ <target name="-build.webapp">
+ <build-webapp webappDir="${webapp.dir}"/>
+ </target>
+
+ <target name="-inject.netui" if="do.inject.netui">
+ <echo message="Injecting NetUI in ${webapp.name}"/>
+ <deploy-netui webappDir="${webapp.dir}"/>
+ </target>
+
+ <target name="-inject.wsm" if="do.inject.wsm">
+ <echo message="Injecting WSM in ${webapp.name}"/>
+ <deploy-wsm webappDir="${webapp.dir}"/>
+ </target>
+
+ <target name="-inject.milton" if="do.inject.milton">
+ <echo message="Injecting ${milton.jar} to ${webapp.name}"/>
+ <mkdir dir="${webapp.dir}/WEB-INF/lib"/>
+
+ <copy file="${milton.jar}" todir="${webapp.dir}/WEB-INF/lib"
+ overwrite="true" verbose="true"/>
+
+ <copy todir="${webapp.dir}/WEB-INF" verbose="true" overwrite="true">
+ <fileset dir="${milton.templates}">
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${webapp.dir}" verbose="true" overwrite="true">
+ <fileset dir="${milton.templates}">
+ <include name="resources/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="-inject.derby" if="do.inject.derby">
+ <echo message="Injecting ${derby.jar} to ${webapp.name}"/>
+ <copy todir="${webapp.dir}/WEB-INF/lib"
+ file="${derby.jar}" verbose="true"
+ overwrite="true" failonerror="true"/>
+ </target>
+
+ <target name="-inject.dbControl" if="do.inject.dbControl">
+ <echo message="Injecting ${dbControl.jar} to ${webapp.name}"/>
+ <copy todir="${webapp.dir}/WEB-INF/lib"
+ file="${dbControl.jar}" verbose="true"
+ overwrite="true" failonerror="true"/>
+ </target>
+
+ <target name="-inject.test.controls" if="do.inject.test.controls">
+ <antcall target="-inject.test.controls.src"/>
+ <antcall target="-inject.test.controls.jar"/>
+ </target>
+
+ <target name="-inject.test.controls.src" if="do.inject.test.controls.src">
+ <echo message="Injecting Controls Source"/>
+ <copy todir="${webapp.dir}/WEB-INF/src" verbose="true"
overwrite="true">
+ <fileset dir="${controls.test.controls}">
+ <include name="*/**"/>
+ <exclude name="*/.svn/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="-inject.test.controls.jar" if="do.inject.test.controls.jar">
+ <echo message="Injecting Controls Jar"/>
+ <copy todir="${webapp.dir}/WEB-INF/lib"
+ file="${controlstestbeans.jar}" verbose="true"
+ overwrite="true"/>
+ </target>
+
+ <target name="-inject.test.drivers" if="do.inject.test.drivers">
+ <antcall target="-inject.test.drivers.src"/>
+ <antcall target="-inject.test.drivers.jar"/>
+ </target>
+
+ <target name="-inject.test.drivers.src" if="do.inject.test.drivers.src">
+ <echo message="Injecting Drivers Source"/>
+ <copy todir="${webapp.dir}/WEB-INF/src" overwrite="true"
verbose="true">
+ <fileset dir="${controls.test.drivers}">
+ <include name="*/**"/>
+ <exclude name="*/.svn/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="-inject.test.drivers.jar" if="do.inject.test.drivers.jar">
+ <echo message="Injecting Drivers Jar"/>
+ <copy todir="${webapp.dir}/WEB-INF/lib"
+ file="${controlstestdrivers.jar}"
+ verbose="true" overwrite="true"/>
+ </target>
+
+ <target name="clean" description="Clean webapp" depends="-init"
if="webapp.dir.present">
+ <echo message="----------------------------------------------"/>
+ <echo message="| Controls controlsWeb clean starting |"/>
+ <echo message="----------------------------------------------"/>
+
+ <undeploy-netui webappDir="${webapp.dir}"/>
+
+ <delete dir="${staging.dir}"/>
+ <delete file="velocity.log"/>
+
+ <echo message="----------------------------------------------"/>
+ <echo message="| Controls controlsWeb clean ending |"/>
+ <echo message="----------------------------------------------"/>
+ </target>
+
+ <target name="scrub" depends="clean" description="Scrub webapp">
+ <delete dir="${tomcat.dir}/work/Catalina/localhost/${webapp.name}"
includeEmptyDirs="true"/>
+ <delete
file="${tomcat.dir}/conf/Catalina/localhost/${webapp.name}.xml"/>
+ </target>
+
+ <!-- ================================================================ -->
+ <!-- -->
+ <!-- Targets for deploying the webapp on a server -->
+ <!-- -->
+ <!-- ================================================================ -->
+ <target name="deploy" description="Deploy webapp" depends="-init">
+ <deploy-webapp webappDir="${webapp.dir}" contextPath="${webapp.name}"/>
+ </target>
+
+ <target name="undeploy" description="Undeploy webapp">
+ <undeploy-webapp contextPath="${webapp.name}"/>
+ </target>
+
+ <target name="redeploy" description="Redeploy webapp">
+ <undeploy-webapp contextPath="${webapp.name}"/>
+ </target>
+
+ <!-- ================================================================ -->
+ <!-- -->
+ <!-- Targets for starting / stopping a server -->
+ <!-- -->
+ <!-- ================================================================ -->
+ <target name="start" description="Start server">
+ <start-server shmem="false" javaOptions=""/>
+ </target>
+
+ <target name="start.with.shmem" description="Start server">
+ <start-server shmem="true" javaOptions=""/>
+ </target>
+
+ <target name="start.with.asserts" description="Start server with asserts
enabled for org.apache.beehive.netui">
+ <start-server shmem="false"
javaOptions="-ea:org.apache.beehive.netui..."/>
+ </target>
+
+ <target name="start.with.shmem.asserts" description="Start server with
asserts enabled for org.apache.beehive.netui">
+ <start-server shmem="true"
javaOptions="-ea:org.apache.beehive.netui..."/>
+ </target>
+
+ <target name="stop" description="Stop server">
+ <stop-server/>
+ </target>
+
+ <target name="ensure.deployed" description="Deploy webapp for the test
recorder">
+ <echo>Ensuring that the webapp ${webapp.name} is deployed on a running
server at the url ${webapp.waitfor.url}</echo>
+
+ <waitfor maxwait="5" maxwaitunit="second"
timeoutproperty="unavailable">
+ <http url="${webapp.waitfor.url}"/>
+ </waitfor>
+ <antcall target="do.deploy"/>
+ <antcall target="do.redeploy"/>
+ <fail if="still.unavailable" message="Couldn't find webapp with path
${webapp.waitfor.url}"/>
+ </target>
+
+ <target name="do.deploy" if="unavailable">
+ <echo>Webapp is not deployed; deploying</echo>
+
+ <antcall target="deploy"/>
+ <echo>...deploy complete</echo>
+
+ <waitfor maxwait="120" maxwaitunit="second"
timeoutproperty="still.unavailable">
+ <http url="${webapp.waitfor.url}"/>
+ </waitfor>
+ </target>
+
+ <target name="do.redeploy" unless="unavailable">
+ <echo>Webapp is deployed; undeploy and redeploy</echo>
+
+ <antcall target="undeploy"/>
+ <echo>...undeploy complete</echo>
+
+ <antcall target="deploy"/>
+ <echo>...deploy complete</echo>
+
+ <waitfor maxwait="120" maxwaitunit="second"
timeoutproperty="still.unavailable">
+ <http url="${webapp.waitfor.url}"/>
+ </waitfor>
+ </target>
+
+</project>
Modified: incubator/beehive/trunk/controls/test/webapps/common.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/common.properties?view=diff&rev=125545&p1=incubator/beehive/trunk/controls/test/webapps/common.properties&r1=125544&p2=incubator/beehive/trunk/controls/test/webapps/common.properties&r2=125545
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/common.properties
(original)
+++ incubator/beehive/trunk/controls/test/webapps/common.properties Tue Jan
18 13:02:36 2005
@@ -1,24 +1,25 @@
-#
-# common.properties -- an Ant properties file that
-# contains properties that are read-only in
-# a user's development environment.
-#
-webui.home=${beehive.dir}/netui
-build.dir=${webui.home}/build
-build.external.dir=${build.dir}/external
-struts.dir=${build.external.dir}/struts
-
-#
-# Tomcat properties. These are used by the XDoclet build
-# and will go away when the Tomcat security integration is
-# implemented on Tomcat 5.x
-#
-
-# External JARs
-
-#
-# External TLDs
-#
-struts11.logic.tld=${struts.dir}/struts-logic.tld
-struts11.html.tld=${struts.dir}/struts-html.tld
-struts11.bean.tld=${struts.dir}/struts-bean.tld
+#
+# common.properties -- an Ant properties file that
+# contains properties that are read-only in
+# a user's development environment.
+#
+beehive.dir=${beehive.home}
+webui.home=${beehive.dir}/netui
+build.dir=${webui.home}/build
+build.external.dir=${build.dir}/external
+struts.dir=${build.external.dir}/struts
+
+#
+# Tomcat properties. These are used by the XDoclet build
+# and will go away when the Tomcat security integration is
+# implemented on Tomcat 5.x
+#
+
+# External JARs
+
+#
+# External TLDs
+#
+struts11.logic.tld=${struts.dir}/struts-logic.tld
+struts11.html.tld=${struts.dir}/struts-html.tld
+struts11.bean.tld=${struts.dir}/struts-bean.tld
Added: incubator/beehive/trunk/distribution.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/distribution.xml Tue Jan 18 13:02:36 2005
@@ -0,0 +1,261 @@
+<?xml version="1.0"?>
+
+<!--
+ Beehive documentation build file.
+-->
+<project name="Beehive/Distribution" default="usage" basedir=".">
+
+ <import file="beehive-imports.xml"/>
+
+ <property name="dist.name.src" value="${dist.name}-src"/>
+
+ <property name="beehive.user.dir" location="${beehive.home}/user"/>
+ <property name="dist.base.dir" location="${beehive.home}/build/dist"/>
+ <property name="dist.docs.dir" location="${beehive.home}/build/dist-docs"/>
+ <property name="dist.dir" location="${dist.base.dir}/${dist.name}"/>
+
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Distribution targets -->
+ <!-- -->
+ <!-- ============================================= -->
+ <target name="build.dist" description="Builds a Beehive distribution">
+ <mkdir dir="${dist.dir}"/>
+
+ <antcall target="build.dist.core"/>
+ <antcall target="build.dist.samples"/>
+ <antcall target="build.dist.docs"/>
+ </target>
+
+ <target name="docs" description="">
+ <ant antfile="build.xml" target="docs" inheritAll="false"/>
+ </target>
+
+ <target name="build.dist.core">
+ <!-- copy the required libraries into dist/ -->
+ <copy todir="${dist.dir}/lib/common" failOnError="true">
+ <fileset refid="commons-codec.fileset"/>
+ <fileset refid="log4j.fileset"/>
+ <fileset refid="xbean.fileset"/>
+ <fileset refid="jsr173.fileset"/>
+ <fileset refid="velocity.fileset"/>
+ </copy>
+
+ <copy todir="${dist.dir}/lib/controls" failOnError="true">
+ <fileset refid="controls.fileset"/>
+ </copy>
+
+ <!-- todo: this needs to be cleaned up; axis shouldn't be in the
Beehive distribution -->
+ <copy todir="${dist.dir}/lib/wsm" failOnError="true">
+ <fileset dir="${beehive.home}/wsm/external" includes="**/*.jar"/>
+ <fileset dir="${beehive.home}/wsm/lib" includes="**/*.jar"/>
+ <fileset dir="${beehive.home}/wsm/build/jars" includes="**/*.jar"/>
+ </copy>
+
+ <copy todir="${dist.dir}/lib/netui" failOnError="true" flatten="true">
+ <fileset dir="${beehive.home}/netui/build/dist/compiler">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${beehive.home}/netui/build/dist/webapp">
+ <include name="WEB-INF/lib/*.jar"/>
+ <exclude name="WEB-INF/lib/apache-xbean.jar"/>
+ <exclude name="WEB-INF/lib/controls.jar"/>
+ <exclude name="WEB-INF/lib/jsr173*.jar"/>
+ <exclude name="WEB-INF/lib/log4j*.jar"/>
+ <include name="WEB-INF/*.tld"/>
+ <include name="WEB-INF/*.tldx"/>
+ </fileset>
+ </copy>
+
+ <!-- this directory structure can't be flattened -->
+ <copy todir="${dist.dir}/lib/netui/resources" failOnError="true">
+ <fileset dir="${beehive.home}/netui/build/dist/webapp/resources">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- copy the required Ant build files dist/ -->
+ <copy todir="${dist.dir}/ant" failOnError="true">
+ <fileset file="user/webappRuntimeCore.xml"/>
+ <fileset file="user/buildWebapp.xml"/>
+ </copy>
+ <copy todir="${dist.dir}" file="user/beehive-imports.xml"/>
+ <copy todir="${dist.dir}/ant" failOnError="true">
+ <fileset file="ant/buildWebappCore.xml"/>
+ </copy>
+
+ <copy todir="${dist.dir}" failOnError="true">
+ <fileset dir="${beehive.home}">
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.txt"/>
+ </fileset>
+ </copy>
+
+ <property name="webapp.name" value="netui-blank"/>
+
+ <!-- build the project templates in dist/ -->
+ <echo>Create the Beehive webapp template</echo>
+ <copy todir="build/tmp-dist/${webapp.name}">
+ <fileset dir="${beehive.home}/netui/build/dist/webapp">
+ <exclude name="WEB-INF/lib/*.jar"/>
+ <exclude name="WEB-INF/*.tld"/>
+ <exclude name="WEB-INF/*.tldx"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/samples/netui-blank">
+ <fileset dir="build/tmp-dist/${webapp.name}"/>
+ </copy>
+ </target>
+
+ <target name="build.dist.samples">
+ <!-- Build the petstore dashboard distro -->
+ <copy todir="${dist.dir}/samples/PetStoreDashboard" failOnError="true">
+ <fileset dir="samples/PetStoreDashboard"/>
+ </copy>
+
+ <!-- Build the petstore distro -->
+ <!-- copy the webapp itself -->
+ <ant antfile="${beehive.home}/ant/buildWebapp.xml" target="clean">
+ <property name="webapp.dir"
location="${beehive.home}/samples/petstoreWeb"/>
+ </ant>
+
+ <copy todir="${dist.dir}/samples/petstoreWeb" failOnError="true">
+ <fileset dir="samples/petstoreWeb">
+ <exclude name="WEB-INF/src/petstore-build.xml"/>
+ <exclude name="WEB-INF/lib/*.jar"/>
+ <exclude name="WEB-INF/*.tld"/>
+ <exclude name="WEB-INF/*.tldx"/>
+ </fileset>
+ </copy>
+
+ <!-- Build the controls blank template app distro -->
+ <copy todir="${dist.dir}/samples/controls-blank" failOnError="true">
+ <fileset dir="samples/controls-blank"/>
+ </copy>
+
+ <!-- Build the controls database template app distro -->
+ <copy todir="${dist.dir}/samples/controls-db" failOnError="true">
+ <fileset dir="samples/controls-db"/>
+ </copy>
+
+ <!-- Build the WSM/template -->
+ <copy todir="${dist.dir}/samples/wsm-blank" failOnError="true">
+ <fileset dir="samples/wsm-blank">
+ <exclude name="WEB-INF/build.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Build the WSM/AddressBookWS sample -->
+ <copy todir="${dist.dir}/samples/AddressBookWS" failOnError="true">
+ <fileset dir="samples/AddressBookWS">
+ <exclude name="WEB-INF/build.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Build the WSM/EmployeeWS sample -->
+ <!-- todo: depends on dbControls.jar; controls-db, which produces that
file and copies it into WEB-INF/lib needs be merged back from alpha -->
+ <copy todir="${dist.dir}/samples/EmployeeWS" failOnError="true">
+ <fileset dir="samples/EmployeeWS">
+ <exclude name="WEB-INF/build.xml"/>
+ </fileset>
+ </copy>
+
+ <ant dir="${dist.dir}/samples/controls-db" antfile="build.xml"
target="build" inheritall="false"/>
+ <copy todir="${dist.dir}/samples/EmployeeWS/WEB-INF/lib"
failOnError="true">
+ <fileset dir="${dist.dir}/samples/controls-db/build">
+ <include name="dbControl.jar"/>
+ </fileset>
+ </copy>
+ <ant
+ dir="${dist.dir}/samples/controls-db"
+ antfile="build.xml"
+ target="clean"
+ inheritall="false"/>
+
+ </target>
+
+ <target name="build.dist.docs" depends="docs" description="Builds
documentation for a Beehive distribution">
+ <mkdir dir="${dist.dir}"/>
+ <!-- copy javadocs to dist -->
+ <copy todir="${dist.dir}/docs/apidocs" failOnError="true">
+ <fileset dir="controls/build/docs/apidocs"/>
+ <fileset dir="netui/build/docs/apidocs"/>
+ <fileset dir="wsm/build/docs/apidocs"/>
+ </copy>
+ <copy todir="${dist.dir}/docs" failOnError="">
+ <fileset dir="docs/forrest/build/site"/>
+ </copy>
+ </target>
+
+ <target name="build.dist.archives" description="Builds all Beehive
distribution archives (.zip, .tar.gz, etc)">
+ <fail unless="beehive.version" message="Could not build distribution
archives; beehive.version property not specified!"/>
+ <antcall target="build.dist.zip"/>
+ <antcall target="build.dist.tgz"/>
+ <!--
+ <antcall target="build.dist.docs.jar"/>
+ -->
+ </target>
+
+ <target name="build.dist.zip" description="Builds a Beehive distribution
zipfile">
+ <fail unless="beehive.version" message="Could not build distribution
archive; beehive.version was not specified"/>
+
+ <mkdir dir="build/jars"/>
+ <zip destfile="build/jars/${dist.name}.zip"
basedir="${dist.base.dir}"/>
+ </target>
+
+ <target name="build.dist.tgz" description="Builds a Beehive distribution
tarball (.tar.gz)">
+ <fail unless="beehive.version" message="Could not build distribution
archive; beehive.version was not specified"/>
+
+ <mkdir dir="build/jars"/>
+ <tar destfile="build/jars/${dist.name}.tar.gz"
basedir="${dist.base.dir}" compression="gzip"/>
+ </target>
+
+ <target name="build.dist.docs.jar" depends="build.dist"
description="Builds a Beehive distribution docs JAR">
+ <fail unless="beehive.version" message="Could not build distribution
archive; beehive.version was not specified"/>
+
+ <mkdir dir="build/jars"/>
+ <jar destfile="build/jars/${dist.name}-docs.jar"
basedir="${dist.dir}/docs"/>
+ </target>
+
+ <target name="clean.dist">
+ <delete dir="build/dist"/>
+ <delete dir="build/tmp-dist"/>
+ </target>
+
+ <target name="test.dist" description="Tests a Beehive distribution">
+ <echo>Testing distribution at ${dist.dir}</echo>
+ <property name="distroStdout.file"
location="${beehive.home}/build/testDistro.output"/>
+
+ <exec executable="cmd" dir="${dist.dir}" newenvironment="true"
os="Windows XP,Windows 2000" outputproperty="testDistro.output">
+ <arg line="/c ${beehive.home}/test/testDistro.cmd"/>
+ </exec>
+ <exec executable="sh" dir="${dist.dir}" newenvironment="true"
os="Linux,SunOS,Solaris" outputproperty="testDistro.output">
+ <arg line="${beehive.home}/test/testDistro.sh"/>
+ </exec>
+ <fail message="${testDistro.output}">
+ <condition>
+ <not>
+ <contains string="${testDistro.output}" substring="BUILD
SUCCESSFUL"/>
+ </not>
+ </condition>
+ </fail>
+ <echo message="${testDistro.output}"/>
+
+ <echo message="${testDistro.output}" file="${distroStdout.file}"/>
+ </target>
+
+ <!-- =========================================== -->
+ <!-- -->
+ <!-- Build Test Module for Distribution Test -->
+ <!-- -->
+ <!-- =========================================== -->
+ <target name="build.test.dist" depends="build.dist"
+ description="Build and package the test module for testing
distribution">
+ <ant dir="${beehive.home}/netui/test/dist-test/ant"
+ antfile="buildTestDist.xml"
+ target="build.test.dist"
+ inheritall="false"/>
+ </target>
+
+</project>
\ No newline at end of file
Modified: incubator/beehive/trunk/docs/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/docs/build.xml&r1=125544&p2=incubator/beehive/trunk/docs/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/docs/build.xml (original)
+++ incubator/beehive/trunk/docs/build.xml Tue Jan 18 13:02:36 2005
@@ -5,10 +5,8 @@
-->
<project name="Beehive Docs Build" default="site" basedir=".">
- <property environment="os"/>
- <property file="../beehive.properties"/>
+ <import file="../beehive-imports.xml"/>
-
<target name="site">
<ant dir="forrest" target="site"/>
</target>
Modified: incubator/beehive/trunk/netui/ant/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/ant/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/ant/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/ant/build.xml Tue Jan 18 13:02:36 2005
@@ -2,8 +2,7 @@
<project name="Beehive/NetUI/DevBuild" default="usage" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <import file="../../beehive-imports.xml"/>
<property file="netui.properties"/>
<!-- ============================================= -->
@@ -14,7 +13,10 @@
<echo message="| NetUI clean starting |"/>
<echo message="--------------------------------------------------"/>
- <antcall target="clean.modules"/>
+ <antcall target="do.subant">
+ <param name="target.name" value="clean"/>
+ </antcall>
+
<antcall target="undeploy"/>
<echo message="--------------------------------------------------"/>
@@ -27,39 +29,23 @@
<echo message="| NetUI build starting |"/>
<echo message="--------------------------------------------------"/>
- <antcall target="build.modules"/>
+ <antcall target="do.subant">
+ <param name="target.name" value="build"/>
+ </antcall>
<echo message="--------------------------------------------------"/>
<echo message="| NetUI build ending |"/>
<echo message="--------------------------------------------------"/>
</target>
- <target name="build.module" depends="prepare" description="Build a single
source module">
- <ant dir="${src.dir}/${module.name}" target="build"
inheritAll="false"/>
- </target>
-
- <target name="clean.module" description="Clean a single source module">
- <ant dir="${src.dir}/${module.name}" target="clean"
inheritAll="false"/>
- <antcall target="undeploy"/>
- </target>
-
- <target name="rebuild.module" description="Clean and build a single NetUI
module">
- <antcall target="clean.module"/>
- <antcall target="build.module"/>
- </target>
-
<target name="deploy" description="Rebuild the NetUI webapp templates.">
<echo message="--------------------------------------------------"/>
<echo message="| NetUI deploy starting |"/>
<echo message="--------------------------------------------------"/>
- <ant antfile="webappTemplate.xml" target="create.netui.webapp"
inheritAll="false">
- <property name="webapp.dir" location="${webapp.dist.dir}"/>
- </ant>
-
- <!-- copy the NetUI compiler into its distribution directory -->
- <mkdir dir="${compiler.dist.dir}"/>
- <copy todir="${compiler.dist.dir}" file="${compiler.jar}"/>
+ <ant antfile="webappTemplate.xml" target="deploy.webapp"
inheritAll="false"/>
+ <ant antfile="webappTemplate.xml" target="deploy.compiler"
inheritAll="false"/>
+ <ant antfile="webappTemplate.xml" target="deploy.tldx"
inheritAll="false"/>
<echo message="--------------------------------------------------"/>
<echo message="| NetUI deploy ending |"/>
@@ -74,31 +60,6 @@
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.lib.dir}"/>
<mkdir dir="${classes.dir}"/>
-
- <copy todir="${build.external.dir}">
- <fileset dir="${external.dir}"/>
- </copy>
- </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">
Modified: incubator/beehive/trunk/netui/ant/javadoc.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/javadoc.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/ant/javadoc.xml&r1=125544&p2=incubator/beehive/trunk/netui/ant/javadoc.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/ant/javadoc.xml (original)
+++ incubator/beehive/trunk/netui/ant/javadoc.xml Tue Jan 18 13:02:36 2005
@@ -1,11 +1,8 @@
<?xml version="1.0"?>
-<project name="Beehive/NetUI/DevBuild" default="usage" basedir=".">
+<project name="Beehive/NetUI/DocBuild" default="usage" basedir=".">
- <property environment="os"/>
-
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="netui.properties"/>
+ <import file="../netui-imports.xml"/>
<property name="docs.build.dir" value="${build.dir}/docs"/>
<property name="docs.temp" value="${docs.build.dir}/temp"/>
@@ -15,19 +12,18 @@
<available file="${build.lib.dir}" type="dir"
property="resources.present"/>
<path id="javadoc.classpath">
- <fileset dir="${external.dir}/struts" includes="*.jar"/>
- <fileset dir="${external.dir}/xdoclet" includes="*.jar"/>
<fileset dir="${build.lib.dir}" includes="*.jar"/>
- <pathelement path="${commons-el.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${jsr173.jar}"/>
- <pathelement path="${controls.jar}"/>
- <pathelement path="${jsf-api.jar}"/>
- <pathelement path="${tools.jar}"/>
- <pathelement path="${ant.jar}"/>
- <pathelement path="${log4j.jar}"/>
- <pathelement path="${jsp20.jar}"/>
- <pathelement path="${servlet24.jar}"/>
+ <path refid="commons-el.dependency.path"/>
+ <path refid="commons-codec.dependency.path"/>
+ <path refid="webdoclet.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="jsf.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="struts11.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="tools.dependency.path"/>
+ <path refid="ant-jar.dependency.path"/>
</path>
<target name="usage">
@@ -103,8 +99,13 @@
<mkdir dir="${docs.temp}/xml/tagref"/>
<mkdir dir="${docs.temp}/html/tagref"/>
<antcall target="copy-tld-files"/>
+ <path id="doclet.path">
+ <path refid="xbean.dependency.path"/>
+ <fileset file="${doclet.jar}"/>
+ <fileset file="${xalan.jar}"/>
+ </path>
<javadoc classpathref="javadoc.classpath"
destdir="${docs.temp}/xml/tagref">
- <doclet
name="org.apache.beehive.netui.tools.doclet.jsptagref.JspTagDoc"
path="${doclet.jar};${xbean.jar};${jsr173.jar};${xalan.jar}">
+ <doclet
name="org.apache.beehive.netui.tools.doclet.jsptagref.JspTagDoc"
pathref="doclet.path">
<param name="-source" value="1.5"/>
<param name="-tlddir" value="${docs.temp}/tld"/>
<param name="-xmldir"
value="${docs.temp}/xml/tagref"/>
Modified: incubator/beehive/trunk/netui/ant/netui.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/ant/netui.properties&r1=125544&p2=incubator/beehive/trunk/netui/ant/netui.properties&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties (original)
+++ incubator/beehive/trunk/netui/ant/netui.properties Tue Jan 18 13:02:36 2005
@@ -3,39 +3,17 @@
# contains properties that are read-only in
# a user's development environment.
#
-
-ant.home=${os.ANT_HOME}
-java.home=${os.JAVA_HOME}
-webui.home=${beehive.dir}/netui
-
-#
-# Beehive/NetUI distribution root values. These directories
-# are the root directories for the NetUI distribution from
-# Beehive and reference three parts:
-# - the webapp template
-# - the JPF compiler set
-# - the NetUI tests
-#
-netui.dist.dir=${webui.home}/build/dist
-webapp.dist.dir=${netui.dist.dir}/webapp
-compiler.dist.dir=${netui.dist.dir}/compiler
-test.dist.dir=${netui.dist.dir}/test
-
-netui.ant.dir=${webui.home}/ant
-test.dir=${webui.home}/test
-build.dir=${webui.home}/build
-docs.dir=${webui.home}/docs
-src.dir=${webui.home}/src
-external.dir=${webui.home}/external
+netui.home=${beehive.home}/netui
+netui.ant.dir=${netui.home}/ant
+test.dir=${netui.home}/test
+build.dir=${netui.home}/build
+docs.dir=${netui.home}/docs
+src.dir=${netui.home}/src
+external.dir=${netui.home}/external
app.dir=${test.dir}/webapps
classes.dir=${build.dir}/classes
build.lib.dir=${build.dir}/lib
-build.external.dir=${build.dir}/external
-
-struts.dir=${build.external.dir}/struts
-jsf.dir=${build.external.dir}/jsf
-xdoclet.dir=${build.external.dir}/xdoclet
javadoc.dir=${build.dir}/javadoc
javadoc.module.dir=${javadoc.dir}/modules
@@ -48,54 +26,13 @@
#
#
---------------------------------------------------------------------------------
-#
-# These JARs are referenced by the bootstrap module build.
-#
-ant.jar=${ant.home}/lib/ant.jar
-
-#
-# Struts JARs
-#
-struts.jar=${struts.dir}/struts.jar
-commons-beanutils.jar=${struts.dir}/commons-beanutils.jar
-commons-collections.jar=${struts.dir}/commons-collections.jar
-commons-logging.jar=${struts.dir}/commons-logging.jar
-commons-digester.jar=${struts.dir}/commons-digester.jar
-commons-fileupload.jar=${struts.dir}/commons-fileupload.jar
-commons-validator.jar=${struts.dir}/commons-validator.jar
-jakarta-oro.jar=${struts.dir}/jakarta-oro.jar
-
-commons-el.jar=${build.external.dir}/commons-el/commons-el.jar
-
-#
-# JSF
-#
-jsf-api.jar=${jsf.dir}/myfaces.jar
-
-#
-# External TLDs
-#
-struts11.logic.tld=${struts.dir}/struts-logic.tld
-struts11.html.tld=${struts.dir}/struts-html.tld
-struts11.bean.tld=${struts.dir}/struts-bean.tld
-
-#
-# JSTL JARs
-#
-jstl.jar=${external.dir}/jstl/jstl.jar
-standard.jar=${external.dir}/jstl/standard.jar
-
-#
-# XDoclet JARs
-#
-xdoclet.jar=${xdoclet.dir}/xdoclet-1.2b4.jar
-xdoclet.web.module.jar=${xdoclet.dir}/xdoclet-web-module-1.2b4.jar
-xjavadoc.jar=${xdoclet.dir}/xjavadoc-1.1-j5-v3.jar
+struts.dir=${netui.home}/external/struts
+jsf.dir=${netui.home}/external/jsf
+tomcat.lib.dir=${netui.home}/external/tomcat
#
# Tomcat properties. These JARs are used to compile the Tomcat 5x
ServerAdapter.
#
-tomcat.lib.dir=${build.external.dir}/tomcat
catalina.5x.jar=${tomcat.lib.dir}/5x/catalina.jar
coyote.5x.jar=${tomcat.lib.dir}/5x/tomcat-coyote.jar
@@ -130,56 +67,9 @@
# NetUI config file name
netuiconfig.xml.name=netui-config.xml
-#
---------------------------------------------------------------------------------
-#
-# NetUI distribution JAR paths (the build creates these files)
-#
-#
---------------------------------------------------------------------------------
-
-# NetUI dist JARs
-bootstrap.jar=${build.lib.dir}/${bootstrap.jar.name}
-tags.html.jar=${build.lib.dir}/${tags-html.jar.name}
-tags.template.jar=${build.lib.dir}/${tags-template.jar.name}
-tags.databinding.jar=${build.lib.dir}/${tags-databinding.jar.name}
-util.jar=${build.lib.dir}/${util.jar.name}
-compiler.jar=${build.lib.dir}/${compiler.jar.name}
-pageflow.jar=${build.lib.dir}/${pageflow.jar.name}
-scoping.jar=${build.lib.dir}/${scoping.jar.name}
-
-netui-tomcat-common.5x.jar=${build.lib.dir}/${netui-tomcat-common.5x.jar.name}
-netui-tomcat-server.5x.jar=${build.lib.dir}/${netui-tomcat-server.5x.jar.name}
-netui-tomcat-webapp.5x.jar=${build.lib.dir}/${netui-tomcat-webapp.5x.jar.name}
-
-# NetUI dist TLD(x)
-netui-tags-html.tld=${build.lib.dir}/${netui-tags-html.tld.name}
-netui-tags-html.tldx=${build.lib.dir}/${netui-tags-html.tldx.name}
-netui-tags-template.tld=${build.lib.dir}/${netui-tags-template.tld.name}
-netui-tags-template.tldx=${build.lib.dir}/${netui-tags-template.tldx.name}
-netui-tags-databinding.tld=${build.lib.dir}/${netui-tags-databinding.tld.name}
-netui-tags-databinding.tldx=${build.lib.dir}/${netui-tags-databinding.tldx.name}
-
# NetUI config file references
-defaultnetuiconfig.xml=${src.dir}/webapp-template/config/netui-config-default.xml
netuiconfig.xml=${src.dir}/webapp-template/default/WEB-INF/netui-config.xml
-#
---------------------------------------------------------------------------------
-#
-# NetUI webapp template JARs. These come from the compressed / exploded
webapp template.
-#
-#
---------------------------------------------------------------------------------
-webappTemplate.webinf=${webapp.dist.dir}/WEB-INF
-webappTemplate.webinf.lib=${webappTemplate.webinf}/lib
-
-deployed.netuiconfig.xml=${webappTemplate.webinf}/netui-config.xml
-
-#
---------------------------------------------------------------------------------
-#
-# Build information that is shared between source modules
-#
-#
---------------------------------------------------------------------------------
-tools.xdoclet.gen.classpath=${xdoclet.jar};${xjavadoc.jar};${xdoclet.web.module.jar};${commons-logging.jar};${commons-collections.jar};${log4j.jar}
-tools.xdoclet.run.classpath=${tools.xdoclet.gen.classpath};${bootstrap.jar};${servlet24.jar}
-
#compile options
compile.debug=true
compile.deprecation=off
@@ -188,4 +78,4 @@
# runtime and compiler versions
pageflow.version.runtime=3
-pageflow.version.compiler=3
+pageflow.version.compiler=3
\ No newline at end of file
Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/webappTemplate.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/ant/webappTemplate.xml&r1=125544&p2=incubator/beehive/trunk/netui/ant/webappTemplate.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Tue Jan 18
13:02:36 2005
@@ -2,14 +2,35 @@
<project name="Beehive/NetUI/WebappTemplates" default="all.templates"
basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="netui.properties"/>
+ <import file="../netui-imports.xml"/>
<property name="resource.dir.name" value="resources/beehive/version1"/>
<property name="template.root.dir" location="${src.dir}/webapp-template/"/>
<property name="struts11.dir"
location="${struts.dir}/legacy/jakarta-struts-1.1-lib"/>
+ <property name="webapp.dist.dir"
location="${beehive.home}/netui/build/dist/webapp"/>
+ <property name="compiler.dist.dir"
location="${beehive.home}/netui/build/dist/compiler"/>
+ <property name="tldx.dist.dir"
location="${beehive.home}/netui/build/dist/tldx"/>
+
+ <target name="deploy.compiler">
+ <!-- copy the NetUI compiler into its distribution directory -->
+ <copy todir="${compiler.dist.dir}"
file="${build.lib.dir}/beehive-netui-compiler.jar"/>
+ </target>
+
+ <target name="deploy.tldx">
+ <!-- copy the NetUI TLDX files into their distribution directory -->
+ <copy todir="${tldx.dist.dir}">
+ <fileset dir="${build.lib.dir}">
+ <patternset refid="netui.tldx"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="deploy.webapp">
+ <property name="webapp.dir" location="${webapp.dist.dir}"/>
+ <antcall target="create.netui.webapp"/>
+ </target>
+
<target name="create.netui.webapp" description="Create a NetUI webapp">
<echo>Create NetUI Webapp in: ${webapp.dir}</echo>
@@ -27,14 +48,13 @@
<antcall target="deploy.netui"/>
<copy todir="${webinf.lib}">
- <fileset file="${commons-el.jar}"/>
- <fileset file="${commons-codec.jar}"/>
- <fileset file="${jstl.jar}"/>
- <fileset file="${standard.jar}"/>
- <fileset file="${xbean.jar}"/>
- <fileset file="${jsr173.jar}"/>
- <fileset file="${log4j.jar}"/>
- <fileset file="${controls.jar}"/>
+ <fileset refid="jstl.fileset"/>
+ <fileset refid="commons-el.fileset"/>
+ <fileset refid="commons-codec.fileset"/>
+ <fileset refid="controls.fileset"/>
+ <fileset refid="xbean.fileset"/>
+ <fileset refid="jsr173.fileset"/>
+ <fileset refid="log4j.fileset"/>
</copy>
<!-- copy JavaScript and resources -->
@@ -219,6 +239,9 @@
<patternset id="netui.webinf">
<include name="beehive-netui-*.tld"/>
+ </patternset>
+
+ <patternset id="netui.tldx">
<include name="beehive-netui-*.tldx"/>
</patternset>
@@ -233,32 +256,8 @@
<include name="jsr173_1.0_api.jar"/>
</patternset>
- <patternset id="struts11.jars">
- <include name="commons-beanutils.jar"/>
- <include name="commons-collections.jar"/>
- <include name="commons-digester.jar"/>
- <include name="commons-fileupload.jar"/>
- <include name="commons-lang.jar"/>
- <include name="commons-logging.jar"/>
- <include name="commons-validator.jar"/>
- <include name="jakarta-oro.jar"/>
- <include name="struts-legacy.jar"/>
- <include name="struts.jar"/>
- </patternset>
-
<patternset id="struts11.webinf">
<include name="validator-rules.xml"/>
- </patternset>
-
- <patternset id="struts12.jars">
- <include name="commons-beanutils.jar"/>
- <include name="commons-collections.jar"/>
- <include name="commons-digester.jar"/>
- <include name="commons-fileupload.jar"/>
- <include name="commons-logging.jar"/>
- <include name="commons-validator.jar"/>
- <include name="jakarta-oro.jar"/>
- <include name="struts.jar"/>
</patternset>
<patternset id="struts12.webinf">
Modified: incubator/beehive/trunk/netui/ant/xmlBean.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/xmlBean.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/ant/xmlBean.xml&r1=125544&p2=incubator/beehive/trunk/netui/ant/xmlBean.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/ant/xmlBean.xml (original)
+++ incubator/beehive/trunk/netui/ant/xmlBean.xml Tue Jan 18 13:02:36 2005
@@ -2,13 +2,7 @@
<project name="Beehive/NetUI/XMLBeanBuild" default="ant.build.xmlbean"
basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
-
- <path id="xbean.classpath">
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${jsr173.jar}"/>
- </path>
+ <import file="../../beehive-imports.xml"/>
<target name="ant.build.xmlbean" description="Compile a set of XSDs using
the XMLBean Ant task">
<fail unless="xsd.root.dir" message="xsd.root.dir must be specified to
build an XMLBean in order find the existing files"/>
@@ -32,13 +26,7 @@
</target>
<target name="xbean_schema_compiler" unless="xbean.uptodate">
- <taskdef name="xmlbeanbuild"
- classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpathref="xbean.classpath"/>
- <xmlbeanbuild classpathref="xbean.classpath"
- schema="${xsd.root.dir}"
- classgendir="${class.output.dir}"
- failonerror="true"/>
+ <build-xbean schemaDir="${xsd.root.dir}"
classgenDir="${class.output.dir}"/>
</target>
</project>
Modified: incubator/beehive/trunk/netui/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/build.xml (original)
+++ incubator/beehive/trunk/netui/build.xml Tue Jan 18 13:02:36 2005
@@ -5,11 +5,10 @@
-->
<project name="Beehive/NetUI Framework Build" default="build" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <import file="../beehive-imports.xml"/>
<target name="docs" description="Generate NetUI Javadoc and JSP tag doc.">
- <ant dir="ant" target="build"
antfile="${os.BEEHIVE_HOME}/netui/ant/javadoc.xml" inheritAll="false"/>
+ <ant dir="ant" target="build"
antfile="${beehive.home}/netui/ant/javadoc.xml" inheritAll="false"/>
</target>
<target name="build" description="Compiles and builds the server bits of
NetUI.">
@@ -39,7 +38,7 @@
</ant>
<!-- run the server DRTs -->
- <ant dir="${beehive.dir}/netui/test/webapps/drt" antfile="build.xml"
target="drt" inheritAll="false">
+ <ant dir="${beehive.home}/netui/test/webapps/drt" antfile="build.xml"
target="drt" inheritAll="false">
<property name="drt.cc.mode" value="true"/>
</ant>
@@ -59,7 +58,7 @@
</ant>
<!-- run the server DRTs -->
- <ant dir="${beehive.dir}/netui/test/webapps/drt" antfile="build.xml"
target="bvt" inheritAll="false">
+ <ant dir="${beehive.home}/netui/test/webapps/drt" antfile="build.xml"
target="bvt" inheritAll="false">
<property name="drt.cc.mode" value="true"/>
</ant>
@@ -68,15 +67,14 @@
<echo message="--------------------------------------------------"/>
</target>
- <target name="deploy.netui"
- description="Deploy the NetUI runtime to a fully-quaflified webapp
directory specified with the property 'webapp.dir'">
+ <target name="deploy.netui" description="Deploy the NetUI runtime to a
fully-quaflified webapp directory specified with the property 'webapp.dir'">
<available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
<fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
<echo>Deploy NetUI to webapp rooted at: ${webapp.dir}</echo>
- <ant dir="${os.BEEHIVE_HOME}/netui/ant"
- antfile="${os.BEEHIVE_HOME}/netui/ant/webappTemplate.xml"
+ <ant dir="${beehive.home}/netui/ant"
+ antfile="${beehive.home}/netui/ant/webappTemplate.xml"
target="deploy.netui.runtime"
inheritAll="false">
<property name="webapp.dir" value="${webapp.dir}"/>
@@ -87,8 +85,8 @@
description="Undeploy the NetUI runtime from a fully-quaflified
webapp directory specified with the property 'webapp.dir'">
<echo>Undeploy NetUI from webapp rooted at: ${webapp.dir}</echo>
- <ant dir="${os.BEEHIVE_HOME}/netui/ant"
- antfile="${os.BEEHIVE_HOME}/netui/ant/webappTemplate.xml"
+ <ant dir="${beehive.home}/netui/ant"
+ antfile="${beehive.home}/netui/ant/webappTemplate.xml"
target="undeploy.netui.runtime"
inheritAll="false">
<property name="webapp.dir" value="${webapp.dir}"/>
@@ -99,7 +97,7 @@
<fail unless="webapp.dir" message="The ${webapp.dir} property is
unset"/>
<copy todir="${webapp.dir}" overwrite="true">
- <fileset dir="${os.BEEHIVE_HOME}/netui/build/dist/webapp"/>
+ <fileset dir="${beehive.home}/netui/build/dist/webapp"/>
</copy>
<mkdir dir="${webapp.dir}/WEB-INF/src"/>
Added: incubator/beehive/trunk/netui/netui-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/netui-imports.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/netui-imports.xml Tue Jan 18 13:02:36 2005
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+
+<!-- ========================================================================
-->
+<!--
-->
+<!-- Common NetUI build dependencies
-->
+<!--
-->
+<!-- ========================================================================
-->
+<project name="module-import">
+
+ <import file="../beehive-imports.xml"/>
+ <property file="${beehive.home}/netui/ant/netui.properties"/>
+
+ <!-- filesets used by <path> structures and for copying -->
+ <fileset id="commons-el.fileset"
file="${beehive.home}/netui/external/commons-el/commons-el.jar"/>
+
+ <fileset id="jstl.fileset" dir="${external.dir}/jstl">
+ <patternset refid="jstl.jars"/>
+ </fileset>
+
+ <!-- <path> structures used by clients needing to reference sets of
related JARs -->
+ <path id="struts11.dependency.path">
+ <fileset dir="${struts.dir}">
+ <patternset refid="struts12.jars"/>
+ </fileset>
+ </path>
+
+ <path id="jsf.dependency.path">
+ <fileset dir="${jsf.dir}">
+ <include name="myfaces.jar"/>
+ </fileset>
+ </path>
+
+ <path id="commons-el.dependency.path">
+ <fileset file="${external.dir}/commons-el/commons-el.jar"/>
+ </path>
+
+ <path id="commons-logging.dependency.path">
+ <fileset file="${external.dir}/struts/commons-logging.jar"/>
+ </path>
+
+ <path id="webdoclet.dependency.path">
+ <path refid="servlet.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <fileset dir="${beehive.home}/netui/external/xdoclet">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${struts.dir}">
+ <include name="commons-logging.jar"/>
+ <include name="commons-collections.jar"/>
+ </fileset>
+ <fileset file="${beehive.home}/netui/build/lib/bootstrap.jar"/>
+ </path>
+
+ <path id="webapp.classpath">
+ <fileset dir="${beehive.home}/netui/build/dist/webapp/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <patternset id="struts11.jars">
+ <include name="commons-beanutils.jar"/>
+ <include name="commons-collections.jar"/>
+ <include name="commons-digester.jar"/>
+ <include name="commons-fileupload.jar"/>
+ <include name="commons-lang.jar"/>
+ <include name="commons-logging.jar"/>
+ <include name="commons-validator.jar"/>
+ <include name="jakarta-oro.jar"/>
+ <include name="struts-legacy.jar"/>
+ <include name="struts.jar"/>
+ </patternset>
+
+ <patternset id="struts12.jars">
+ <include name="commons-beanutils.jar"/>
+ <include name="commons-collections.jar"/>
+ <include name="commons-digester.jar"/>
+ <include name="commons-fileupload.jar"/>
+ <include name="commons-logging.jar"/>
+ <include name="commons-validator.jar"/>
+ <include name="jakarta-oro.jar"/>
+ <include name="struts.jar"/>
+ </patternset>
+
+ <patternset id="jstl.jars">
+ <include name="jstl.jar"/>
+ <include name="standard.jar"/>
+ </patternset>
+
+</project>
Modified: incubator/beehive/trunk/netui/src/bootstrap/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/bootstrap/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/bootstrap/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/bootstrap/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/bootstrap/build.xml (original)
+++ incubator/beehive/trunk/netui/src/bootstrap/build.xml Tue Jan 18
13:02:36 2005
@@ -2,9 +2,7 @@
<project name="Beehive/NetUI/Bootstrap" default="build" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+ <import file="../../netui-imports.xml"/>
<property name="module.name" value="bootstrap"/>
<property name="module.dir" location="${src.dir}/${module.name}"/>
@@ -12,19 +10,22 @@
<property name="xdoclet.metainf.dir"
location="${this.output.dir}/META-INF"/>
<property name="xdoclet.template"
location="${module.dir}/xdoclet-xml.xdt"/>
- <!-- Bootstrap JAR dependencies -->
- <property name="module.classpath"
value="${ant.jar};${tools.xdoclet.gen.classpath}"/>
+ <path id="module.classpath">
+ <path refid="ant-jar.dependency.path"/>
+ <path refid="webdoclet.dependency.path"/>
+ </path>
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${this.output.dir}"/>
<javac srcdir="${module.dir}/"
destdir="${this.output.dir}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
@@ -34,13 +35,14 @@
<copy todir="${this.output.dir}">
<fileset dir="${module.dir}" includes="**/*.properties"/>
- <fileset dir="${module.dir}" includes="**/*.xml"/>
+ <fileset dir="${module.dir}" includes="**/*.xml">
+ <exclude name="build.xml"/>
+ </fileset>
<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}"/>
+ <taskdef name="xdoclet" classname="xdoclet.DocletTask"
classpathref="webdoclet.dependency.path"/>
<mkdir dir="${xdoclet.metainf.dir}"/>
<xdoclet destdir="${xdoclet.metainf.dir}" verbose="true">
<fileset dir="${module.dir}">
@@ -50,7 +52,7 @@
<template templateFile="${xdoclet.template}"
destinationFile="xdoclet.xml"/>
</xdoclet>
- <jar jarfile="${bootstrap.jar}" basedir="${this.output.dir}"/>
+ <jar jarfile="${build.lib.dir}/bootstrap.jar"
basedir="${this.output.dir}"/>
</target>
<target name="clean">
Modified: incubator/beehive/trunk/netui/src/compiler/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/compiler/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/compiler/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/compiler/build.xml (original)
+++ incubator/beehive/trunk/netui/src/compiler/build.xml Tue Jan 18
13:02:36 2005
@@ -2,17 +2,19 @@
<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"/>
+ <import file="../../netui-imports.xml"/>
<property name="module.name" value="compiler"/>
- <property name="module.classpath" location="${xbean.jar};${jsr173.jar}"/>
<property name="module.dir" location="${src.dir}/${module.name}"/>
+ <path id="module.classpath">
+ <path refid="xbean.dependency.path"/>
+ </path>
+
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>basedir: ${basedir}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
@@ -21,7 +23,7 @@
<javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
Modified: incubator/beehive/trunk/netui/src/pageflow/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/pageflow/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/pageflow/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/build.xml (original)
+++ incubator/beehive/trunk/netui/src/pageflow/build.xml Tue Jan 18
13:02:36 2005
@@ -2,34 +2,28 @@
<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"/>
+ <import file="../../netui-imports.xml"/>
<property name="module.name" value="pageflow"/>
<property name="module.dir" location="${src.dir}/${module.name}"/>
<path id="module.classpath">
- <pathelement path="${commons-beanutils.jar}"/>
- <pathelement path="${commons-logging.jar}"/>
- <pathelement path="${commons-collections.jar}"/>
- <pathelement path="${commons-digester.jar}"/>
- <pathelement path="${commons-validator.jar}"/>
- <pathelement path="${struts.jar}"/>
- <pathelement path="${servlet24.jar}"/>
- <pathelement path="${jsp20.jar}"/>
- <pathelement path="${log4j.jar}"/>
- <pathelement path="${util.jar}"/>
- <pathelement path="${scoping.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${controls.jar}"/>
- <pathelement path="${jsf-api.jar}"/>
- <pathelement path="${commons-el.jar}"/>
+ <path refid="commons-el.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="struts11.dependency.path"/>
+ <path refid="jsf.dependency.path"/>
+
+ <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
</path>
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
Modified: incubator/beehive/trunk/netui/src/scoping/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/scoping/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/scoping/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/scoping/build.xml (original)
+++ incubator/beehive/trunk/netui/src/scoping/build.xml Tue Jan 18 13:02:36 2005
@@ -2,24 +2,28 @@
<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"/>
+ <import file="../../netui-imports.xml"/>
<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}"/>
+ <path id="module.classpath">
+ <path refid="servlet.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="struts11.dependency.path"/>
+ </path>
+
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
<javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
Modified: incubator/beehive/trunk/netui/src/tags-databinding/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tags-databinding/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tags-databinding/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/build.xml
(original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/build.xml Tue Jan
18 13:02:36 2005
@@ -2,25 +2,33 @@
<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"/>
+ <import file="../../netui-imports.xml"/>
<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}"/>
+ <path id="module.classpath">
+ <path refid="servlet.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="struts11.dependency.path"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-tags-html.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-pageflow.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
+ </path>
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${module.classes.dir}"/>
<javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
@@ -33,8 +41,7 @@
</copy>
<echo>Generate TLD and TLDx</echo>
- <echo>tools.xdoclet.run.classpath:
${tools.xdoclet.run.classpath}</echo>
- <taskdef name="webdoclet"
classname="xdoclet.modules.web.WebDocletTask"
classpath="${tools.xdoclet.run.classpath}"/>
+ <taskdef name="webdoclet"
classname="xdoclet.modules.web.WebDocletTask"
classpathref="webdoclet.dependency.path"/>
<webdoclet
destdir="${build.lib.dir}"
excludedtags="@version,@author,@todo"
Modified: incubator/beehive/trunk/netui/src/tags-html/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tags-html/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tags-html/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-html/build.xml Tue Jan 18
13:02:36 2005
@@ -2,30 +2,36 @@
<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"/>
+ <import file="../../netui-imports.xml"/>
<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}"/>
+ <path id="module.classpath">
+ <path refid="servlet.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="struts11.dependency.path"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-tags-html.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-pageflow.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
+ </path>
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
<javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- source="${compile.source}"
- >
+ source="${compile.source}">
<include name="**/*.java"/>
</javac>
@@ -35,8 +41,7 @@
</copy>
<echo>Generate TLD and TLDx</echo>
- <echo>tools.xdoclet.run.classpath=${tools.xdoclet.run.classpath}</echo>
- <taskdef name="webdoclet"
classname="xdoclet.modules.web.WebDocletTask"
classpath="${tools.xdoclet.run.classpath}"/>
+ <taskdef name="webdoclet"
classname="xdoclet.modules.web.WebDocletTask"
classpathref="webdoclet.dependency.path"/>
<webdoclet
destdir="${build.lib.dir}"
excludedtags="@version,@author,@todo"
Modified: incubator/beehive/trunk/netui/src/tags-template/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tags-template/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tags-template/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-template/build.xml Tue Jan 18
13:02:36 2005
@@ -2,25 +2,32 @@
<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"/>
+ <import file="../../netui-imports.xml"/>
<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}"/>
+ <path id="module.classpath">
+ <path refid="servlet.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="struts11.dependency.path"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-pageflow.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-tags-html.jar"/>
+ <pathelement
path="${build.lib.dir}/beehive-netui-tags-databinding.jar"/>
+ </path>
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
<javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
@@ -32,8 +39,7 @@
</copy>
<echo>Generate TLD and TLDx</echo>
- <echo>tools.xdoclet.run.classpath=${tools.xdoclet.run.classpath}</echo>
- <taskdef name="webdoclet"
classname="xdoclet.modules.web.WebDocletTask"
classpath="${tools.xdoclet.run.classpath}"/>
+ <taskdef name="webdoclet"
classname="xdoclet.modules.web.WebDocletTask"
classpathref="webdoclet.dependency.path"/>
<webdoclet
destdir="${build.lib.dir}"
excludedtags="@version,@author,@todo"
Modified: incubator/beehive/trunk/netui/src/tomcat-common/5x/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-common/5x/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tomcat-common/5x/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tomcat-common/5x/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tomcat-common/5x/build.xml
(original)
+++ incubator/beehive/trunk/netui/src/tomcat-common/5x/build.xml Tue Jan
18 13:02:36 2005
@@ -2,23 +2,24 @@
<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"/>
+ <import file="../../../netui-imports.xml"/>
<property name="module.dir" location="${src.dir}/${module.name}/5x"/>
- <property name="module.classpath" location="${servlet24.jar}"/>
+ <path id="module.classpath">
+ <path refid="servlet.dependency.path"/>
+ </path>
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
<javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
Modified: incubator/beehive/trunk/netui/src/tomcat-common/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-common/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tomcat-common/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tomcat-common/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tomcat-common/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tomcat-common/build.xml Tue Jan 18
13:02:36 2005
@@ -2,9 +2,7 @@
<project name="Beehive/NetUI/TomcatCommon" default="build" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+ <import file="../../netui-imports.xml"/>
<property name="module.name" value="tomcat-common"/>
<property name="module.dir" location="${src.dir}/${module.name}"/>
Modified: incubator/beehive/trunk/netui/src/tomcat-server/5x/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-server/5x/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tomcat-server/5x/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tomcat-server/5x/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tomcat-server/5x/build.xml
(original)
+++ incubator/beehive/trunk/netui/src/tomcat-server/5x/build.xml Tue Jan
18 13:02:36 2005
@@ -2,23 +2,29 @@
<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"/>
+ <import file="../../../netui-imports.xml"/>
<property name="module.dir" location="${src.dir}/${module.name}/5x"/>
- <property name="module.classpath"
location="${servlet24.jar};${netui-tomcat-common.5x.jar};${log4j.jar};${commons-logging.jar};${catalina.5x.jar};${coyote.5x.jar}"/>
+ <path id="module.classpath">
+ <path refid="servlet.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="commons-logging.dependency.path"/>
+ <pathelement
location="${build.lib.dir}/beehive-netui-tomcat-common-5x.jar"/>
+ <pathelement location="${catalina.5x.jar}"/>
+ <pathelement location="${coyote.5x.jar}"/>
+ </path>
<target name="build">
<echo>dompile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
<javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
Modified: incubator/beehive/trunk/netui/src/tomcat-server/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-server/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tomcat-server/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tomcat-server/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tomcat-server/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tomcat-server/build.xml Tue Jan 18
13:02:36 2005
@@ -2,9 +2,7 @@
<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"/>
+ <import file="../../netui-imports.xml"/>
<property name="module.name" value="tomcat-server"/>
<property name="module.dir" location="${src.dir}/${module.name}"/>
Modified: incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml
(original)
+++ incubator/beehive/trunk/netui/src/tomcat-webapp/5x/build.xml Tue Jan
18 13:02:36 2005
@@ -2,23 +2,28 @@
<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"/>
+ <import file="../../../netui-imports.xml"/>
<property name="module.dir" location="${src.dir}/${module.name}/5x"/>
- <property name="module.classpath"
location="${servlet24.jar};${netui-tomcat-common.5x.jar};${scoping.jar};${pageflow.jar};${util.jar}"/>
+ <path id="module.classpath">
+ <path refid="servlet.dependency.path"/>
+ <pathelement
path="${build.lib.dir}/beehive-netui-tomcat-common-5x.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-util.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-pageflow.jar"/>
+ </path>
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${classes.dir}/${module.name}"/>
<javac srcdir="${module.dir}"
destdir="${classes.dir}/${module.name}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
Modified: incubator/beehive/trunk/netui/src/tomcat-webapp/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tomcat-webapp/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/tomcat-webapp/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/tomcat-webapp/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/tomcat-webapp/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tomcat-webapp/build.xml Tue Jan 18
13:02:36 2005
@@ -2,9 +2,7 @@
<project name="Beehive/NetUI/TomcatCommon" default="build" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
+ <import file="../../netui-imports.xml"/>
<property name="module.name" value="tomcat-webapp"/>
<property name="module.dir" location="${src.dir}/${module.name}"/>
Modified: incubator/beehive/trunk/netui/src/util/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/util/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/src/util/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/src/util/build.xml (original)
+++ incubator/beehive/trunk/netui/src/util/build.xml Tue Jan 18 13:02:36 2005
@@ -2,32 +2,27 @@
<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"/>
+ <import file="../../netui-imports.xml"/>
<property name="module.name" value="util"/>
<property name="module.dir" location="${src.dir}/${module.name}"/>
+ <property name="defaultnetuiconfig.xml"
location="${module.dir}/netui-config-default.xml"/>
- <!-- core test recorder build file; everything beneath here should be
generic to the environment in which the TR runs -->
<path id="module.classpath">
- <pathelement path="${servlet24.jar}"/>
- <pathelement path="${jsp20.jar}"/>
- <pathelement path="${struts.jar}"/>
- <pathelement path="${log4j.jar}"/>
- <pathelement path="${commons-logging.jar}"/>
- <pathelement path="${xbean.jar}"/>
- <pathelement path="${jsr173.jar}"/>
- <pathelement path="${scoping.jar}"/>
- <pathelement path="${commons-codec.jar}"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="commons-codec.dependency.path"/>
+ <path refid="struts11.dependency.path"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
</path>
<target name="build">
<echo>compile module: ${module.name}</echo>
-
+ <property name="classpath" refid="module.classpath"/>
+ <echo>module classpath: ${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="${module.dir}/schema/"/>
<property name="class.output.dir"
value="${classes.dir}/${module.name}"/>
@@ -47,7 +42,6 @@
<copy todir="${classes.dir}/${module.name}">
<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 -->
Copied: incubator/beehive/trunk/netui/src/util/netui-config-default.xml (from
r125190,
incubator/beehive/trunk/netui/src/webapp-template/config/netui-config-default.xml)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/netui-config-default.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/src/webapp-template/config/netui-config-default.xml&r1=125190&p2=incubator/beehive/trunk/netui/src/util/netui-config-default.xml&r2=125545
==============================================================================
Deleted:
/incubator/beehive/trunk/netui/src/webapp-template/config/netui-config-default.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/webapp-template/config/netui-config-default.xml?view=auto&rev=125544
==============================================================================
Modified: incubator/beehive/trunk/netui/test/ant/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/ant/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/ant/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/build.xml Tue Jan 18 13:02:36 2005
@@ -2,10 +2,10 @@
<project name="Beehive/NetUI/Test" default="drt" 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"/>
+ <import file="test-imports.xml"/>
+
+ <property name="drt.testResults.dir"
location="${beehive.home}/netui/build/drt.testResults"/>
+ <property name="bvt.testResults.dir"
location="${beehive.home}/netui/build/bvt.testResults"/>
<target name="prepare">
<mkdir dir="${test.lib.dir}"/>
@@ -36,7 +36,9 @@
</subant>
</target>
- <!-- Run the NetUI DRTs -->
+ <!-- ============================================= -->
+ <!-- DRT Targets -->
+ <!-- ============================================= -->
<target name="drt" depends="test.clean,test.build,junit.drt"
description="Run the NetUI JUnit DRTs"/>
<target name="junit.drt">
Modified: incubator/beehive/trunk/netui/test/ant/buildWebapp.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/buildWebapp.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/ant/buildWebapp.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/ant/buildWebapp.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/buildWebapp.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/buildWebapp.xml Tue Jan 18
13:02:36 2005
@@ -2,10 +2,9 @@
<project name="Beehive/NetUI/Webapp Build" default="usage" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/netui.properties"/>
- <property file="test.properties"/>
+ <import file="../../../beehive-imports.xml"/>
+<!-- <property file="${beehive.home}/netui/ant/netui.properties"/> -->
+ <property name="test.dir" location="${beehive.home}/netui/test"/>
<!-- ================================================================ -->
<!-- -->
@@ -14,13 +13,13 @@
<!-- ================================================================ -->
<!-- params (location webapp.dir, [value include.testrecorder, value
testRecorder.config.name]) -->
<target name="deploy.netui" description="Deploy the NetUI runtime into a
webapp rooted at ${webapp.dir}">
- <ant antfile="${buildWebapp.ant}"
target="deploy.beehive.webapp.runtime" inheritAll="false"/>
+ <deploy-netui webappDir="${webapp.dir}"/>
<antcall target="deploy.testrecorder"/>
</target>
<!-- params (location webapp.dir, [value include.testrecorder]) -->
<target name="undeploy.netui" description="Clean the NetUI runtime from a
webapp rooted at ${webapp.dir}">
- <ant antfile="${buildWebapp.ant}"
target="undeploy.beehive.webapp.runtime" inheritAll="false"/>
+ <undeploy-netui webappDir="${webapp.dir}"/>
<antcall target="undeploy.testrecorder"/>
</target>
@@ -55,7 +54,7 @@
<target name="undeploy.testrecorder" if="include.testrecorder"
description="Undeploy the test recorder from a webapp">
<echo>Clean the test recorder to webapp at root: ${webapp.dir}</echo>
- <ant antfile="${test.dir}/ant/testRecorder.xml" target="undeploy"
inheritAll="false">
+ <ant antfile="${test.dir}/ant/testRecorder.xml"
target="undeploy.testrecorder" inheritAll="false">
<property name="webapp.dir" location="${webapp.dir}"/>
</ant>
</target>
Modified: incubator/beehive/trunk/netui/test/ant/junitCore.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/junitCore.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/ant/junitCore.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/ant/junitCore.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/junitCore.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/junitCore.xml Tue Jan 18
13:02:36 2005
@@ -2,24 +2,22 @@
<project name="Beehive/NetUI/JUnitTests" basedir=".">
- <!-- ============================================= -->
- <!-- Test Suite Targets -->
- <!-- ============================================= -->
+ <import file="test-imports.xml"/>
+
<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="${commons-codec.jar}"/>
+ <path refid="junit-tests.dependency.path"/>
+ <path refid="webapp.classpath"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
</path>
<target name="run.tests">
<fail unless="formatter.type" message="Unspecified value for
formatter.type"/>
<fail unless="testout.dir" message="Unspecified value for
testout.dir"/>
<fail unless="fail" message="Unspecified value for fail"/>
+
+ <property name="classpath" refid="test.classpath"/>
+ <echo>test.classpath: ${classpath}</echo>
<property name="show.output" value="false"/>
Added: incubator/beehive/trunk/netui/test/ant/test-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/test-imports.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/ant/test-imports.xml Tue Jan 18
13:02:36 2005
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<project name="Beehive/NetUI/TestImports">
+
+ <import file="../../netui-imports.xml"/>
+
+ <property name="test.lib.dir" location="${netui.home}/build/test-lib"/>
+ <property name="test.classes.dir"
location="${netui.home}/build/test-classes"/>
+ <property name="test.dir" location="${netui.home}/test"/>
+ <property name="test.src.dir" location="${test.dir}/src"/>
+ <property name="test.external.dir" location="${test.dir}/external"/>
+ <property name="log4jconfig.verbose.junit"
location="${test.dir}/conf/junitLogCfgVerbose.xml"/>
+ <property name="log4jconfig.junit"
location="${test.dir}/conf/junitLogCfg.xml"/>
+
+ <property name="testRecorder.dir" location="${test.lib.dir}/testRecorder"/>
+
+ <path id="httpclient.dependency.path">
+ <pathelement
location="${test.external.dir}/commons-httpclient-2.0.jar"/>
+ </path>
+
+ <path id="junit-tests.dependency.path">
+ <pathelement location="${test.lib.dir}/beehive-netui-junitTests.jar"/>
+ </path>
+
+ <path id="commons-logging.dependency.path">
+ <pathelement location="${test.external.dir}/commons-logging.jar"/>
+ </path>
+
+ <macrodef name="copy-testrecorder-deps">
+ <attribute name="todir"/>
+ <sequential>
+ <copy todir="@{todir}">
+ <fileset
file="${test.external.dir}/commons-httpclient-2.0.jar"/>
+ <fileset file="${test.external.dir}/commons-logging.jar"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+</project>
Deleted: /incubator/beehive/trunk/netui/test/ant/test.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/test.properties?view=auto&rev=125544
==============================================================================
Modified: incubator/beehive/trunk/netui/test/ant/testRecorder.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/testRecorder.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/ant/testRecorder.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/ant/testRecorder.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/testRecorder.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/testRecorder.xml Tue Jan 18
13:02:36 2005
@@ -2,38 +2,19 @@
<project name="Beehive/NetUI/TestRecorder" default="" 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"/>
+ <import file="../../netui-imports.xml"/>
+ <import file="test-imports.xml"/>
<property name="_testRecorder.base.dir"
location="${build.dir}/testRecorder"/>
- <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}"/>
- <property name="_log4j.jar" location="${log4j.jar}"/>
- <property name="_servlet24.jar" location="${servlet24.jar}"/>
- <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="${httpClient.jar}"/>
- <property name="_testRecorder.jar" location="${test-recorder.jar}"/>
- <property name="_commons-logging.jar" location="${commons-logging.jar}"/>
-
- <property name="_testRecorder.jar.name" value="${test-recorder.jar.name}"/>
- <property name="_httpClient.jar.name" value="${httpClient.jar.name}"/>
- <property name="_junit.jar.name" value="${junit.jar.name}"/>
- <property name="_server.maxWait" value="300"/>
<property name="_log4j.config.verbose"
location="${log4jconfig.verbose.junit}"/>
<property name="_log4j.config" location="${log4jconfig.junit}"/>
-
- <property name="testRecorder.build.dir"
location="${test.dir}/src/testRecorder"/>
+ <property name="_server.maxWait" value="300"/>
+ <property name="testRecorder.dir" location="${test.lib.dir}/testRecorder"/>
<import file="testRecorderCore.xml"/>
<target name="generate.report">
- <!-- build a report -->
<junitreport todir="${report.dir}/">
<fileset dir="${report.dir}/">
<include name="TEST-*.xml"/>
@@ -41,5 +22,4 @@
<report format="noframes" todir="${report.dir}/html"/>
</junitreport>
</target>
-
</project>
Modified: incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml Tue Jan 18
13:02:36 2005
@@ -5,23 +5,33 @@
-->
<project name="Beehive/NetUI/TestRecorderCoreTasks" default="" basedir=".">
- <!-- core test recorder build file; everything beneath here should be
generic to the environment in which the TR runs -->
- <path id="test.recorder.classpath">
- <pathelement path="${_junit.jar}"/>
- <pathelement path="${_ant-junit.jar}"/>
- <pathelement path="${_log4j.jar}"/>
- <pathelement path="${_servlet24.jar}"/>
- <pathelement path="${_xbean.jar}"/>
- <pathelement path="${_jsr173.jar}"/>
- <pathelement path="${_test.config.dir}"/>
- <pathelement path="${_httpClient.jar}"/>
- <pathelement path="${_testRecorder.jar}"/>
- <pathelement path="${_commons-logging.jar}"/>
- </path>
-
<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="_ant-junit.jar"
location="${os.ANT_HOME}/lib/ant-junit.jar"/>
+
+ <patternset id="testrecorder.jars">
+ <include name="commons-httpclient-2.0.jar"/>
+ <include name="junit.jar"/>
+ <include name="testRecorder.jar"/>
+ <include name="commons-logging.jar"/>
+ </patternset>
+
+ <path id="testrecorder.dependency.path">
+ <fileset dir="${testRecorder.dir}/lib">
+ <patternset id="testrecorder.jars"/>
+ </fileset>
+ </path>
+
+ <path id="test.recorder.classpath">
+ <path refid="junit.dependency.path"/>
+ <path refid="ant-all.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="testrecorder.dependency.path"/>
+ <pathelement path="${_test.config.dir}"/>
+ </path>
<taskdef name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
<classpath>
@@ -322,12 +332,15 @@
<echo>config jar: ${_config.jar}</echo>
- <copy file="${_testRecorder.jar}" toDir="${webapp.dir}/WEB-INF/lib"/>
- <copy file="${_httpClient.jar}" toDir="${webapp.dir}/WEB-INF/lib"/>
- <copy file="${_junit.jar}" toDir="${webapp.dir}/WEB-INF/lib"/>
+ <copy todir="${webapp.dir}/WEB-INF/lib">
+ <fileset dir="${testRecorder.dir}/lib">
+ <patternset id="testrecorder.jars"/>
+ </fileset>
+ </copy>
+
<copy file="${_config.jar}" toDir="${webapp.dir}/WEB-INF/lib"/>
<copy todir="${webapp.dir}/testRecorder" overwrite="true">
- <fileset dir="${_testRecorder.resource.dir}">
+ <fileset dir="${testRecorder.dir}/jsp">
<include name="**/*.jsp"/>
<include name="**/*.inc"/>
</fileset>
@@ -339,14 +352,14 @@
Params:
webapp.dir == the webapp into which to deploy the testRecorder
-->
- <target name="undeploy" description="Undeploy the Test Recorder artifacts
from the specified webapp">
+ <target name="undeploy.testrecorder" description="Undeploy the Test
Recorder artifacts from the specified webapp">
<echo>Undeploy testRecorder from: ${webapp.dir}</echo>
- <property name="webapp.lib" location="${webapp.dir}/WEB-INF/lib"/>
-
- <delete file="${webapp.lib}/${_testRecorder.jar.name}"/>
- <delete file="${webapp.lib}/${_httpClient.jar.name}"/>
- <delete file="${webapp.lib}/${_junit.jar.name}"/>
+ <delete quiet="true">
+ <fileset dir="${webapp.dir}/WEB-INF/lib">
+ <patternset refid="testrecorder.jars"/>
+ </fileset>
+ </delete>
<delete quiet="true">
<fileset dir="${webapp.dir}/testRecorder">
<include name="*.jsp"/>
Added: incubator/beehive/trunk/netui/test/ant/webapp-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/webapp-imports.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/ant/webapp-imports.xml Tue Jan 18
13:02:36 2005
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<!-- ========================================================================
-->
+<!--
-->
+<!-- Common imports for webapps
-->
+<!--
-->
+<!-- ========================================================================
-->
+
+<project name="webapp-imports">
+
+ <import file="../../../beehive-imports.xml"/>
+ <import file="../../netui-imports.xml"/>
+
+</project>
\ No newline at end of file
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/dist-test/ant/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/dist-test/ant/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/build.xml Tue Jan 18
13:02:36 2005
@@ -10,9 +10,8 @@
<property environment="os"/>
<property file="test-dist.properties"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <path id="test.classpath">
+ <path id="test.classpath">
<pathelement path="${test.classes.dir}/junitTests"/>
<fileset dir="${dist.home}/lib">
<include name="**/*.jar"/>
@@ -65,7 +64,7 @@
<!-- ================================================================ -->
<target name="junit.drt" description="Run JUnit drt test suite">
- <ant dir="${test.dir}/ant" antfile="junitCore.xml" target="run.tests">
+ <ant dir="${test.dir}/ant" antfile="junitCore.xml" target="run.tests"
inheritAll="false">
<property name="testout.dir" value="${drt.testResults.dir}"/>
<reference refid="test.classpath"/>
<property name="formatter.type" value="xml"/>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml
(original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/buildTestDist.xml Tue Jan
18 13:02:36 2005
@@ -2,10 +2,7 @@
<project name="Beehive/NetUI/BuildTestDist" default="build.test.dist"
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"/>
+ <import file="../../ant/test-imports.xml"/>
<!-- ========================================= -->
<!-- Targets for building the standalone test -->
@@ -52,6 +49,10 @@
</copy>
<copy todir="${test.dist.base.dir}/beehive-test-dist/ant">
+ <fileset file="${beehive.home}/ant/tomcat-imports.xml"/>
+ </copy>
+
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/ant">
<fileset dir="${test.dir}/ant"
includes="testRecorder.xml,testRecorderCore.xml,junitCore.xml"/>
</copy>
@@ -72,20 +73,10 @@
<fileset dir="${build.dir}/testRecorder/config"/>
</copy>
- <copy
todir="${test.dist.base.dir}/beehive-test-dist/testRecorder/testRecorder-jsp">
- <fileset dir="${test.lib.dir}/testRecorder-jsp"/>
+ <copy todir="${test.dist.base.dir}/beehive-test-dist/testRecorder">
+ <fileset dir="${test.lib.dir}/testRecorder"/>
</copy>
- <copy todir="${test.dist.base.dir}/beehive-test-dist/testRecorder/lib">
- <fileset dir="${test.lib.dir}" includes="testRecorder.jar"/>
- </copy>
-
- <copy todir="${test.dist.base.dir}/beehive-test-dist/testRecorder/lib"
- file="${httpClient.jar}"/>
-
- <copy todir="${test.dist.base.dir}/beehive-test-dist/junit/lib"
- file="${junit.jar}"/>
-
<copy todir="${test.dist.base.dir}/beehive-test-dist/conf">
<fileset dir="${test.dir}/conf"/>
</copy>
@@ -95,18 +86,18 @@
</copy>
<copy todir="${test.dist.base.dir}/beehive-test-dist">
- <fileset dir="${dist.base.dir}"/>
+ <fileset dir="${beehive.home}/build/dist"/>
</copy>
</target>
<target name="package.test.dist" description="Build the test package for
distribution test">
- <mkdir dir="${beehive.dir}/build/testDistArchives"/>
- <zip
destfile="${beehive.dir}/build/testDistArchives/${dist.name}-test.zip"
+ <mkdir dir="${beehive.home}/build/testDistArchives"/>
+ <zip
destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.zip"
basedir="${test.dist.base.dir}"
excludes="**/*.gz,**/*.sh"/>
- <tar
destfile="${beehive.dir}/build/testDistArchives/${dist.name}-test.tar.gz"
+ <tar
destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.tar.gz"
basedir="${test.dist.base.dir}"
excludes="**/*.zip,**/*.cmd" compression="gzip"/>
</target>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties&r1=125544&p2=incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties
(original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties
Tue Jan 18 13:02:36 2005
@@ -18,7 +18,6 @@
# Webapp build properties
netuiconfig.xml.name=netui-config.xml
-# webappTemplate.webinf.lib=${webapp.dir}/WEB-INF/lib
buildWebapp.ant=${dist.home}/ant/buildWebapp.xml
@@ -39,7 +38,6 @@
servlet24.jar=${tomcat.dir}/common/lib/servlet-api.jar
jsp20.jar=${tomcat.dir}/common/lib/jsp-api.jar
-
# Netui test JARs/resources
testRecorder.config.name=netui-server-drt-config
Added: incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/test-imports.xml Tue Jan
18 13:02:36 2005
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+
+<project name="Beehive/NetUI/testDistribution" default="usage" basedir=".">
+
+ <property environment="os"/>
+
+ <property file="../test-dist.properties"/>
+
+ <path id="junit-tests.dependency.path">
+ <pathelement path="${test.classes.dir}/junitTests"/>
+ </path>
+
+ <path id="ant-all.dependency.path">
+ <fileset dir="${os.ANT_HOME}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="webapp.dependency.path">
+ <fileset dir="${dist.home}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="junit.dependency.path">
+ <pathelement path="${junit.jar}"/>
+ </path>
+
+ <path id="log4j.dependency.path">
+ <pathelement path="${os.BEEHIVE_HOME}/lib/common/log4j-1.2.8.jar"/>
+ </path>
+
+ <path id="xbean.dependency.path">
+ <pathelement path="${os.BEEHIVE_HOME}/lib/common/apache-xbean.jar"/>
+ <pathelement path="${os.BEEHIVE_HOME}/lib/common/jsr173_1.0_api.jar"/>
+ </path>
+
+ <path id="testrecorder.dependency.path">
+ <fileset dir="${testRecorder.dir}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="servlet.dependency.path">
+ <pathelement path="${servlet24.jar}"/>
+ <pathelement path="${jsp20.jar}"/>
+ </path>
+
+</project>
Added: incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/testRecorder.xml Tue Jan
18 13:02:36 2005
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<project name="Beehive/NetUI/TestRecorder" default="" basedir=".">
+
+ <import file="test-imports.xml"/>
+
+ <property name="_testRecorder.base.dir"
location="${build.dir}/testRecorder"/>
+ <property name="_test.config.dir" location="${test.dir}/conf"/>
+ <property name="_log4j.config.verbose"
location="${log4jconfig.verbose.junit}"/>
+ <property name="_log4j.config" location="${log4jconfig.junit}"/>
+ <property name="_server.maxWait" value="300"/>
+ <property name="testRecorder.dir" location="${test.dir}/testRecorder"/>
+
+ <import file="testRecorderCore.xml"/>
+
+ <target name="generate.report">
+ <junitreport todir="${report.dir}/">
+ <fileset dir="${report.dir}/">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" todir="${report.dir}/html"/>
+ </junitreport>
+ </target>
+</project>
\ No newline at end of file
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml
(original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml Tue Jan
18 13:02:36 2005
@@ -12,7 +12,6 @@
<property environment="os"/>
<property file="${os.BEEHIVE_TEST_HOME}/test-dist.properties"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
<!-- ================================================================ -->
<!-- -->
@@ -27,9 +26,8 @@
<antcall target="update.runtime"/>
<antcall target="deploy.testrecorder"/>
- <ant antfile="${buildWebapp.ant}" target="build.webapp"
inheritAll="false">
+ <ant dir="${dist.home}/ant/" antfile="buildWebapp.xml" target="build"
inheritAll="false">
<property name="webapp.dir" location="${webapp.dir}"/>
- <property name="os.BEEHIVE_HOME" location="${dist.home}"/>
</ant>
<echo message="--------------------------------------------------"/>
@@ -39,17 +37,12 @@
<target name="deploy.testrecorder" description="Deploy the test recorder
to the test webapp - coreWeb at this time">
<echo>Deploying the test recorder to webapp at root:
${webapp.dir}</echo>
- <ant antfile="${test.dir}/ant/testRecorder.xml"
target="deployTestRecorder" inheritAll="false">
- <property name="os.BEEHIVE_TEST_HOME" location="${test.dir}"/>
- <property name="os.BEEHIVE_HOME" location="${dist.home}"/>
- <property file="${test.dir}/test-dist.properties"/>
- </ant>
+ <ant antfile="${test.dir}/ant/testRecorder.xml"
target="deployTestRecorder" inheritAll="false"/>
</target>
<target name="update.runtime" description="Update the NetUI runtime in the
webapp without building the resources">
- <ant antfile="${buildWebapp.ant}"
target="deploy.beehive.webapp.runtime" inheritAll="false">
+ <ant dir="${dist.home}/ant" antfile="webappRuntimeCore.xml"
target="deploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="${webapp.dir}"/>
- <property name="os.BEEHIVE_HOME" location="${dist.home}"/>
</ant>
<copy file="${webapp.dir}/WEB-INF/local-netui-config.xml"
@@ -114,26 +107,21 @@
<!-- -->
<!-- ================================================================ -->
<target name="deploy" description="Deploy webapp">
- <ant antfile="${buildWebapp.ant}" target="deploy" inheritAll="false">
+ <ant dir="ant" antfile="tomcat-imports.xml" target="deploy"
inheritAll="false">
<property name="webapp.dir" location="${webapp.dir}"/>
<property name="context.path" value="${webapp.name}"/>
- <property name="os.BEEHIVE_HOME" value="${dist.home}"/>
</ant>
</target>
<target name="undeploy" description="Undeploy webapp">
- <ant antfile="${buildWebapp.ant}" target="undeploy" inheritAll="false">
- <property name="webapp.dir" location="${webapp.dir}"/>
+ <ant dir="ant" antfile="tomcat-imports.xml" target="undeploy"
inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
- <property name="os.BEEHIVE_HOME" value="${dist.home}"/>
</ant>
</target>
<target name="redeploy" description="Redeploy webapp">
- <ant antfile="${buildWebapp.ant}" target="redeploy" inheritAll="false">
- <property name="webapp.dir" location="${webapp.dir}"/>
+ <ant dir="ant" antfile="tomcat-imports.xml" target="redeploy"
inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
- <property name="os.BEEHIVE_HOME" value="${dist.home}"/>
</ant>
</target>
@@ -144,17 +132,13 @@
<!-- ================================================================ -->
<target name="start" description="Start server with asserts enabled for
org.apache.beehive.netui">
- <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false">
+ <ant dir="ant" antfile="tomcat-imports.xml" target="start"
inheritAll="false">
<property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
- <property name="os.CATALINA_HOME" value="${tomcat.dir}"/>
- <property name="os.BEEHIVE_HOME" value="${dist.home}"/>
</ant>
</target>
<target name="stop" description="Stop server">
- <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false">
- <property name="os.CATALINA_HOME" value="${tomcat.dir}"/>
- <property name="os.BEEHIVE_HOME" value="${dist.home}"/>
+ <ant dir="ant" antfile="tomcat-imports.xml" target="stop"
inheritAll="false">
</ant>
</target>
@@ -192,13 +176,6 @@
<waitfor maxwait="120" maxwaitunit="second"
timeoutproperty="still.unavailable">
<http url="${webapp.waitfor.url}"/>
</waitfor>
- </target>
-
- <target name="fix.crlf">
- <echo>Fix CRLF on file(s) ${file}</echo>
- <fixcrlf srcdir="." eol="unix">
- <include name="${file}"/>
- </fixcrlf>
</target>
</project>
Added: incubator/beehive/trunk/netui/test/external/commons-logging.jar
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/external/commons-logging.jar?view=auto&rev=125545
==============================================================================
Binary file. No diff available.
Modified: incubator/beehive/trunk/netui/test/src/junitTests/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/src/junitTests/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/src/junitTests/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/build.xml (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/build.xml Tue Jan 18
13:02:36 2005
@@ -2,27 +2,17 @@
<project name="Beehive/NetUI/JUnitTests" 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"/>
+ <import file="../../ant/test-imports.xml"/>
<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="${test.lib.dir}/${module.jar.name}"/>
+ <property name="module.jar"
location="${test.lib.dir}/beehive-netui-junitTests.jar"/>
<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 refid="webapp.classpath"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
</path>
<target name="build">
Modified: incubator/beehive/trunk/netui/test/src/testRecorder/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/testRecorder/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/src/testRecorder/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/src/testRecorder/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/src/testRecorder/build.xml
(original)
+++ incubator/beehive/trunk/netui/test/src/testRecorder/build.xml Tue Jan
18 13:02:36 2005
@@ -1,23 +1,26 @@
<?xml version="1.0"?>
-<project name="Beehive/NetUI/testRecorder" default="build" 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"/>
+ <import file="../../ant/test-imports.xml"/>
<property name="module.name" value="testRecorder"/>
<property name="module.dir" location="${test.src.dir}/${module.name}"/>
- <property name="module.classpath"
-
location="${httpClient.jar};${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="${test.lib.dir}/${module.jar.name}"/>
+ <property name="module.jar.name" value="testRecorder.jar"/>
+ <property name="module.jar"
location="${test.lib.dir}/testRecorder/lib/${module.jar.name}"/>
+
+ <path id="module.classpath">
+ <path refid="log4j.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="commons-logging.dependency.path"/>
+ <path refid="httpclient.dependency.path"/>
+ </path>
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module.classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${test.lib.dir}"/>
@@ -32,7 +35,7 @@
<javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
@@ -40,11 +43,14 @@
<include name="**/*.java"/>
</javac>
- <jar jarfile="${module.jar}" basedir="${module.classes.dir}"/>
-
- <copy todir="${test.lib.dir}/testRecorder-jsp">
+ <!-- make testRecorder output directory -->
+ <mkdir dir="${test.lib.dir}/testRecorder"/>
+ <copy todir="${test.lib.dir}/testRecorder/jsp">
<fileset dir="${module.dir}/jsp"/>
</copy>
+ <copy-junit todir="${test.lib.dir}/testRecorder/lib"/>
+ <copy-testrecorder-deps todir="${test.lib.dir}/testRecorder/lib"/>
+ <jar jarfile="${module.jar}" basedir="${module.classes.dir}"/>
</target>
<target name="clean">
Modified: incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
(original)
+++ incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml Tue Jan
18 13:02:36 2005
@@ -2,28 +2,42 @@
<project name="Beehive/NetUI/testRecorderQa" 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"/>
+ <import file="../../ant/test-imports.xml"/>
<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="testRecorder-qa.jar"/>
<property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/>
+ <patternset id="testrecorder.jars">
+ <include name="commons-httpclient-2.0.jar"/>
+ <include name="junit.jar"/>
+ <include name="testRecorder.jar"/>
+ <include name="commons-logging.jar"/>
+ </patternset>
+
+ <path id="testrecorder.dependency.path">
+ <fileset dir="${testRecorder.dir}/lib">
+ <patternset id="testrecorder.jars"/>
+ </fileset>
+ </path>
+
+ <path id="module.classpath">
+ <path refid="junit.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="testrecorder.dependency.path"/>
+ </path>
+
<target name="build">
<echo>compile module: ${module.name}</echo>
- <echo>module classpath: ${module.classpath}</echo>
<echo>debug: ${compile.debug}</echo>
<mkdir dir="${module.classes.dir}"/>
<javac srcdir="${module.dir}"
destdir="${module.classes.dir}"
- classpath="${module.classpath}"
+ classpathref="module.classpath"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
@@ -39,11 +53,9 @@
</target>
<path id="tr.test.classpath">
- <pathelement path="${junit.jar}"/>
+ <path refid="module.classpath"/>
+ <path refid="log4j.dependency.jar"/>
<pathelement path="${module.jar}"/>
- <pathelement path="${test-recorder.jar}"/>
- <pathelement path="${commons-logging.jar}"/>
- <pathelement path="${log4j.jar}"/>
</path>
<target name="testrecorder.test">
Modified: incubator/beehive/trunk/netui/test/webapps/drt/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/build.xml Tue Jan 18
13:02:36 2005
@@ -13,15 +13,13 @@
-->
<project name="Beehive/NetUI/TestRecorder-webapp" default="usage" basedir=".">
- <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/netui.properties"/>
+ <import file="../../ant/webapp-imports.xml"/>
<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}"/>
+ <property name="webapp.dir" location="${app.dir}/drt/${webapp.name}"/>
<!-- ================================================================ -->
<!-- -->
@@ -33,13 +31,9 @@
<echo message="| NetUI coreWeb DRT webapp build starting |"/>
<echo message="--------------------------------------------------"/>
- <property name="webapp.dir" location="${app.dir}/drt/${webapp.name}"/>
-
<antcall target="update.runtime"/>
- <ant antfile="${buildWebapp.ant}" target="build.webapp"
inheritAll="false">
- <property name="webapp.dir" location="${webapp.dir}"/>
- </ant>
+ <build-webapp webappDir="${webapp.dir}"/>
<echo message="--------------------------------------------------"/>
<echo message="| NetUI coreWeb DRT webapp build ending |"/>
@@ -66,10 +60,6 @@
<copy file="${webapp.dir}/WEB-INF/local-netui-config.xml"
tofile="${webapp.dir}/WEB-INF/${netuiconfig.xml.name}"
overwrite="true" failonerror="false"/>
-
- <copy todir="${webapp.dir}/WEB-INF" file="${struts11.logic.tld}"/>
- <copy todir="${webapp.dir}/WEB-INF" file="${struts11.html.tld}"/>
- <copy todir="${webapp.dir}/WEB-INF" file="${struts11.bean.tld}"/>
</target>
<target name="clean" description="Clean webapp">
@@ -78,12 +68,11 @@
<echo message="--------------------------------------------------"/>
<ant antfile="${test.dir}/ant/buildWebapp.xml" target="undeploy.netui"
inheritAll="false">
- <property name="webapp.dir"
location="${app.dir}/drt/${webapp.name}"/>
+ <property name="webapp.dir" location="${webapp.dir}"/>
<property name="include.testrecorder" value="true"/>
</ant>
- <ant antfile="${buildWebapp.ant}" target="clean.webapp"
inheritAll="false">
- <property name="webapp.dir"
location="${app.dir}/drt/${webapp.name}"/>
- </ant>
+
+ <clean-webapp webappDir="${webapp.dir}"/>
<delete failOnError="false">
<fileset dir="${app.dir}/drt/${webapp.name}/WEB-INF/lib"
includes="**/*.jar"/>
@@ -172,22 +161,15 @@
<!-- -->
<!-- ================================================================ -->
<target name="deploy" description="Deploy webapp">
- <ant antfile="${buildWebapp.ant}" target="deploy" inheritAll="false">
- <property name="context.path" value="${webapp.name}"/>
- <property name="webapp.dir" value="${app.dir}/drt/${webapp.name}"/>
- </ant>
+ <deploy-webapp webappDir="${webapp.dir}" contextPath="${webapp.name}"/>
</target>
<target name="undeploy" description="Undeploy webapp">
- <ant antfile="${buildWebapp.ant}" target="undeploy" inheritAll="false">
- <property name="context.path" value="${webapp.name}"/>
- </ant>
+ <undeploy-webapp contextPath="${webapp.name}"/>
</target>
<target name="redeploy" description="Redeploy webapp">
- <ant antfile="${buildWebapp.ant}" target="redeploy" inheritAll="false">
- <property name="context.path" value="${webapp.name}"/>
- </ant>
+ <redeploy-webapp contextPath="${webapp.name}"/>
</target>
<!-- ================================================================ -->
@@ -196,34 +178,28 @@
<!-- -->
<!-- ================================================================ -->
<target name="start.without.asserts" description="Start server without
asserts enabled for org.apache.beehive.netui">
- <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
+ <start-server shmem="false" javaOptions=""/>
</target>
<target name="start.with.shmem" description="Start server">
- <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false"/>
+ <start-server shmem="true" javaOptions=""/>
</target>
<target name="start" description="Start server with asserts enabled for
org.apache.beehive.netui">
- <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false">
- <property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
- </ant>
+ <start-server shmem="false"
javaOptions="-ea:org.apache.beehive.netui..."/>
</target>
<target name="start.with.shmem.asserts" description="Start server with
asserts enabled for org.apache.beehive.netui">
- <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false">
- <property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
- </ant>
+ <start-server shmem="true"
javaOptions="-ea:org.apache.beehive.netui..."/>
</target>
<target name="start.with.shmem.asserts.i18n"
description="Start server with asserts enabled for
org.apache.beehive.netui, with debugging enabled, and in a non-US locale for
i18n / l10n testing.">
- <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false">
- <property name="java.options"
value="-ea:org.apache.beehive.netui... -Duser.language=NL -Duser.country=BE"/>
- </ant>
+ <start-server shmem="true"
javaOptions="-ea:org.apache.beehive.netui... -Duser.language=NL
-Duser.country=BE"/>
</target>
<target name="stop" description="Stop server">
- <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
+ <stop-server/>
</target>
<target name="package.drts" description="Package the NetUI DRT
application.">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<html>
<head>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp3.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp3.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp3.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp3.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp3.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/formBean/test2/Jsp3.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<html>
<head>
Deleted:
/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-bean.tld
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-bean.tld?view=auto&rev=125544
==============================================================================
Deleted:
/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-html.tld
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-html.tld?view=auto&rev=125544
==============================================================================
Deleted:
/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-logic.tld
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-logic.tld?view=auto&rev=125544
==============================================================================
Deleted:
/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-tiles.tld
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/struts-tiles.tld?view=auto&rev=125544
==============================================================================
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test1/Struts1/Struts1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test1/Struts1/Struts1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test1/Struts1/Struts1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test1/Struts1/Struts1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test1/Struts1/Struts1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test1/Struts1/Struts1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<%-----------------------------------------%>
<%-- Struts jsp page called from a Jpf1 --%>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test2/Struts1/Struts1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test2/Struts1/Struts1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test2/Struts1/Struts1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test2/Struts1/Struts1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test2/Struts1/Struts1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test2/Struts1/Struts1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<%-----------------------------------------%>
<%-- Struts jsp page called from a Jpf1 --%>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test3/Struts1/Struts1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test3/Struts1/Struts1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test3/Struts1/Struts1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test3/Struts1/Struts1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test3/Struts1/Struts1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test3/Struts1/Struts1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<%-----------------------------------------%>
<%-- Struts jsp page called from a Jpf1 --%>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test4/Struts1/Struts1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test4/Struts1/Struts1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test4/Struts1/Struts1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test4/Struts1/Struts1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test4/Struts1/Struts1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test4/Struts1/Struts1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<%-----------------------------------------%>
<%-- Struts jsp page called from a Jpf1 --%>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<%-----------------------------------------%>
<%-- Struts jsp page called from a Jpf1 --%>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts2.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts2.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts2.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts2.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/interOp/test5/Struts1/Struts2.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<%-----------------------------------------%>
<%-- Struts jsp page called from a Jpf1 --%>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.blank.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.blank.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.blank.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.blank.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.blank.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.blank.jsp
Tue Jan 18 13:02:36 2005
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<h1> Blank Body Tile </h1>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.panel1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.panel1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.panel1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.panel1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.panel1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.panel1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<table bgcolor="#4169E1" cellspacing="0" cellpadding="10" border="1"
width="100%">
<tr>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.struts-body.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.struts-body.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.struts-body.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.struts-body.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.struts-body.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/components.struts-body.jsp
Tue Jan 18 13:02:36 2005
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<h1> Main Body Tile - Struts HTML tags</h1>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternate.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternate.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternate.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternate.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternate.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternate.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles"; prefix="tiles" %>
<html:html locale="true">
<head>
<%-- We rely on tiles-defs.xml to set the title --%>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternateBody.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternateBody.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternateBody.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternateBody.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternateBody.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.alternateBody.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles"; prefix="tiles" %>
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr valign="top">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.default.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.default.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.default.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.default.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.default.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.default.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles"; prefix="tiles" %>
<html:html locale="true">
<head>
<%-- We rely on tiles-defs.xml to set the title --%>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.mainBody.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.mainBody.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.mainBody.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.mainBody.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.mainBody.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/tiles/layout.mainBody.jsp
Tue Jan 18 13:02:36 2005
@@ -1,5 +1,5 @@
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles"; prefix="tiles" %>
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr valign="top">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug30303/Jsp1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug30303/Jsp1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug30303/Jsp1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug30303/Jsp1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug30303/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug30303/Jsp1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,6 +1,6 @@
<%@ page language="java" %>
<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui" %>
-<%@ taglib uri="struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<netui:html>
<head>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,6 +1,6 @@
<%@ page language="java" %>
<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui" %>
-<%@ taglib uri="struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<netui:html>
<head>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp2.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp2.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp2.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp2.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp2.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug38484/Jsp2.jsp
Tue Jan 18 13:02:36 2005
@@ -1,6 +1,6 @@
<%@ page language="java" %>
<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui" %>
-<%@ taglib uri="struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<netui:html>
<head>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/bug39028/Jsp1.jsp
Tue Jan 18 13:02:36 2005
@@ -1,6 +1,6 @@
<%@ page language="java" %>
<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui" %>
-<%@ taglib uri="struts-html.tld" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
<netui:html>
<head>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/test13/submit.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/test13/submit.jsp?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/test13/submit.jsp&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/test13/submit.jsp&r2=125545
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/test13/submit.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miscJpf/test13/submit.jsp
Tue Jan 18 13:02:36 2005
@@ -1,7 +1,7 @@
<%@ page language="java" %>
-<%@ taglib uri="struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="struts-html.tld" prefix="html" %>
-<%@ taglib uri="struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"; prefix="bean" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic"; prefix="logic" %>
<html>
<head>
Modified: incubator/beehive/trunk/netui/test/webapps/jsf/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/jsf/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/jsf/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/jsf/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/jsf/build.xml Tue Jan 18
13:02:36 2005
@@ -5,9 +5,7 @@
<project name="Beehive/NetUI/JSFTests" default="usage" basedir=".">
<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/netui.properties"/>
+ <import file="../../ant/webapp-imports.xml"/>
<property name="webapp.name" value="jsfWeb"/>
<property name="testRecorder.config.name" value="netui-server-jsf-config"/>
Modified: incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml&r1=125544&p2=incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml
(original)
+++ incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml
Tue Jan 18 13:02:36 2005
@@ -14,9 +14,7 @@
<project name="Beehive/NetUI/TestRecorder-webapp" default="usage" basedir=".">
<property environment="os"/>
- <property file="../../../../beehive.properties"/>
- <property file="../../ant/test.properties"/>
- <property file="../../../ant/netui.properties"/>
+ <import file="../../ant/webapp-imports.xml"/>
<property name="webapp.name" value="testRecorder-test"/>
<property name="testRecorder.config.name" value="${webapp.name}-config"/>
Modified: incubator/beehive/trunk/samples/controls-blank/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-blank/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/samples/controls-blank/build.xml&r1=125544&p2=incubator/beehive/trunk/samples/controls-blank/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/samples/controls-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-blank/build.xml Tue Jan 18
13:02:36 2005
@@ -3,7 +3,6 @@
<project name="controls-blank" default="usage">
<property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
<property name="source.dir" value="${basedir}/src"/>
<property name="build.dir" value="${basedir}/build"/>
@@ -11,11 +10,23 @@
<property name="build.beansrc" value="${build.dir}/beansrc"/>
<property name="build.jar" value="mycontrols.jar"/>
+ <path id="tools.dependency.path">
+ <pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
+ </path>
+
+ <path id="controls.dependency.path">
+ <pathelement location="${beehive.home}/lib/controls/controls.jar"/>
+ </path>
+
+ <path id="velocity.dependency.path">
+ <pathelement location="${beehive.home}/lib/common/velocity-1.4.jar"/>
+ <pathelement
location="${beehive.home}/lib/common/velocity-dep-1.4.jar"/>
+ </path>
+
<path id="build.classpath">
- <pathelement location="${tools.jar}"/>
- <pathelement location="${velocity14.jar}"/>
- <pathelement location="${velocitydep14.jar}"/>
- <pathelement location="${controls.jar}"/>
+ <path refid="tools.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="controls.dependency.path"/>
<pathelement path="${build.classes}"/>
</path>
Added: incubator/beehive/trunk/samples/controls-db/build-svn.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-db/build-svn.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/samples/controls-db/build-svn.xml Tue Jan 18
13:02:36 2005
@@ -0,0 +1,66 @@
+<?xml version="1.0" ?>
+
+<project name="controls-db" default="usage" basedir=".">
+
+ <import file="../../beehive-imports.xml"/>
+
+ <property name="source.dir" value="${basedir}/src"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="build.classes" value="${build.dir}/classes"/>
+ <property name="build.beansrc" value="${build.dir}/beansrc"/>
+ <property name="build.jar" value="dbControl.jar"/>
+
+ <path id="build.classpath">
+ <path refid="controls.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="tools.dependency.path"/>
+ <pathelement path="${build.classes}"/>
+ </path>
+
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="controls.dependency.path"
+ onerror="report" />
+ <taskdef name="control-jar"
+
classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
+ classpathref="controls.dependency.path"
+ onerror="report" />
+
+ <target name="usage">
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="Controls Template Build file"/>
+ <echo
message="================================================================"/>
+ <echo message="| Usage
|"/>
+ <echo
message="================================================================"/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="| Standard Targets
|"/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="clean - Delete all generated files"/>
+ <echo message="build - build controls"/>
+ <echo
message="----------------------------------------------------------------"/>
+ </target>
+
+ <target name="clean" description="Deletes all generated files">
+ <delete dir="${build.dir}"/>
+ <delete file="velocity.log"/>
+ </target>
+
+ <target name="dirs">
+ <mkdir dir="${build.classes}" />
+ <mkdir dir="${build.beansrc}" />
+ </target>
+
+ <target name="build" depends="dirs" description="Builds controls sources">
+ <apt srcdir="${source.dir}"
+ destdir="${build.classes}"
+ gendir="${build.beansrc}"
+ classpathref="build.classpath"
+ debug="on"
+ compileByExtension="true"
+ srcExtensions="*.java,*.jcx,*.jcs">
+ </apt>
+ <control-jar destfile="${build.dir}/${build.jar}"
basedir="${build.classes}" />
+ </target>
+
+</project>
Modified: incubator/beehive/trunk/samples/controls-db/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-db/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/samples/controls-db/build.xml&r1=125544&p2=incubator/beehive/trunk/samples/controls-db/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/samples/controls-db/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-db/build.xml Tue Jan 18
13:02:36 2005
@@ -1,9 +1,8 @@
<?xml version="1.0" ?>
-<project name="controls-blank" default="usage">
+<project name="controls-db" default="usage" basedir=".">
<property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
<property name="source.dir" value="${basedir}/src"/>
<property name="build.dir" value="${basedir}/build"/>
@@ -11,19 +10,26 @@
<property name="build.beansrc" value="${build.dir}/beansrc"/>
<property name="build.jar" value="dbControl.jar"/>
+ <path id="controls.classpath">
+ <pathelement location="../../lib/controls/controls.jar"/>
+ </path>
<path id="build.classpath">
- <pathelement location="${tools.jar}"/>
- <pathelement location="${velocity14.jar}"/>
- <pathelement location="${velocitydep14.jar}"/>
- <pathelement location="${controls.jar}"/>
+ <path refid="controls.classpath"/>
+ <pathelement location="../../lib/common/velocity-1.4.jar"/>
+ <pathelement location="../../lib/common/velocity-dep-1.4.jar"/>
+ <pathelement location="../../lib/controls/controls.jar"/>
+ <pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
<pathelement path="${build.classes}"/>
</path>
- <taskdef name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="${controls.jar}" onerror="report" />
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="controls.classpath"
+ onerror="report" />
<taskdef name="control-jar"
classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpath="${controls.jar}" onerror="report" />
+ classpathref="controls.classpath"
+ onerror="report" />
<target name="usage">
<echo message=""/>
@@ -51,7 +57,9 @@
</target>
<target name="build" depends="dirs" description="Builds controls sources">
- <apt srcdir="${source.dir}" destdir="${build.classes}"
gendir="${build.beansrc}"
+ <apt srcdir="${source.dir}"
+ destdir="${build.classes}"
+ gendir="${build.beansrc}"
classpathref="build.classpath"
debug="on"
compileByExtension="true"
Modified: incubator/beehive/trunk/test/testDistro.cmd
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/testDistro.cmd?view=diff&rev=125545&p1=incubator/beehive/trunk/test/testDistro.cmd&r1=125544&p2=incubator/beehive/trunk/test/testDistro.cmd&r2=125545
==============================================================================
--- incubator/beehive/trunk/test/testDistro.cmd (original)
+++ incubator/beehive/trunk/test/testDistro.cmd Tue Jan 18 13:02:36 2005
@@ -2,7 +2,10 @@
REM Tests an installation of a Beehive distribution
REM
-call beehiveUser.cmd
set
-cd ant
-call ant -Dwebapp.dir=%BEEHIVE_HOME%\samples\petstoreWeb -f buildWebapp.xml
deploy.beehive.webapp.runtime build.webapp
+
+REM Populate the petstoreWeb with the Beehive/NetUI webapp runtime
+call ant -Dwebapp.dir=%CD%\samples\petstoreWeb -f ant\webappRuntimeCore.xml
deploy.beehive.webapp.runtime
+
+REM Build the petstoreWeb
+call ant -Dwebapp.dir=%CD%\samples\petstoreWeb -f ant\buildWebapp.xml build
Modified: incubator/beehive/trunk/test/testDistro.sh
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/testDistro.sh?view=diff&rev=125545&p1=incubator/beehive/trunk/test/testDistro.sh&r1=125544&p2=incubator/beehive/trunk/test/testDistro.sh&r2=125545
==============================================================================
--- incubator/beehive/trunk/test/testDistro.sh (original)
+++ incubator/beehive/trunk/test/testDistro.sh Tue Jan 18 13:02:36 2005
@@ -1,8 +1,12 @@
#!/bin/sh
-
#
-#Tests an installation of a Beehive distribution
+# Tests an installation of a Beehive distribution
#
-. beehiveUser.sh
-cd ant
-ant -Dwebapp.dir=$BEEHIVE_HOME/samples/petstoreWeb -f buildWebapp.xml
deploy.beehive.webapp.runtime build.webapp
+
+env
+
+# Populate the petstoreWeb with the Beehive/NetUI webapp runtime
+call ant -Dwebapp.dir=$CWD\samples\petstoreWeb -f ant\webappRuntimeCore.xml
deploy.beehive.webapp.runtime
+
+# Build the petstoreWeb
+call ant -Dwebapp.dir=$CWD\samples\petstoreWeb -f ant\buildWebapp.xml build
Added: incubator/beehive/trunk/user/beehive-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive-imports.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/user/beehive-imports.xml Tue Jan 18 13:02:36 2005
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2004 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:$
+ -->
+
+<!--
+ A build file that needs to be imported by all sub-projects.
+-->
+<project name="beehive-imports" default="" basedir=".">
+
+ <property environment="os"/>
+ <dirname property="beehive.home" file="${ant.file.beehive-imports}"/>
+
+ <path id="controls.dependency.path">
+ <pathelement location="${beehive.home}/lib/controls/controls.jar"/>
+ </path>
+
+ <path id="netui-compiler.dependency.path">
+ <pathelement
location="${beehive.home}/lib/netui/beehive-netui-compiler.jar"/>
+ </path>
+
+ <path id="velocity.dependency.path">
+ <pathelement location="${beehive.home}/lib/controls/velocity-1.4.jar"/>
+ <pathelement
location="${beehive.home}/lib/controls/velocity-dep-1.4.jar"/>
+ </path>
+
+ <path id="xbean.dependency.path">
+ <pathelement location="${beehive.home}/lib/common/apache-xbean.jar"/>
+ <pathelement location="${beehive.home}/lib/common/jsr173_1.0_api.jar"/>
+ </path>
+
+</project>
\ No newline at end of file
Modified: incubator/beehive/trunk/user/beehive.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive.properties?view=diff&rev=125545&p1=incubator/beehive/trunk/user/beehive.properties&r1=125544&p2=incubator/beehive/trunk/user/beehive.properties&r2=125545
==============================================================================
--- incubator/beehive/trunk/user/beehive.properties (original)
+++ incubator/beehive/trunk/user/beehive.properties Tue Jan 18 13:02:36 2005
@@ -3,27 +3,26 @@
# Beehive distribution properties.
#
#
-beehive.dir=${os.BEEHIVE_HOME}
-
-ant.dir=${os.ANT_HOME}
-log4j.dir=${os.LOG4J_HOME}
+#beehive.dir=${os.BEEHIVE_HOME}
+#ant.dir=${os.ANT_HOME}
+#log4j.dir=${os.LOG4J_HOME}
# External JARs not included in the Beehive distribution
-tools.jar=${os.JAVA_HOME}/lib/tools.jar
-ant.jar=${ant.dir}/lib/ant.jar
-log4j.jar=${log4j.dir}/dist/lib/log4j-1.2.8.jar
+#tools.jar=${os.JAVA_HOME}/lib/tools.jar
+#ant.jar=${ant.dir}/lib/ant.jar
+#log4j.jar=${log4j.dir}/dist/lib/log4j-1.2.8.jar
#servlet24.jar,jsp20.jar set in appserver properties file
# External JARs included in the Beehive distribution
-jsr173.jar=${beehive.dir}/lib/common/jsr173_1.0_api.jar
-velocity14.jar=${beehive.dir}/lib/common/velocity-1.4.jar
-velocitydep14.jar=${beehive.dir}/lib/common/velocity-dep-1.4.jar
-xbean.jar=${beehive.dir}/lib/common/apache-xbean.jar
+#jsr173.jar=${beehive.dir}/lib/common/jsr173_1.0_api.jar
+#velocity14.jar=${beehive.dir}/lib/common/velocity-1.4.jar
+#velocitydep14.jar=${beehive.dir}/lib/common/velocity-dep-1.4.jar
+#xbean.jar=${beehive.dir}/lib/common/apache-xbean.jar
# Beehive JARs
-controls.jar=${beehive.dir}/lib/controls/controls.jar
-netui-compiler.jar=${beehive.dir}/lib/netui/beehive-netui-compiler.jar
+#controls.jar=${beehive.dir}/lib/controls/controls.jar
+#netui-compiler.jar=${beehive.dir}/lib/netui/beehive-netui-compiler.jar
# Application Server to use
#appserver.ant=${beehive.dir}/ant/runJonasCore.xml
-appserver.ant=${beehive.dir}/ant/runTomcatCore.xml
+#appserver.ant=${beehive.dir}/ant/runTomcatCore.xml
Added: incubator/beehive/trunk/user/buildWebapp.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/buildWebapp.xml?view=auto&rev=125545
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/user/buildWebapp.xml Tue Jan 18 13:02:36 2005
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+
+<project name="Beehive/WebappBuild" default="usage">
+
+ <property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
+
+ <import file="../beehive-imports.xml"/>
+ <import file="buildWebappCore.xml"/>
+
+ <path id="appserver.build.classpath">
+ <fileset dir="${os.CATALINA_HOME}/common/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="build">
+ <available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
+ <fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
+
+ <!-- this is the classpath to include when building webapp sources -->
+ <path id="webapp.build.classpath">
+ <pathelement location="${webapp.dir}/WEB-INF/classes"/>
+ <fileset dir="${webapp.dir}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!--
+ this directory needs to get whacked before every build so
+ that control interface repackagings don't cause stale
+ files to be compiled
+ -->
+ <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
includeEmptyDirs="true"/>
+
+ <mkdir dir="${webapp.dir}/WEB-INF/classes"/>
+
+ <!-- compile XSDs -->
+ <build-schemas sourceDir="${webapp.dir}/WEB-INF/schemas"
destDir="${webapp.dir}/WEB-INF/classes"/>
+
+ <!-- compile controls -->
+ <build-controls sourceDir="${webapp.dir}/WEB-INF/src"
destdir="${webapp.dir}/WEB-INF/classes"
tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"/>
+
+ <!-- compile JPFs -->
+ <build-pageflows sourceDir="${webapp.dir}"
destdir="${webapp.dir}/WEB-INF/classes"
tmpdir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"/>
+
+ <!-- copy resources -->
+ <echo>Copy all .properties files</echo>
+ <copy todir="${webapp.dir}/WEB-INF/classes">
+ <fileset dir="${webapp.dir}/WEB-INF/src"
includes="**/*.properties"/>
+ </copy>
+
+ <echo>Copy all .xml files</echo>
+ <copy todir="${webapp.dir}/WEB-INF/classes/" failonerror="false">
+ <fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.xml"/>
+ </copy>
+
+ </target>
+
+ <target name="clean">
+ <available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
+ <fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
+
+ <delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
+ <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
includeEmptyDirs="true"/>
+ </target>
+
+ <target name="usage" description="">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-projecthelp"/>
+ </java>
+ </target>
+
+</project>
\ No newline at end of file
Modified: incubator/beehive/trunk/user/webappRuntimeCore.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/webappRuntimeCore.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/user/webappRuntimeCore.xml&r1=125544&p2=incubator/beehive/trunk/user/webappRuntimeCore.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/user/webappRuntimeCore.xml (original)
+++ incubator/beehive/trunk/user/webappRuntimeCore.xml Tue Jan 18 13:02:36 2005
@@ -2,9 +2,6 @@
<project name="Beehive/Webapp Deploy" default="usage" basedir=".">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
-
<target name="deploy.beehive.webapp.runtime" description="Deploy the
Beehive webapp runtime given a webapp root as -Dwebapp.dir">
<available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
<fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
@@ -12,29 +9,29 @@
<echo>Deploy NetUI to webapp rooted at: ${webapp.dir}</echo>
<copy todir="${webapp.dir}/WEB-INF/lib">
- <fileset dir="${os.BEEHIVE_HOME}/lib/netui">
+ <fileset dir="../lib/netui">
<include name="*.jar"/>
<exclude name="beehive-*-compiler.jar"/>
</fileset>
- <fileset dir="${os.BEEHIVE_HOME}/lib/common">
+ <fileset dir="../lib/common">
<include name="*.jar"/>
</fileset>
- <fileset dir="${os.BEEHIVE_HOME}/lib/controls">
+ <fileset dir="../lib/controls">
<include name="*.jar"/>
</fileset>
- <fileset dir="${os.BEEHIVE_HOME}/lib/wsm/">
+ <fileset dir="../lib/wsm">
<include name="*.jar"/>
</fileset>
</copy>
<copy todir="${webapp.dir}/WEB-INF/">
- <fileset dir="${os.BEEHIVE_HOME}/lib/netui">
+ <fileset dir="../lib/netui">
<include name="**.tld*"/>
</fileset>
</copy>
<copy todir="${webapp.dir}/resources/">
- <fileset dir="${os.BEEHIVE_HOME}/lib/netui/resources">
+ <fileset dir="../lib/netui/resources">
<include name="**/*"/>
</fileset>
</copy>
@@ -47,13 +44,13 @@
<echo>Deploy WSM to webapp rooted at: ${webapp.dir}</echo>
<copy todir="${webapp.dir}/WEB-INF/lib">
- <fileset dir="${os.BEEHIVE_HOME}/lib/common">
+ <fileset dir="../lib/common">
<include name="*.jar"/>
</fileset>
- <fileset dir="${os.BEEHIVE_HOME}/lib/controls">
+ <fileset dir="../lib/controls">
<include name="*.jar"/>
</fileset>
- <fileset dir="${os.BEEHIVE_HOME}/lib/wsm/">
+ <fileset dir="../lib/wsm/">
<include name="*.jar"/>
</fileset>
</copy>
Modified: incubator/beehive/trunk/wsm/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/wsm/build.xml&r1=125544&p2=incubator/beehive/trunk/wsm/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Tue Jan 18 13:02:36 2005
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Copyright 2004 The Apache Software Foundation
@@ -16,57 +17,43 @@
$Header:$
-->
<project name="Beehive - Metadata for Web Services" default="usage"
basedir=".">
- <property environment="os"/>
- <property file="../beehive.properties"/>
- <!-- THE WSM BUILD REQUIRES JDK5 AND LATER. ATTEMPTS TO BUILD ON JDK
EALRIER THAN 5.0 WILL BE A NOOP -->
- <condition property="isJDKOver5">
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </condition>
- <property name="build.dir" value="build" />
- <property name="classes.dir" value="${build.dir}/classes" />
- <property name="jars.dir" value="${build.dir}/jars" />
- <property name="docs.dir" value="${build.dir}/docs" />
- <property name="template.dir" value="src/webapp-template/default" />
- <property name="api.dir" value="src/api" />
- <property name="api.classes" value="${classes.dir}/api" />
- <property name="runtime.dir" value="src/runtime" />
- <property name="runtime.classes" value="${classes.dir}/runtime" />
- <property name="lib.dir" value="lib" />
- <property name="ext.lib.dir" value="external" />
- <property name="wsm.jar" value="${jars.dir}/wsm.jar" />
- <property name="wsm-axis.jar" value="${jars.dir}/wsm-axis.jar" />
- <property name="xsd.schema.dir" value="src/runtime/schema" />
- <property name="xsd.classes.dir" value="${build.dir}/xsd-classes" />
+
+ <import file="../beehive-imports.xml"/>
+ <import file="../ant/${webservice.runtime}-import.xml"/>
+
+ <property name="build.dir" location="build" />
+ <property name="classes.dir" location="${build.dir}/classes" />
+ <property name="jars.dir" location="${build.dir}/jars" />
+ <property name="docs.dir" location="${build.dir}/docs" />
+ <property name="api.dir" location="src/api" />
+ <property name="api.classes" location="${classes.dir}/api" />
+ <property name="runtime.dir" location="src/runtime" />
+ <property name="runtime.classes" location="${classes.dir}/runtime" />
+ <property name="lib.dir" location="lib" />
+ <property name="ext.lib.dir" location="external" />
+ <property name="wsm.jar" location="${jars.dir}/wsm.jar" />
+ <property name="wsm-axis.jar" location="${jars.dir}/wsm-axis.jar" />
+ <property name="xsd.schema.dir" location="src/runtime/schema" />
+ <property name="xsd.classes.dir" location="${build.dir}/xsd-classes" />
<property name="xsd.includes" value="*.xsd" />
<path id="runtime.classpath">
- <pathelement location="${ant.jar}"/>
- <pathelement location="${tools.jar}"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="tools.dependency.path"/>
+ <path refid="ant-jar.dependency.path"/>
+ <path refid="commons-codec.dependency.path"/>
<pathelement location="${api.classes}"/>
- <pathelement location="${xbean.jar}"/>
- <pathelement location="${jsr173.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${log4j.jar}"/>
<pathelement location="${lib.dir}/wsdltypes.jar"/>
<pathelement location="${lib.dir}/schematypes.jar"/>
- <pathelement location="${commons-codec.jar}"/>
- <pathelement location="${velocity14.jar}"/>
- <pathelement location="${velocitydep14.jar}"/>
</path>
- <fileset id="axis.jars" dir="${ext.lib.dir}">
- <include name="wsdl4j.jar"/>
- <include name="saaj.jar"/>
- <include name="jaxrpc.jar"/>
- <include name="commons-logging.jar"/>
- <include name="commons-discovery.jar"/>
- <include name="axis-ant.jar"/>
- <include name="axis.jar"/>
- </fileset>
<path id="axis.classpath">
- <fileset refid="axis.jars"/>
- <pathelement location="${controls.jar}"/>
- <pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="tools.dependency.path"/>
<path refid="runtime.classpath"/>
+ <path refid="webservice.classpath"/>
<pathelement location="${runtime.classes}"/>
<pathelement location="${xsd.classes.dir}"/>
</path>
@@ -123,7 +110,7 @@
<!-- ====================================================================
-->
<!-- Compiles the source code of the project. -->
<!-- ====================================================================
-->
- <target name="classes" depends="api, runtime" if="isJDKOver5">
+ <target name="classes" depends="api, runtime">
<!-- Copy template files into the build -->
<copy todir="${runtime.classes}" overwrite="true">
<fileset dir="${runtime.dir}"
includes="**/*.template,**/*.vm,META-INF/**"/>
@@ -133,13 +120,13 @@
<fileset dir="${runtime.dir}" includes="**/*.properties"/>
</copy>
</target>
- <target name="api" depends="dirs" if="isJDKOver5">
+ <target name="api" depends="dirs">
<!-- Build the API classes -->
<javac destdir="${api.classes}" debug="on">
<src path="${api.dir}"/>
</javac>
</target>
- <target name="runtime" depends="api" if="isJDKOver5">
+ <target name="runtime" depends="api">
<!-- Build the runtime classes -->
<javac destdir="${runtime.classes}" classpathref="runtime.classpath"
debug="on">
<src path="${runtime.dir}"/>
@@ -154,9 +141,7 @@
<fileset dir="${runtime.dir}" includes="**/*.properties"/>
</copy>
</target>
- <target name="axis" depends="xsd,runtime" if="isJDKOver5">
- <!-- makes sure controls.jar has been built -->
- <ant dir="${beehive.dir}/controls" target="build"/>
+ <target name="axis" depends="xsd,runtime">
<!-- Build the axis classes -->
<echo message="AXIS build"/>
<javac destdir="${runtime.classes}" classpathref="axis.classpath"
debug="on">
@@ -167,7 +152,7 @@
<!-- ====================================================================
-->
<!-- Generate classes from xml schemas using XMLBeans.
-->
<!-- ====================================================================
-->
- <target name="xsd" if="isJDKOver5" description="Compile a set of XSDs
using the XMLBean Ant task">
+ <target name="xsd" description="Compile a set of XSDs using the XMLBean
Ant task">
<fileset id="xbean.sources" dir="${xsd.schema.dir}"
includes="${xsd.includes}"/>
<!-- checks whether classes have already been generated. -->
<uptodate property="xbean.uptodate"
targetfile="${xsd.classes.dir}/schema">
@@ -177,15 +162,12 @@
</target>
<target name="xsd.generate" unless="xbean.uptodate">
<echo message="generate"/>
- <taskdef name="xmlbeanbuild"
classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpath="${xbean.jar};${jsr173.jar}"/>
- <xmlbeanbuild classpath="${xbean.jar};${jsr173.jar}"
schema="${xsd.schema.dir}"
- classgendir="${xsd.classes.dir}" failonerror="true"/>
+ <build-xbean schemaDir="${xsd.schema.dir}"
classgenDir="${xsd.classes.dir}"/>
</target>
<!-- ====================================================================
-->
<!-- Jars up the classes, libraries, and resources. -->
<!-- ====================================================================
-->
- <target name="build" depends="classes" if="isJDKOver5">
+ <target name="build" depends="classes">
<echo message="--------------------------------------------------"/>
<echo message="| WSM build starting |"/>
<echo message="--------------------------------------------------"/>
@@ -199,7 +181,7 @@
<echo message="| WSM build ending |"/>
<echo message="--------------------------------------------------"/>
</target>
- <target name="build_axis" depends="axis" if="isJDKOver5">
+ <target name="build_axis" depends="axis">
<echo message="--------------------------------------------------"/>
<echo message="| WSM-AXIS build starting |"/>
<echo message="--------------------------------------------------"/>
@@ -258,24 +240,20 @@
<fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
<echo>Deploy WSM to webapp rooted at: ${webapp.dir}</echo>
<!-- copy the required libraries -->
+ <deploy-webservice-runtime appdir="${webapp.dir}/WEB-INF/lib"/>
<copy todir="${webapp.dir}/WEB-INF/lib/" failOnError="true">
<fileset dir="${jars.dir}" includes="**/*.jar"/>
- <fileset file="${controls.jar}"/>
<fileset dir="${lib.dir}" includes="**/*.jar"/>
- <fileset dir="${ext.lib.dir}" includes="**/*.jar"/>
- <!-- beehive/external -->
- <fileset file="${log4j.jar}"/>
- <fileset file="${xbean.jar}"/>
- <fileset file="${jsr173.jar}"/>
- <!-- velocity -->
- <fileset file="${velocity14.jar}"/>
- <fileset file="${velocitydep14.jar}"/>
+ <fileset refid="log4j.fileset"/>
+ <fileset refid="xbean.fileset"/>
+ <fileset refid="jsr173.fileset"/>
+ <fileset refid="controls.fileset"/>
</copy>
</target>
<!-- ====================================================================
-->
<!-- deploy -->
<!-- ====================================================================
-->
- <target name="deploy" depends="build_all" if="isJDKOver5">
+ <target name="deploy" depends="build_all">
<echo message="--------------------------------------------------"/>
<echo message="| WSM deploy starting |"/>
<echo message="--------------------------------------------------"/>
@@ -305,7 +283,7 @@
<!-- ====================================================================
-->
<!-- docs -->
<!-- ====================================================================
-->
- <target name="docs" if="isJDKOver5">
+ <target name="docs">
<javadoc destdir="${docs.dir}/apidocs/classref_wsm" maxmemory="256M"
windowtitle="WSM Documentation" doctitle="Web Services Metadata" version="true"
author="false" use="true" additionalparam="-breakiterator -noqualifier all
-notimestamp " useexternalfile="true" classpathref="axis.classpath">
<packageset dir="${api.dir}" defaultexcludes="yes"/>
<packageset dir="${runtime.dir}" defaultexcludes="yes"/>
Modified: incubator/beehive/trunk/wsm/drt/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/build.xml?view=diff&rev=125545&p1=incubator/beehive/trunk/wsm/drt/build.xml&r1=125544&p2=incubator/beehive/trunk/wsm/drt/build.xml&r2=125545
==============================================================================
--- incubator/beehive/trunk/wsm/drt/build.xml (original)
+++ incubator/beehive/trunk/wsm/drt/build.xml Tue Jan 18 13:02:36 2005
@@ -2,8 +2,7 @@
<project name="wsmdrt" default="drt">
- <property environment="os"/>
- <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
+ <import file="../../beehive-imports.xml"/>
<property name="drt.root" location="${basedir}"/>
<property name="drt.logs" location="${drt.root}/logs"/>
@@ -13,14 +12,15 @@
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.tests" location="${build.classes}/tests"/>
<property name="webapp.dir" location="${drt.root}/webapp"/>
+ <property name="lib.dir" value="../lib"/>
+ <property name="ext.lib.dir" value="../external"/>
+
<condition property="drt.os" value="windows">
<os family="windows"/>
</condition>
<condition property="drt.os" value="unix">
<os family="unix"/>
</condition>
- <property name="lib.dir" value="../lib"/>
- <property name="ext.lib.dir" value="../external"/>
<fileset id="axis.jars" dir="${ext.lib.dir}">
<include name="wsdl4j.jar"/>
@@ -33,18 +33,17 @@
</fileset>
<path id="drt.classpath">
- <pathelement location="${junit.jar}"/>
- <pathelement location="${tools.jar}"/>
- <pathelement location="${xbean.jar}"/>
- <pathelement location="${jsr173.jar}"/>
- <pathelement location="${commons-codec.jar}"/>
- <pathelement location="${log4j.jar}"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="tools.dependency.path"/>
+ <path refid="commons-codec.dependency.path"/>
+
<pathelement location="${lib.dir}/wsdltypes.jar"/>
<pathelement location="${lib.dir}/schematypes.jar"/>
<pathelement location="../build/jars/wsm.jar"/>
<pathelement location="../build/jars/wsm-axis.jar"/>
- <pathelement location="${velocity14.jar}"/>
- <pathelement location="${velocitydep14.jar}"/>
<fileset refid="axis.jars"/>
</path>
@@ -102,12 +101,8 @@
</target>
<target name="build.webapp">
- <ant target="deploy.wsm.webapp.runtime"
dir="${os.BEEHIVE_HOME}/test/ant" antfile="buildWebapp.xml" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
- <ant target="build.webapp" dir="${os.BEEHIVE_HOME}/test/ant"
antfile="buildWebapp.xml" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
+ <deploy-wsm webappDir="${webapp.dir}"/>
+ <build-webapp webappDir="${webapp.dir}"/>
</target>
<target name="clean.tests">
@@ -120,33 +115,23 @@
</target>
<target name="clean.webapp">
- <ant target="clean.webapp" dir="${os.BEEHIVE_HOME}/test/ant"
antfile="buildWebapp.xml" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
+ <clean-webapp webappDir="${webapp.dir}"/>
<delete dir="${webapp.dir}/WEB-INF/lib" />
- <!-- should be target in buildWebapp.xml -->
+ <!-- should be target in buildWebapp.xml -->
</target>
<target name="xbean">
- <taskdef name="xmlbeanbuild"
classname="org.apache.xmlbeans.impl.tool.XMLBean">
- <classpath>
- <path refid="drt.classpath"/>
- </classpath>
- </taskdef>
- <xmlbeanbuild
- schema="tests/schemas"
- classgendir="${webapp.dir}/WEB-INF/classes"
- failonerror="true">
- <classpath>
- <path refid="drt.classpath"/>
- <pathelement location="${webapp.dir}/WEB-INF/classes"/>
- </classpath>
- </xmlbeanbuild>
+ <path id="xbean.build.classpath">
+ <path refid="drt.classpath"/>
+ <pathelement location="${webapp.dir}/WEB-INF/classes"/>
+ </path>
+ <build-xbean schemaDir="${drt.schemas}"
classgenDir="${webapp.dir}/WEB-INF/classes"
xbeanBuildClasspathRef="xbean.build.classpath"/>
</target>
<target name="run.drt">
<echo message="** junit logfiles written to ${drt.logs} **"/>
<junit failureproperty="wsmdrtfailed" printsummary="on"
tempdir="${build.dir}" fork="yes">
+ <sysproperty key="beehive.home" value="${beehive.home}"/>
<classpath>
<pathelement location="${build.tests}"/>
<path refid="drt.classpath"/>
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/security/MemoryUserListTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/security/MemoryUserListTest.java?view=diff&rev=125545&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/security/MemoryUserListTest.java&r1=125544&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/security/MemoryUserListTest.java&r2=125545
==============================================================================
---
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/security/MemoryUserListTest.java
(original)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/security/MemoryUserListTest.java
Tue Jan 18 13:02:36 2005
@@ -39,7 +39,7 @@
public class MemoryUserListTest extends TestCase {
- private static final String BEEHIVE_HOME = System.getenv("BEEHIVE_HOME");
+ private static final String BEEHIVE_HOME =
System.getProperty("beehive.home");
BeehiveRoleDocument brd = null;
UserList userList = null;
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java?view=diff&rev=125545&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java&r1=125544&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java&r2=125545
==============================================================================
---
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
(original)
+++
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessorTest.java
Tue Jan 18 13:02:36 2005
@@ -50,7 +50,7 @@
*/
public class XmlBeanWSDLProcessorTest extends TestCase {
- private static final String BEEHIVE_HOME = System.getenv("BEEHIVE_HOME");
// todo: needs to go -- the build process has been updated, BEEHIVE_HOME
obsoleted
+ private static final String BEEHIVE_HOME =
System.getProperty("beehive.home");
private static final String CLASSNAME =
"org.apache.beehive.wsm.jsr181.wsdl.StarWars";
Jsr181TypeMetadata serverModel;
