cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2004-06-18 Thread markt
markt   2004/06/18 13:18:31

  Modified:webapps/tomcat-docs/config host.xml
  Log:
  Fix bug 18433. Update docs to clarify relationship between autodeploy and livedeploy
  
  Revision  ChangesPath
  1.17  +8 -5  jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- host.xml  23 Dec 2003 16:50:58 -  1.16
  +++ host.xml  18 Jun 2004 20:18:31 -  1.17
  @@ -71,10 +71,12 @@
 /attribute
   
 attribute name=autoDeploy required=false
  -pThis flag value indicates if web applications from this host should
  -be automatically deployed by the host configurator.
  -The flag's value defaults to true.  See
  -a href=#Automatic Application DeploymentAutomatic Application
  +pThis flag value indicates if web applications from this host
  +should
 be automatically deployed by the host configurator at
  +startup.
 The flag's value defaults to true.  strongNote/strong
  +that if this
 flag is set to false and livedeploy is set
 to true then
  +   
 the web
 applications will still be deployed shortly after
 startup.
  +See
 a href=#Automatic Application DeploymentAutomatic
 Application

   Deployment/a for more information./p
 /attribute
   
  @@ -280,7 +282,8 @@
   you can also request that new XML configuration files, WAR files, or
   subdirectories (containing web applications) that are dropped in to the
   codeappBase/code directory while Tomcat is running will be
  -automatically deployed, according to the rules described above./p
  +automatically deployed, according to the rules described above by
  +setting the livedeploy attribute to true./p
   
   pWhen using automatic deployment, the codedocBase/code defined by
   an XML a href=context.htmlContext/a file should be outside of the
  
  
  

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



cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2003-12-23 Thread markt
markt   2003/12/23 08:50:58

  Modified:webapps/tomcat-docs/config host.xml
  Log:
  - Port patch.
  - Fix a couple of typos.
  - Update docs in response to bug 9960. Clarify potential issues using xml context 
