cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2004-05-23 Thread markt
markt   2004/05/23 12:47:19

  Modified:webapps/tomcat-docs/appdev build.xml.txt
  Log:
  Fix bug 20885. Align the description of the reload target in this file with the
description of reload from the manager documentation.
  
  Revision  ChangesPath
  1.8   +10 -4 jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml.txt 28 Dec 2002 09:08:58 -  1.7
  +++ build.xml.txt 23 May 2004 19:47:19 -  1.8
  @@ -455,9 +455,15 @@
   
   !--
   
  -  The reload target tells the specified Tomcat 4 installation to dynamically
  -  reload this web application, to reflect changes in the underlying classes or
  -  the web.xml deployment descriptor.
  +  The reload signals the specified application Tomcat 4 to shut itself down
  +  and reload. This can be useful when the web application context is not
  +  reloadable and you have updated classes or property files in the
  +  /WEB-INF/classes directory or when you have added or updated jar files in the
  +  /WEB-INF/lib directory.
  +
  +  NOTE: The /WEB-INF/web.xml web application configuration file is not reread
  +  on a reload. If you have made changes to your web.xml file you must stop
  +  then start the web application. 
   
   --
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2002-12-28 Thread jfclere
jfclere 2002/12/28 01:08:58

  Modified:webapps/tomcat-docs/appdev build.xml.txt
  Log:
  typo ;-)
  
  Revision  ChangesPath
  1.7   +2 -2  jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml.txt 9 Mar 2002 22:39:19 -   1.6
  +++ build.xml.txt 28 Dec 2002 09:08:58 -  1.7
  @@ -318,7 +318,7 @@
  description=Create binary distribution
   
   !-- Copy documentation subdirectories --
  -mkdir   todir=${dist.home}/docs/
  +mkdir   dir=${dist.home}/docs/
   copytodir=${dist.home}/docs
 fileset dir=${docs.home}/
   /copy
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2002-03-11 Thread craigmcc

craigmcc02/03/11 16:01:24

  Modified:webapps/tomcat-docs/appdev Tag: tomcat_40_branch
build.xml.txt
  Log:
  Correct a typo in a commented-out directive that will cause you grief if you
  uncomment it.
  
  Submitted by:  Harold Carr harold.carr at sun.com
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.2.2.3   +1 -1  jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- build.xml.txt 12 Feb 2002 23:57:15 -  1.2.2.2
  +++ build.xml.txt 12 Mar 2002 00:01:24 -  1.2.2.3
  @@ -330,7 +330,7 @@
   !-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
   mkdir  dir=${build.home}/WEB-INF/lib/
   !--
  -copy todir=${build..home}/WEB-INF/lib file=${foo.jar}/
  +copy todir=${build.home}/WEB-INF/lib file=${foo.jar}/
   --
   
   !-- Copy static files from external dependencies as needed --
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2002-03-09 Thread craigmcc

craigmcc02/03/09 14:39:19

  Modified:webapps/tomcat-docs/appdev build.xml.txt
  Log:
  Add a list target for conveniently determining whether or not the app
  you are building has been installed yet or not.
  
  Make the reload target depend on compile, so that the typical development
  cycle becomes:
   - Modify files as required
   - ant reload
   - Test modified app
  
  Revision  ChangesPath
  1.6   +24 -2 jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml.txt 14 Feb 2002 07:06:36 -  1.5
  +++ build.xml.txt 9 Mar 2002 22:39:19 -   1.6
  @@ -18,7 +18,7 @@
image files), including the WEB-INF subdirectory
and its configuration file contents.
   
  - $Id: build.xml.txt,v 1.5 2002/02/14 07:06:36 craigmcc Exp $
  + $Id: build.xml.txt,v 1.6 2002/03/09 22:39:19 craigmcc Exp $
   --
   
   
  @@ -144,6 +144,7 @@
   --
   
 taskdef name=install classname=org.apache.catalina.ant.InstallTask/
  +  taskdef name=listclassname=org.apache.catalina.ant.ListTask/
 taskdef name=reload  classname=org.apache.catalina.ant.ReloadTask/
 taskdef name=remove  classname=org.apache.catalina.ant.RemoveTask/
   
  @@ -390,6 +391,27 @@
   
   
   
  +!-- == List Target === --
  +
  +!--
  +
  +  The list target asks the specified Tomcat 4 installation to list the
  +  currently running web applications, either loaded at startup time or
  +  installed dynamically.  It is useful to determine whether or not the
  +  application you are currently developing has been installed.
  +
  +--
  +
  +  target name=list
  +   description=List installed applications on servlet container
  +
  +listurl=${manager.url}
  +username=${manager.username}
  +password=${manager.password}/
  +
  +  /target
  +
  +
   !--  Prepare Target == --
   
   !--
  @@ -439,7 +461,7 @@
   
   --
   
  -  target name=reload
  +  target name=reload depends=compile
  description=Reload application on servlet container
   
   reload url=${manager.url}
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2002-02-13 Thread craigmcc

