svn commit: r292827 - in /beehive/trunk/controls/test/webapps: build.xml controlsWeb/app.properties

[ek...@apache.org]

Author: ekoneil
Date: Fri Sep 30 11:21:56 2005
New Revision: 292827

URL: http://svn.apache.org/viewcvs?rev=292827&view=rev
Log:
Remove WSM from the controls tests in trunk/.

BB: self
Test: Controls pass


Modified:
    beehive/trunk/controls/test/webapps/build.xml
    beehive/trunk/controls/test/webapps/controlsWeb/app.properties

Modified: beehive/trunk/controls/test/webapps/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/build.xml?rev=292827&r1=292826&r2=292827&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/build.xml (original)
+++ beehive/trunk/controls/test/webapps/build.xml Fri Sep 30 11:21:56 2005
@@ -119,7 +119,6 @@
         <!-- webapps are copied into a staging directory where additional build steps can be performed -->
         <antcall target="stage.webapp"/>
         <antcall target="-inject.netui"/>
-        <antcall target="-inject.wsm"/>
         <antcall target="-inject.milton"/>
         <antcall target="-inject.test.controls"/>
         <antcall target="-inject.test.drivers"/>
@@ -141,17 +140,15 @@
         <deploy-netui webappDir="${webapp.dir}"/>
     </target>
 
-    <target name="-inject.wsm" if="do.inject.wsm">
-        <echo message="Injecting WSM in ${controls.test.webapp.name}"/>
-        <deploy-wsm webappDir="${webapp.dir}"/>
-    </target>
-
     <target name="-inject.milton" if="do.inject.milton">
-        <echo message="Injecting ${milton.jar} to ${controls.test.webapp.name}"/>
+        <echo message="Injecting ${milton.jar} to ${controls.test.webapp.name}.  Note, Milton depends on Axis."/>
+
         <mkdir dir="${webapp.dir}/WEB-INF/lib"/>
 
-        <copy file="${milton.jar}" todir="${webapp.dir}/WEB-INF/lib"
-              overwrite="true" verbose="true"/>
+        <copy file="${milton.jar}" todir="${webapp.dir}/WEB-INF/lib" overwrite="true" verbose="true"/>
+        <copy todir="${webapp.dir}/WEB-INF/lib" overwrite="true" verbose="true">
+            <fileset dir="${beehive.home}/wsm/external/" includes="*.jar"/>
+        </copy>
 
         <copy todir="${webapp.dir}/WEB-INF" verbose="true" overwrite="true">
             <fileset dir="${milton.templates}">
@@ -207,7 +204,8 @@
         <echo message="Injecting Drivers Jar"/>
         <copy todir="${webapp.dir}/WEB-INF/lib"
               file="${controlstestdrivers.jar}"
-              verbose="true" overwrite="true"/>
+              verbose="true" 
+              overwrite="true"/>
     </target>
 
     <target name="-inject.test.systemcontrols" if="do.inject.test.systemcontrol.jars">

Modified: beehive/trunk/controls/test/webapps/controlsWeb/app.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/controlsWeb/app.properties?rev=292827&r1=292826&r2=292827&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/controlsWeb/app.properties (original)
+++ beehive/trunk/controls/test/webapps/controlsWeb/app.properties Fri Sep 30 11:21:56 2005
@@ -1,6 +1,6 @@
 app.inject.netui: true
-app.inject.wsm: true
 app.inject.milton: true
+
 ### these two can be set to 'jar' or 'src' ###
 app.inject.test.drivers: jar
 app.inject.test.controls: jar