files and auto deployment.
  
  Revision  ChangesPath
  1.16  +8 -2  jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- host.xml  12 Jan 2003 17:26:48 -  1.15
  +++ host.xml  23 Dec 2003 16:50:58 -  1.16
  @@ -247,14 +247,14 @@
   pIf you are using the standard strongHost/strong implementation,
   the following actions take place automatically when Catalina is first
   started, if the codeautoDeploy/code property is set to
  -codetrue/code (which is the default value:/p
  +codetrue/code (which is the default value):/p
   ul
   liAny XML file in the directory defined by appBase
   (emApplication Base/em directory) is assumed to contain a
   a href=context.htmlContext/a element (and its associated
   subelements) for a single web application.  The codedocBase/code
   attribute of this codelt;Contextgt;/code element will typically
  -be the absolute pathname to a web applicationd directory, or the
  +be the absolute pathname to a web application directory, or the
   absolute pathname of a web application archive (WAR) file (which
   will not be expanded)./li
   liAny web application archive file that does not have a corresponding
  @@ -281,6 +281,12 @@
   subdirectories (containing web applications) that are dropped in to the
   codeappBase/code directory while Tomcat is running will be
   automatically deployed, according to the rules described above./p
  +
  +pWhen using automatic deployment, the codedocBase/code defined by
  +an XML a href=context.htmlContext/a file should be outside of the
  +codeappBase/code directory. If this is not the case difficulties
  +may be experienced deploying the web application or the application may
  +be deployed twice./p
   
 /subsection
   
  
  
  

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



Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2003-01-13 Thread Remy Maucherat
[EMAIL PROTECTED] wrote:

glenn   2003/01/10 07:52:19

  Modified:.RELEASE-NOTES-4.1.txt build.properties.sample
   catalina build.xml
   catalina/src/share/org/apache/catalina Deployer.java
   catalina/src/share/org/apache/catalina/core
LocalStrings.properties StandardHost.java
StandardHostDeployer.java
   catalina/src/share/org/apache/catalina/servlets
HTMLManagerServlet.java LocalStrings.properties
LocalStrings_fr.properties
LocalStrings_ja.properties ManagerServlet.java
   catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
   webapps/manager build.xml
   webapps/manager/WEB-INF web.xml
   webapps/tomcat-docs index.xml manager-howto.xml project.xml
   webapps/tomcat-docs/config host.xml
  Added:   catalina/src/share/org/apache/catalina/startup
ExpandWar.java
   webapps/tomcat-docs html-manager-howto.xml
  Log:
  Bug fixes and minor improvements to the manager and html manager web
  applications.  These patches fix as many of the 11 bugs I found for
  the manager in bugzilla that I could reproduce.


Glenn,

I am grateful for the fixes introduced with the patch, however:
- could you please post something about modifying the base interfaces, 
before you actually do so ? The change was probably needed, but may 
break custom extensions.
- this is code which changes a lot of things; as such, it should have 
been committed in the development branch first.

Remy


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



Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2003-01-13 Thread Remy Maucherat
Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:


glenn   2003/01/10 07:52:19

  Modified:.RELEASE-NOTES-4.1.txt build.properties.sample
   catalina build.xml
   catalina/src/share/org/apache/catalina Deployer.java
   catalina/src/share/org/apache/catalina/core
LocalStrings.properties StandardHost.java
StandardHostDeployer.java
   catalina/src/share/org/apache/catalina/servlets
HTMLManagerServlet.java LocalStrings.properties
LocalStrings_fr.properties
LocalStrings_ja.properties ManagerServlet.java
   catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
   webapps/manager build.xml
   webapps/manager/WEB-INF web.xml
   webapps/tomcat-docs index.xml manager-howto.xml 
project.xml
   webapps/tomcat-docs/config host.xml
  Added:   catalina/src/share/org/apache/catalina/startup
ExpandWar.java
   webapps/tomcat-docs html-manager-howto.xml
  Log:
  Bug fixes and minor improvements to the manager and html manager web
  applications.  These patches fix as many of the 11 bugs I found for
  the manager in bugzilla that I could reproduce.


Glenn,

I am grateful for the fixes introduced with the patch, however:
- could you please post something about modifying the base interfaces, 
before you actually do so ? The change was probably needed, but may 
break custom extensions.
- this is code which changes a lot of things; as such, it should have 
been committed in the development branch first.

And actually, I missed the additional dependency added on fileupload.
It also seems you recoded install to respond to a POST, as well as 
duplicate the functionality of upload (it seems).

Maybe that seems good to you, but:
- this has not been discussed before
- the deployer behavior needs some thinking, and IMO consensus, to avoid 
making more mistakes, or ending in a jspc situation, where there are 
plenty of features nobody can or is willing to maintain anymore

I'll have to veto the patch until this gets discussed further.

Remy


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



Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2003-01-13 Thread Glenn Nielsen


Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:


glenn   2003/01/10 07:52:19

  Modified:.RELEASE-NOTES-4.1.txt build.properties.sample
   catalina build.xml
   catalina/src/share/org/apache/catalina Deployer.java
   catalina/src/share/org/apache/catalina/core
LocalStrings.properties StandardHost.java
StandardHostDeployer.java
   catalina/src/share/org/apache/catalina/servlets
HTMLManagerServlet.java LocalStrings.properties
LocalStrings_fr.properties
LocalStrings_ja.properties ManagerServlet.java
   catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
   webapps/manager build.xml
   webapps/manager/WEB-INF web.xml
   webapps/tomcat-docs index.xml manager-howto.xml 
project.xml
   webapps/tomcat-docs/config host.xml
  Added:   catalina/src/share/org/apache/catalina/startup
ExpandWar.java
   webapps/tomcat-docs html-manager-howto.xml
  Log:
  Bug fixes and minor improvements to the manager and html manager web
  applications.  These patches fix as many of the 11 bugs I found for
  the manager in bugzilla that I could reproduce.


Glenn,

I am grateful for the fixes introduced with the patch, however:
- could you please post something about modifying the base interfaces, 
before you actually do so ? The change was probably needed, but may 
break custom extensions.
- this is code which changes a lot of things; as such, it should have 
been committed in the development branch first.

Remy


Glad you like the changes and bug fixes. :-)

Sorry, I should have mentioned that I was working on the manager and
the bug fixes required one method addition to the interface for Deployer.

I will port the changes to Tomcat 5.

If you feel that backward compatability of the Deployer interface in
Tomcat 4.1 is required, I can remove the new method from the Deployer
interface and change the ManagerServlet to use the new remove method
only if it detects an instance of StandardHostDeployer.

Regards,

Glenn


--
Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder|
MOREnet System Programming   |  * if iz ina coment.  |
Missouri Research and Education Network  |  */   |
--


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




Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2003-01-13 Thread Remy Maucherat
Glenn Nielsen wrote:



Remy Maucherat wrote:


