Re: Jk2 config
I'm understandably fond of ApacheConfig, but I realize that we can do better. For the rest, see inline. - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, February 22, 2002 11:02 PM Subject: Jk2 config I'm going to do few more changes to jk2 config ( unless anyone has a better idea ). Instead of renaming all config directives with Jk2, I would like to just _remove_ them all. If the old directives are used in a config, mod_jk1 will do what's expected. From what I've read, I'd still like a 'compatibility mode', to allow for webmasters to fine-tune. The fatal flaw of mod_webapp was to promise more than it could deliver (and, no, Pier, I don't want to start a flame-war. warp could have been very good if it hadn't been orphaned). But I suspect that I'm just not fully understanding the proposal. I would like to minimze the number of directives to 2-3, and keep most of the code common for all servers. I'm thinking about: 1. JkSet NAME VALUE Will have exactly the same behavior as NAME=VALUE in a workers.properties file. All settings that you can do in workers.properties today could be done by JkSet, in httpd.conf. Or all settings could be done in workers.properties. For example JkLogLevel DEBUG will be now: JkSet logLevel DEBUG ( in httpd.conf ) or logLevel=DEBUG ( in workers.propertes ) The first style is for people who prefer working with httpd.conf, the other one will be easier for IIS/iPlanet and may be easier to generate/edit. 2. JkWebapp NAME VALUE Set properties on a webapp level. Will be set at Location level. An equivalent setting will be in a uri-workers.properties ( or a better named one ), the same that we use for IIS. AFAIK, the Location is unique to Apache and has no equivalent in IIS or iPlanet. Even with Apache it is problematic in the presence of VirtualHosts. JkMount is not doing anything special - it's the same efect as the properties file we use on IIS. Except that properties are easier to generate and will be consistent for all servers ( no longer need to generate 3 different styles ). As much as I hate the IIS syntax, I suppose I'll have to hold my nose and vote +1. Location will be used for performance, it uses the apache mapper instead of jk's. 3. JkServlet NAME VALUE Set properties per/servlet. I'm not yet finished with this one, we may not need it. -1. This should be handled by Tomcat (via web.xml), not Apache/IIS/iPlanet. After jk2 is finalized and we're ready to drop jk1 we'll just implement a compat layer - the old options in jk1. That's what I did so far, but I think it's better to make the switch to a better model and keep that only for migration. Opinions ? Costin -- 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]
RE: Jk2 config
1. JkSet NAME VALUE Will have exactly the same behavior as NAME=VALUE in a workers.properties file. All settings that you can do in workers.properties today could be done by JkSet, in httpd.conf. Or all settings could be done in workers.properties. For example JkLogLevel DEBUG will be now: JkSet logLevel DEBUG ( in httpd.conf ) or logLevel=DEBUG ( in workers.propertes ) The first style is for people who prefer working with httpd.conf, the other one will be easier for IIS/iPlanet and may be easier to generate/edit. +1 - i really like the idea of being able to configure the different web servers +(apache/iis/netscape) in a similar fashion. 2. JkWebapp NAME VALUE Set properties on a webapp level. Will be set at Location level. An equivalent setting will be in a uri-workers.properties ( or a better named one ), the same that we use for IIS. JkMount is not doing anything special - it's the same efect as the properties file we use on IIS. Except that properties are easier to generate and will be consistent for all servers ( no longer need to generate 3 different styles ). Location will be used for performance, it uses the apache mapper instead of jk's. +1 for the same reasons as above. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina build.xml
glenn 02/02/23 07:52:10
Modified:catalina build.xml
Log:
Make sure build/common/endorsed is created so build doesn't fail
Revision ChangesPath
1.107 +1 -0 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- build.xml 21 Feb 2002 05:54:21 - 1.106
+++ build.xml 23 Feb 2002 15:52:10 - 1.107
@@ -649,6 +649,7 @@
mkdir dir=${catalina.build}/bin/
mkdir dir=${catalina.build}/common/classes/
mkdir dir=${catalina.build}/common/lib/
+mkdir dir=${catalina.build}/common/endorsed/
mkdir dir=${catalina.build}/conf/
mkdir dir=${catalina.build}/logs/
mkdir dir=${catalina.build}/server/classes/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Jk2 config
On Sat, 23 Feb 2002, Bill Barker wrote: Instead of renaming all config directives with Jk2, I would like to just _remove_ them all. If the old directives are used in a config, mod_jk1 will do what's expected. From what I've read, I'd still like a 'compatibility mode', to allow for webmasters to fine-tune. The fatal flaw of mod_webapp was to promise more To fine-tune - exactly the same tunning can be done by using a 'JkLogLevel DEBUG' or 'JkSet logLevel DEBUG' or 'logLevel=DEBUG' in workers.properties ( same for all other options ) My proposal is to stick with the last 2 as 'default/recommended' in jk2. A compatibility layer will be added when we deprecated jk1, it's not difficult ( so old configs will still work ). But at this moment is better to have 'old configs' work by using jk1. Adding a fourth Jk2LogLevel doesn't get us anything. Keeping all settings in the same map will simplify other servers as well, we'll not have to duplicate the code dealing with properties - it'll be in common. Set properties on a webapp level. Will be set at Location level. An equivalent setting will be in a uri-workers.properties ( or a better named one ), the same that we use for IIS. AFAIK, the Location is unique to Apache and has no equivalent in IIS or iPlanet. Even with Apache it is problematic in the presence of VirtualHosts. Using uri-workers.properties ( which is equivalent with JkMount ) will work on all servers ( and is easy to generate ). That should be the default. For performance or fine tunning - Location has several benefits, and allow better integration into apache. And it works fine with VirtualHosts :-). I believe iPlanet and IIS may have some equivalent 'native' mapping rule - and it would be nice to support it as well, but the properties are going to work fine. properties are easier to generate and will be consistent for all servers ( no longer need to generate 3 different styles ). As much as I hate the IIS syntax, I suppose I'll have to hold my nose and vote +1. If you're thinking about the uri properties file - we can improve this, and hopefully you'll not have to touch this ever. 3. JkServlet NAME VALUE Set properties per/servlet. I'm not yet finished with this one, we may not need it. -1. This should be handled by Tomcat (via web.xml), not Apache/IIS/iPlanet. If we use Location style, we'll have a Location /examples JkWebapp worker ajp13 /Location Location /examples/servlets/* JkServlet name invoker /Location Location /examples/foo/* JkServlet name myServlet /Location Both JkWebapp and JkServlet are to be used with 'native' ( and probably more performant and well 'integrated' ) mode. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Problems with mod_webapp. Please read!
On Fri, 2002-02-22 at 16:18, Erik Lotspeich wrote: Brian, In my previous e-mails I gave more details. My setup is this: Linux 2.4, glibc 2.1, JDK 1.3.1, Jakarta-tomcat 4.0.2, Apache 1.3.20, APR 20011211172103, mod_webapp 4.0.2. Does mod_webapp require a more recent version of Apache? Does it require JDK 1.4? I was under the impression that it would work with the setup that I had. Eric, did you compile webapp? Did you compile apache? What is in the apache error_log? What is in the tomcat/logs/apache log? Did you configure /webapp-info? Santa Barbara? Must be nice. I grew up in Santa Ynez. Miss that ocean. -- Brian Millett Enterprise Consulting Group Shifts in paradigms (314) 205-9030 often cause nose bleeds. [EMAIL PROTECTED] Greg Glenn -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 - New directory
costin 02/02/23 10:59:34 jakarta-tomcat-connectors/jk/native2/server/apache13 - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c
costin 02/02/23 11:01:05 Added: jk/native2/server/apache13 mod_jk2.c Log: Quick and dirty backport of mod_jk.c. Apr is not used, I'll probably remove the location and the other 'special' code ( like native logger, etc ) - then try to make it work ( it just compiles right now ) Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c Index: mod_jk2.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * *
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/02/23 11:02:19
Modified:jk/native2 build.xml
Log:
Adding apache13 to the mix, better detection, support for RedHat-style package
( apache13 is bundled with redhat, so easier to get things running with
minimal effort for users )
Revision ChangesPath
1.15 +14 -5 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 22 Feb 2002 10:06:05 - 1.14
+++ build.xml 23 Feb 2002 19:02:19 - 1.15
@@ -14,6 +14,7 @@
property name=netscape.home location=${iplanet.home}/plugins /
property name=apache2.home location=/opt/apache2 /
+ !-- That's the default RedHat package --
property name=apache13.home location=/usr /
property name=apache2.include location=${apache2.home}/include /
@@ -44,16 +45,16 @@
!-- Targets --
- target name=main depends=init,apache20,jni
+ target name=main depends=init,apache20,apache13,jni
/target
target name=init
- echo message=build.properties.${os.arch}.${os.name} /
+echo message=build.properties.${os.arch}.${os.name} /
taskdef resource=META-INF/ant.tasks
classpathref=jkant /
available property=HAVE_APR file=${apr.include}/apr.h /
available property=apache13.detect
- file=${apache13.home} /
+ file=${apache13.home}/bin/htpasswd /
available property=apache2.detect
file=${apache2.home} /
available property=iis.detect
@@ -61,6 +62,10 @@
available property=iplanet.detect
file=${iplanet.home} /
mkdir dir=${build.dir} /
+echo message=Apache2 ${apache2.home} ${apache2.detect} /
+echo message=Apache13 ${apache13.home} ${apache13.detect} /
+echo message=IIS ${iis.home} ${iis.detect} /
+echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
/target
target name=apache20 depends=init if=apache2.detect
@@ -177,7 +182,7 @@
target name=apache13 depends=init if=apache13.detect
mkdir dir=${jk.build}/WEB-INF/jk2/apache13 /
-so sofile=mod_jk
+so sofile=mod_jk2
buildDir=${jk.build}/WEB-INF/jk2/apache13
optimize=${so.optimize}
debug=${so.debug}
@@ -189,11 +194,15 @@
exclude name=jk_nwmain.c
unless=netware /
include name=common/apr/*.c if=HAVE_APR /
+exclude name=common/apr_socket.c /
/src
includes
+ include name=${native.dir}/include /
include name=${native.dir}/common /
include name=${build.compiler.base}/include /
include name=${apache13.include} /
+!-- Redhat package --
+ include name=${apache13.home}/include/apache /
include name=${native.dir}/include /
include name=${java.home}/../include /
@@ -207,7 +216,7 @@
include name=${apache13.home}/os/win32 if=win32 /
include name=${java.home}/../include/win32 if=win32 /
include name=${native.dir}/common if=win32 /
-
+include name=${java.home}/../include/hp-ux if=hpux /
include name=${java.home}/../include/linux if=linux /
/includes
depends
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
larryi 02/02/23 19:36:15
Modified:src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
Log:
Add the port number to JVM_Bind exceptions.
Submitted by: Jon Stevens
Revision ChangesPath
1.17 +12 -8
jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PoolTcpEndpoint.java 7 Dec 2001 04:40:06 - 1.16
+++ PoolTcpEndpoint.java 24 Feb 2002 03:36:15 - 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
1.16 2001/12/07 04:40:06 billbarker Exp $
- * $Revision: 1.16 $
- * $Date: 2001/12/07 04:40:06 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
1.17 2002/02/24 03:36:15 larryi Exp $
+ * $Revision: 1.17 $
+ * $Date: 2002/02/24 03:36:15 $
*
*
*
@@ -256,11 +256,15 @@
if(factory==null)
factory=ServerSocketFactory.getDefault();
if(serverSocket==null) {
- if (inet == null) {
- serverSocket = factory.createSocket(port, backlog);
- } else {
- serverSocket = factory.createSocket(port, backlog, inet);
- }
+try {
+if (inet == null) {
+serverSocket = factory.createSocket(port, backlog);
+} else {
+serverSocket = factory.createSocket(port, backlog, inet);
+}
+} catch ( BindException be ) {
+throw new BindException(be.getMessage() + : + port);
+}
}
if( serverTimeout = 0 )
serverSocket.setSoTimeout( serverTimeout );
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config ServerXmlReader.java
larryi 02/02/23 19:37:49
Modified:src/share/org/apache/tomcat/modules/config
ServerXmlReader.java
Log:
Add warning message if server config file isn't found. Update modules.xml
message to similar format.
Revision ChangesPath
1.20 +3 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java
Index: ServerXmlReader.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ServerXmlReader.java 31 Dec 2001 20:54:40 - 1.19
+++ ServerXmlReader.java 24 Feb 2002 03:37:49 - 1.20
@@ -159,8 +159,9 @@
loadConfigFile(xh,f,cm);
cm.log(sm.getString(tomcat.loading) + + f);
}
-
}
+else
+log(Warning: Server configuration file + f + was not found!);
}
// Xml reading details
@@ -324,7 +325,7 @@
}
}
else
-log(Warning: No modules.xml file found!);
+log(Warning: Modules configuration file + f + was not found!);
}
void loadCachedModules( File f, Properties mods ) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java
larryi 02/02/23 19:39:58
Modified:src/share/org/apache/tomcat/startup EmbededTomcat.java
Log:
If using server.xml, verify that some interceptors were added. If not,
don't start since modules.xml or server.xml are likely missing.
Revision ChangesPath
1.64 +13 -2
jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
Index: EmbededTomcat.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- EmbededTomcat.java11 Jan 2002 07:24:17 - 1.63
+++ EmbededTomcat.java24 Feb 2002 03:39:58 - 1.64
@@ -552,6 +552,15 @@
contextM.addInterceptor( (BaseInterceptor)
modules.elementAt( i ) );
}
+
+// if using server.xml and no new interceptors found, then quit
+if( serverXml (modules.size() ==
+contextM.getContainer().getInterceptors().length)) {
+debug(No configuration found.);
+debug(The modules and/or server configuration files are missing.);
+return;
+}
+
contextM.init();
} catch( Throwable ex ) {
if( ex instanceof InvocationTargetException ) {
@@ -696,8 +705,10 @@
debug(Init time + (time2-time1));
}
- // Start
- start();
+if( initialized ) {
+// Start
+start();
+}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config AutoWebApp.java
larryi 02/02/23 19:46:06
Modified:src/share/org/apache/tomcat/modules/config AutoWebApp.java
Log:
Make the special characters configurable. These are used in deriving
the virtual host and path name from the directory name. Fix bug where
virtual host character was incorrectly included in the context's path name.
Revision ChangesPath
1.12 +25 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java
Index: AutoWebApp.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AutoWebApp.java 5 Feb 2002 01:30:29 - 1.11
+++ AutoWebApp.java 24 Feb 2002 03:46:06 - 1.12
@@ -164,6 +164,30 @@
public void setReloadable( boolean b ) {
reloadable=b;
}
+
+public void setHostChar( String c ) {
+if ( c.length() 0 ) {
+hostSeparator = c.charAt(0);
+} else {
+hostSeparator = '\0';
+}
+}
+
+public void setHostDotChar( String c ) {
+if ( c.length() 0 ) {
+dotReplacement = c.charAt(0);
+} else {
+dotReplacement = '\0';
+}
+}
+
+public void setPathSlashChar( String c ) {
+if ( c.length() 0 ) {
+slashReplacement = c.charAt(0);
+} else {
+slashReplacement = '\0';
+}
+}
// Implementation
@@ -212,7 +236,7 @@
int idx=name.indexOf( hostSeparator ); // may change
if( idx 0 ) {
appHost=name.substring( 0, idx );
- name=name.substring( idx );
+ name=name.substring( idx + 1 );
}
}
if( appHost == null )
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/doc serverxml.html
larryi 02/02/23 19:47:16 Modified:src/doc serverxml.html Log: Document updates to AutoWebApp. Revision ChangesPath 1.21 +51 -2 jakarta-tomcat/src/doc/serverxml.html Index: serverxml.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- serverxml.html8 Feb 2002 20:24:53 - 1.20 +++ serverxml.html24 Feb 2002 03:47:16 - 1.21 @@ -4,7 +4,7 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN html head - !-- $Id: serverxml.html,v 1.20 2002/02/08 20:24:53 larryi Exp $ -- + !-- $Id: serverxml.html,v 1.21 2002/02/24 03:47:16 larryi Exp $ -- !-- Copyright 1999-2001 Apache Software Foundation -- meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 link rel=stylesheet href=style.css @@ -864,15 +864,57 @@ /tr tr valign=top tdhost/td -tdVirtual host into which each application will be deployed./td +tdVirtual host into which each application will be deployed.br +bNote:/b If this attribute is specified in codeserver.xml/code, +the handling for codehostChar/code and codehostDotChar/code is +disabled./td tdDEFAULT/td /tr tr valign=top +tdhostCharbrb[Tomcat 3.3.1]/td +tdCharacter used to designate the end of the host portion of the + directory name. For example, a directory named quot;mydomain@myappquot; + would deploy to virtual host quot;mydomainquot; as the quot;/myappquot; + context. Deriving a host name from the directory name is disabled if + the codehost/code attribute is specified in codeserver.xml/code. + Also see the codehostDotChar/code attribute for including periods in + the host name.br + bNote:/b This attribute was implemented, but not configurable in + Tomcat 3.3. However, a bug in Tomcat 3.3 makes this feature unusable. The + '@' character is incorrectly included in the context name. This bug has + been corrected in Tomcat 3.3.1./td +td@/td + /tr + tr valign=top +tdhostDotCharbrb[Tomcat 3.3.1]/td +tdCharacter used as a substitute for periods in the host portion of the + directory name. For example, a directory named + quot;www_mydomain_com@myappquot; would deploy to virtual host + quot;www.mydomain.comquot; as the quot;/myappquot; context. Also see + the codehostChar/code attribute for designating the end of the host + name.br + bNote:/b This attribute was implemented, but not configurable in + Tomcat 3.3. However, a bug in the handing for codehostChar/code in + Tomcat 3.3 makes this feature unusable. It is fully funtional in + Tomcat 3.3.1./td +td_/td + /tr + tr valign=top tdignoreDot/td tdIgnore dirs starting with '.'/td tdtrue/td /tr tr valign=top +tdpathSlashCharbrb[Tomcat 3.3.1]/td +tdCharacter used as a substitute for slashes in the context path portion + of the directory name. For example, a directory named + quot;my_appquot; would deploy to the default host as the + quot;/my/appquot; context.br + bNote:/b This attribute was implemented, but not configurable in + Tomcat 3.3./td +td_/td + /tr + tr valign=top tdprefixbrb[Tomcat 3.3.1]/b/td tdPrefix to add to the context path for each deployed web application. The context path will consist of the prefix followed subdirectory name./td @@ -888,11 +930,18 @@ /tr /table +pbNote:/b The special directory name handling controlled by +codehostChar/code, codehostDotChar/code, and codepathSlashChar/code +is always enabled. If you wish to include '_' characters in a web application +directory name, disable the feature by redefining the codepathSlashChar/code +to an empty string./p + h4Example(s)/h4 pre lt;AutoWebApp dir=quot;webappsquot; host=quot;DEFAULTquot; /gt; lt;AutoWebApp dir=quot;myhostquot; host=quot;myhost.comquot; /gt; + lt;AutoWebApp dir=quot;webappsquot; pathSlashChar= /gt; /pre hr size=5 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat build.xml
larryi 02/02/23 19:49:37
Modified:.build.xml
Log:
Update to eliminate fixcrlf warnings. Ant 1.4 or later is now required.
Revision ChangesPath
1.164 +2 -2 jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- build.xml 12 Jan 2002 07:19:38 - 1.163
+++ build.xml 24 Feb 2002 03:49:37 - 1.164
@@ -191,8 +191,8 @@
copy tofile=${tomcat.build}/lib/common/servlet.jar
file=${servlet22.jar}/
-fixcrlf srcdir=${tomcat.build}/bin includes=**/*.sh cr=remove/
-fixcrlf srcdir=${tomcat.build}/bin includes=**/*.bat cr=add/
+fixcrlf srcdir=${tomcat.build}/bin includes=**/*.sh eol=lf/
+fixcrlf srcdir=${tomcat.build}/bin includes=**/*.bat eol=crlf/
chmod perm=+x file=${tomcat.build}/bin/tomcat.sh/
chmod perm=+x file=${tomcat.build}/bin/jspc.sh/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat README
larryi 02/02/23 19:50:14 Modified:.README Log: Update to document Ant 1.4 or later is required. Revision ChangesPath 1.19 +8 -12 jakarta-tomcat/README Index: README === RCS file: /home/cvs/jakarta-tomcat/README,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- README20 Sep 2001 04:28:09 - 1.18 +++ README24 Feb 2002 03:50:14 - 1.19 @@ -22,19 +22,15 @@ (%JAVA_HOME%\bin for Windows) to your PATH. Configure the CLASSPATH environment variable as well, if required. -* Download the Ant version 1.3 (or 1.4) binary distribution from - http://jakarta.apache.org/builds/jakarta-ant/release/v1.3/bin (or - http://jakarta.apache.org/builds/jakarta-ant/release/v1.4/bin) and install - it in the $JAKARTA_HOME directory. Set an ANT_HOME environment variable - to point to $JAKARTA_HOME/jakarta-ant-1.3 (or $JAKARTA_HOME/jakarta-ant-1.4). - If you are using Windows 9x, you should set ANT_HOME using the DOS 8.3 name, - In this case, you may find it convenient to rename the directory to a name - that is within the DOS 8.3 format, such as ant-1.3 (or ant-1.4). +* Download the latest Ant binary distribution (currently version 1.4.1) from + http://jakarta.apache.org/site/binindex.html and install it in the + $JAKARTA_HOME directory. Set an ANT_HOME environment variable + to point to $JAKARTA_HOME/jakarta-ant-version where version matches + the version of Ant downloaded ($JAKARTA_HOME/jakarta-ant-1.4.1 for + Ant v1.4.1). If you are using Windows 9x, you should set ANT_HOME using + the DOS 8.3 name. In this case, you may find it convenient to rename + the directory to a name that is within the DOS 8.3 format, such as ant-141. Also, add $ANT_HOME/bin (%ANT_HOME%/bin for Windows) to your PATH. - - Note: If you build with Ant 1.4, you will receive deprecation warnings for - the use of the cr attribute on the fixcrlf task. This is normal and - not an indication of an error. * If you want to include SSL support, download the Java Secure Sockets Extension (JSSE) implementation (current version number is 1.0.2) from -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat RELEASE-NOTES-3.3.1.txt
larryi 02/02/23 19:52:00 Modified:.RELEASE-NOTES-3.3.1.txt Log: Document updates to startup error messages and improvements to AutoWebApp module. Revision ChangesPath 1.39 +10 -3 jakarta-tomcat/RELEASE-NOTES-3.3.1.txt Index: RELEASE-NOTES-3.3.1.txt === RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.1.txt,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- RELEASE-NOTES-3.3.1.txt 22 Feb 2002 03:19:32 - 1.38 +++ RELEASE-NOTES-3.3.1.txt 24 Feb 2002 03:52:00 - 1.39 @@ -3,7 +3,7 @@ Release Notes = -$Id: RELEASE-NOTES-3.3.1.txt,v 1.38 2002/02/22 03:19:32 billbarker Exp $ +$Id: RELEASE-NOTES-3.3.1.txt,v 1.39 2002/02/24 03:52:00 larryi Exp $ This document describes the changes that have been made since the @@ -69,8 +69,9 @@ this logger is replaced a new logger set by the LogSetter module, its reduction in efficiency won't affect normal operation. - ServerXmlReader now logs a warning if the modules.xml file isn't - found. + Startup error output has been improved. Messages will be shown if + modules.xml or server.xml isn't present. Also, the port number is + now shown when JVM_Bind exceptions occur. The internal test script, test-tomcat.xml, has been made more configurable and the Admin app internal test page, test.jsp, has @@ -134,6 +135,12 @@ to support automatic or explicit use of Ajp12 or Ajp13 protocol to shutdown Tomcat. This includes use of an optional secret password with either protocol. + + Added hostChar, hostDotChar, and pathSlashChar attributes to + AutoWebApp module. These make configurable the special characters + used in the directory name to delimit a virtual host name and act + as substitution characters. Also, fixed behavior so that hostChar + isn't included in the context path name. Server: -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory Constants.java ResourceFactory.java
remm02/02/23 21:09:59
Modified:catalina/src/share/org/apache/naming/factory Constants.java
ResourceFactory.java
Log:
- Use the DBCP factory as the default factory for the java.sql.DataSource type.
Revision ChangesPath
1.4 +6 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Constants.java8 Nov 2001 19:31:19 - 1.3
+++ Constants.java24 Feb 2002 05:09:58 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java,v
1.3 2001/11/08 19:31:19 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2001/11/08 19:31:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java,v
1.4 2002/02/24 05:09:58 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/24 05:09:58 $
*
*
*
@@ -87,6 +87,9 @@
public static final String DEFAULT_EJB_FACTORY =
Package + .EjbFactory;
+
+public static final String DBCP_DATASOURCE_FACTORY =
+Package + .DbcpDataSourceFactory;
public static final String TYREX_DATASOURCE_FACTORY =
Package + .TyrexDataSourceFactory;
1.7 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java
Index: ResourceFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceFactory.java 26 Dec 2001 02:15:43 - 1.6
+++ ResourceFactory.java 24 Feb 2002 05:09:58 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
1.6 2001/12/26 02:15:43 glenn Exp $
- * $Revision: 1.6 $
- * $Date: 2001/12/26 02:15:43 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
1.7 2002/02/24 05:09:58 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/24 05:09:58 $
*
*
*
@@ -77,7 +77,7 @@
* Object factory for Resources.
*
* @author Remy Maucherat
- * @version $Revision: 1.6 $ $Date: 2001/12/26 02:15:43 $
+ * @version $Revision: 1.7 $ $Date: 2002/02/24 05:09:58 $
*/
public class ResourceFactory
@@ -152,7 +152,7 @@
if (ref.getClassName().equals(javax.sql.DataSource)) {
String javaxSqlDataSourceFactoryClassName =
System.getProperty(javax.sql.DataSource.Factory,
- Constants.TYREX_DATASOURCE_FACTORY);
+ Constants.DBCP_DATASOURCE_FACTORY);
try {
factory = (ObjectFactory)
Class.forName(javaxSqlDataSourceFactoryClassName)
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