craigmcc02/02/13 23:06:36

  Modified:webapps/tomcat-docs class-loader-howto.xml manager-howto.xml
   webapps/tomcat-docs/appdev build.xml.txt
  Log:
  Miscellaneous typo corrections to the documentation and sample build.xml file.
  
  Revision  ChangesPath
  1.6   +35 -2 jakarta-tomcat-4.0/webapps/tomcat-docs/class-loader-howto.xml
  
  Index: class-loader-howto.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/class-loader-howto.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- class-loader-howto.xml29 Jan 2002 15:23:50 -  1.5
  +++ class-loader-howto.xml14 Feb 2002 07:06:35 -  1.6
  @@ -105,8 +105,10 @@
   applications.  Normally, application classes should strongNOT/strong
   be placed here.  All unpacked classes and resources in
   code$CATALINA_HOME/common/classes/code, as well as classes and
  -resources in JAR files under
  -code$CATALINA_HOME/common/lib/code, are made visible through this
  +resources in JAR files under the
  +code$CATALINA_HOME/commons/endorsed/code and
  +code$CATALINA_HOME/common/lib/code directories,
  +are made visible through this
   class loader.  By default, that includes the following:
   ul
   liemjndi.jar/em - The Java Naming and Directory Interface API
  @@ -203,12 +205,43 @@
   liBootstrap classes of your JVM/li
   liSystem class loader classses (described above)/li
   liem$CATALINA_HOME/common/classes/em/li
  +liem$CATALINA_HOME/common/endorsed/*.jar/em/li
   liem$CATALINA_HOME/common/lib/*.jar/em/li
   liem$CATALINA_HOME/shared/classes/em/li
   liem$CATALINA_HOME/shared/lib/*.jar/em/li
   /ul
   
   /section
  +
  +
  +section name=XML Parsers and JDK 1.4
  +
  +pAmong many other changes, the JDK 1.4 release packages the JAXP APIs, and
  +a version of Xerces, inside the JDK.  This has impacts on applications that
  +wish to use their own XML parser./p
  +
  +pIn previous versions of Tomcat 4, you could simply replace the XML parser
  +in the code$CATALINA_HOME/common/lib/code directory to change the parser
  +used by all web applications.  However, this technique will not be effective
  +when you are running on JDK 1.4, because the usual class loader delegation
  +process will always choose the implementation inside the JDK in preference
  +to this one./p
  +
  +pJDK 1.4 supports a mechanism called the Endorsed Standards Override
  +Mechanism to allow replacement of APIs created outside of the JCP (i.e.
  +DOM and SAX from W3C).  It can also be used to update the XML parser
  +implementation.  For more information, see:
  +a href=http://java.sun.com/j2se/1.4/docs/guide/standards/index.html;
  +http://java.sun.com/j2se/1.4/docs/guide/standards/index.html/a./p
  +
  +pTomcat utilizes this mechanism by including the system property setting
  +code-Djava.endorsed.dirs=$CATALINA_HOME/common/endorsed/code in the
  +command line that starts the container.  Therefore, you can replace the
  +parser that is installed in this directory, and it will get used even on a
  +JDK 1.4 system./p
  +
  +/section
  +
   
   
   /body
  
  
  
  1.9   +6 -6  jakarta-tomcat-4.0/webapps/tomcat-docs/manager-howto.xml
  
  Index: manager-howto.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/manager-howto.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- manager-howto.xml 12 Feb 2002 22:14:02 -  1.8
  +++ manager-howto.xml 14 Feb 2002 07:06:35 -  1.9
  @@ -642,20 +642,20 @@
   ... construct web application in ${build} subdirectory ...
 lt;/targetgt;
   
  -  lt;target name=deploy description=Deploy web application
  +  lt;target name=install description=Install web application
 depends=compilegt;
  -lt;deploy url=${url} username=${username} password=${password}
  +lt;install url=${url} username=${username} password=${password}
   path=${path} war=file://${build}/gt;
 lt;/targetgt;
   
 lt;target name=reload description=Reload web application
 depends=compilegt;
   lt;reload  url=${url} username=${username} password=${password}
  -path=${path} war=file://${build}/gt;
  +path=${path}/gt;
 lt;/targetgt;
   
  -  lt;target name=undeploy description=Undeploy and delete web applicationgt;
  -lt;deploy url=${url} username=${username} password=${password}
  +  lt;target name=remove description=Remove web applicationgt;
  +lt;remove url=${url} username=${username} password=${password}
   path=${path}/gt;
 lt;/targetgt;
   
  @@ -663,7 +663,7 @@
   /pre/td/tr
   /table
   
  -pNow, you can execute commands like codeant deploy/code to deploy the
  +pNow, you can execute commands like codeant install/code to install th
   

cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2002-02-12 Thread remm

remm02/02/12 15:57:15

  Modified:webapps/tomcat-docs/appdev Tag: tomcat_40_branch
build.xml.txt
  Log:
  - Apparently forgot to port a fix for a typo (this was already fixed in the HEAD).
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.2.2.2   +1 -1  jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- build.xml.txt 10 Dec 2001 01:15:33 -  1.2.2.1
  +++ build.xml.txt 12 Feb 2002 23:57:15 -  1.2.2.2
  @@ -297,7 +297,7 @@
   mkdir  dir=${dist.home}/docs/api/
   javadoc sourcepath=src
   destdir=${dist.home}/docs/api
  -   packagenames=*/
  +   packagenames=*
 classpath refid=compile.classpath/
   /javadoc
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2001-12-09 Thread craigmcc