I am grateful for the fixes introduced with the patch, however:
- could you please post something about modifying the base interfaces, 
before you actually do so ? The change was probably needed, but may 
break custom extensions.
- this is code which changes a lot of things; as such, it should have 
been committed in the development branch first.

Remy


Glad you like the changes and bug fixes. :-)


With a few details. I may be against the change which adds POST support; 
I don't know what it does, and it adds a dependency. I'm reviewing all 
changes to the 4.1.x branch, at the moment (and that big patch is giving 
me trouble).

Sorry, I should have mentioned that I was working on the manager and
the bug fixes required one method addition to the interface for Deployer.

I will port the changes to Tomcat 5.

If you feel that backward compatability of the Deployer interface in
Tomcat 4.1 is required, I can remove the new method from the Deployer
interface and change the ManagerServlet to use the new remove method
only if it detects an instance of StandardHostDeployer.


This part of the change looks like it's fixing an issue, so I think I am 
ok with it. This should be case by case, though (please don't try to 
sneak it in a big patch).

Remy


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



Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2003-01-13 Thread Remy Maucherat
Remy Maucherat wrote:

Glenn Nielsen wrote:

With a few details. I may be against the change which adds POST support; 
I don't know what it does, and it adds a dependency. I'm reviewing all 
changes to the 4.1.x branch, at the moment (and that big patch is giving 
me trouble).

I do see what it does now. This is fancy.
There's a dumb bug which prevents correct startup of the default 
configuration. This seems quite obvious. Did you test the patch 
extensively ?

Sorry, I should have mentioned that I was working on the manager and
the bug fixes required one method addition to the interface for Deployer.

I will port the changes to Tomcat 5.


Indeed, you must do that.

Remy


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




Re: cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2003-01-13 Thread Glenn Nielsen
Remy Maucherat wrote:

Remy Maucherat wrote:


Glenn Nielsen wrote:

With a few details. I may be against the change which adds POST 
support; I don't know what it does, and it adds a dependency. I'm 
reviewing all changes to the 4.1.x branch, at the moment (and that big 
patch is giving me trouble).


I do see what it does now. This is fancy.


Thanks. This should make life easier for sysads who do application
web hosting for multiple virtual hosted customers. :-)


There's a dumb bug which prevents correct startup of the default 
configuration. This seems quite obvious. Did you test the patch 
extensively ?


Looks like you fixed that bug from your commit.  Yes, I tested it on
my system with my config.  But I don't have Windows.  So today a coworker
did some more exhaustive testing on windows and with different configs.
Plus did a review of the docs. :-)  I fixed a couple more bugs and made
some minor updates to the docs.

The manager changes look pretty stable now.

I'll start work on porting them to Tomcat 5.


Sorry, I should have mentioned that I was working on the manager and
the bug fixes required one method addition to the interface for 
Deployer.

I will port the changes to Tomcat 5.



Indeed, you must do that.

