[Laszlo-checkins] r16711 - in openlaszlo/trunk: . build-tools

[ptw@openlaszlo.org]

Author: ptw
Date: 2010-06-14 07:24:23 -0700 (Mon, 14 Jun 2010)
New Revision: 16711

Added:
   openlaszlo/trunk/build-tools/tomcat-manager-ant-macros.xml
Modified:
   openlaszlo/trunk/build.xml
Log:
Change 20100613-ptw-E by ptw at padme.local on 2010-06-13 09:58:43 EDT
    in /Users/ptw/OpenLaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Add dnault's deploy-in-place mechanism for developer builds

Technical Reviewer: rajubitter at gmail.com (pending)
QA Reviewer: henry.minsky at gmail.com (Message-ID: <AANLkTinHf4xJwIUamZPJyM0Yr9km3Gb28WRJC-fwQOPG at mail.gmail.com>)

Details:
    Add dnault's tomcat-manager-ant-macros.  Use them.

Tests:
    `ant make` works for me, and doesn't spend minutes copying my
    webapp into the tomcat work directory



Added: openlaszlo/trunk/build-tools/tomcat-manager-ant-macros.xml


Property changes on: openlaszlo/trunk/build-tools/tomcat-manager-ant-macros.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Modified: openlaszlo/trunk/build.xml
===================================================================
--- openlaszlo/trunk/build.xml	2010-06-14 08:29:07 UTC (rev 16710)
+++ openlaszlo/trunk/build.xml	2010-06-14 14:24:23 UTC (rev 16711)
@@ -1406,33 +1406,27 @@
      </target>
 
     <!--=========  Target [webapp.deploy, webapp.undeploy, webapp.install, webapp.uninstall] === -->
+    <import file="./build-tools/tomcat-manager-ant-macros.xml"/>
+
     <!-- These targets affect the LPS webapp. The tomcat server must be started for these
         to be meaningful -->
     <target name="webapp.deploy" depends="init"  unless="no.tomcat"
         description="Deploy lps webapp into tomcat5." >
-         <!-- Note that there must be a space after the  close-curly-brace
-             in the localWar attribute. I don't know why, but it doesn't work
-             without that space. [bshine 4.29.06] -->
-         <deploy url="${tom.url}"
-             username="${tom.username}"
-             password="${tom.password}"
-             path="/${build.branch}"
-             localWar="file://${LPS_HOME}" />
+      <tomcatDeployInPlace
+          tomcatManagerUrl="${tom.url}"
+          username="${tom.username}"
+          password="${tom.password}"
+          contextPath="/${build.branch}"
+          docBase="${LPS_HOME}"/>
      </target>
 
     <target name="webapp.undeploy" description="Undeploy LPS from tomcat" unless="no.tomcat"
         depends="init">
-        <script language="javascript">
-         // We use javascript here because that's the only way to get to the
-         // setFailOnError field.
-         var undeployTask = lps.createTask("undeploy");
-         undeployTask.setUrl( lps.getProperty("tom.url"));
-         undeployTask.setUsername( lps.getProperty("tom.username"));
-         undeployTask.setPassword( lps.getProperty("tom.password"));
-         undeployTask.setPath( "/" + lps.getProperty("build.branch"));
-         undeployTask.setFailOnError(false);
-         undeployTask.execute();
-        </script>
+      <tomcatUndeploy
+          tomcatManagerUrl="${tom.url}"
+          username="${tom.username}"
+          password="${tom.password}"
+          contextPath="/${build.branch}" />
     </target>
 
      <target name="webapp.install" unless="no.tomcat"