-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This proposed change is for the derby.war build and Web Application
Descriptor. This was not included in the original code drop. It adds a
derbywar target to the top level build.xml which is included in the
buildjars target.
Index: tools/j2ee/derby/WEB-INF/web.xml
===================================================================
- --- tools/j2ee/derby/WEB-INF/web.xml (revision 0)
+++ tools/j2ee/derby/WEB-INF/web.xml (revision 0)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+ "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";>
+
+<web-app id = "DERBYNET_ID">
+
+<display-name>Apache Derby Network Server</display-name>
+<description> Apache Network Server Administration </description>
+
+<servlet>
+ <servlet-name> derbynet </servlet-name>
+ <servlet-class> org.apache.derby.drda.NetServlet </servlet-class>
+ <init-param>
+ <param-name> startNetworkServerOnInit </param-name>
+ <param-value> true </param-value>
+ <description> Starts the Network Server at servlet
+ initialization if 'true'. </description>
+ </init-param>
+ <init-param>
+ <param-name> portNumber </param-name>
+ <param-value> 1527 </param-value>
+ <description> Port number to use. The default is 1527. </description>
+ </init-param>
+ <init-param>
+ <param-name> tracingDirectory </param-name>
+ <param-value></param-value>
+ <description> Port number to use. The default is 1527. </description>
+ </init-param>
+</servlet>
+
+<servlet-mapping>
+ <servlet-name> derbynet </servlet-name>
+ <url-pattern> /derbynet </url-pattern>
+</servlet-mapping>
+
+<welcome-file-list>
+ <welcome-file>/derbynet</welcome-file>
+</welcome-file-list>
+
+</web-app>
Index: build.xml
===================================================================
- --- build.xml (revision 37437)
+++ build.xml (working copy)
@@ -485,8 +485,8 @@
~ <!-- Jar targets
~ -->
~ <!--
=================================================================== -->
- - <target name="buildjarsclean"
depends="cleanjars,initjars,derbyjar,derbytoolsjar,derbynetjar"/>
- - <target name="buildjars"
depends="initjars,derbyjar,derbytoolsjar,derbynetjar"/>
+ <target name="buildjarsclean"
depends="cleanjars,initjars,derbyjar,derbytoolsjar,derbynetjar,derbywar"/>
+ <target name="buildjars"
depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbywar"/>
~ <target name="initjars" depends="setsanityname">
~ <property name="derby.jar.dir"
value="${basedir}/jars/${sanity.name}"/>
@@ -708,6 +708,14 @@
~ </target>
+<!-- - - - - - - - - - - - - - derby.war target - - - - - - - - - - - -->
+ <target name="derbywar" depends="initjars">
+
+ <echo message="Beginning derby.war build"/>
+ <delete file="${derby.jar.dir}/derby.war"/>
+ <zip zipfile="${derby.jar.dir}/derby.war" compress="true"
basedir="tools/j2ee/derby"/>
+ </target>
+
~ <!-- - - - - - - - - - - - jar build helper targets - - - - - - - -
- - -->
~ <target name="setsanityname"
depends="init,setissane,sanitynamesane,sanitynameinsane"/>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFBOPMaG0h36bFmkocRAhMdAJ9A4dEOQ2nJAJ/Q8on7Wb6G3voUEQCglRTE
dfPLbpJncmUcB4FzW65t2/I=
=SaeI
-----END PGP SIGNATURE-----