Remy


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




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




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2002-12-02 Thread jfclere
jfclere 2002/12/02 07:09:09

  Modified:webapps/tomcat-docs/config host.xml
  Log:
  Try to improve the Application Base related explainations.
  
  Revision  ChangesPath
  1.13  +3 -2  jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- host.xml  20 Mar 2002 12:33:01 -  1.12
  +++ host.xml  2 Dec 2002 15:09:09 -   1.13
  @@ -247,7 +247,8 @@
   started, if the codeautoDeploy/code property is set to
   codetrue/code (which is the default value:/p
   ul
  -liAny XML file in this directory is assumed to contain a
  +liAny XML file in the directory defined by appBase
  +(emApplication Base/em directory) is assumed to contain a
   a href=context.htmlContext/a element (and its associated
   subelements) for a single web application.  The codedocBase/code
   attribute of this codelt;Contextgt;/code element will typically
  @@ -260,7 +261,7 @@
   is set to codefalse/code.  If you redeploy an updated WAR file,
   be sure to delete the expanded directory when restarting Tomcat, so
   that the updated WAR file will be re-expanded./li
  -liAny subdirectory within the emapplication base directory/em
  +liAny subdirectory within the emApplication Base/em directory
   that appears to be an unpacked web application (that is, it contains
   a code/WEB-INF/web.xml/code file) will receive an automatically
   generated a href=context.htmlContext/a element, even if this
  
  
  

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




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2002-03-20 Thread glenn

glenn   02/03/20 04:33:01

  Modified:webapps/tomcat-docs/config host.xml
  Log:
  Add the Host deployXML attribute. If false, Context config XML files
  found in the Host's appBase are not deployed.  Default is true.
  
  When Catalina deploys an application in runs with the security
  policy settings of the server.  In a virtual web hosting environment
  this could allow the virtual host outside of its security sandbox.
  
  Revision  ChangesPath
  1.12  +9 -0  jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- host.xml  5 Mar 2002 01:55:03 -   1.11
  +++ host.xml  20 Mar 2002 12:33:01 -  1.12
  @@ -115,6 +115,15 @@
   debugging detail level is zero (0)./p
 /attribute
   
  +  attribute name=deployXML required=false
  +pSet to codefalse/code if you want to disable deploying
  +applications using a Context XML config file. Applications are
  +deployed with the security permissions of catalina, for security
  +this may need to be set to codefalse/code if untrusted users
  +can manage web applications.  The flag's value defaults to
  +codetrue/code./p
  +  /attribute
  +
 attribute name=errorReportValveClass required=false
   pJava class name of the error reporting valve which will be used
   by this Host. The responsability of this valve is to output error
  
  
  

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




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2002-03-04 Thread craigmcc

craigmcc02/03/04 17:55:03

  Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
   webapps/tomcat-docs/config host.xml
  Log:
  Separate the concepts of autoDeploy of applications in the appBase
  subdirectory from the concept of liveDeploy (checking for new apps in a
  background thread while Tomcat is running).  These can now be configured
  separately in the Host element.
  
  Default for both properties is true to mirror the previous behavior.
  
  Submitted by: Glenn Nielsen [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.18  +45 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java
  
  Index: HostConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- HostConfig.java   1 Mar 2002 03:04:44 -   1.17
  +++ HostConfig.java   5 Mar 2002 01:55:02 -   1.18
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
 1.17 2002/03/01 03:04:44 craigmcc Exp $
  - * $Revision: 1.17 $
  - * $Date: 2002/03/01 03:04:44 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
 1.18 2002/03/05 01:55:02 craigmcc Exp $
  + * $Revision: 1.18 $
  + * $Date: 2002/03/05 01:55:02 $
*
* 
*
  @@ -102,7 +102,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.17 $ $Date: 2002/03/01 03:04:44 $
  + * @version $Revision: 1.18 $ $Date: 2002/03/05 01:55:02 $
*/
   
   public class HostConfig
  @@ -157,6 +157,13 @@
   
   
   /**
  + * Should we monitor the codeappBase/code directory for new
  + * applications and automatically deploy them?
  + */
  +private boolean liveDeploy = false;
  +
  +
  +/**
* The background thread.
*/
   private Thread thread = null;
  @@ -258,6 +265,28 @@
   
   
   /**
  + * Return the live deploy flag for this component.
  + */
  +public boolean isLiveDeploy() {
  +
  +return (this.liveDeploy);
  +
  +}
  +
  +
  +/**
  + * Set the live deploy flag for this component.
  + *
  + * @param liveDeploy The new live deploy flag
  + */
  +public void setLiveDeploy(boolean liveDeploy) {
  +
  +this.liveDeploy = liveDeploy;
  +
  +}
  +
  +
  +/**
* Return the unpack WARs flag.
*/
   public boolean isUnpackWARs() {
  @@ -297,6 +326,7 @@
   if (hostDebug  this.debug) {
   this.debug = hostDebug;
   }
  +setLiveDeploy(((StandardHost) host).getLiveDeploy());
   setUnpackWARs(((StandardHost) host).isUnpackWARs());
   }
   } catch (ClassCastException e) {
  @@ -746,7 +776,13 @@
   if (debug = 1)
   log(sm.getString(hostConfig.start));
   
  -threadStart();
  +if (host.getAutoDeploy()) {
  +deployApps();
  +}
  +
  +if (isLiveDeploy()) {
  +threadStart();
  +}
   
   }
   
  @@ -869,15 +905,14 @@
   // Loop until the termination semaphore is set
   while (!threadDone) {
   
  +// Wait for our check interval
  +threadSleep();
  +
   // Deploy apps if the Host allows auto deploying
  -if (host.getAutoDeploy())
  -deployApps();
  +deployApps();
   
   // Check for web.xml modification
   checkWebXmlLastModified();
  -
  -// Wait for our check interval
  -threadSleep();
   
   }
   
  
  
  
  1.11  +14 -8 jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- host.xml  2 Mar 2002 16:38:58 -   1.10
  +++ host.xml  5 Mar 2002 01:55:03 -   1.11
  @@ -126,6 +126,14 @@
   will be used by default./p
 /attribute
   
  +  attribute name=liveDeploy required=false
  +pThis flag value indicates if new web applications, dropped in to
  +the codeappBase/code directory while Tomcat is running, should
  +be automatically deployed.  The flag's value defaults to true.  See
  +a href=#Automatic Application DeploymentAutomatic Application
  +Deployment/a for more information./p
  +  /attribute
  +
 attribute name=unpackWARs 

cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2002-03-02 Thread glenn

glenn   02/03/02 08:38:58

  Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
   webapps/tomcat-docs/config host.xml
  Log:
  Minor fix to the below changes.
  
  This fixes a spec compliance bug, SRV.3.7.1 states that the
  tempdir for a Servlet Context must be unique.
  
  Added the Engine name as a directory path component when creating
  the default work directory for a web application.  This fixes a bug
  where the same work directory would be used for the http and https version
  of a virtual host.
  
  Added the workDir attribute to the Host configuration.  This makes it
  easier to set the base directory where the work directories for
  applications are placed when virtual hosting sites with Tomcat.
  
  Revision  ChangesPath
  1.101 +7 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- StandardContext.java  28 Feb 2002 17:20:56 -  1.100
  +++ StandardContext.java  2 Mar 2002 16:38:58 -   1.101
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.100 2002/02/28 17:20:56 glenn Exp $
  - * $Revision: 1.100 $
  - * $Date: 2002/02/28 17:20:56 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.101 2002/03/02 16:38:58 glenn Exp $
  + * $Revision: 1.101 $
  + * $Date: 2002/03/02 16:38:58 $
*
* 
*
  @@ -147,7 +147,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.100 $ $Date: 2002/02/28 17:20:56 $
  + * @version $Revision: 1.101 $ $Date: 2002/03/02 16:38:58 $
*/
   
   public class StandardContext
  @@ -3840,7 +3840,9 @@
   Container parentHost = getParent();
   if (parentHost != null) {
   hostName = parentHost.getName();
  -hostWorkDir = ((StandardHost)parentHost).getWorkDir();
  +if (parentHost instanceof StandardHost) {
  +hostWorkDir = ((StandardHost)parentHost).getWorkDir();
  +}
   Container parentEngine = parentHost.getParent();
   if (parentEngine != null) {
  engineName = parentEngine.getName();
  
  
  
  1.10  +12 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- host.xml  1 Mar 2002 05:46:52 -   1.9
  +++ host.xml  2 Mar 2002 16:38:58 -   1.10
  @@ -136,6 +136,18 @@
   Deployment/a for more information./p
 /attribute
   
  +  attribute name=workDir required=false
  +pPathname to a scratch directory to be used by applications for
  +this Host. Each application will have its own sub directory with
  +temporary read-write use.  Configuring a Context workDir will override
  +use of the Host workDir configuration.  This directory will be made
  +visible to servlets in the web application by a servlet context
  +attribute (of type codejava.io.File/code) named
  +codejavax.servlet.context.tempdir/code as described in the
  +Servlet Specification.  If not specified, a suitable directory
  +underneath code$CATALINA_HOME/work/code will be provided./p
  +  /attribute
  +
   /attributes
   
 /subsection
  
  
  

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




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2002-02-28 Thread craigmcc

craigmcc02/02/28 21:46:52

  Modified:webapps/tomcat-docs/config host.xml
  Log:
  Tweak the auto-deployment documentation to reflect the current
  functionality.
  
  Revision  ChangesPath
  1.9   +21 -15jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- host.xml  25 Oct 2001 00:38:49 -  1.8
  +++ host.xml  1 Mar 2002 05:46:52 -   1.9
  @@ -73,7 +73,9 @@
 attribute name=autoDeploy required=false
   pThis flag value indicates if web applications from this host should
   be automatically deployed by the host configurator.
  -The flag's value defaults to true./p
  +The flag's value defaults to true.  See
  +a href=#Automatic Application DeploymentAutomatic Application
  +Deployment/a for more information./p
 /attribute
   
 attribute name=className required=false
  @@ -117,18 +119,21 @@
   pJava class name of the error reporting valve which will be used
   by this Host. The responsability of this valve is to output error
   reports. Setting this property allows to customize the look of the
  -error pages which will be generated by Tomcat. This class must 
  -implement the 
  +error pages which will be generated by Tomcat. This class must
  +implement the
   codeorg.apache.catalina.Valve/code interface. If none is specified,
  -the value codeorg.apache.catalina.valves.ErrorReportValve/code 
  +the value codeorg.apache.catalina.valves.ErrorReportValve/code
   will be used by default./p
 /attribute
   
 attribute name=unpackWARs required=false
   pSet to codetrue/code if you want web applications that are
  -deployed into this virtual host from a Web Application Archive (WAR)
  -file to be unpacked into a disk directory structure, or
  -codefalse/code to run the application directly from a WAR file./p
  +placed in the codeappBase/code directory as web application
  +archive (WAR) files to be unpacked into a corresponding disk directory
  +structure, codefalse/code to run such web applications directly
  +from a WAR file.  See
  +a href=#Automatic Application DeploymentAutomatic Application
  +Deployment/a for more information./p
 /attribute
   
   /attributes
  @@ -215,6 +220,13 @@
   This behavior is enabled by setting the codeautoDeploy/code attribute
   to codetrue/code (which is the default value):/p
   ul
  +liAny XML file in this directory is assumed to contain a
  +a href=context.htmlContext/a element (and its associated
  +subelements) for a single web application.  The codedocBase/code
  +attribute of this codelt;Contextgt;/code element will typically
  +be the absolute pathname to a web applicationd directory, or the
  +absolute pathname of a web application archive (WAR) file (which
  +will not be expanded)./li
   liAny web application archive file that does not have a corresponding
   directory of the same name (without the .war extension) will be
   automatically expanded, unless the codeunpackWARs/code property
  @@ -232,19 +244,13 @@
   deployed Context will be a slash character (/) followed by the
   directory name, unless the directory name is ROOT, in which case
   the context path will be an empty string ()./li
  -liAny XML file in this directory is assumed to contain a
  -a href=context.htmlContext/a element (and its associated
  -subelements) for a single web application.  The codedocBase/code
  -attribute of this codelt;Contextgt;/code element will typically
  -be the absolute pathname to a web applicationd directory, or the
  -absolute pathname of a web application archive (WAR) file (which
  -will not be expanded)./li
   /ul
   
   pIn addition to the automatic deployment that occurs at startup time,
   you can also add new WAR files, directory, or XML configuration files
   into the codeappBase/code directory at any time, and the corresponding
  -applications will be automatically deployed./p
  +applications will be automatically deployed if the codeautoDeploy/code
  +property is set to codetrue/code./p
   
 /subsection
   
  
  
  

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




cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2001-10-21 Thread remm

remm01/10/21 21:49:19

  Modified:webapps/tomcat-docs/config host.xml
  Log:
  - Add new auto deploy flag. If true, the web applcations will be automatically
deployed by the host configurator.
  
  Revision  ChangesPath
  1.7   +6 -0  jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- host.xml  2001/10/12 17:09:37 1.6
  +++ host.xml  2001/10/22 04:49:19 1.7
  @@ -70,6 +70,12 @@
   deployment of web applications to be deployed automatically./p
 /attribute
   
  +  attribute name=autoDeploy required=false
  +pThis flag value indicates if web applications from this host should
  +be automatically deployed by the host configurator.
  +The flag's value defaults to true./p
  +  /attribute
  +
 attribute name=className required=false
   pJava class name of the implementation to use.  This class must
   implement the codeorg.apache.catalina.Host/code interface.
  
  
  



cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml

2001-09-26 Thread remm

remm01/09/26 11:10:28

  Modified:webapps/tomcat-docs/config host.xml
  Log:
  - Update docs on the new property for StandardHost.
  
  Revision  ChangesPath
  1.4   +11 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
  
  Index: host.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- host.xml  2001/09/26 02:29:21 1.3
  +++ host.xml  2001/09/26 18:10:28 1.4
  @@ -107,6 +107,17 @@
   debugging detail level is zero (0)./p
 /attribute
   
  +  attribute name=errorReportValveClass required=false
  +pJava class name of the error reporting valve which will be used
  +by this Host. The responsability of this valve is to output error
  +reports. Setting this property allows to customize the look of the
  +error pages which will be generated by Tomcat. This class must 
  +implement the 
  +codeorg.apache.catalina.Valve/code interface. If none is specified,
  +the value codeorg.apache.catalina.valves.ErrorReportValve/code 
  +will be used by default./p
  +  /attribute
  +
 attribute name=unpackWARs required=false
   pSet to codetrue/code if you want web applications that are
   deployed into this virtual host from a Web Application Archive (WAR)