You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2002/06/16 01:12:31 UTC
cvs commit: jakarta-struts/src/example/org/apache/struts/webapp/example/memory MemoryDatabasePlugIn.java
craigmcc 2002/06/15 16:12:31
Modified: . build-webapps.xml build.xml
src/example/org/apache/struts/webapp/example/memory
MemoryDatabasePlugIn.java
Log:
Add "install.catalina", "remove.catalina", "list.catalina", and
"reload.catalina" targets that allow dynamic installation of the
struts-example webapp on Tomcat 4.1.x or later, if you are running it.
(See the Tomcat 4.1 docs for using the custom Ant tasks to interact
with the Manager webapp.)
Revision Changes Path
1.12 +11 -9 jakarta-struts/build-webapps.xml
Index: build-webapps.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-webapps.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build-webapps.xml 19 Mar 2002 03:57:01 -0000 1.11
+++ build-webapps.xml 15 Jun 2002 23:12:31 -0000 1.12
@@ -35,7 +35,7 @@
application's WEB-INF/lib directory.
-->
-<property name="build.home" value="target"/>
+<property name="build.home" value="${basedir}/target"/>
<property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar"/>
<property name="struts.libs" value="${build.home}/library"/>
@@ -62,13 +62,13 @@
<property name="compile.optimize" value="true" />
<!-- The base directory for distribution targets -->
-<property name="dist.home" value="dist" />
+<property name="dist.home" value="${basedir}/dist" />
<!-- The directory into which Struts JAR and TLD files have been created -->
<property name="struts.home" value="${build.home}/library" />
<!-- Directory where core struts library configurations files are stored -->
-<property name="conf.share.dir" value="conf/share"/>
+<property name="conf.share.dir" value="${basedir}/conf/share"/>
<!-- Doc directory -->
<property name="doc.dir" value="doc"/>
@@ -229,9 +229,10 @@
<!-- Compile Tiles contrib -->
<ant antFile="build.xml" dir="contrib/tiles" target="compile.for.struts">
- <property name="struts.libs" value="../../${struts.libs}"/>
- <property name="build.home" value="../../${build.home}/tiles"/>
- <property name="dist.home" value="../../${dist.home}"/>
+ <property name="struts.home" value="${struts.home}"/>
+ <property name="struts.libs" value="${struts.libs}"/>
+ <property name="build.home" value="${build.home}/tiles"/>
+ <property name="dist.home" value="${dist.home}"/>
<property name="app.name" value="tiles"/>
<property name="project.name" value="Tiles"/>
</ant>
@@ -288,9 +289,10 @@
<!-- Compile Tiles dist -->
<ant antFile="build.xml" dir="contrib/tiles" target="dist.for.struts">
- <property name="struts.libs" value="../../${struts.libs}"/>
- <property name="build.home" value="../../${build.home}/tiles"/>
- <property name="dist.home" value="../../${dist.home}"/>
+ <property name="struts.home" value="${struts.home}"/>
+ <property name="struts.libs" value="${struts.libs}"/>
+ <property name="build.home" value="${build.home}/tiles"/>
+ <property name="dist.home" value="${dist.home}"/>
<property name="app.name" value="tiles"/>
<property name="project.name" value="Tiles"/>
</ant>
1.68 +44 -1 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- build.xml 2 Apr 2002 03:59:54 -0000 1.67
+++ build.xml 15 Jun 2002 23:12:31 -0000 1.68
@@ -24,6 +24,15 @@
installation. This is required only when
executing the "deploy.catalina" target.
+ catalina.url (optional) URL of the Tomcat 4.1.x
+ manager app for dynamic installation
+
+ catalina.username (optional) Username for the Tomcat 4.1.x
+ manager app for dynamic installation
+
+ catalina.password (optional) Password for the Tomcat 4.1.x
+ manager app for dynamic installation
+
commons-beanutils.jar (required). The path to the JAR file
of the Jakarta Commons Beanutils
package (version 1.0 or later).
@@ -114,7 +123,7 @@
-->
<!-- Output directory name for all files generated by the build process -->
- <property name="build.home" value="target"/>
+ <property name="build.home" value="${basedir}/target"/>
<!-- Should Java compilations set the debug compiler option? -->
<property name="compile.debug" value="true" />
@@ -483,6 +492,40 @@
</copy>
</target>
+
+<!--
+ Dynamic installation commands on Catalina (Tomcat 4.1.x required)
+-->
+
+ <target name="install.catalina" depends="compile.webapps"
+ description="Dynamically install struts-example on Catalina (Tomcat 4.1)">
+ <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
+ <install url="${catalina.url}" username="${catalina.username}"
+ password="${catalina.password}" path="/struts-example"
+ war="file://${build.home}/example"/>
+ </target>
+
+ <target name="list.catalina"
+ description="Dynamically list installed apps on Catalina (Tomcat 4.1)">
+ <taskdef name="list" classname="org.apache.catalina.ant.ListTask"/>
+ <list url="${catalina.url}" username="${catalina.username}"
+ password="${catalina.password}"/>
+ </target>
+
+ <target name="reload.catalina"
+ description="Dynamically reload struts-example on Catalina (Tomcat 4.1)">
+ <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
+ <reload url="${catalina.url}" username="${catalina.username}"
+ password="${catalina.password}" path="/struts-example"/>
+ </target>
+
+ <target name="remove.catalina"
+ description="Dynamically install struts-example on Catalina (Tomcat 4.1)">
+ <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
+ <remove url="${catalina.url}" username="${catalina.username}"
+ password="${catalina.password}" path="/struts-example"/>
+ </target>
+
<!--
Deploy these applications on Tomcat
1.3 +4 -5 jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java
Index: MemoryDatabasePlugIn.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryDatabasePlugIn.java 22 Mar 2002 23:47:18 -0000 1.2
+++ MemoryDatabasePlugIn.java 15 Jun 2002 23:12:31 -0000 1.3
@@ -202,7 +202,6 @@
}
database.setPathname(path);
database.open();
- database.save();
} catch (Exception e) {
log.error("Opening memory database", e);
throw new ServletException("Cannot load database from '" +
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>