cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs index.xml project.xml
remm2002/09/10 02:06:55 Modified:webapps/tomcat-docs index.xml project.xml Log: - Add visible links to the JK documentation. Revision ChangesPath 1.16 +11 -4 jakarta-tomcat-4.0/webapps/tomcat-docs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/index.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- index.xml 8 Sep 2002 17:56:04 - 1.15 +++ index.xml 10 Sep 2002 09:06:55 - 1.16 @@ -47,6 +47,10 @@ steps necessary to download Tomcat 4 source code (and the other packages that it depends on), and build a binary distribution from those sources. /li +lia href=config/index.htmlstrongServer Configuration Reference/strong/a +- Reference manual that documents all available elements and attributes + that may be placed into a Tomcat 4 codeconf/server.xml/code file. +/li /ul /section @@ -60,10 +64,9 @@ ul lia href=cgi-howto.htmlstrongCGI HOW-TO/strong/a - Configuring Tomcat to use CGI (Common Gateway Interface)./li -lia href=config/index.htmlstrongServer Configuration Reference/strong/a -- Reference manual that documents all available elements and attributes - that may be placed into a Tomcat 4 codeconf/server.xml/code file. -/li +lia href=config/connectors.htmlstrongConnectors List/strong/a +- List of the connectors (both HTTP and native webservers) available for + use with Tomcat./li lia href=class-loader-howto.htmlstrongClass Loader HOW-TO/strong/a - Information about class loading in Tomcat 4, including where to place your application classes so that they are visible./li @@ -71,6 +74,10 @@ strongJNDI DataSource HOW-TO/strong/a - Configuring a JNDI DataSoure with a dB connection pool. Examples for many popular databases./li +lia href=jk2/index.htmlstrongJK Documenation/strong/a +- Complete documentation and HOWTOs on the JK native webserver connector, + used to interface Tomcat with servers like Apache HTTPd, IIS + and others./li lia href=jndi-resources-howto.htmlstrongJNDI Resources HOW-TO/strong/a - Configuring standard and custom resources in the JNDI naming context that is provided to each web application./li 1.18 +1 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/project.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- project.xml 10 Sep 2002 08:49:05 - 1.17 +++ project.xml 10 Sep 2002 09:06:55 - 1.18 @@ -30,6 +30,7 @@ item name=CGI HOW-TOhref=cgi-howto.html/ item name=Class Loader HOW-TO href=class-loader-howto.html/ item name=Connectors List href=config/connectors.html/ +item name=JK Documentation href=jk2/index.html/ item name=JNDI DataSource HOW-TO href=jndi-datasource-examples-howto.html/ item name=JNDI Resources HOW-TO href=jndi-resources-howto.html/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs index.xml project.xml
craigmcc01/09/05 12:45:27
Modified:.RELEASE-PLAN-4.0.txt
catalina build.xml
webapps/tomcat-docs index.xml project.xml
Log:
Cleaning up old TODO items ...
Split out the built-in servlets that are part of Catalina into their own
JAR files in $CATALINA_HOME/server/lib so that you can grant individual
security manager permissions to each servlet (if you want to), or -- for
paranoid sysadmins -- remove them entirely if you do not need that
particular servlet's functionality in your environment.
The servlets-common.jar file contains things that are common to all of
the servlets (so it needs to stay in /server/lib if *any* of them are
used). Each of the other servlets-*.jar files contains only the code
for the corresponding built-in servlet.
Revision ChangesPath
1.4 +3 -1 jakarta-tomcat-4.0/RELEASE-PLAN-4.0.txt
Index: RELEASE-PLAN-4.0.txt
===
RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-PLAN-4.0.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RELEASE-PLAN-4.0.txt 2001/09/05 02:27:23 1.3
+++ RELEASE-PLAN-4.0.txt 2001/09/05 19:45:27 1.4
@@ -1,4 +1,4 @@
-$Id: RELEASE-PLAN-4.0.txt,v 1.3 2001/09/05 02:27:23 craigmcc Exp $
+$Id: RELEASE-PLAN-4.0.txt,v 1.4 2001/09/05 19:45:27 craigmcc Exp $
Release Plan for Apache Tomcat 4.0
==
@@ -104,6 +104,8 @@
Jasper 3195Javadoc errors during build
Jasper 3340sun.tools.javac.Main has been deprecated in JDK 1.4-beta-2
+
+Jasper 3433Bad performance on JspWriterImpl.java
Servletapi 3196Javadoc errors during build
1.53 +47 -8 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- build.xml 2001/08/27 16:47:57 1.52
+++ build.xml 2001/09/05 19:45:27 1.53
@@ -341,14 +341,59 @@
/target
- !-- == DEPLOY: Create Catalina JAR = --
+ !-- == DEPLOY: Create Catalina JARs --
target name=deploy-main depends=deploy-static
+
+!-- Catalina Main JAR File --
jar jarfile=${catalina.deploy}/server/lib/catalina.jar
basedir=${catalina.build}/classes
-
excludes=**/org/apache/naming/**,**/connector/warp/**,org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/startup/BootstrapService.class,org/apache/catalina/loader/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class,org/apache/catalina/startup/SecurityManagerDebug.class
/
+
excludes=**/org/apache/naming/**,**/connector/warp/**,org/apache/catalina/startup/Bootstrap.class,org/apache/catalina/startup/BootstrapService.class,org/apache/catalina/loader/StandardClassLoader*.class,org/apache/catalina/loader/Extension.class,org/apache/catalina/loader/Reloader.class,org/apache/catalina/startup/SecurityManagerDebug.class,org/apache/catalina/servlets/**,org/apache/catalina/util/ssi/**
/
+
+!-- WARP Connector JAR File --
jar jarfile=${catalina.deploy}/server/lib/warp.jar
basedir=${catalina.build}/classes
includes=**/connector/warp/** /
+
+!-- Servlets - Common Files --
+jar jarfile=${catalina.deploy}/server/lib/servlets-common.jar
+ basedir=${catalina.build}/classes
+
includes=org/apache/catalina/servlets/Constants.class,org/apache/catalina/servlets/*.properties
/
+
+!-- Servlets - CGI Servlet --
+jar jarfile=${catalina.deploy}/server/lib/servlets-cgi.jar
+ basedir=${catalina.build}/classes
+ includes=org/apache/catalina/servlets/CGI* /
+
+!-- Servlets - Default File-Serving Servlet --
+jar jarfile=${catalina.deploy}/server/lib/servlets-default.jar
+ basedir=${catalina.build}/classes
+ includes=org/apache/catalina/servlets/Default* /
+
+!-- Servlets - Invoker Servlet --
+jar jarfile=${catalina.deploy}/server/lib/servlets-invoker.jar
+ basedir=${catalina.build}/classes
+ includes=org/apache/catalina/servlets/Invoker* /
+
+!-- Servlets - Manager Servlet --
+jar jarfile=${catalina.deploy}/server/lib/servlets-manager.jar
+ basedir=${catalina.build}/classes
+ includes=org/apache/catalina/servlets/*Manager* /
+
+!-- Servlets - Snoop Servlet --
+jar jarfile=${catalina.deploy}/server/lib/servlets-snoop.jar
+ basedir=${catalina.build}/classes
+
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs index.xml project.xml
craigmcc01/08/20 15:43:52
Modified:catalina/src/share/org/apache/catalina/servlets
InvokerServlet.java
webapps/tomcat-docs index.xml project.xml
Log:
Synchronize around the first-time creation of a new Wrapper for the
invoked servlet. This avoids race conditions when multiple requests try
to create the same wrapper at the same time.
PR: Bugzilla #3188
Submitted by: Eddie Ruvinsky [EMAIL PROTECTED]
Revision ChangesPath
1.11 +29 -23
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java
Index: InvokerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- InvokerServlet.java 2001/08/20 00:33:34 1.10
+++ InvokerServlet.java 2001/08/20 22:43:52 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java,v
1.10 2001/08/20 00:33:34 craigmcc Exp $
- * $Revision: 1.10 $
- * $Date: 2001/08/20 00:33:34 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java,v
1.11 2001/08/20 22:43:52 craigmcc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/08/20 22:43:52 $
*
*
*
@@ -87,7 +87,7 @@
* in the web application deployment descriptor.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/08/20 00:33:34 $
+ * @version $Revision: 1.11 $ $Date: 2001/08/20 22:43:52 $
*/
public final class InvokerServlet
@@ -342,25 +342,31 @@
log(Creating wrapper for ' + servletClass +
' with mapping ' + pattern + ');
-// Create and install a new wrapper
-try {
-wrapper = context.createWrapper();
-wrapper.setName(name);
-wrapper.setLoadOnStartup(1);
-wrapper.setServletClass(servletClass);
-context.addChild(wrapper);
-context.addServletMapping(pattern, name);
-} catch (Throwable t) {
-log(sm.getString(invokerServlet.cannotCreate,
- inRequestURI), t);
-if (included)
-throw new ServletException
-(sm.getString(invokerServlet.cannotCreate,
- inRequestURI), t);
-else {
-response.sendError(HttpServletResponse.SC_NOT_FOUND,
- inRequestURI);
-return;
+// Create and install a new wrapper (synchronized to avoid
+// race conditions when multiple requests try to initialize
+// the same servlet at the same time)
+synchronized (this) {
+try {
+wrapper = context.createWrapper();
+wrapper.setName(name);
+wrapper.setLoadOnStartup(1);
+wrapper.setServletClass(servletClass);
+context.addChild(wrapper);
+context.addServletMapping(pattern, name);
+} catch (Throwable t) {
+log(sm.getString(invokerServlet.cannotCreate,
+ inRequestURI), t);
+context.removeServletMapping(pattern);
+context.removeChild(wrapper);
+if (included)
+throw new ServletException
+(sm.getString(invokerServlet.cannotCreate,
+ inRequestURI), t);
+else {
+response.sendError(HttpServletResponse.SC_NOT_FOUND,
+ inRequestURI);
+return;
+}
}
}
1.8 +4 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/index.xml
Index: index.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/index.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.xml 2001/08/16 23:21:25 1.7
+++ index.xml 2001/08/20 22:43:52 1.8
@@ -116,6 +116,10 @@
the development of the emJasper/em JSP container portion of Tomcat
itself, or to better understand its internal architecture and operation./p
ul
+!--
+lia href=jasper-requirements.htmlstrongJasper Overall
Requirements/strong/a
