svn commit: r397632 - in /beehive/trunk/controls/test/webapps: build.properties build.xml common/ web/app.properties

[ek...@apache.org]

Author: ekoneil
Date: Thu Apr 27 13:59:01 2006
New Revision: 397632

URL: http://svn.apache.org/viewcvs?rev=397632&view=rev
Log:
Final bit of cleanup in the webapp.  Everything is nice, simple, and debuggable now.  :)

This might have broken the distribution tests -- we'll know in an hour or two.

BB: self
Test: Controls pass


Removed:
    beehive/trunk/controls/test/webapps/common/
    beehive/trunk/controls/test/webapps/web/app.properties
Modified:
    beehive/trunk/controls/test/webapps/build.properties
    beehive/trunk/controls/test/webapps/build.xml

Modified: beehive/trunk/controls/test/webapps/build.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/build.properties?rev=397632&r1=397631&r2=397632&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/build.properties (original)
+++ beehive/trunk/controls/test/webapps/build.properties Thu Apr 27 13:59:01 2006
@@ -6,4 +6,15 @@
 context.path=controlsWeb
 
 servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
-jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
\ No newline at end of file
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+
+#
+# The properties below are temporary properties that are used by
+# the Milton (etc) test tools which will be removed in the future.
+#
+app.inject.netui: true
+app.inject.milton: true
+
+### these two can be set to 'jar' or 'src' ###
+app.inject.test.drivers: jar
+app.inject.test.controls: jar

Modified: beehive/trunk/controls/test/webapps/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/build.xml?rev=397632&r1=397631&r2=397632&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/build.xml (original)
+++ beehive/trunk/controls/test/webapps/build.xml Thu Apr 27 13:59:01 2006
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
-
 <!--
-  Copyright 2004 The Apache Software Foundation.
+  Copyright 2004, 2006 The Apache Software Foundation.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -22,12 +21,10 @@
 -->
 <project name="Beehive/Controls/Test" default="usage" basedir=".">
 
-    <import file="../../../beehive-imports.xml"/>
-    <import file="../../../ant/beehive-tools.xml"/>
-    <import file="../../../ant/axis-import.xml"/>
-
+    <property environment="os"/>
     <property file="build.properties"/>
-    <property file="web/app.properties"/>
+    <import file="${beehive.home}/beehive-imports.xml"/>
+    <import file="${beehive.home}/ant/axis-import.xml"/>
 
     <property file="../common/path.properties"/>
 
@@ -163,14 +160,6 @@
         <copy file="${milton.jar}" todir="${webapp.build.dir}/WEB-INF/lib" overwrite="true" verbose="true"/>
 
         <deploy-webservice-runtime appdir="${webapp.build.dir}/WEB-INF/lib"/>
-
-        <copy todir="${webapp.build.dir}/WEB-INF" verbose="true" overwrite="true">
-            <fileset dir="${milton.templates}" includes="src/**"/>
-        </copy>
-
-        <copy todir="${webapp.build.dir}" verbose="true" overwrite="true">
-            <fileset dir="${milton.templates}" includes="resources/**"/>
-        </copy>
     </target>
 
     <target name="_inject.test.controls" if="do.inject.test.controls">
@@ -284,9 +273,7 @@
     </target>
 
     <target name="ensure.deployed" description="Deploy webapp for the test recorder">
-        <echo>Ensuring that the webapp ${context.path} is deployed on a running server at the URL
-            ${webapp.waitfor.url}
-        </echo>
+        <echo>Ensuring that the webapp ${context.path} 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}"/>