Mamye, can you please test this patch on the pc? Once a dedicated pc
developer confirms that it works, I'll check it in.
-ben
On Feb 7, 2007, at 9:44 AM, Dan Stowell wrote:
Ben,
I think you sent out this change for someone else to review but
never heard back. I can resolve LPP-3396 if you just check this in
though. At least, I think that's how it works.
Index: build.xml
===================================================================
--- build.xml (revision 3390)
+++ build.xml (working copy)
@@ -1066,7 +1066,8 @@
<target name="tomcat.start" unless="no.tomcat" depends="init"
description="Start the tomcat server (not just a webapp,
the server
itself) with the tomcat startup scripts">
- <exec executable="${server.home}/bin/startup.sh">
+ <exec executable="bash">
+ <arg line="${server.home}/bin/startup.sh"/>
<env key="JAVA_OPTS" value="${tomcat.java.opts}" />
</exec>
</target>
@@ -1074,7 +1075,8 @@
<target name="tomcat.stop" unless="no.tomcat" depends="init"
description="Stop the tomcat server (not just a webapp,
the server
itself) with the tomcat shutdown scripts">
- <exec executable="${server.home}/bin/shutdown.sh"
failonerror="false">
+ <exec executable="bash" failonerror="false">
+ <arg line="${server.home}/bin/shutdown.sh"/>
<env key="JAVA_OPTS" value="${tomcat.java.opts}" />
</exec>
</target>
@@ -1164,7 +1166,7 @@
<target name="uninstall" depends="init" unless="no.tomcat"
description="unInstall lps (convenience alias for
webapp.undeploy)" >
- <antcall target="webapp.install" />
+ <antcall target="webapp.uninstall" />
</target>
@@ -1189,12 +1191,12 @@
<target name="start" depends="init" unless="no.tomcat"
description="Start tomcat but not lps (convenience alias
for tomcat.start)" >
- <antcall target="tomcat.start" />
+ <antcall target="${tomcat.start}" />
</target>
<target name="stop" depends="init" unless="no.tomcat"
description="Stop tomcat (convenience alias for
tomcat.stop)"
- <antcall target="tomcat.stop" />
+ <antcall target="${tomcat.stop}" />
</target>
<!-- ============= Target [all] ===================== -->
Benjamin Shine
Software Engineer, Open Laszlo / Laszlo Systems
[EMAIL PROTECTED]