craigmcc01/12/09 17:15:05

  Modified:webapps/tomcat-docs/appdev build.xml.txt
  Log:
  Usability improvements to the default build.xml script described in the
  Application Developer's Guide documentation.
  
  PR: Bugzilla #4917
  Submitted by: Brian Ewins [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.3   +13 -9 jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml.txt 2001/09/17 03:16:58 1.2
  +++ build.xml.txt 2001/12/10 01:15:05 1.3
  @@ -33,6 +33,8 @@
   
   --
   
  +  property file=build.properties/
  +  property file=${user.home}/build.properties/
   
   
   !--  File and Directory Names  --
  @@ -214,7 +216,7 @@
   /javac
   
   !-- Copy associated resource files --
  -copy  todir=${build.home}/library/classes
  +copy  todir=${build.home}/WEB-INF/classes
   fileset dir=src includes=**/*.properties/
   /copy
   
  @@ -242,13 +244,6 @@
 fileset dir=${build.home}/
   /copy
   
  -!-- Copy external dependencies as required --
  -!-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
  -mkdir  dir=${deploy.home}/WEB-INF/lib/
  -!--
  -copy todir=${deploy.home}/WEB-INF/lib file=${foo.jar}/
  ---
  -
 /target
   
   
  @@ -302,7 +297,9 @@
   mkdir  dir=${dist.home}/docs/api/
   javadoc sourcepath=src
   destdir=${dist.home}/docs/api
  -   packagenames=mypackage.*/
  +   packagenames=*/
  +  classpath refid=compile.classpath/
  +/javadoc
   
 /target
   
  @@ -328,6 +325,13 @@
   copy todir=${build.home}
 fileset dir=web/
   /copy
  +
  +!-- Copy external dependencies as required --
  +!-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
  +mkdir  dir=${build.home}/WEB-INF/lib/
  +!--
  +copy todir=${build.home}/WEB-INF/lib file=${foo.jar}/
  +--
   
   !-- Copy static files from external dependencies as needed --
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2001-12-09 Thread craigmcc

craigmcc01/12/09 17:15:33

  Modified:webapps/tomcat-docs/appdev Tag: tomcat_40_branch
build.xml.txt
  Log:
  Port usability improvements to the build.xml script documented in the
  Application Developer's Guide.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.2.2.1   +13 -9 jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- build.xml.txt 2001/09/17 03:16:58 1.2
  +++ build.xml.txt 2001/12/10 01:15:33 1.2.2.1
  @@ -33,6 +33,8 @@
   
   --
   
  +  property file=build.properties/
  +  property file=${user.home}/build.properties/
   
   
   !--  File and Directory Names  --
  @@ -214,7 +216,7 @@
   /javac
   
   !-- Copy associated resource files --
  -copy  todir=${build.home}/library/classes
  +copy  todir=${build.home}/WEB-INF/classes
   fileset dir=src includes=**/*.properties/
   /copy
   
  @@ -242,13 +244,6 @@
 fileset dir=${build.home}/
   /copy
   
  -!-- Copy external dependencies as required --
  -!-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
  -mkdir  dir=${deploy.home}/WEB-INF/lib/
  -!--
  -copy todir=${deploy.home}/WEB-INF/lib file=${foo.jar}/
  ---
  -
 /target
   
   
  @@ -302,7 +297,9 @@
   mkdir  dir=${dist.home}/docs/api/
   javadoc sourcepath=src
   destdir=${dist.home}/docs/api
  -   packagenames=mypackage.*/
  +   packagenames=*/
  +  classpath refid=compile.classpath/
  +/javadoc
   
 /target
   
  @@ -328,6 +325,13 @@
   copy todir=${build.home}
 fileset dir=web/
   /copy
  +
  +!-- Copy external dependencies as required --
  +!-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
  +mkdir  dir=${build.home}/WEB-INF/lib/
  +!--
  +copy todir=${build..home}/WEB-INF/lib file=${foo.jar}/
  +--
   
   !-- Copy static files from external dependencies as needed --
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/appdev build.xml.txt

2001-09-16 Thread craigmcc

craigmcc01/09/16 20:16:58

  Modified:webapps/tomcat-docs/appdev build.xml.txt
  Log:
  Modify the default class path created when compiling to include all of the
  classes that Tomcat 4 automatically exposes to web applications.  In this
  way, there is no special case for servlet.jar or other commonly required
  files.
  
  Applications built with this file will need no customizations unless they
  have other JAR files that need to be included in /WEB-INF/lib.
  
  Revision  ChangesPath
  1.2   +25 -27jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/appdev/build.xml.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml.txt 2001/07/28 22:54:13 1.1
  +++ build.xml.txt 2001/09/17 03:16:58 1.2
  @@ -18,7 +18,7 @@
 Each of the following properties are used in the build script.
 Values for these properties are set by the first place they are
 defined, from the following list:
  -  * Definitions on the ant command line (ant -Ddeploy.home=xyz compile)
  +  * Definitions on the ant command line (ant -Dcatalina.home=xyz compile)
 * Definitions from a build.properties file in the top level
   source directory
 * Definitions from a build.properties file in the developer's
  @@ -109,15 +109,10 @@
 * Being copied into the /WEB-INF/lib directory during execution
   of the deploy target.
   
  -  For the purposes of this example, the servlet.jar property should be set
  -  to the pathname of the servlet.jar file included in your Tomcat 4 release.
  -  It is included on the compiler classpath (because this is required in order
  -  to compile a servlet), but is not copied to the deployment directory because
  -  servlet containers already provide it at runtime.
  -
  -  This example also includes a dummy foo.jar property, used to illustrate
  -  where you would make customizations for your own external dependencies
  -  in order to use them for compilation and/or deployment.
  +  Because we will automatically include all of the Java classes that Tomcat 4
  +  exposes to web applications, we will not need to explicitly list any of those
  +  dependencies.  You only need to worry about external dependencies for JAR
  +  files that you are going to include inside your /WEB-INF/lib directory.
   
   --
   
  @@ -127,11 +122,7 @@
  value=/path/to/foo.jar/
   --
   
  -  property name=servlet.jar 
  -   value=${catalina.home}/common/lib/servlet.jar/
   
  -
  -
   !--  Compilation Classpath === --
   
   !--
  @@ -139,23 +130,30 @@
 Rather than relying on the CLASSPATH environment variable, Ant includes
 features that makes it easy to dynamically construct the classpath you
 need for each compilation.  The example below constructs the compile
  -  classpath to include the servlet.jar file, and includes comments on where
  -  you would insert your own additional JAR files.  Such references should
  -  be based on external dependency properties, as described above, so that
  -  you can customize the actual location of the JAR files using build.properties
  -  files.
  +  classpath to include the servlet.jar file, as well as the other components
  +  that Tomcat makes available to web applications automatically, plus anything
  +  that you explicitly added.
   
   --
   
 path id=compile.classpath
  -
  -!-- Include for the servlet.jar file --
  -pathelement location=${servlet.jar}/
   
  -!-- Dummy include for our foo.jar file --
  +!-- Include all JAR files that will be included in /WEB-INF/lib --
  +!-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
   !--
   pathelement location=${foo.jar}/
   --
  +
  +!-- Include all elements that Tomcat exposes to applications --
  +pathelement location=${catalina.home}/common/classes/
  +fileset dir=${catalina.home}/common/lib
  +  include name=*.jar/
  +/fileset
  +pathelement location=${catalina.home}/classes/
  +fileset dir=${catalina.home}/lib
  +  include name=*.jar/
  +/fileset
  +
 /path
   
   
  @@ -244,11 +242,11 @@
 fileset dir=${build.home}/
   /copy
   
  -!-- Pick up external dependencies as required --
  -mkdir dir=${deploy.home}/WEB-INF/lib/
  +!-- Copy external dependencies as required --
  +!-- *** CUSTOMIZE HERE AS REQUIRED BY YOUR APPLICATION *** --
  +mkdir  dir=${deploy.home}/WEB-INF/lib/
   !--
  -copy   tofile=${deploy.home}/WEB-INF/lib/foo.jar
  -  file=${foo.jar}/
  +copy todir=${deploy.home}/WEB-INF/lib file=${foo.jar}/
   --
   
 /target