[PATCH][3.3] tomcat.sh cleanup
Hi,
The help text displayed when you type ./tomcat.sh currently reads:
Usage:
tomcat (start|env|run|stop|jspc)
start - start tomcat in the background
run - start tomcat in the foreground
run -wait - wait until tomcat is initialized before returning
-security - use a SecurityManager when starting
stop - stop tomcat
env - set CLASSPATH and TOMCAT_HOME env. variables
jspc - run jsp pre compiler
This is out of date (missing 'enableAdmin' and 'estart'), is partially
incorrect (-wait applies to 'start', not 'run'), and is hard to read.
The attached patch fixes this, so it will print:
./tomcat.sh (start|run|stop|enableAdmin|estart|env|jspc)
start- start tomcat in the background
start -security - use a SecurityManager when starting
start -noout - redirect stdout/stderr to $TOMCAT_HOME/logs/stdout.log
start -wait - wait until tomcat is initialized before returning
run - start tomcat in the foreground
run -security- use a SecurityManager when starting
stop - stop tomcat
stop -force - stop tomcat with the 'kill' command if necessary
enableAdmin - Trust the admin web application,
i.e. rewrites conf/apps-admin.xml with trusted=true
estart - Start Tomcat using the/your EmbededTomcat class which
uses a hardcoded set of modules
env - set CLASSPATH and TOMCAT_HOME env. variables
jspc - run jsp pre compiler
The patch also fixes indentation, and parametrizes the MAX_WAIT variable to
reliably fix another doc bug.
Also, I noticed that line 294 contains:
TOMCAT_OPTS=$TOMCAT_OPTS -Djava.security.policy==${TOMCAT_HOME}/conf/tomcat.policy
Shouldn't that be a single '='? There is the same thing in tomcat.bat. Not
being sure of the implications, I haven't changed this in the patch.
--Jeff
Index: src/shell/tomcat.sh
===
RCS file: /home/cvspublic/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.30
diff -u -r1.30 tomcat.sh
--- src/shell/tomcat.sh 2001/09/20 03:35:41 1.30
+++ src/shell/tomcat.sh 2001/10/21 06:23:31
@@ -32,9 +32,9 @@
ls=`ls -ld $PRG`
link=`expr $ls : '.*- \(.*\)$'`
if expr $link : '.*/.*' /dev/null; then
- PRG=$link
+PRG=$link
else
- PRG=`dirname $PRG`/$link
+PRG=`dirname $PRG`/$link
fi
done
@@ -43,10 +43,10 @@
echo Guessing TOMCAT_INSTALL from tomcat.sh to ${TOMCAT_INSTALL_1}
fi
if [ -d ${TOMCAT_INSTALL_1}/lib ] ; then
- TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
+TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
if [ $DEBUG_HOMEFIND != false ] ; then
echo Setting TOMCAT_INSTALL to $TOMCAT_INSTALL
- fi
+fi
fi
fi
@@ -85,11 +85,11 @@
if [ $TOMCAT_HOME = ] ; then
if [ -d ./conf ] ; then
- TOMCAT_HOME=.
+TOMCAT_HOME=.
elif [ -d ../conf ] ; then
- TOMCAT_HOME=..
+TOMCAT_HOME=..
else
- TOMCAT_HOME=$TOMCAT_INSTALL
+TOMCAT_HOME=$TOMCAT_INSTALL
fi
fi
@@ -147,11 +147,12 @@
rm -f ${TOMCAT_HOME}/conf/ajp12.id
fi
+ MAX_WAIT=360
WAIT=0
if [ $1 = -wait ] ; then
shift
# wait at least 6 min
-WAIT=360
+WAIT=${MAX_WAIT}
fi
if [ $1 = -noout ] ; then
@@ -175,8 +176,8 @@
WAIT=`expr $WAIT - 1`
if [ $WAIT = 0 ] ; then
-echo Tomcat was no ready after 120 seconds, giving up waiting
- break;
+echo Tomcat was no ready after ${MAX_WAIT} seconds, giving up waiting
+break;
fi
done
fi
@@ -223,17 +224,17 @@
shift
CLASSPATH=.
for i in ${TOMCAT_HOME}/lib/container/* ${TOMCAT_HOME}/lib/common/* ; do
- CLASSPATH=${CLASSPATH}:$i
+CLASSPATH=${CLASSPATH}:$i
done
CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
# Backdoor classpath setting for development purposes when all classes
- # are compiled into a /classes dir and are not yet jarred.
+# are compiled into a /classes dir and are not yet jarred.
if [ -d ${TOMCAT_HOME}/classes ]; then
- CLASSPATH=${TOMCAT_HOME}/classes:${CLASSPATH}
+CLASSPATH=${TOMCAT_HOME}/classes:${CLASSPATH}
fi
if [ $oldCP != ]; then
- CLASSPATH=${CLASSPATH}:${oldCP}
+CLASSPATH=${CLASSPATH}:${oldCP}
fi
(cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS -Dtomcat.home=${TOMCAT_HOME}
org.apache.jasper.JspC $@ )
@@ -266,15 +267,21 @@
else
echo Usage:
- echo tomcat (start|env|run|stop|jspc)
- echo start - start tomcat in the background
- echo run - start tomcat in the foreground
- echo run -wait - wait until tomcat is initialized before returning
- echo -security - use a SecurityManager when starting
- echo stop - stop tomcat
- echo
DO NOT REPLY [Bug 4266] - Jasper is unable to handle a jar containing multiple tlds.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4266. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4266 Jasper is unable to handle a jar containing multiple tlds. --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 00:54 --- Hey, i made a test with my taglib project. Split my logical and i18n task and deploy it as one jar. I have META-INF/logic-taglib.tld META_INF/i18n-taglib.tld with the JSP 1.2 doctype Than I made some test with a webapp web.xml with taglib taglib-uri/op-logic/taglib-uri taglib-location/WEB-INF/logic-taglib.tld/taglib-location /taglib taglib taglib-uri/op-i18n/taglib-uri taglib-location/WEB-INF/i18n-taglib.tld/taglib-location /taglib I bundle my taglib descriptors at WEB-INF also. It works at 4.0 final and 4.0.1 very succesfull! Than I comment out the tablib description at web.xml. I want test the jar tld auto description and it works also fine! I look at TagLibraryInfoImpl and I think you have define a wrong taglib description at you web.xml. The TagLibraryInfoImpl search for a description file and it can't find a file! Regards Peter
DO NOT REPLY [Bug 4307] New: - SSI Server Side Include
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4307. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4307 SSI Server Side Include Summary: SSI Server Side Include Product: Tomcat 4 Version: 4.0 Final Platform: PC URL: http://www.jguru.com/forums/view.jsp?EID=520845 OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hi, I put my application under ROOT and my SSI is as follows: !--#include virtual=/infonetIniFiles/header.ini --. / should point to the ROOT (so the directory of my application), but the SSI does not work ! References to pictures, e.g. /image/test.gif are fine ! To put my application under ROOT was my last trial to get the SSI run correctly. I also tried init-param paramnameisVirtualWebappRelative/param-name param-value1/param-value /init-param with 0 and 1 in web.XML and Context path=... docBase=... debug=0/ in server.xml. Please send me an eMail, if I am wrong. Boerries
RE: [PATCH][3.3] tomcat.sh cleanup
It would be nice also to display the command that is used
to initialize the jk web config files, jkconf or whatever.
Keith
| -Original Message-
| From: Jeff Turner [mailto:[EMAIL PROTECTED]]
| Sent: Sunday, October 21, 2001 2:44 AM
| To: [EMAIL PROTECTED]
| Subject: [PATCH][3.3] tomcat.sh cleanup
|
|
| Hi,
|
| The help text displayed when you type ./tomcat.sh currently reads:
|
| Usage:
| tomcat (start|env|run|stop|jspc)
| start - start tomcat in the background
| run - start tomcat in the foreground
| run -wait - wait until tomcat is initialized before returning
| -security - use a SecurityManager when starting
| stop - stop tomcat
| env - set CLASSPATH and TOMCAT_HOME env. variables
| jspc - run jsp pre compiler
|
|
| This is out of date (missing 'enableAdmin' and 'estart'), is partially
| incorrect (-wait applies to 'start', not 'run'), and is hard to read.
|
| The attached patch fixes this, so it will print:
|
| ./tomcat.sh (start|run|stop|enableAdmin|estart|env|jspc)
| start- start tomcat in the background
| start -security - use a SecurityManager when starting
| start -noout - redirect stdout/stderr to $TOMCAT_HOME/logs/stdout.log
| start -wait - wait until tomcat is initialized before returning
| run - start tomcat in the foreground
| run -security- use a SecurityManager when starting
| stop - stop tomcat
| stop -force - stop tomcat with the 'kill' command if necessary
| enableAdmin - Trust the admin web application,
| i.e. rewrites conf/apps-admin.xml with trusted=true
| estart - Start Tomcat using the/your EmbededTomcat class which
| uses a hardcoded set of modules
| env - set CLASSPATH and TOMCAT_HOME env. variables
| jspc - run jsp pre compiler
|
|
| The patch also fixes indentation, and parametrizes the MAX_WAIT variable to
| reliably fix another doc bug.
|
|
| Also, I noticed that line 294 contains:
|
| TOMCAT_OPTS=$TOMCAT_OPTS
| -Djava.security.policy==${TOMCAT_HOME}/conf/tomcat.policy
|
| Shouldn't that be a single '='? There is the same thing in tomcat.bat. Not
| being sure of the implications, I haven't changed this in the patch.
|
|
| --Jeff
|
DO NOT REPLY [Bug 4310] New: - Host and Context start events triggered twice during startup
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4310. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4310 Host and Context start events triggered twice during startup Summary: Host and Context start events triggered twice during startup Product: Tomcat 4 Version: Nightly Build Platform: PC OS/Version: Solaris Status: NEW Severity: Normal Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Host and Context start events are triggered twice during startup. This causes things like Servlet 2.3 Listeners to be executed twice and increases the amount of time it takes to startup Tomcat 4. Here are the two stack traces from when a Sevlet 2.3 lister was invoked for the same Context on startup. WebService.configure() net.more.soap.webservices.system.KineticSystemException: This is a test at net.more.soap.webservices.WebService.doConfigure(WebService.java:121) at net.more.soap.webservices.WebService.configure(WebService.java:109) at net.more.soap.webservices.session.SessionWriter.contextInitialized(SessionWriter.java:37) at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:3176) at org.apache.catalina.core.StandardContext.start(StandardContext.java:3367) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1123) at org.apache.catalina.core.StandardHost.start(StandardHost.java:612) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1123) at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:307) at org.apache.catalina.core.StandardService.start(StandardService.java:388) at org.apache.catalina.core.StandardServer.start(StandardServer.java:505) at org.apache.catalina.startup.Catalina.start(Catalina.java:481) at org.apache.catalina.startup.Catalina.execute(Catalina.java:388) at org.apache.catalina.startup.Catalina.process(Catalina.java:178) at java.lang.reflect.Method.invoke(Native Method) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:243) WebService.configure() net.more.soap.webservices.system.KineticSystemException: This is a test at net.more.soap.webservices.WebService.doConfigure(WebService.java:121) at net.more.soap.webservices.WebService.configure(WebService.java:109) at net.more.soap.webservices.session.SessionWriter.contextInitialized(SessionWriter.java:37) at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:3176) at org.apache.catalina.core.StandardContext.start(StandardContext.java:3367) at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:785) at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:454) at org.apache.catalina.core.StandardHost.install(StandardHost.java:712) at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:300) at org.apache.catalina.startup.HostConfig.start(HostConfig.java:389) at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:232) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:155) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1131) at org.apache.catalina.core.StandardHost.start(StandardHost.java:612) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1123) at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:307) at org.apache.catalina.core.StandardService.start(StandardService.java:388) at org.apache.catalina.core.StandardServer.start(StandardServer.java:505) at org.apache.catalina.startup.Catalina.start(Catalina.java:481) at org.apache.catalina.startup.Catalina.execute(Catalina.java:388) at org.apache.catalina.startup.Catalina.process(Catalina.java:178) at java.lang.reflect.Method.invoke(Native Method) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:243)
DO NOT REPLY [Bug 4313] New: - server.xml variable substitution broken
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4313.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4313
server.xml variable substitution broken
Summary: server.xml variable substitution broken
Product: Tomcat 3
Version: 3.3 Release Candidate 2
Platform: Other
OS/Version: Other
Status: NEW
Severity: Normal
Priority: Other
Component: Config
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Hi,
I've been trying to get variable substitution in server.xml working. I have the
following:
ContextManager workDir=work
property name=timestamps value=true/
..
LogSetter name=tc_log timestamps=${tstamps}
verbosityLevel=INFORMATION /
If I start up Tomcat, it reports XmlMapper: Replace ${tstamps} true, but logs
certainly aren't prefixed with timestamps (the default). I picked timestamps as
an easily verifiable example, but I can't get anything else (ports, etc) working
either.
If property support is indeed broken, it might be best just to comment out the
few doc references to it, and defer till 3.3.x. It's nice, but not a big deal..
--Jeff
Re: [PATCH][3.3] tomcat.sh cleanup
On Sun, Oct 21, 2001 at 08:06:06AM -0400, Keith Wannamaker wrote:
It would be nice also to display the command that is used
to initialize the jk web config files, jkconf or whatever.
Oh yes.. you get that help currently if you type './tomcat.sh start -help'.
Rather than try to duplicate that, the attached revised patch adds 2 more
lines:
echo start -help - more options
echo start -help - more options
enableAdmin ought also to have -help, but it's currently broken.
--Jeff
Keith
Index: src/shell/tomcat.sh
===
RCS file: /home/cvspublic/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.30
diff -u -r1.30 tomcat.sh
--- src/shell/tomcat.sh 2001/09/20 03:35:41 1.30
+++ src/shell/tomcat.sh 2001/10/21 13:01:24
@@ -32,9 +32,9 @@
ls=`ls -ld $PRG`
link=`expr $ls : '.*- \(.*\)$'`
if expr $link : '.*/.*' /dev/null; then
- PRG=$link
+PRG=$link
else
- PRG=`dirname $PRG`/$link
+PRG=`dirname $PRG`/$link
fi
done
@@ -43,10 +43,10 @@
echo Guessing TOMCAT_INSTALL from tomcat.sh to ${TOMCAT_INSTALL_1}
fi
if [ -d ${TOMCAT_INSTALL_1}/lib ] ; then
- TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
+TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
if [ $DEBUG_HOMEFIND != false ] ; then
echo Setting TOMCAT_INSTALL to $TOMCAT_INSTALL
- fi
+fi
fi
fi
@@ -85,11 +85,11 @@
if [ $TOMCAT_HOME = ] ; then
if [ -d ./conf ] ; then
- TOMCAT_HOME=.
+TOMCAT_HOME=.
elif [ -d ../conf ] ; then
- TOMCAT_HOME=..
+TOMCAT_HOME=..
else
- TOMCAT_HOME=$TOMCAT_INSTALL
+TOMCAT_HOME=$TOMCAT_INSTALL
fi
fi
@@ -147,11 +147,12 @@
rm -f ${TOMCAT_HOME}/conf/ajp12.id
fi
+ MAX_WAIT=360
WAIT=0
if [ $1 = -wait ] ; then
shift
# wait at least 6 min
-WAIT=360
+WAIT=${MAX_WAIT}
fi
if [ $1 = -noout ] ; then
@@ -161,6 +162,7 @@
echo Using classpath: ${CLASSPATH}
echo Using JAVA_HOME: ${JAVA_HOME}
echo Using TOMCAT_HOME: ${TOMCAT_HOME}
+echo $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@
$JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@
fi
@@ -175,8 +177,8 @@
WAIT=`expr $WAIT - 1`
if [ $WAIT = 0 ] ; then
-echo Tomcat was no ready after 120 seconds, giving up waiting
- break;
+echo Tomcat was no ready after ${MAX_WAIT} seconds, giving up waiting
+break;
fi
done
fi
@@ -223,17 +225,17 @@
shift
CLASSPATH=.
for i in ${TOMCAT_HOME}/lib/container/* ${TOMCAT_HOME}/lib/common/* ; do
- CLASSPATH=${CLASSPATH}:$i
+CLASSPATH=${CLASSPATH}:$i
done
CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
# Backdoor classpath setting for development purposes when all classes
- # are compiled into a /classes dir and are not yet jarred.
+# are compiled into a /classes dir and are not yet jarred.
if [ -d ${TOMCAT_HOME}/classes ]; then
- CLASSPATH=${TOMCAT_HOME}/classes:${CLASSPATH}
+CLASSPATH=${TOMCAT_HOME}/classes:${CLASSPATH}
fi
if [ $oldCP != ]; then
- CLASSPATH=${CLASSPATH}:${oldCP}
+CLASSPATH=${CLASSPATH}:${oldCP}
fi
(cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS -Dtomcat.home=${TOMCAT_HOME}
org.apache.jasper.JspC $@ )
@@ -266,15 +268,23 @@
else
echo Usage:
- echo tomcat (start|env|run|stop|jspc)
- echo start - start tomcat in the background
- echo run - start tomcat in the foreground
- echo run -wait - wait until tomcat is initialized before returning
- echo -security - use a SecurityManager when starting
- echo stop - stop tomcat
- echo env - set CLASSPATH and TOMCAT_HOME env. variables
- echo jspc - run jsp pre compiler
-
+ echo $0 (start|run|stop|enableAdmin|estart|env|jspc)
+ echo start- start tomcat in the background
+ echo start -security - use a SecurityManager when starting
+ echo start -noout - redirect stdout/stderr to
+\$TOMCAT_HOME/logs/stdout.log
+ echo start -wait - wait until tomcat is initialized before returning
+ echo start -help - more options
+ echo run - start tomcat in the foreground
+ echo run -security- use a SecurityManager when starting
+ echo stop - stop tomcat
+ echo stop -force - stop tomcat with the 'kill' command if necessary
+ echo start -help - more options
+ echo enableAdmin - Trust the admin web application,
+ echo i.e. rewrites conf/apps-admin.xml with trusted=\true\
+ echo estart - Start Tomcat using the/your EmbededTomcat class which
+ echo uses a hardcoded set of modules
+ echo env - set CLASSPATH and
DO NOT REPLY [Bug 4314] New: - Catalina Testcase not working complete
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4314. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4314 Catalina Testcase not working complete Summary: Catalina Testcase not working complete Product: Tomcat 4 Version: 4.0.1 Final Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Minor Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hey, I have recompile 4.0.1 final and the checkout 4.0 cvs tree on 21.01 14:00 GMT+1 . Find that ant test got following error report 4.0.1
DO NOT REPLY [Bug 4314] - Catalina Testcase not working complete
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4314. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4314 Catalina Testcase not working complete --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 06:21 --- Sorry ! Send incomplete Bug report.. Arggh.. Hey, I have recompile 4.0.1 final and the checkout 4.0 cvs tree on 21.01 14:00 GMT+1 . Find that ant test got following error report 4.0.1 test-dir-context: [echo] Running FileDirContext tests [java] .F... [java] Time: 0,671 [java] There was 1 failure: [java] 1) testGetAttributesWebInf(org.apache.naming.resources.FileDirContex tTestCase)junit.framework.AssertionFailedError: WEB-INF attribute 'resourcetype' is expected [java] at org.apache.naming.resources.BaseDirContextTestCase.checkWebIn fAttributes(BaseDirContextTestCase.java:452) [java] at org.apache.naming.resources.FileDirContextTestCase.testGetAtt ributesWebInf(FileDirContextTestCase.java:162) [java] [java] FAILURES!!! [java] Tests run: 8, Failures: 1, Errors: 0 [java] Find that ant test got following error report 4.0 cvs checkout test-dir-context: [echo] Running FileDirContext tests [java] .F...F.F..F.F [java] Time: 0,23 [java] There were 5 failures: [java] 1) testGetAttributesWebInf(org.apache.naming.resources.FileDirContex tTestCase)junit.framework.AssertionFailedError: WEB-INF attribute 'resourcetype' is expected [java] at org.apache.naming.resources.BaseDirContextTestCase.checkWebIn fAttributes(BaseDirContextTestCase.java:452) [java] at org.apache.naming.resources.FileDirContextTestCase.testGetAtt ributesWebInf(FileDirContextTestCase.java:162) [java] 2) testListBindingsWebInfDirect(org.apache.naming.resources.FileDirC ontextTestCase)junit.framework.AssertionFailedError: Name 'validators' is expect ed [java] at org.apache.naming.resources.BaseDirContextTestCase.checkListB indings(BaseDirContextTestCase.java:397) [java] at org.apache.naming.resources.BaseDirContextTestCase.testListBi ndingsWebInfDirect(BaseDirContextTestCase.java:310) [java] 3) testListBindingsWebInfIndirect(org.apache.naming.resources.FileDi rContextTestCase)junit.framework.AssertionFailedError: Name 'validators' is expe cted [java] at org.apache.naming.resources.BaseDirContextTestCase.checkListB indings(BaseDirContextTestCase.java:397) [java] at org.apache.naming.resources.BaseDirContextTestCase.testListBi ndingsWebInfIndirect(BaseDirContextTestCase.java:327) [java] 4) testListWebInfDirect(org.apache.naming.resources.FileDirContextTe stCase)junit.framework.AssertionFailedError: Name 'validators' is expected [java] at org.apache.naming.resources.BaseDirContextTestCase.checkList( BaseDirContextTestCase.java:359) [java] at org.apache.naming.resources.BaseDirContextTestCase.testListWe bInfDirect(BaseDirContextTestCase.java:254) [java] 5) testListWebInfIndirect(org.apache.naming.resources.FileDirContext TestCase)junit.framework.AssertionFailedError: Name 'validators' is expected [java] at org.apache.naming.resources.BaseDirContextTestCase.checkList( BaseDirContextTestCase.java:359) [java] at org.apache.naming.resources.BaseDirContextTestCase.testListWe bInfIndirect(BaseDirContextTestCase.java:271) [java] [java] FAILURES!!! [java] Tests run: 8, Failures: 5, Errors: 0 [java] BUILD FAILED It seems that some attributes (resourcetype) not read from Context as expected! Regards, Peter
[PATCH][3.3] last minute doc fixes
Hi, Just did a sweep over the latest 3.3 docs, particularly the user guide, and picked up a few typos, apostrophe misuse and other stuff. Evidently tcsh users don't read user guides, because the tcsh-specific commands were all wrong. Patch attached.. --Jeff PS: by comparison with 3.2, the docs have been *greatly* improved. Someone has been very busy :) Index: src/doc/mod_jk-howto.html === RCS file: /home/cvspublic/jakarta-tomcat/src/doc/mod_jk-howto.html,v retrieving revision 1.14 diff -u -r1.14 mod_jk-howto.html --- src/doc/mod_jk-howto.html 2001/09/27 10:18:01 1.14 +++ src/doc/mod_jk-howto.html 2001/10/21 13:27:35 @@ -601,7 +601,7 @@ specified, defaults to ajp13 if an Ajp13Interceptor is in use, otherwise it defaults to ajp12./li libforwardAll/b - If true, forward all requests to Tomcat. -This helps insure that all the behavior configured in the web.xml +This helps ensure that all the behavior configured in the web.xml file functions correctly. If false, let Apache serve static resources. The default is true. Warning: When false, some configuration in the web.xml may not be duplicated in Apache. @@ -637,7 +637,7 @@ /blockquote differs from the file generated by Tomcat 3.2.x. In Tomcat 3.3, the default is to forward all requests to Tomcat for Tomcat's contexts (i.e. -forwardAll=true), excluding the root context. This helps insure +forwardAll=true), excluding the root context. This helps ensure that behavior configured in web.xml files will function properly. The configuration that best matches Tomcat 3.2.x behavior is: blockquote Index: src/doc/readme === RCS file: /home/cvspublic/jakarta-tomcat/src/doc/readme,v retrieving revision 1.21 diff -u -r1.21 readme --- src/doc/readme 2001/10/09 17:49:14 1.21 +++ src/doc/readme 2001/10/21 13:27:38 @@ -91,7 +91,7 @@ 6. The default auto-generated configuration files configure the external web server to send all requests for a context to Tomcat. That is the - best way to insure that behavior specified in the web application's + best way to ensure that behavior specified in the web application's web.xml functions properly. Also, by default, the configuration file doesn't try to send any requests for the root context to Tomcat. The external web server continues to serve its root context as they would Index: src/doc/serverxml.html === RCS file: /home/cvspublic/jakarta-tomcat/src/doc/serverxml.html,v retrieving revision 1.8 diff -u -r1.8 serverxml.html --- src/doc/serverxml.html 2001/10/19 03:16:13 1.8 +++ src/doc/serverxml.html 2001/10/21 13:27:46 @@ -32,7 +32,7 @@ number of settable properties and implements one or more 'hooks', providing a piece of functionality./p -pThe modules can be configured and assembled in sevaral ways, but the +pThe modules can be configured and assembled in several ways, but the default and most flexible mechanism uses XML files. Each module is described by an XML element, with attributes used to set module properties. The main configuration file is located in codeTOMCAT_HOME/conf/server.xml/code, used to @@ -69,8 +69,8 @@ h2Configuration Elements/h2 -pServer.xml is an XML document. Most elements corespond to tomcat modules, -with java setters beeing automatically associated with element attributes. The +pServer.xml is an XML document. Most elements correspond to tomcat modules, +with java setters being automatically associated with element attributes. The javadoc will contain most details, in this document we focus on the common and supported behaviors. /p @@ -105,8 +105,8 @@ dl dtlt;imodule_name/igt;/dt ddAdds a module to the configuration. Module names are defined in - module.xml, where each tag is associated with a class name that - implements the module. Each element attribute coresponds to a setter + modules.xml, where each tag is associated with a class name that + implements the module. Each element attribute corresponds to a setter method in the implementing class./dd dtlt;Contextgt;/dt ddDefines a web application. This is a legacy method of specifying a @@ -654,7 +654,7 @@ /tr tr valign=top tdforwardAll/td -tdIf codetrue/code, forward all requests to Tomcat. This helps insure that all the +tdIf codetrue/code, forward all requests to Tomcat. This helps ensure that +all the behavior configured in the web.xml file functions correctly. If codefalse/code, let Apache serve static resources. Warning: When codefalse/code, some configuration in the web.xml may not be duplicated in Apache. Review the mod_jk @@ -996,7 +996,7 @@ h4Description/h4 -pHandles incomming HTTP, or optionally HTTPS,
DO NOT REPLY [Bug 4315] New: - EJB Access with weblogic.jar included: Can't access new InitialContext()
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315 EJB Access with weblogic.jar included: Can't access new InitialContext() Summary: EJB Access with weblogic.jar included: Can't access new InitialContext() Product: Tomcat 4 Version: 4.0.1 Final Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Critical Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I inserted weblogic.jar at WEB-INF/lib/ and than I get a Exception for usage InitialContext context = new InitialContext(); (s. error message) But I can access the weblogic ejb with Properties props = new Properties() ; props.put(Context.INITIAL_CONTEXT_FACTORY, weblogic.jndi.WLInitialContextFactory); props.put(Context.PROVIDER_URL, t3://127.0.0.1:7001 ); Context ctx = new InitialContext(props); also when I copy a correct jndi.properties to WEB-INF/classes/ I got with InitialContext context = new InitialContext() the weblogic server. Question is: How can I access the local Tomcat context also ? How can I setup at server.xml remote ejb references ? The current syntax is little bit strange: Ejb name=ejb/Echo type=Session home=echo.EchoHome remote=echo.Echo / On which Server the EJB is located ? Why we can't used the following example ? Ejb name=ejb/Echo type=Session home=echo.EchoHome remote=echo.Echo remote-jndi=echo.EchoHome factory=weblogic.jndi.WLInitialContextFactory factoryLocation=t3://127.0.0.1:7001 principal=system credentials=weblogic / At Weblogic WEBAPP'S you can transfer with weblogic.xml from web.xml ejb reference to concrete jndi lookups. web.xml ejb-ref descriptionExample EJB Reference/description ejb-ref-nameejb/Echo/ejb-ref-name ejb-ref-typeSession/ejb-ref-type homeecho.EchoHome/home remoteecho.Echot/remote /ejb-ref weblogic.xml weblogic-webapp reference-descriptor ejb-reference-description ejb-ref-nameejb/Echo/ejb-ref-name jndi-nameecho.EchoBean/jndi-name /ejb-reference-description /reference-descriptor weblogic-webapp Or is the EJB Syntax only for J2EE 1.3 Reference Implementation usefull ? Regards, Peter Error Message: Apache Tomcat/4.0.1 - HTTP Status 500 - Internal Server Error type Exception report message Internal Server Error description The server encountered an internal error (Internal Server Error) that prevented it from fulfilling this request. exception javax.servlet.ServletException: Cannot instantiate class: org.apache.naming.java.javaURLContextFactory at AccessJndiServlet.init(AccessJndiServlet.java:26) at javax.servlet.GenericServlet.init(GenericServlet.java:258) at org.apache.catalina.core.StandardWrapper.load(StandardWrapper.java:852) at org.apache.catalina.core.StandardWrapper.allocate(StandardWrapper.java:615) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:2 14) at org.apache.catalina.core.StandardPipeline.invokeNext(StandardPipeline.java:566) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:472) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:943) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:2 01) at org.apache.catalina.core.StandardPipeline.invokeNext(StandardPipeline.java:566) at org.apache.catalina.valves.CertificatesValve.invoke(CertificatesValve.java:246) at org.apache.catalina.core.StandardPipeline.invokeNext(StandardPipeline.java:564) at org.apache.catalina.core.StandardPipeline.invoke(StandardPipeline.java:472) at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:943) at org.apache.catalina.core.StandardContext.invoke(StandardContext.java:2344) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:164) at org.apache.catalina.core.StandardPipeline.invokeNext(StandardPipeline.java:566) at org.apache.catalina.valves.ErrorDispatcherValve.invoke(ErrorDispatcherValve.java :170) at org.apache.catalina.core.StandardPipeline.invokeNext(StandardPipeline.java:564) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:170)
Re: [PATCH][3.3] tomcat.sh cleanup
On Sun, Oct 21, 2001 at 11:16:31PM +1000, Jeff Turner wrote:
On Sun, Oct 21, 2001 at 08:06:06AM -0400, Keith Wannamaker wrote:
It would be nice also to display the command that is used
to initialize the jk web config files, jkconf or whatever.
Oh yes.. you get that help currently if you type './tomcat.sh start -help'.
Rather than try to duplicate that, the attached revised patch adds 2 more
lines:
echo start -help - more options
echo start -help - more options
Feh.. that's as nonsensical as it sounds. Fixed patch attached. Extra entries:
start -help - more options
(config, debug, estart, home, install, jkconf, sandbox)
stop -help - more options
(ajpid, host, home, pass, port)
--Jeff
enableAdmin ought also to have -help, but it's currently broken.
--Jeff
Keith
Index: src/shell/tomcat.sh
===
RCS file: /home/cvspublic/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.30
diff -u -r1.30 tomcat.sh
--- src/shell/tomcat.sh 2001/09/20 03:35:41 1.30
+++ src/shell/tomcat.sh 2001/10/21 14:05:44
@@ -32,9 +32,9 @@
ls=`ls -ld $PRG`
link=`expr $ls : '.*- \(.*\)$'`
if expr $link : '.*/.*' /dev/null; then
- PRG=$link
+PRG=$link
else
- PRG=`dirname $PRG`/$link
+PRG=`dirname $PRG`/$link
fi
done
@@ -43,10 +43,10 @@
echo Guessing TOMCAT_INSTALL from tomcat.sh to ${TOMCAT_INSTALL_1}
fi
if [ -d ${TOMCAT_INSTALL_1}/lib ] ; then
- TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
+TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
if [ $DEBUG_HOMEFIND != false ] ; then
echo Setting TOMCAT_INSTALL to $TOMCAT_INSTALL
- fi
+fi
fi
fi
@@ -85,11 +85,11 @@
if [ $TOMCAT_HOME = ] ; then
if [ -d ./conf ] ; then
- TOMCAT_HOME=.
+TOMCAT_HOME=.
elif [ -d ../conf ] ; then
- TOMCAT_HOME=..
+TOMCAT_HOME=..
else
- TOMCAT_HOME=$TOMCAT_INSTALL
+TOMCAT_HOME=$TOMCAT_INSTALL
fi
fi
@@ -147,11 +147,12 @@
rm -f ${TOMCAT_HOME}/conf/ajp12.id
fi
+ MAX_WAIT=360
WAIT=0
if [ $1 = -wait ] ; then
shift
# wait at least 6 min
-WAIT=360
+WAIT=${MAX_WAIT}
fi
if [ $1 = -noout ] ; then
@@ -175,8 +176,8 @@
WAIT=`expr $WAIT - 1`
if [ $WAIT = 0 ] ; then
-echo Tomcat was no ready after 120 seconds, giving up waiting
- break;
+echo Tomcat was not ready after ${MAX_WAIT} seconds, giving up waiting
+break;
fi
done
fi
@@ -223,17 +224,17 @@
shift
CLASSPATH=.
for i in ${TOMCAT_HOME}/lib/container/* ${TOMCAT_HOME}/lib/common/* ; do
- CLASSPATH=${CLASSPATH}:$i
+CLASSPATH=${CLASSPATH}:$i
done
CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
# Backdoor classpath setting for development purposes when all classes
- # are compiled into a /classes dir and are not yet jarred.
+# are compiled into a /classes dir and are not yet jarred.
if [ -d ${TOMCAT_HOME}/classes ]; then
- CLASSPATH=${TOMCAT_HOME}/classes:${CLASSPATH}
+CLASSPATH=${TOMCAT_HOME}/classes:${CLASSPATH}
fi
if [ $oldCP != ]; then
- CLASSPATH=${CLASSPATH}:${oldCP}
+CLASSPATH=${CLASSPATH}:${oldCP}
fi
(cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS -Dtomcat.home=${TOMCAT_HOME}
org.apache.jasper.JspC $@ )
@@ -266,15 +267,25 @@
else
echo Usage:
- echo tomcat (start|env|run|stop|jspc)
- echo start - start tomcat in the background
- echo run - start tomcat in the foreground
- echo run -wait - wait until tomcat is initialized before returning
- echo -security - use a SecurityManager when starting
- echo stop - stop tomcat
- echo env - set CLASSPATH and TOMCAT_HOME env. variables
- echo jspc - run jsp pre compiler
-
+ echo $0 (start|run|stop|enableAdmin|estart|env|jspc)
+ echo start- start tomcat in the background
+ echo start -security - use a SecurityManager when starting
+ echo start -noout - redirect stdout/stderr to
+\$TOMCAT_HOME/logs/stdout.log
+ echo start -wait - wait until tomcat is initialized before returning
+ echo start -help - more options
+ echo (config, debug, estart, home, install, jkconf,
+sandbox)
+ echo run - start tomcat in the foreground
+ echo run -security- use a SecurityManager when starting
+ echo stop - stop tomcat
+ echo stop -force - stop tomcat with the 'kill' command if necessary
+ echo stop -help - more options
+ echo (ajpid, host, home, pass, port)
+ echo enableAdmin - Trust the admin web application,
+ echo i.e.
cvs commit: jakarta-tomcat/src/doc mod_jk-howto.html
larryi 01/10/21 08:28:45
Modified:src/doc mod_jk-howto.html
Log:
Fixed typo.
Submitted by: Jeff Turner
Other updates for Tomcat 3.3.
Revision ChangesPath
1.15 +128 -116 jakarta-tomcat/src/doc/mod_jk-howto.html
Index: mod_jk-howto.html
===
RCS file: /home/cvs/jakarta-tomcat/src/doc/mod_jk-howto.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_jk-howto.html 2001/09/27 10:18:01 1.14
+++ mod_jk-howto.html 2001/10/21 15:28:44 1.15
@@ -62,7 +62,7 @@
a href=#s5Definitions and Terminology/a/li
li
-a href=#s6Obtaining mod_jk/a/li
+a href=#s6Obtaining mod_jk/a
ul
li
@@ -76,10 +76,10 @@
li
a href=#s64Building mod_jk for Unix/a/li
-/ul
+/ul/li
li
-a href=#s7Configuring Apache/a/li
+a href=#s7Configuring Apache/a
ul
li
@@ -90,10 +90,10 @@
li
a href=#s73Assigning URLs to be redirected to Tomcat/a/li
-/ul
+/ul/li
li
-a href=#s8Configuring Tomcat/a/li
+a href=#s8Configuring Tomcat/a
ul
li
@@ -104,7 +104,7 @@
li
a href=#s83Defining Workers/a/li
-/ul
+/ul/li
li
a href=#s9Example Configuration/a/li
@@ -193,7 +193,7 @@
td class=inlinetdWeb Server Plug-in/Tomcat Redirector/td
td class=inlinetdFor Tomcat to cooperate with any web server it needs
-an agent to reside in the web server and send him servlet requests. This
+an quot;agentquot; to reside in the web server and send him servlet requests. This
is the web server plug-in, and in our case the web server plug-in is mod_jk.
The redirector usually comes in the shape of a DLL or shared object module
that you plug into the web server./td
@@ -234,25 +234,27 @@
by platform.nbsp; For some platforms, such as Windows, this is the typical
way of obtaining mod_jk since most Windows systems do not have C compilers.nbsp;
For others, the binary distribution of mod_jk offers simpler installation.
-pFor example, the Tomcat 3.3 M1 Release at a
href=http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.3-m1/bin/;http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.3-m1/bin//a
+pFor example, the Tomcat 3.3 Release at
+ a href=http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.3/bin/;
+ http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.3/bin//a
contains the following:
-brnbsp;
+brnbsp;/p
table BORDER CELLSPACING=0 CELLPADDING=2 WIDTH=600 bordercolor=#00
tr
-td WIDTH=15%linux/i386//td
+td WIDTH=15%linux/i386/td
td WIDTH=85%Contains mod_jk.so for Apache 1.3 for the standard API
as well as EAPI and mod_jk.so for Apache 2.0/td
/tr
tr
-td WIDTH=15%netware//td
+td WIDTH=15%netware/i386/td
td WIDTH=85%Contains the mod_jk.nlm and nsapi.nlm/td
/tr
tr
-td WIDTH=15%win32//td
+td WIDTH=15%win32/i386/td
td WIDTH=85%Contains the mod_jk.dll for Windows as well as other useful
binaries./td
@@ -310,7 +312,7 @@
ol
li
Make sure your Apache has DSO support. You can check this with
tt$APACHE_HOME/bin/httpd
--l/tt. If you see mod_so.c in the output, DSO support is available.
+-l/tt. If you see quot;mod_so.cquot; in the output, DSO support is available.
If it's missing, you may have to recompile or reinstall Apache./li
li
@@ -339,24 +341,24 @@
ul
li
-set JAVA_HOME in your shell, e.g. ttset JAVA_HOME=/usr/local/jdk1.2.2;
-export JAVA_HOME/tt/li
+set JAVA_HOME in your shell, e.g. quot;ttset JAVA_HOME=/usr/local/jdk1.3.1;
+export JAVA_HOME/ttquot;/li
li
-set APACHE_HOME in your shell, e.g. ttset APACHE_HOME=/usr/local/apache;
-export APACHE_HOME/tt/li
+set APACHE_HOME in your shell, e.g. quot;ttset APACHE_HOME=/usr/local/apache;
+export APACHE_HOME/ttquot;/li
li
uncomment the following line in the ttbuild-unix.sh/tt file, replacing
-linux with the name of your platform as specified in the Java include
+quot;linuxquot; with the name of your platform as specified in the Java include
directory for your installation/li
-blockquotett# JAVA_INCLUDE=-I ${JAVA_HOME}/include -I
${JAVA_HOME}/include/linux/tt/blockquote
+blockquotett# JAVA_INCLUDE=quot;-I ${JAVA_HOME}/include -I
${JAVA_HOME}/include/linuxquot;/tt/blockquote
/ul
li
If build-unix.sh fails, you may have better luck with the Makefiles in
-the same directory, e.g. ttmake -f Makefile.linux mod_jk.so/tt/li
+the same directory, e.g. quot;ttmake -f Makefile.linux mod_jk.so/ttquot;/li
pbrFinally, you can try to build it manually. Run the ttapxs/tt
command that came with your apache distribution (hint: look in
/usr/local/apache/bin,
@@ -459,17 +461,20 @@
a NAME=s72/aConfigure Apache to use mod_jk/h3
div class=subsectionThe simplest way to configure Apache to use mod_jk
-is to turn on the Apache
cvs commit: jakarta-tomcat/src/doc serverxml.html
larryi 01/10/21 08:40:27 Modified:src/doc serverxml.html Log: Fixed typos. Submitted by: Jeff Turner Revision ChangesPath 1.9 +13 -13jakarta-tomcat/src/doc/serverxml.html Index: serverxml.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- serverxml.html2001/10/19 03:16:13 1.8 +++ serverxml.html2001/10/21 15:40:27 1.9 @@ -4,7 +4,7 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN html head - !-- $Id: serverxml.html,v 1.8 2001/10/19 03:16:13 larryi Exp $ -- + !-- $Id: serverxml.html,v 1.9 2001/10/21 15:40:27 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 @@ -32,7 +32,7 @@ number of settable properties and implements one or more 'hooks', providing a piece of functionality./p -pThe modules can be configured and assembled in sevaral ways, but the +pThe modules can be configured and assembled in several ways, but the default and most flexible mechanism uses XML files. Each module is described by an XML element, with attributes used to set module properties. The main configuration file is located in codeTOMCAT_HOME/conf/server.xml/code, used to @@ -69,8 +69,8 @@ h2Configuration Elements/h2 -pServer.xml is an XML document. Most elements corespond to tomcat modules, -with java setters beeing automatically associated with element attributes. The +pServer.xml is an XML document. Most elements correspond to Tomcat modules, +with Java setters being automatically associated with element attributes. The javadoc will contain most details, in this document we focus on the common and supported behaviors. /p @@ -105,8 +105,8 @@ dl dtlt;imodule_name/igt;/dt ddAdds a module to the configuration. Module names are defined in - module.xml, where each tag is associated with a class name that - implements the module. Each element attribute coresponds to a setter + modules.xml, where each tag is associated with a class name that + implements the module. Each element attribute corresponds to a setter method in the implementing class./dd dtlt;Contextgt;/dt ddDefines a web application. This is a legacy method of specifying a @@ -654,7 +654,7 @@ /tr tr valign=top tdforwardAll/td -tdIf codetrue/code, forward all requests to Tomcat. This helps insure that all the +tdIf codetrue/code, forward all requests to Tomcat. This helps ensure that all the behavior configured in the web.xml file functions correctly. If codefalse/code, let Apache serve static resources. Warning: When codefalse/code, some configuration in the web.xml may not be duplicated in Apache. Review the mod_jk @@ -996,7 +996,7 @@ h4Description/h4 -pHandles incomming HTTP, or optionally HTTPS, requests./p +pHandles incoming HTTP, or optionally HTTPS, requests./p h4Attributes/h4 @@ -1182,7 +1182,7 @@ /tr tr valign=top tdforwardAll/td -tdIf codetrue/code, forward all requests to Tomcat. This helps insure that all the +tdIf codetrue/code, forward all requests to Tomcat. This helps ensure that all the behavior configured in the web.xml file functions correctly. If codefalse/code, let IIS serve static resources. Warning: When codefalse/code, some configuration in the web.xml may not be duplicated in IIS. Review the configuration @@ -1327,7 +1327,7 @@ h4Description/h4 -pInsures that the proper context classloader is in effect during servlet +pEnsures that the proper context classloader is in effect during servlet execution./p h4Attributes/h4 @@ -1449,7 +1449,7 @@ /tr tr valign=top tdforwardAll/td -tdIf codetrue/code, forward all requests to Tomcat. This helps insure that all the +tdIf codetrue/code, forward all requests to Tomcat. This helps ensure that all the behavior configured in the web.xml file functions correctly. If codefalse/code, let Apache serve static resources. Warning: When codefalse/code, some configuration in the web.xml may not be duplicated in Apache. Review the tomcat-apache.conf @@ -1902,7 +1902,7 @@ /tr tr valign=top tdforwardAll/td -tdIf codetrue/code, forward all requests to Tomcat. This helps insure that all the +tdIf codetrue/code, forward all requests to Tomcat. This helps ensure that all the behavior configured in the web.xml file functions correctly. If codefalse/code, let Netscape serve static resources. Warning: When codefalse/code,
cvs commit: jakarta-tomcat/src/doc tomcat-iis-howto.html
larryi 01/10/21 08:43:06 Modified:src/doc tomcat-iis-howto.html Log: Fixed typos. Submitted by: Jeff Turner Other minor updates. Revision ChangesPath 1.5 +13 -12jakarta-tomcat/src/doc/tomcat-iis-howto.html Index: tomcat-iis-howto.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-iis-howto.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tomcat-iis-howto.html 2001/10/20 20:58:59 1.4 +++ tomcat-iis-howto.html 2001/10/21 15:43:06 1.5 @@ -1,6 +1,6 @@ html head - !-- $Id: tomcat-iis-howto.html,v 1.4 2001/10/20 20:58:59 larryi Exp $ -- + !-- $Id: tomcat-iis-howto.html,v 1.5 2001/10/21 15:43:06 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 @@ -97,11 +97,12 @@ codeserver.xml/code file. This module is responsible for writting the configuration files used for the IIS installation and operation./p -pUnlike prior versions of Tomcat, the configuration files are not automatically -written each time Tomcat 3.3 is started up. Instead you must start Tomcat 3.3 -with quot;jkconfquot; specified. Tomcat 3.3 will initialize, write the -configuration files, and then exit. This may be done, while an instance of -Tomcat 3.3 is running./p +pIn Tomcat 3.3, configuration files are written on demand. You must start +Tomcat 3.3 with the quot;jkconfquot; option specified. Tomcat 3.3 will +initialize, write the configuration files, and then exit. This may be done, +while an instance of Tomcat 3.3 is running. This differs from prior versions +of Tomcat where the configuration files are written each time Tomcat is +started./p pThe IISConfig writes two configuration files. The first is the registry configuration file, which by default will be @@ -160,10 +161,10 @@ /ol pAdding a context to the ISAPI redirector is simple, all you need to do is to -start Tomcat 3.3 with quot;jkconfquot; specified again. After the +start Tomcat 3.3 with quot;jkconfquot; option specified again. After the worker map file is rewritten, restart IIS/PWS./p -pIf you are using a manually modified worker map file, edit the fileyour +pIf you are using a manually modified worker map file, edit the file to add a line that looks like: /p ptt/context/*=worker_name/tt/p @@ -254,7 +255,7 @@ pAs you can see the second configuration is more explicit, it actually instruct the redirector to redirect only requests to resources under tt/examples/servlet//tt and resources under tt/examples/ /ttwhose name ends with tt.jsp/tt. This is -similar to what is automically written to the tturiworkermap.properties-auto/tt +similar to what is automatically written to the tturiworkermap.properties-auto/tt file for each context./p pYou can even be more explicit and provide lines such as:/p @@ -320,7 +321,7 @@ to an unmodified copy of the codeconf/auto/uriworkermap.properties/code file. Results may be misleading if ttworker_mount_file/tt points to a modified version of the file. It is also assumed that the quot;/examplesquot; -context works correcly if you access Tomcat directly./p +context works correctly if you access Tomcat directly./p h3Win98/h3 @@ -338,7 +339,7 @@ Foundation\Jakarta Isapi Redirector\1.0quot; key. Case isn't important, but an incorrect letter will prevent the isapi_redirect.dll from finding its registry settings./li - liCheck the ttlog_file/tt setting for typos, name and data. Also insure + liCheck the ttlog_file/tt setting for typos, name and data. Also ensure the directory in which the log file will appear already exists./li /ol If the above are set correctly, the ISAPI redirector should be able to create @@ -414,7 +415,7 @@ but an incorrect letter will prevent the isapi_redirect.dll from finding its registry settings./li liCheck the ttlog_file/tt setting for typos, name and data. Also -insure the directory in which the log file will appear already exists./li +ensure the directory in which the log file will appear already exists./li /ol If the above are set correctly, the ISAPI redirector should be able to create the log file./li
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/depend DependClassLoader.java
nacho 01/10/21 08:47:27
Modified:src/share/org/apache/tomcat/util/depend
DependClassLoader.java
Log:
Fix: debug level was very low for DCL, making Reloadinterceptor produce
too much log messages to be useful, now DCL logs when debug 9,
in the ReloadInterceptor
Revision ChangesPath
1.14 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java
Index: DependClassLoader.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DependClassLoader.java2001/09/29 04:37:42 1.13
+++ DependClassLoader.java2001/10/21 15:47:27 1.14
@@ -154,7 +154,7 @@
protected Class loadClassInternal1( String name, boolean resolve )
throws ClassNotFoundException
{
- if( debug0) log( loadClass() + name + + resolve);
+ if( debug9) log( loadClass() + name + + resolve);
// The class object that will be returned.
Class c = null;
@@ -237,7 +237,7 @@
File f=null;
if( file.equals( res.getProtocol() )) {
f=new File( res.getFile());
- if( debug 0 ) log( File dep +f );
+ if( debug 9 ) log( File dep +f );
if( ! f.exists()) f=null;
}
if( jar.equals( res.getProtocol() )) {
@@ -252,7 +252,7 @@
if( fileN.startsWith( /file: ))
fileN=fileN.substring( 6 );
f=new File(fileN);
- if( debug 0 ) log( Jar dep +f + + f.exists() );
+ if( debug 9 ) log( Jar dep +f + + f.exists() );
if( ! f.exists()) f=null;
}
cvs commit: jakarta-tomcat/src/doc tomcat-ug.html
larryi 01/10/21 09:29:00 Modified:src/doc tomcat-ug.html Log: Fixed typos and other corrections. Submitted by: Jeff Turner Other minor updates. Revision ChangesPath 1.20 +53 -52jakarta-tomcat/src/doc/tomcat-ug.html Index: tomcat-ug.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-ug.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- tomcat-ug.html2001/10/20 20:58:01 1.19 +++ tomcat-ug.html2001/10/21 16:29:00 1.20 @@ -1,7 +1,7 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN html head -!-- $Id: tomcat-ug.html,v 1.19 2001/10/20 20:58:01 larryi Exp $ -- +!-- $Id: tomcat-ug.html,v 1.20 2001/10/21 16:29:00 larryi Exp $ -- !-- Copyright 1999-2001 Apache Software Foundation -- meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 link rel=stylesheet type=text/css href=style.css @@ -28,19 +28,19 @@ H1Tomcat 3.3 User's Guide/H1 pThis document is an introduction to the Tomcat 3.3 servlet - container. It should be enough for anyone to install, - configure, and deploy Tomcat 3.3, or later its later maintenance releases. +container. It should be enough for anyone to install, +configure and deploy Tomcat 3.3, or it's maintenance releases. As well, it answers many questions common to new users. If you have any comments or suggestions about this document don't hesitate to send them to the - Tomcat a href=http://jakarta.apache.org/site/mail.html;mailing - lists/a./p +Tomcat a href=http://jakarta.apache.org/site/mail.html;mailing +lists/a./p pSince Tomcat 3.3 is a reference implementation of the Servlet 2.2 and -JSP 1.1 specification, would would be very benefitial to become familiar -with these documents to better understand much of the behavior that Tomcat -3.3 implements. The Servlet 2.2 specifications may be obtained +JSP 1.1 specification, it would be very beneficial to become familiar +with these documents, to better understand much of the behavior that Tomcat +3.3 implements. The Servlet 2.2 specification may be obtained a href=http://java.sun.com/products/servlet/download.html;here/a and the -JSP 1.1 specifications obtained +JSP 1.1 specification obtained a href=http://java.sun.com/products/jsp/download.html;here/a/p pOne of the features of Tomcat 3.3 is its upgradability via add-on modules @@ -232,7 +232,7 @@ h2a name=using_tomcatUsing Tomcat 3.3/a/h2 -pA lot of effort has put into making Tomcat easy to use as well as flexible. +pA lot of effort has been put into making Tomcat easy to use as well as flexible. It comes with a default configuration which should be a good starting point for most users. Once you have Tomcat 3.3 up and running, there are many customizations from which you can choose./p @@ -247,7 +247,7 @@ h3a name=install_tomcatInstalling Tomcat/a/h3 -pThis section deals will installing the Tomcat 3.3 binary archive available +pThis section deals with installing the Tomcat 3.3 binary archive available from the Jakarta Project. It is also possible to install Tomcat 3.3 by building it from source, but that isn't covered in this document./p @@ -261,17 +261,18 @@ codequot;jakarta-tomcat-ilt;versiongt;/iquot;/code. You may rename this directory if you wish. Just remember to adjust the instructions that follow to use the new name. If you are using - Linux, you can install the chosen RPM(s)./li + Linux, RPMs may be installed with the command quot;rpm -Uvhquot;. Type + strongman rpm/strong for more info./li /ul h3a name=env_setupEnvironment Setup/a/h3 pThere are a number of different methods to start and stop Tomcat 3.3. There are differences in the environmental setup needed for these methods. This -section addresses the environmental setup need to using the shell scripts +section addresses the environmental setup needed for using the shell scripts and batch files provided to simplify starting and stopping Tomcat. This section also assumes you will be manually starting and stopping Tomcat from -as shell or MS-DOS window./p +a shell or MS-DOS window./p ul liIn a shell or DOS window, change to the @@ -292,14 +293,14 @@ /li liUnix (bash/sh):br ttbig - JAVA_HOME=/user/local/java/jdk1.3.1; export JAVA_HOMEbr + JAVA_HOME=/usr/local/java/jdk1.3.1; export JAVA_HOMEbr PATH=$JAVA_HOME/bin:$PATH; export PATHbr /big/tt /li liUnix (tcsh):br ttbig - setenv JAVA_HOME=/user/local/java/jdk1.3.1br - setenv
cvs commit: jakarta-tomcat/src/doc tomcat-security.html
larryi 01/10/21 09:51:01 Modified:src/doc tomcat-security.html Log: Fixed typo. Submitted by: Jeff Turner Othe updates, including porting debugging information from Tomcat 4.0 document. Revision ChangesPath 1.4 +20 -9 jakarta-tomcat/src/doc/tomcat-security.html Index: tomcat-security.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-security.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tomcat-security.html 2000/08/28 19:05:27 1.3 +++ tomcat-security.html 2001/10/21 16:51:00 1.4 @@ -47,7 +47,7 @@ running in your browser, use of a SecurityManager while running Tomcat can protect your server from trojan servlets, JSP's, JSP beans, and tag libraries.nbsp; Or even inadvertent mistakes. -pImagine if someone who is authorized to publish JSP's on your site invadvertently +pImagine if someone who is authorized to publish JSP's on your site inadvertently included the following in their JSP: blockquote prelt;% System.exit(1); %/pre @@ -105,11 +105,11 @@ a NAME=config/aConfiguring Tomcat for use with a SecurityManager/h3 btomcat.policy/b pThe security policies implemented by the Java SecurityManager are configured -in the btomcat.policy /bfile located in the tomcat conf directory.nbsp; +in the btomcat.policy /bfile located in the tomcat codeconf/code directory.nbsp; The tomcat.policy file replaces any system java.policy file.nbsp; The tomcat.policy file can be edited by hand or you can use the bpolicytool /bapplication -that comes with Java 1.2. +that comes with Java 1.2, or later. pEntries in the tomcat.policy file use the standard java.policy file format as follows: table border=0trtdpre// Example policy file entry @@ -205,15 +205,11 @@ nbsp; permission java.util.PropertyPermission *,read; };/td/tr/table/pre -pbrbserver.xml/b -pUncomment out the entry in server.xml for the ContextInterceptor which -defines the class named PolicyInterceptor. -brnbsp; h3 a NAME=start/aStarting Tomcat with a SecurityManager/h3 -Once you have configured the tomcat.policy and server.xml files for use +Once you have configured the tomcat.policy for use with a SecurityManager, Tomcat can be started with the SecurityManager -in place by using the -security option to bin/startup.bat or bin/startup.sh. +in place by adding the -security option to bin/startup.bat or bin/startup.sh. brnbsp; h3 a NAME=violation/aWhat happens when the SecurityManager detects a @@ -224,6 +220,21 @@ h2 a NAME=trouble/aTrouble shooting tomcat.policy configuration and Security Violations/h2 +You can turn on Java SecurityManager debug logging by setting the environmental +variable: +pre +TOMCAT_OPTS=-Djava.security.debug=all +/pre +The debug output will be written to Tomcat's log file, or the console if no log +file is defined.br +brstrongNote:/strong This gives the most complete debugging information, +but generates many MB's of output, for less verbose security debug output, use: +pre +TOMCAT_OPTS=-Djava.security.debug=access,failure +/pre +Use the following shell command to determine all the security debug options +available: ttjava -Djava.security.debug=help/ttbr +br bJSP Compile using JVM internal javac fails with AccessControlException for RuntimePermission accessClassInPackage sun.tools.javac./b pCheck your JAVA_HOME/jre/lib/security/java.security file configuration.nbsp;
Bug report for Tomcat 3 [2001/10/21]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal EHN=Ehnancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 3983|New|Maj|2001-10-05|uploading files | | 4260|Ass|Nor|2001-10-18|PageContextImpl cast in JspFactoryImpl.getPageCont| | 4275|Unc|Blk|2001-10-18|java.lang.NullPointerException| | 4313|New|Nor|2001-10-21|server.xml variable substitution broken | +-+---+---+--+--+ | Total4 bugs | +---+
Bug report for Tomcat 4 [2001/10/21]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal EHN=Ehnancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 821|Ver|Maj|2001-03-02|JSPC doesn't like NT paths| | 3509|Ass|Blk|2001-09-07|Apache 1.3.20 mod_webapp Tomcat 4b7 HANGS | | 3546|Ver|Min|2001-09-11|req.getDateHeader() can fail under load | | 3570|Ass|Nor|2001-09-12|info page reporting wrong server port when using w| | 3643|Ass|Enh|2001-09-16|Enable static-linking within Apache for WebApp mod| | 4042|Ass|Enh|2001-10-09|webapp component requires Port directive versus Li| | 4139|Ass|Enh|2001-10-12|mod_webapp build files for Win32 | | 4156|Opn|Nor|2001-10-14|javadoc errors| | 4157|Opn|Nor|2001-10-14|javadoc errors| | 4187|New|Nor|2001-10-16|mod_webapp hangs | | 4198|New|Cri|2001-10-16|__lshrdi3: referenced symbol not found| | 4200|New|Enh|2001-10-16|Adapters for Microsoft IIS absent in Tomcat 4 | | 4207|New|Blk|2001-10-16|error when access ejb component from jsp page | | 4211|New|Nor|2001-10-16|Apache 1.3.14 hangs constantly with image requests| | 4212|New|Nor|2001-10-16|How to configure Apache to serve static contents? | | 4223|New|Nor|2001-10-17|AJP13 connectors InputStream newer returns -1 | | 4225|New|Nor|2001-10-17|minor bug in configure script for mod_webapp | | 4227|New|Nor|2001-10-17|Invalid CGI path | | 4231|New|Enh|2001-10-17|use CATALINA_BASE/classes CATALINA_BASE/lib for | | 4232|New|Nor|2001-10-17|Tomcat home page has a typo | | 4236|New|Cri|2001-10-17|error in translation of tag attribute value, stri| | 4247|New|Enh|2001-10-17|Please add user session ID logging in the access l| | 4266|New|Maj|2001-10-18|Jasper is unable to handle a jar containing multip| | 4277|New|Maj|2001-10-18|can't compile webapp-module-1.0-tc40 | | 4282|New|Cri|2001-10-18|On JSP compile deprecation Note: line throws exc| | 4294|New|Nor|2001-10-19|apache tomcat connection is halted| | 4295|New|Cri|2001-10-19|Cookies not following RFC2109 | | 4296|Opn|Enh|2001-10-19|Allow to disable the shutdown listener| | 4307|New|Nor|2001-10-21|SSI Server Side Include | | 4310|New|Nor|2001-10-21|Host and Context start events triggered twice duri| | 4314|New|Min|2001-10-21|Catalina Testcase not working complete| | 4315|New|Cri|2001-10-21|EJB Access with weblogic.jar included: Can't acces| +-+---+---+--+--+ | Total 32 bugs | +---+
RE: [PATCH][3.3] last minute doc fixes
Hi Jeff, Many thanks for the proof read. These have all been committed. Larry -Original Message- From: Jeff Turner Sent: Sun 10/21/2001 9:43 AM To: [EMAIL PROTECTED] Cc: Subject: [PATCH][3.3] last minute doc fixes Hi, Just did a sweep over the latest 3.3 docs, particularly the user guide, and picked up a few typos, apostrophe misuse and other stuff. Evidently tcsh users don't read user guides, because the tcsh-specific commands were all wrong. Patch attached.. --Jeff PS: by comparison with 3.2, the docs have been *greatly* improved. Someone has been very busy :) application/ms-tnef
cvs commit: jakarta-tomcat/src/shell tomcat.sh
larryi 01/10/21 10:33:41
Modified:src/shell tomcat.sh
Log:
Update to usage info and a little formatting.
Submitted by: Jeff Turner
Revision ChangesPath
1.31 +35 -24jakarta-tomcat/src/shell/tomcat.sh
Index: tomcat.sh
===
RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tomcat.sh 2001/09/20 03:35:41 1.30
+++ tomcat.sh 2001/10/21 17:33:41 1.31
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: tomcat.sh,v 1.30 2001/09/20 03:35:41 larryi Exp $
+# $Id: tomcat.sh,v 1.31 2001/10/21 17:33:41 larryi Exp $
# Shell script to start and stop the server
@@ -32,9 +32,9 @@
ls=`ls -ld $PRG`
link=`expr $ls : '.*- \(.*\)$'`
if expr $link : '.*/.*' /dev/null; then
- PRG=$link
+PRG=$link
else
- PRG=`dirname $PRG`/$link
+PRG=`dirname $PRG`/$link
fi
done
@@ -43,10 +43,10 @@
echo Guessing TOMCAT_INSTALL from tomcat.sh to ${TOMCAT_INSTALL_1}
fi
if [ -d ${TOMCAT_INSTALL_1}/lib ] ; then
- TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
+TOMCAT_INSTALL=${TOMCAT_INSTALL_1}
if [ $DEBUG_HOMEFIND != false ] ; then
echo Setting TOMCAT_INSTALL to $TOMCAT_INSTALL
- fi
+fi
fi
fi
@@ -85,11 +85,11 @@
if [ $TOMCAT_HOME = ] ; then
if [ -d ./conf ] ; then
- TOMCAT_HOME=.
+TOMCAT_HOME=.
elif [ -d ../conf ] ; then
- TOMCAT_HOME=..
+TOMCAT_HOME=..
else
- TOMCAT_HOME=$TOMCAT_INSTALL
+TOMCAT_HOME=$TOMCAT_INSTALL
fi
fi
@@ -147,11 +147,12 @@
rm -f ${TOMCAT_HOME}/conf/ajp12.id
fi
+ MAX_WAIT=360
WAIT=0
if [ $1 = -wait ] ; then
shift
# wait at least 6 min
-WAIT=360
+WAIT=${MAX_WAIT}
fi
if [ $1 = -noout ] ; then
@@ -175,8 +176,8 @@
WAIT=`expr $WAIT - 1`
if [ $WAIT = 0 ] ; then
-echo Tomcat was no ready after 120 seconds, giving up waiting
- break;
+echo Tomcat was not ready after ${MAX_WAIT} seconds, giving up waiting
+break;
fi
done
fi
@@ -223,17 +224,17 @@
shift
CLASSPATH=.
for i in ${TOMCAT_HOME}/lib/container/* ${TOMCAT_HOME}/lib/common/* ; do
- CLASSPATH=${CLASSPATH}:$i
+CLASSPATH=${CLASSPATH}:$i
done
CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
# Backdoor classpath setting for development purposes when all classes
- # are compiled into a /classes dir and are not yet jarred.
+# are compiled into a /classes dir and are not yet jarred.
if [ -d ${TOMCAT_HOME}/classes ]; then
- CLASSPATH=${TOMCAT_HOME}/classes:${CLASSPATH}
+CLASSPATH=${TOMCAT_HOME}/classes:${CLASSPATH}
fi
if [ $oldCP != ]; then
- CLASSPATH=${CLASSPATH}:${oldCP}
+CLASSPATH=${CLASSPATH}:${oldCP}
fi
(cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS -Dtomcat.home=${TOMCAT_HOME}
org.apache.jasper.JspC $@ )
@@ -266,15 +267,25 @@
else
echo Usage:
- echo tomcat (start|env|run|stop|jspc)
- echo start - start tomcat in the background
- echo run - start tomcat in the foreground
- echo run -wait - wait until tomcat is initialized before returning
- echo -security - use a SecurityManager when starting
- echo stop - stop tomcat
- echo env - set CLASSPATH and TOMCAT_HOME env. variables
- echo jspc - run jsp pre compiler
-
+ echo $0 (start|run|stop|enableAdmin|estart|env|jspc)
+ echo start- start tomcat in the background
+ echo start -security - use a SecurityManager when starting
+ echo start -noout - redirect stdout/stderr to
\$TOMCAT_HOME/logs/stdout.log
+ echo start -wait - wait until tomcat is initialized before returning
+ echo start -help - more options
+ echo (config, debug, estart, home, install, jkconf,
sandbox)
+ echo run - start tomcat in the foreground
+ echo run -security- use a SecurityManager when starting
+ echo stop - stop tomcat
+ echo stop -force - stop tomcat with the 'kill' command if necessary
+ echo stop -help - more options
+ echo (ajpid, host, home, pass, port)
+ echo enableAdmin - Trust the admin web application,
+ echo i.e. rewrites conf/apps-admin.xml with
trusted=\true\
+ echo estart - Start Tomcat using the/your EmbededTomcat class which
+ echo uses a hardcoded set of modules
+ echo env
cvs commit: jakarta-tomcat/src/shell tomcat.bat
larryi 01/10/21 10:34:12 Modified:src/shell tomcat.bat Log: Update to usage info. Revision ChangesPath 1.45 +13 -9 jakarta-tomcat/src/shell/tomcat.bat Index: tomcat.bat === RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.bat,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- tomcat.bat2001/09/09 22:00:45 1.44 +++ tomcat.bat2001/10/21 17:34:12 1.45 @@ -29,7 +29,7 @@ rem Tomcat, refer to the Tomcat Users Guide (tomcat_ug.html found rem in the doc directory. rem -rem $Id: tomcat.bat,v 1.44 2001/09/09 22:00:45 larryi Exp $ +rem $Id: tomcat.bat,v 1.45 2001/10/21 17:34:12 larryi Exp $ rem - @@ -115,14 +115,18 @@ echo Usage: tomcat ( enableAdmin | env | estart | jspc | run | start | stop ) echo Commands: echo enableAdmin - Trust the admin web application, -echo i.e. rewrites conf/apps-admin.xml with trusted=true -echo env - Set up environment variables that Tomcat would use -echo estart - Start Tomcat using the/your EmbeddedTomcat class which -echouses a hardcoded set of modules -echo jspc - Run JSPC in Tomcat's environment -echo run - Start Tomcat in the current window -echo start - Start Tomcat in a separate window -echo stop - Stop Tomcat +echo i.e. rewrites conf/apps-admin.xml with trusted=true +echo env - Set up environment variables that Tomcat would use +echo estart - Start Tomcat using the/your EmbeddedTomcat class which +echo uses a hardcoded set of modules +echo jspc- Run JSPC in Tomcat's environment +echo run - Start Tomcat in the current window +echo run -help - more options (usable with start as well): +echo (config, debug, estart, home, install, jkconf, sandbox) +echo start - Start Tomcat in a separate window +echo stop- Stop Tomcat +echo stop -help - more options: +echo (ajpid, host, home, pass, port) goto cleanup :startServer
cvs commit: jakarta-tomcat/src/webpages index.html
larryi 01/10/21 10:35:16 Modified:src/webpages index.html Log: Update for Tomcat 3.3 Final. Revision ChangesPath 1.20 +4 -4 jakarta-tomcat/src/webpages/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/webpages/index.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- index.html2001/10/09 19:49:26 1.19 +++ index.html2001/10/21 17:35:16 1.20 @@ -4,13 +4,13 @@ meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 meta name=GENERATOR content=Mozilla/4.72 [en] (WinNT; U) [Netscape] meta name=Author content=Anil K. Vijendran -titleTomcat v3.3 Release Candidate 2/title +titleTomcat v3.3 Final/title /head body bgcolor=#FF img SRC=tomcat.gif height=92 width=130 align=LEFTbfont face=Arial, Helvetica, sans-seriffont size=+3Tomcat/font/font/b br bfont face=Arial, Helvetica, sans-seriffont size=-1Version -3.3 Release Candidate 2/font/font/b +3.3 Final/font/font/b pThis is the default Tomcat home page. This page serves as a quick reference guide to related resources and is located at: ul @@ -47,10 +47,10 @@ at: ul li -ba href=http://java.sun.com/products/jsp;Sun's Java Server Pages Site/a/b/li +ba href=http://java.sun.com/products/jsp/;Sun's Java Server Pages Site/a/b/li li -ba href=http://java.sun.com/products/servlet;Sun's Servlet Site/a/b/li +ba href=http://java.sun.com/products/servlet/;Sun's Servlet Site/a/b/li /ul and by subscribing to one or more of the following Servlet and JSP related interest lists:
cvs commit: jakarta-tomcat/src/doc readme
larryi 01/10/21 10:40:17 Modified:src/doc readme Log: Additional updates for Tomcat 3.3 Final. Revision ChangesPath 1.22 +57 -27jakarta-tomcat/src/doc/readme Index: readme === RCS file: /home/cvs/jakarta-tomcat/src/doc/readme,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- readme2001/10/09 17:49:14 1.21 +++ readme2001/10/21 17:40:17 1.22 @@ -1,9 +1,9 @@ -$Id: readme,v 1.21 2001/10/09 17:49:14 larryi Exp $ +$Id: readme,v 1.22 2001/10/21 17:40:17 larryi Exp $ Release Notes for: - = - TOMCAT Version 3.3rc2 - = + == + TOMCAT Version 3.3 + == 0. TABLE OF CONTENTS: @@ -89,14 +89,6 @@ conf/auto/tomcat-apache.conf file will be written each time Tomcat is started. - 6. The default auto-generated configuration files configure the external - web server to send all requests for a context to Tomcat. That is the - best way to insure that behavior specified in the web application's - web.xml functions properly. Also, by default, the configuration file - doesn't try to send any requests for the root context to Tomcat. The - external web server continues to serve its root context as they would - normally. - - Enhanced mod_jk Connector The mod_jk connector for Apache 1.3 now supports chunked input. @@ -112,10 +104,10 @@ The test web application along with the test-tomcat.xml and associated support files are not part of the binary Tomcat 3.3 distribution. The test web application is supplied separately as test.war. This file - may be downloaded from the v3.3-rc2/apps directory of the Tomcat 3.3rc2 + may be downloaded from the v3.3/apps directory of the Tomcat 3.3 release and placed in the webapps directory of your installation. Running the test has been integrated into the Admin web application that is part of - the Tomcat 3.3rc2 distribution. A preliminary step to running the test is to + the Tomcat 3.3 distribution. A preliminary step to running the test is to trust the Admin web application. It is set to untrusted by default. This change can be accomplished by executing the command from the TOMCAT_HOME directory with JAVA_HOME set: @@ -123,7 +115,7 @@ ./bin/tomcat.sh enableAdmin-- Unix bin\tomcat enableAdmin -- Windows - Start or restart Tomcat 3.3rc2 and invoke the following URL in your browser: + Start or restart Tomcat 3.3 and invoke the following URL in your browser: http://localhost:8080/admin/test/test.jsp @@ -197,8 +189,8 @@ Many new features have been added to Tomcat since the 3.2.x release. Among the most important are: -- The code has undergone a refactoring effort resulting in (we hope) improved - readability, ease of use, and performance. +- The code has undergone a major refactoring effort resulting in improved + performance, expanded configurability, and easier to maintain code. - Auto-generated connector configuration files for mod_jk based connectors defaults to being generated on demand only. This avoids the possibility @@ -220,7 +212,7 @@ - The Tomcat documentation directory (i.e. TOMCAT_HOME/doc) is now included in the ROOT webapp and is available from a link in the root's index.html. -- A modules directory has been added where add-on modules may be placed. +- A modules directory has been added where add-on modules may be placed. An add-on module is a special War file that deploys a module that participates in Tomcat's behavior, like the modules found in the server.xml file. @@ -232,11 +224,49 @@ - Many other improvements, too numerous to list. -In addition, numerous changes have occured since the 3.2.x release. Among the -primary changes are: +In addition to new features, numerous changes have occured from the +Tomcat 3.2.x releases. Among the more important behavior or usage +differences are: - Your CLASSPATH environment variable is ignored by the Tomcat shell scripts - and batch files found int TOMCAT_HOME/bin. + and batch files found in TOMCAT_HOME/bin. The classloader scheme in + Tomcat 3.3 is more flexible and you now have choices concerning how + classes are added. See the Configuring Classes section of the + Tomcat User's Guide (tomcat-ug.html) for details. + +- Context declarations are normally not put in the server.xml file in + Tomcat 3.3. Instead, these declarations are placed XML files separate + from server.xml.
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java
larryi 01/10/21 10:42:21
Modified:src/share/org/apache/tomcat/core ContextManager.java
Log:
Update for Tomcat 3.3 Final.
Revision ChangesPath
1.198 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- ContextManager.java 2001/10/13 04:24:00 1.197
+++ ContextManager.java 2001/10/21 17:42:21 1.198
@@ -148,7 +148,7 @@
public class ContextManager {
/** Official name and version
*/
-public static final String TOMCAT_VERSION = 3.3 Release Candidate 2;
+public static final String TOMCAT_VERSION = 3.3 Final;
public static final String TOMCAT_NAME = Tomcat Web Server;
/** System property used to set the base directory ( tomcat home ).
DO NOT REPLY [Bug 4315] - EJB Access with weblogic.jar included: Can't access new InitialContext()
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315 EJB Access with weblogic.jar included: Can't access new InitialContext() [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 12:08 --- Bug reports are not meant to replace tomcat-user. Please, don't ask questions inside a bug report, and it's always better to investigate an issue before filing the bug. To reference an EJB, use the ejb-link element, and set its value to the JNDI name in your external initial context (of course, you have to set the appropriate system properties in that case, as you did). If you want to use only Weblogic's JNDI environment, use the '-nonaming' command line option. I would recommend doing that (it's simpler). The exception may be caused because you have the JNDI base classes in /WEB- INF/lib (and they clash with the ones from the JDK).
DO NOT REPLY [Bug 4310] - Host and Context start events triggered twice during startup
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4310. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4310 Host and Context start events triggered twice during startup --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 13:37 --- Are you sure it's the same context ? The first trace is from a context which is explicitely declared in the server.xml file. The second one is from a context deployed by the HostConfig. In any case, both stacks go through ContainerBase.start (and presumably addChild) twice, which can't happen on the same context.
cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/naming/resources BaseDirContextTestCase.java
remm01/10/21 15:03:34
Modified:catalina/src/test/org/apache/naming/resources
BaseDirContextTestCase.java
Log:
- Fix the test (bug 4314).
Revision ChangesPath
1.3 +6 -5
jakarta-tomcat-4.0/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
Index: BaseDirContextTestCase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseDirContextTestCase.java 2001/06/01 16:58:21 1.2
+++ BaseDirContextTestCase.java 2001/10/21 22:03:34 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java,v
1.2 2001/06/01 16:58:21 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2001/06/01 16:58:21 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java,v
1.3 2001/10/21 22:03:34 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/10/21 22:03:34 $
*
*
*
@@ -105,7 +105,7 @@
* /ul
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/06/01 16:58:21 $
+ * @version $Revision: 1.3 $ $Date: 2001/10/21 22:03:34 $
*/
public abstract class BaseDirContextTestCase extends TestCase {
@@ -154,7 +154,8 @@
* The set of names that should be attributes of WEB-INF.
*/
protected static final String webInfAttrs[] =
-{ creationdate, displayname, getcontentlength, getlastmodified };
+{ creationdate, displayname, getcontentlength, getlastmodified,
+ resourcetype };
/**
DO NOT REPLY [Bug 4314] - Catalina Testcase not working complete
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4314. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4314 Catalina Testcase not working complete [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 15:12 --- I get the same failure in both branches (1 test failing each time). The test is wrong in that particular case (resourcetype should be present on all resources). I can't reproduce the other failures on either branches.
DO NOT REPLY [Bug 4315] - EJB Access with weblogic.jar included: Can't access new InitialContext()
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315 EJB Access with weblogic.jar included: Can't access new InitialContext() --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 15:33 --- I thought about it more, and there could be another way to get a clean integration, by using a custom object factory which would access the weblogic naming context. You can use the ResourceParams element in server.xml. More details: http://jakarta.apache.org/tomcat/tomcat-4.0-doc/jndi-resources-howto.html The Reference object your factory will get will get all the parameters you specified there.
DO NOT REPLY [Bug 4314] - Catalina Testcase not working complete
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4314. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4314 Catalina Testcase not working complete --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 15:37 --- I have used the old /commons-digester-1.1 and got a compile error, than I switch to /commons-digester-1.1.1 release and it compiles. It is as example a difference at my build.properties. I hope that help. --- build at [javac] Compiling 296 source files to D:\develop\jakarta\jakarta-tomcat-4.0\ catalina\build\server\classes [javac] D:\develop\jakarta\jakarta-tomcat-4.0\catalina\src\share\org\apache\ catalina\startup\WebRuleSet.java:457: Method getPublicId() not found in class or g.apache.commons.digester.Digester. [javac] paramValues[0] = digester.getPublicId(); [javac] ^ [javac] Note: 11 files use or override a deprecated API. Recompile with -d eprecation for details. [javac] 1 error, 1 warning
DO NOT REPLY [Bug 4315] - EJB Access with weblogic.jar included: Can't access new InitialContext()
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315 EJB Access with weblogic.jar included: Can't access new InitialContext() --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 15:52 --- I read the tomcat-user problem also before wrote the bug report! I want show that we must change the server.xml ejb semantic's, to address Servlet API conform ejb access. At my source code I don't directly reference the EJB JNDI names from Weblogic or JBoss. I want not used absolute jndi names. The local names as java:/comp/env/ejb/Customer are better for portable code. BEA address this feature with the weblogic.xml mapping and I thing we can do more with the ejb tag. Ejb name=ejb/Echo type=Session home=echo.EchoHome remote=echo.Echo remote-jndi=echo.EchoHome factory=weblogic.jndi.WLInitialContextFactory factoryLocation=t3://127.0.0.1:7001 principal=system credentials=weblogic / or for grouping ejb-context factoryweblogic.jndi.WLInitialContextFactory/factory locationt3://127.0.0.1:7001location param param-nameprincipalparam-name param-valuesystemparam-value /param param param-namecredentialsparam-name param-valueweblogicparam-value /param ejb name=ejb/Echo type=Session home=echo.EchoHome remote=echo.Echo remote-jndi-name=echo.EchoHome / ejb-context I hope know is the bug or missing feature report clear. Peter
DO NOT REPLY [Bug 4315] - EJB Access with weblogic.jar included: Can't access new InitialContext()
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4315 EJB Access with weblogic.jar included: Can't access new InitialContext() --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 16:05 --- No, you can't add additional attributes to the Ejb element because of the way the xml mapper / digester works. Instead, you can use the ResourceParams element to specify the custom parameters of the Reference. (Then, of course, you need the custom object factory) That's why I said it would probably be simpler to use the Weblogic naming environment (if possible). Also, you could use: - specify the env properties for the Weblogic IC - use ejb-link: Ejb name=ejb/Echo type=Session home=echo.EchoHome remote=echo.Echo link=jndi_name_in_the_weblogic_context / That's totally untested, but the factory should do a lookup on the JNDI name you specify. You also have to put the Weblogic classes in the shared classloader.
DO NOT REPLY [Bug 4313] - server.xml variable substitution broken
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4313. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4313 server.xml variable substitution broken [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||LATER --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 17:10 --- Sorry I missed this one for Tomcat 3.3. It will be fixed in a 3.3 nightly shortly after 3.3 releases.
DO NOT REPLY [Bug 4310] - Host and Context start events triggered twice during startup
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4310. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4310 Host and Context start events triggered twice during startup [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 18:24 --- After further investigation, it turns out it's the same issue as in bug 4299. In 4.1, a flag will be added to allow disabling auto-deployment. *** This bug has been marked as a duplicate of 4299 ***
DO NOT REPLY [Bug 4299] - Servlet loaded twice with load-on-startup
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4299. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4299 Servlet loaded twice with load-on-startup [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2001-10-21 18:24 --- *** Bug 4310 has been marked as a duplicate of this bug. ***
[PATCH][3.3] broken links
The attached patch fixes two broken links, one from the main
doc/index.html page.
--Jeff
Index: src/doc/Tomcat-Workers-HowTo.html
===
RCS file: /home/cvspublic/jakarta-tomcat/src/doc/Tomcat-Workers-HowTo.html,v
retrieving revision 1.2
diff -u -r1.2 Tomcat-Workers-HowTo.html
--- src/doc/Tomcat-Workers-HowTo.html 2001/01/30 04:27:38 1.2
+++ src/doc/Tomcat-Workers-HowTo.html 2001/10/22 04:10:18
@@ -5,7 +5,7 @@
!-- Copyright 1999, Apache Software Foundation --
meta http-equiv=Content-Type content=text/html
-link rel=stylesheet href=uguide/style.css
+link rel=stylesheet href=style.css
style type=text/css
td {
background-color: #E0E0E0;
Index: src/doc/readme
===
RCS file: /home/cvspublic/jakarta-tomcat/src/doc/readme,v
retrieving revision 1.22
diff -u -r1.22 readme
--- src/doc/readme 2001/10/21 17:40:17 1.22
+++ src/doc/readme 2001/10/22 04:10:19
@@ -39,7 +39,7 @@
Kit 1.1 or later environment, including JDKs conformant with Java2.
For detailed information about installing and running Tomcat, point your
-browser at the file tomcat_ug.html found in the same directory as this
+browser at the file tomcat-ug.html found in the same directory as this
file.
IMPORTANT NOTE: Some major changes have occurred in Tomcat 3.3 which
Index: src/doc/appdev/introduction.html
===
RCS file: /home/cvspublic/jakarta-tomcat/src/doc/appdev/introduction.html,v
retrieving revision 1.2
diff -u -r1.2 introduction.html
--- src/doc/appdev/introduction.html2000/03/28 00:44:11 1.2
+++ src/doc/appdev/introduction.html2001/10/22 04:10:20
@@ -93,7 +93,7 @@
chapters on servlet and JSP design are useful even when your application
does not require other J2EE platform components.
brbr
-lia href=../uguide/tomcat_ug.html target=_top../uguide/tomcat_ug.html/a -
+lia href=../tomcat-ug.html target=_top../tomcat-ug.html/a -
iTomcat - A Minimalistic User's Guide/i. This document covers the
detailed steps required to download and install Tomcat, including
configuration for a variety of environments. This guide is included
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina Host.java
remm01/10/21 21:48:56
Modified:catalina/src/share/org/apache/catalina Host.java
Log:
- Add new auto deploy flag. If true, the web applcations will be automatically
deployed by the host configurator.
Revision ChangesPath
1.7 +20 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Host.java
Index: Host.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Host.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Host.java 2001/10/16 23:14:13 1.6
+++ Host.java 2001/10/22 04:48:56 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Host.java,v 1.6
2001/10/16 23:14:13 remm Exp $
- * $Revision: 1.6 $
- * $Date: 2001/10/16 23:14:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Host.java,v 1.7
2001/10/22 04:48:56 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/10/22 04:48:56 $
*
*
*
@@ -89,7 +89,7 @@
* an individual servlet context), depending upon the Engine implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/10/16 23:14:13 $
+ * @version $Revision: 1.7 $ $Date: 2001/10/22 04:48:56 $
*/
public interface Host extends Container {
@@ -129,6 +129,22 @@
* @param appBase The new application root
*/
public void setAppBase(String appBase);
+
+
+/**
+ * Return the value of the auto deploy flag. If true, it indicates that
+ * this host's child webapps should be discovred and automatically
+ * deployed.
+ */
+public boolean getAutoDeploy();
+
+
+/**
+ * Set the auto deploy flag value for this host.
+ *
+ * @param autoDeploy The new auto deploy flag
+ */
+public void setAutoDeploy(boolean autoDeploy);
/**
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardHost.java
remm01/10/21 21:49:10
Modified:catalina/src/share/org/apache/catalina/core
StandardHost.java
Log:
- Add new auto deploy flag. If true, the web applcations will be automatically
deployed by the host configurator.
Revision ChangesPath
1.21 +37 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- StandardHost.java 2001/10/16 23:17:13 1.20
+++ StandardHost.java 2001/10/22 04:49:10 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.20 2001/10/16 23:17:13 remm Exp $
- * $Revision: 1.20 $
- * $Date: 2001/10/16 23:17:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.21 2001/10/22 04:49:10 remm Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/10/22 04:49:10 $
*
*
*
@@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.20 $ $Date: 2001/10/16 23:17:13 $
+ * @version $Revision: 1.21 $ $Date: 2001/10/22 04:49:10 $
*/
public class StandardHost
@@ -141,6 +141,12 @@
/**
+ * The auto deploy flag for this Host.
+ */
+private boolean autoDeploy = true;
+
+
+/**
* The Java class name of the default context configuration class
* for deployed web applications.
*/
@@ -215,6 +221,33 @@
String oldAppBase = this.appBase;
this.appBase = appBase;
support.firePropertyChange(appBase, oldAppBase, this.appBase);
+
+}
+
+
+/**
+ * Return the value of the auto deploy flag. If true, it indicates that
+ * this host's child webapps should be discovred and automatically
+ * deployed.
+ */
+public boolean getAutoDeploy() {
+
+return (this.autoDeploy);
+
+}
+
+
+/**
+ * Set the auto deploy flag value for this host.
+ *
+ * @param autoDeploy The new auto deploy flag
+ */
+public void setAutoDeploy(boolean autoDeploy) {
+
+boolean oldAutoDeploy = this.autoDeploy;
+this.autoDeploy = autoDeploy;
+support.firePropertyChange(autoDeploy, oldAutoDeploy,
+ this.autoDeploy);
}
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config host.xml
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/catalina/src/conf server.xml
remm01/10/21 21:49:37 Modified:catalina/src/conf server.xml Log: - Add new auto deploy flag. If true, the web applcations will be automatically deployed by the host configurator. Revision ChangesPath 1.39 +2 -1 jakarta-tomcat-4.0/catalina/src/conf/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- server.xml2001/10/13 19:26:39 1.38 +++ server.xml2001/10/22 04:49:37 1.39 @@ -158,7 +158,8 @@ -- !-- Define the default virtual host -- - Host name=localhost debug=0 appBase=webapps unpackWARs=true + Host name=localhost debug=0 appBase=webapps + unpackWARs=true autoDeploy=true !-- Normally, users must authenticate themselves to each web app individually. Uncomment the following entry if you would like
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup HostConfig.java
remm01/10/21 22:15:51
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
- Add new auto deploy flag. If true, the web applcations will be automatically
deployed by the host configurator.
Revision ChangesPath
1.12 +7 -6
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HostConfig.java 2001/10/20 18:43:52 1.11
+++ HostConfig.java 2001/10/22 05:15:51 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.11 2001/10/20 18:43:52 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2001/10/20 18:43:52 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.12 2001/10/22 05:15:51 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/10/22 05:15:51 $
*
*
*
@@ -100,7 +100,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.11 $ $Date: 2001/10/20 18:43:52 $
+ * @version $Revision: 1.12 $ $Date: 2001/10/22 05:15:51 $
*/
public class HostConfig
@@ -600,8 +600,9 @@
// Loop until the termination semaphore is set
while (!threadDone) {
-// Deploy apps
-deployApps();
+// Deploy apps if the Host allows auto deploying
+if (host.getAutoDeploy())
+deployApps();
// Check for web.xml modification
checkWebXmlLastModified();
