cvs commit: jakarta-tomcat-4.0/catalina/src/conf server.xml
funkman 2003/06/01 18:29:22 Modified:catalina/src/conf server.xml Log: Remove warp/webapp declaration since it is deprecated. Revision ChangesPath 1.68 +21 -61jakarta-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.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- server.xml9 Dec 2002 13:22:40 - 1.67 +++ server.xml2 Jun 2003 01:29:22 - 1.68 @@ -14,8 +14,8 @@ !-- Comment these entries out to disable JMX MBeans support -- - !-- You may also configure custom components (e.g. Valves/Realms) by - including your own mbean-descriptor file(s), and setting the + !-- You may also configure custom components (e.g. Valves/Realms) by + including your own mbean-descriptor file(s), and setting the descriptors attribute to point to a ';' seperated list of paths (in the ClassLoader sense) of files to add to the default list. e.g. descriptors=/com/myfirm/mypackage/mbean-descriptor.xml @@ -94,7 +94,7 @@ enableLookups=true redirectPort=8443 acceptCount=100 debug=0 connectionTimeout=2 useURIValidationHack=false disableUploadTimeout=true / -!-- Note : To disable connection timeouts, set connectionTimeout value +!-- Note : To disable connection timeouts, set connectionTimeout value to -1 -- !-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -- @@ -102,7 +102,7 @@ Connector className=org.apache.coyote.tomcat4.CoyoteConnector port=8443 minProcessors=5 maxProcessors=75 enableLookups=true -acceptCount=100 debug=0 scheme=https secure=true + acceptCount=100 debug=0 scheme=https secure=true useURIValidationHack=false disableUploadTimeout=true Factory className=org.apache.coyote.tomcat4.CoyoteServerSocketFactory clientAuth=false protocol=TLS / @@ -157,9 +157,9 @@ on to the appropriate Host (virtual host). -- !-- You should set jvmRoute to support load-balancing via JK/JK2 ie : -Engine name=Standalone defaultHost=localhost debug=0 jmvRoute=jvm1 --- - +Engine name=Standalone defaultHost=localhost debug=0 jmvRoute=jvm1 +-- + !-- Define the top level container in our container hierarchy -- Engine name=Standalone defaultHost=localhost debug=0 @@ -231,7 +231,7 @@ -- !-- Define the default virtual host -- - Host name=localhost debug=0 appBase=webapps + Host name=localhost debug=0 appBase=webapps unpackWARs=true autoDeploy=true !-- Normally, users must authenticate themselves to each web app @@ -265,7 +265,7 @@ directory.-- Logger className=org.apache.catalina.logger.FileLogger directory=logs prefix=localhost_log. suffix=.txt - timestamp=true/ +timestamp=true/ !-- Define properties for each web application. This is only needed if you want to set non-default properties, or have web application @@ -282,7 +282,7 @@ reloadable=true crossContext=true Logger className=org.apache.catalina.logger.FileLogger prefix=localhost_examples_log. suffix=.txt - timestamp=true/ + timestamp=true/ Ejb name=ejb/EmplRecord type=Entity home=com.wombat.empl.EmployeeRecordHome remote=com.wombat.empl.EmployeeRecord/ @@ -304,22 +304,22 @@ -- - !-- PersistentManager: Uncomment the section below to test Persistent -Sessions. - + !-- PersistentManager: Uncomment the section below to test Persistent + Sessions. + saveOnRestart: If true, all active sessions will be saved to the Store when Catalina is shutdown, regardless of - other settings. All Sessions found in the Store will be + other settings. All Sessions found in the Store will be loaded on startup. Sessions past their expiration are ignored in both cases. - maxActiveSessions: If 0 or greater, having too many active + maxActiveSessions: If 0 or greater, having too many active sessions will result in some being swapped out. minIdleSwap limits this. -1 or 0 means unlimited sessions are allowed. If it is not possible to swap sessions new sessions
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java mbeans-descriptors.xml
funkman 2003/06/01 13:57:00 Modified:catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml Added: catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java Log: W3C Extended Log File Format support as defined in http://www.w3.org/TR/WD-logfile.html Revision ChangesPath 1.2 +94 -34 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mbeans-descriptors.xml17 Mar 2003 06:45:33 - 1.1 +++ mbeans-descriptors.xml1 Jun 2003 20:57:00 - 1.2 @@ -6,12 +6,12 @@ domain=Catalina group=Valve type=org.apache.catalina.valves.AccessLogValve - + attribute name=className description=Fully qualified class name of the managed object type=java.lang.String writeable=false/ - + attribute name=debug description=The debugging detail level for this component type=int/ @@ -23,11 +23,11 @@ attribute name=directory description=The directory in which log files are created type=java.lang.String/ - + attribute name=pattern description=The pattern used to format our access log lines type=java.lang.String/ - + attribute name=prefix description=The prefix that is added to log file filenames type=java.lang.String/ @@ -36,7 +36,7 @@ description=Resolve hosts is=true type=boolean/ - + attribute name=rotatable description=Rotate log is=true @@ -52,12 +52,12 @@ domain=Catalina group=Valve type=org.apache.catalina.valves.CertificatesValve - + attribute name=className description=Fully qualified class name of the managed object type=java.lang.String writeable=false/ - + attribute name=containerName description=Object name of the container type=javax.management.ObjectName/ @@ -65,20 +65,20 @@ attribute name=debug description=The debugging detail level for this component type=int/ - + /mbean - + mbean name=ErrorReportValve description=Implementation of a Valve that outputs HTML error pages domain=Catalina group=Valve type=org.apache.catalina.valves.ErrorReportValve - + attribute name=className description=Fully qualified class name of the managed object type=java.lang.String writeable=false/ - + attribute name=containerName description=Object name of the container type=javax.management.ObjectName/ @@ -86,16 +86,16 @@ attribute name=debug description=The debugging detail level for this component type=int/ - + /mbean - + mbean name=ErrorDispatcherValve description=Implementation of a Valve that handles the error dispatch domain=Catalina group=Valve type=org.apache.catalina.valves.ErrorDispatcherValve - + attribute name=className description=Fully qualified class name of the managed object type=java.lang.String @@ -108,19 +108,79 @@ attribute name=debug description=The debugging detail level for this component type=int/ - + /mbean - + + mbean name=ExtendedAccessLogValve + description=Valve that generates a web server access log + domain=Catalina + group=Valve + type=org.apache.catalina.valves.ExtendedAccessLogValve + +attribute name=className + description=Fully qualified class name of the managed object + type=java.lang.String + writeable=false/ + +attribute name=debug + description=The debugging detail level for this component + type=int/ + +attribute name=containerName + description=Object name of the container + type=javax.management.ObjectName/ + +attribute name=directory + description
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JkMX.java
funkman 2003/06/01 18:22:33
Modified:jk/java/org/apache/jk/common JkMX.java
Log:
Check for the existence of the class before trying to load the adapter.
This is an attempt to prevent the logging of error messages
since they aren't errors. If no adapters get loaded, but mx.port
was defined, expose a warning message.
Revision ChangesPath
1.12 +119 -88 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java
Index: JkMX.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JkMX.java 11 Apr 2003 20:25:42 - 1.11
+++ JkMX.java 2 Jun 2003 01:22:32 - 1.12
@@ -78,7 +78,7 @@
MBeanServer mserver;
private int port=-1;
private String host;
-
+
public JkMX()
{
}
@@ -105,105 +105,124 @@
/* Start/stop */
ObjectName serverName=null;
-
+
/** Initialize the worker. After this call the worker will be
* ready to accept new requests.
*/
public void loadAdapter() throws IOException {
-try {
-serverName = new ObjectName(Http:name=HttpAdaptor);
-mserver.createMBean(mx4j.adaptor.http.HttpAdaptor, serverName, null);
-if( host!=null )
-mserver.setAttribute(serverName, new Attribute(Host, host));
-mserver.setAttribute(serverName, new Attribute(Port, new
Integer(port)));
-
-ObjectName processorName = new ObjectName(Http:name=XSLTProcessor);
-mserver.createMBean(mx4j.adaptor.http.XSLTProcessor, processorName,
null);
-
-//mserver.setAttribute(processorName, new Attribute(File,
/opt/41/server/lib/openjmx-tools.jar));
-//mserver.setAttribute(processorName, new Attribute(UseCache, new
Boolean(false)));
-//mserver.setAttribute(processorName, new Attribute(PathInJar,
/openjmx/adaptor/http/xsl));
-mserver.setAttribute(serverName, new Attribute(ProcessorName,
processorName));
-
-//server.invoke(serverName, addAuthorization,
-// new Object[] {openjmx, openjmx},
-// new String[] {java.lang.String, java.lang.String});
-
-// use basic authentication
-//server.setAttribute(serverName, new Attribute(AuthenticationMethod,
basic));
-
-// ObjectName sslFactory = new
ObjectName(Adaptor:service=SSLServerSocketFactory);
-//
server.createMBean(openjmx.adaptor.ssl.SSLAdaptorServerSocketFactory, sslFactory,
null);
-//SSLAdaptorServerSocketFactoryMBean factory =
-//
(SSLAdaptorServerSocketFactoryMBean)StandardMBeanProxy.create(SSLAdaptorServerSocketFactoryMBean.class,
server, sslFactory);
-// // Customize the values below
-// factory.setKeyStoreName(certs);
-// factory.setKeyStorePassword(openjmx);
-
-// server.setAttribute(serverName, new
Attribute(SocketFactoryName, sslFactory.toString()));
+boolean adapterLoaded = false;
+
+if (classExists(mx4j.adaptor.http)) {
+try {
+serverName = new ObjectName(Http:name=HttpAdaptor);
+mserver.createMBean(mx4j.adaptor.http.HttpAdaptor, serverName,
null);
+if( host!=null )
+mserver.setAttribute(serverName, new Attribute(Host, host));
+mserver.setAttribute(serverName, new Attribute(Port, new
Integer(port)));
+
+ObjectName processorName = new
ObjectName(Http:name=XSLTProcessor);
+mserver.createMBean(mx4j.adaptor.http.XSLTProcessor,
processorName, null);
+
+//mserver.setAttribute(processorName, new Attribute(File,
/opt/41/server/lib/openjmx-tools.jar));
+//mserver.setAttribute(processorName, new Attribute(UseCache, new
Boolean(false)));
+//mserver.setAttribute(processorName, new Attribute(PathInJar,
/openjmx/adaptor/http/xsl));
+mserver.setAttribute(serverName, new Attribute(ProcessorName,
processorName));
+
+//server.invoke(serverName, addAuthorization,
+// new Object[] {openjmx, openjmx},
+// new String[] {java.lang.String,
java.lang.String});
+
+// use basic authentication
+//server.setAttribute(serverName, new
Attribute(AuthenticationMethod, basic));
+
+// ObjectName sslFactory = new
ObjectName(Adaptor:service
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml ExtendedAccessLogValve.java AccessLogValve.java
funkman 2003/06/04 09:58:21
Modified:catalina/src/share/org/apache/catalina/valves
mbeans-descriptors.xml ExtendedAccessLogValve.java
AccessLogValve.java
Log:
Fix bz - 20380 AccessLogValve incorrectly calculates timezone
Enc bz - 16374 Date in file name configurable
Enc bz - 16400 Allow logging to be conditional
Revision ChangesPath
1.3 +13 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbeans-descriptors.xml1 Jun 2003 20:57:00 - 1.2
+++ mbeans-descriptors.xml4 Jun 2003 16:58:21 - 1.3
@@ -38,13 +38,21 @@
type=boolean/
attribute name=rotatable
- description=Rotate log
+ description=Flag to indicate automatic log rotation.
is=true
type=boolean/
attribute name=suffix
description=The suffix that is added to log file filenames
type=java.lang.String/
+
+attribute name=condition
+ description=The value to look for conditional logging.
+ type=java.lang.String/
+
+attribute name=fileDateFormat
+ description=The format for the date date based log rotation.
+ type=java.lang.String/
/mbean
mbean name=CertificatesValve
@@ -158,6 +166,10 @@
attribute name=suffix
description=The suffix that is added to log file filenames
+ type=java.lang.String/
+
+attribute name=fileDateFormat
+ description=The format for the date date based log rotation.
type=java.lang.String/
operation name=rotate
1.3 +28 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtendedAccessLogValve.java 3 Jun 2003 23:37:05 - 1.2
+++ ExtendedAccessLogValve.java 4 Jun 2003 16:58:21 - 1.3
@@ -359,6 +359,10 @@
private boolean checkExists = false;
+/**
+ * Date format to place in log file name. Use at your own risk!
+ */
+private String fileDateFormat = null;
// - Properties
@@ -535,6 +539,23 @@
}
+
+/**
+ * Return the date format date based log rotation.
+ */
+public String getFileDateFormat() {
+return fileDateFormat;
+}
+
+
+/**
+ * Set the date format date based log rotation.
+ */
+public void setFileDateFormat(String fileDateFormat) {
+this.fileDateFormat = fileDateFormat;
+}
+
+
// - Public Methods
@@ -1072,7 +1093,9 @@
timeFormatter = new SimpleDateFormat(HH:mm:ss);
timeFormatter.setTimeZone(tz);
currentDate = new Date(System.currentTimeMillis());
-fileDateFormatter = new SimpleDateFormat(-MM-dd);
+if (fileDateFormat==null || fileDateFormat.length()==0)
+fileDateFormat = -MM-dd;
+fileDateFormatter = new SimpleDateFormat(fileDateFormat);
dateStamp = fileDateFormatter.format(currentDate);
timeTakenFormatter = new DecimalFormat(0.000);
1.4 +117 -21
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Index: AccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AccessLogValve.java 11 Jan 2003 05:12:48 - 1.3
+++ AccessLogValve.java 4 Jun 2003 16:58:21 - 1.4
@@ -67,6 +67,7 @@
import java.io.PrintWriter;
import java.net.InetAddress;
import java.text.SimpleDateFormat;
+import java.text.DecimalFormat;
import java.util.Date;
import java.util.TimeZone;
import javax.servlet.ServletException;
@@ -113,18 +114,19 @@
* an empty string
* lib%r/b - First line of the request
* lib%s/b - HTTP status code
cvs commit: jakarta-tomcat-catalina/catalina/src/conf web.xml
funkman 2003/06/08 11:18:56 Modified:catalina/src/conf web.xml Log: bugzilla 19808 - Add sit extension Revision ChangesPath 1.17 +6 -2 jakarta-tomcat-catalina/catalina/src/conf/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- web.xml 1 May 2003 17:32:52 - 1.16 +++ web.xml 8 Jun 2003 18:18:56 - 1.17 @@ -306,7 +306,7 @@ -- !-- The mapping for the CGI Gateway servlet -- - + !-- servlet-mapping servlet-namecgi/servlet-name @@ -724,6 +724,10 @@ mime-typeaudio/x-midi/mime-type /mime-mapping mime-mapping +extensionsit/extension +mime-typeapplication/x-stuffit/mime-type +/mime-mapping +mime-mapping extensionsnd/extension mime-typeaudio/basic/mime-type /mime-mapping @@ -826,7 +830,7 @@ mime-mapping extensionsvgz/extension mime-typeimage/svg+xml/mime-type -/mime-mapping +/mime-mapping mime-mapping !-- Wireless Bitmap -- extensionwbmp/extension - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/conf web.xml
funkman 2003/06/08 11:20:36 Modified:catalina/src/conf web.xml Log: bugzilla 19808 - Add sit extension Revision ChangesPath 1.49 +4 -0 jakarta-tomcat-4.0/catalina/src/conf/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- web.xml 3 Jan 2003 13:26:01 - 1.48 +++ web.xml 8 Jun 2003 18:20:36 - 1.49 @@ -709,6 +709,10 @@ mime-typeapplication/x-shar/mime-type /mime-mapping mime-mapping +extensionsit/extension +mime-typeapplication/x-stuffit/mime-type +/mime-mapping +mime-mapping extensionsmf/extension mime-typeaudio/x-midi/mime-type /mime-mapping - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq - New directory
funkman 2003/06/11 17:22:03 jakarta-tomcat-site/xdocs-faq - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/docs/faq - New directory
funkman 2003/06/11 17:22:44 jakarta-tomcat-site/docs/faq - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/docs/faq/printer - New directory
funkman 2003/06/11 17:23:01 jakarta-tomcat-site/docs/faq/printer - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
funkman 2003/06/16 18:31:12 Modified:catalina/src/conf web.xml catalina/src/share/org/apache/catalina/servlets DefaultServlet.java Log: - Allow a site (webapp) wide xslt transformation for look (real file name) - Allow per directory xslt transformation for customized look - Allow a readme file to be rendered with the directory listing - fix typo in row color when trying to gray bar lines Any suggestions on not making globalXsltFile a real file but still cross webapp app friendly? Revision ChangesPath 1.19 +17 -0 jakarta-tomcat-catalina/catalina/src/conf/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- web.xml 15 Jun 2003 13:12:44 - 1.18 +++ web.xml 17 Jun 2003 01:31:11 - 1.19 @@ -39,6 +39,23 @@ !-- readonlyIs this context read only, so HTTP -- !-- commands like PUT and DELETE are -- !-- rejected? [true] -- + !-- -- + !-- readmeFile File name to display with the directory-- + !-- contents. [null] -- + !-- -- + !-- For directory listing customization. Checks localXsltFile, then -- + !-- globalXsltFile, then defaults to original behavior. -- + !-- -- + !-- localXsltFile Make directory listings an XML doc and -- + !-- pass the result to this style sheet residing -- + !-- in that directory. This overrides -- + !--globalXsltFile[null] -- + !-- -- + !-- globalXsltFile Site wide configuration version of -- + !-- localXsltFile This argument is expected-- + !-- to be a physical file. [null] -- + !-- -- + !-- -- servlet servlet-namedefault/servlet-name 1.12 +248 -31 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java Index: DefaultServlet.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- DefaultServlet.java 15 Jun 2003 08:17:37 - 1.11 +++ DefaultServlet.java 17 Jun 2003 01:31:12 - 1.12 @@ -1,4 +1,5 @@ /* + * * $Header$ * $Revision$ * $Date$ @@ -76,6 +77,8 @@ import java.io.RandomAccessFile; import java.io.Reader; import java.io.InputStreamReader; +import java.io.StringReader; +import java.io.StringWriter; import java.io.Writer; import java.io.OutputStreamWriter; import java.net.MalformedURLException; @@ -110,6 +113,12 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.Transformer; + import org.apache.tomcat.util.http.FastHttpDateFormat; import org.apache.naming.resources.Resource; @@ -193,6 +202,25 @@ protected static URLEncoder urlEncoder; +/** + * Allow customized directory listing per directory. + */ +protected String localXsltFile = null; + + +/** + * Allow customized directory listing per instance. + */ +protected String globalXsltFile = null; + + +/** + * Allow a readme file to be included. + */ +protected String readmeFile = null; + + + // - Static Initializer @@ -283,6 +311,11 @@ ; } +globalXsltFile = getServletConfig().getInitParameter(globalXsltFile); +localXsltFile = getServletConfig().getInitParameter(localXsltFile); +readmeFile = getServletConfig
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
funkman 2003/06/19 05:23:47
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
Cleanup for xslt and readme functionality
- make readme retrieval its own method
- getting xsltInputStream its own method
- use Resource for above functionality instead of ResourceInfo
Revision ChangesPath
1.13 +96 -67
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultServlet.java 17 Jun 2003 01:31:12 - 1.12
+++ DefaultServlet.java 19 Jun 2003 12:23:47 - 1.13
@@ -1384,37 +1384,13 @@
*/
protected InputStream render
(String contextPath, ResourceInfo resourceInfo) {
-InputStream xsltInputStream = null;
-try {
-if (localXsltFile!=null) {
-DirContext resources = getResources();
-String xsltFile = resourceInfo.path + localXsltFile;
-ResourceInfo xsltInfo = new ResourceInfo(xsltFile, resources);
-
-if (xsltInfo.exists)
-xsltInputStream = xsltInfo.getStream();
-}
-
-if (xsltInputStream==null globalXsltFile!=null)
-xsltInputStream = new FileInputStream(globalXsltFile);
-
-} catch(Throwable e) {
-xsltInputStream = null;
-}
-
+InputStream xsltInputStream =
+findXsltInputStream(resourceInfo.directory);
if (xsltInputStream==null) {
return renderHtml(contextPath, resourceInfo);
} else {
-try {
-return renderXml(contextPath, resourceInfo, xsltInputStream);
-} finally {
-try {
-xsltInputStream.close();
-} catch(Throwable e){
-;
-}
-}
+return renderXml(contextPath, resourceInfo, xsltInputStream);
}
}
@@ -1501,24 +1477,12 @@
sb.append(/entries);
-if (readmeFile!=null) {
-DirContext resources = getResources();
-String readme = resourceInfo.path + readmeFile;
-ResourceInfo readmeInfo = new ResourceInfo(readme,
- resources);
-if (readmeInfo.exists()) {
-try {
-StringWriter buffer = new StringWriter();
-copyRange(new InputStreamReader(readmeInfo.getStream()),
- new PrintWriter(buffer));
+String readme = getReadme(resourceInfo.directory);
-sb.append(readme![CDATA[);
-sb.append(buffer.toString());
-sb.append(]]/readme);
-} catch(IOException e) {
-; /* Change me if this should be verbose */
-}
-}
+if (readme!=null) {
+sb.append(readme![CDATA[);
+sb.append(readme);
+sb.append(]]/readme);
}
@@ -1538,7 +1502,7 @@
osWriter.flush();
return (new ByteArrayInputStream(stream.toByteArray()));
} catch (Exception e) {
-e.printStackTrace();
+log(directory transform failure: + e.getMessage());
return renderHtml(contextPath, resourceInfo);
}
}
@@ -1698,24 +1662,11 @@
sb.append(HR size=\1\ noshade);
-if (readmeFile!=null) {
-DirContext resources = getResources();
-String readme = resourceInfo.path + readmeFile;
-ResourceInfo readmeInfo = new ResourceInfo(readme,
- resources);
-if (readmeInfo.exists()) {
-try {
-StringWriter buffer = new StringWriter();
-copyRange(new InputStreamReader(readmeInfo.getStream()),
- new PrintWriter(buffer));
-
-sb.append(buffer.toString());
-sb.append(HR size=\1\ noshade);
-} catch(IOException e) {
-; /* Change me if this should be verbose */
-}
-}
- }
+String readme = getReadme(resourceInfo.directory);
+if (readme!=null) {
+sb.append(readme);
+sb.append(HR size=\1\ noshade);
+}
sb.append(h3
cvs commit: jakarta-tomcat-catalina/webapps/docs proxy-howto.xml
funkman 2003/06/19 14:37:15 Modified:webapps/docs proxy-howto.xml Log: Remove mod_webapp references Fix links to Coyote HTTP/1.1 Connector Add quick blurb about apache 2 Revision ChangesPath 1.4 +9 -7 jakarta-tomcat-catalina/webapps/docs/proxy-howto.xml Index: proxy-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/proxy-howto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- proxy-howto.xml 15 Jan 2003 03:40:43 - 1.3 +++ proxy-howto.xml 19 Jun 2003 21:37:15 - 1.4 @@ -19,7 +19,7 @@ pUsing standard configurations of Tomcat, web applications can ask for the server name and port number to which the request was directed for processing. When Tomcat is running standalone with the -a href=config/http11.htmlHTTP/1.1 Connector/a, it will generally +a href=config/coyote.htmlCoyote HTTP/1.1 Connector/a, it will generally report the server name specified in the request, and the port number on which the strongConnector/strong is listening. The two servlet API calls of interest, for this purpose, are:/p @@ -47,7 +47,7 @@ pApache 1.3 supports an optional module (codemod_proxy/code) that configures the web server to act as a proxy server. This can be used to forward requests for a particular web application to a Tomcat 5 instance, -without having to configure a web connector such as codemod_webapp/code. +without having to configure a web connector such as codemod_jk/code. To accomplish this, you need to perform the following tasks:/p ol liConfigure your copy of Apache so that it includes the @@ -116,12 +116,14 @@ pWhen requests are proxied in this manner, strongall/strong requests for the configured web applications will be processed by Tomcat (including -requests for static content). You will often be able to improve performance -by using the codemod_webapp/code web connector instead, which -automatically configures itself to have Apache handle static content that is -not processed by filters or security constraints defined within the web -application's deployment descriptor (code/WEB-INF/web.xml/code)./p +requests for static content). +/p +/section + +section name=Apache 2.0 Proxy Support +The same instructions hold true as for 1.3. (Except in Apache 2.0, +you may omit codeAddModule mod_proxy.c/code) /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs tomcat-docs.xsl
funkman 2003/06/19 14:42:43
Modified:webapps/docs tomcat-docs.xsl
Log:
Update copyright year
Revision ChangesPath
1.6 +2 -2 jakarta-tomcat-catalina/webapps/docs/tomcat-docs.xsl
Index: tomcat-docs.xsl
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/tomcat-docs.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat-docs.xsl 4 Jun 2003 21:57:35 - 1.5
+++ tomcat-docs.xsl 19 Jun 2003 21:42:43 - 1.6
@@ -159,7 +159,7 @@
xsl:commentPAGE FOOTER/xsl:comment
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright #169; 1999-2002, Apache Software Foundation
+Copyright #169; 1999-2003, Apache Software Foundation
/em/font/div
/td/tr
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves ErrorReportValve.java
funkman 2003/06/21 10:37:17
Modified:catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
Log:
Dig as deep as possible to display possible nesting of ServletExceptions
Revision ChangesPath
1.4 +16 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ErrorReportValve.java 9 Oct 2002 12:42:51 - 1.3
+++ ErrorReportValve.java 21 Jun 2003 17:37:17 - 1.4
@@ -99,7 +99,7 @@
*
* pThis Valve should be attached at the Host level, although it will work
* if attached to a Context./p
- *
+ *
* pHTML code from the Cocoon 2 project./p
*
* @author Remy Maucherat
@@ -153,7 +153,7 @@
/**
- * Invoke the next Valve in the sequence. When the invoke returns, check
+ * Invoke the next Valve in the sequence. When the invoke returns, check
* the response state, and output an error report is necessary.
*
* @param request The servlet request to be processed
@@ -172,7 +172,7 @@
context.invokeNext(request, response);
ServletRequest sreq = (ServletRequest) request;
-Throwable throwable =
+Throwable throwable =
(Throwable) sreq.getAttribute(Globals.EXCEPTION_ATTR);
ServletResponse sresp = (ServletResponse) response;
@@ -228,7 +228,7 @@
/**
* Prints out an error report.
- *
+ *
* @param request The request being processed
* @param response The response being generated
* @param exception The exception that occurred (which possibly wraps
@@ -326,7 +326,7 @@
sb.append(/b pre);
sb.append(stackTrace.toString());
sb.append(/pre/p);
-if (rootCause != null) {
+while (rootCause != null) {
stackTrace = new StringWriter();
rootCause.printStackTrace(new PrintWriter(stackTrace));
sb.append(pb);
@@ -334,6 +334,12 @@
sb.append(/b pre);
sb.append(stackTrace.toString());
sb.append(/pre/p);
+
+/* In case root cause is somehow heavily nested */
+if (rootCause instanceof ServletException)
+rootCause = ((ServletException) rootCause).getRootCause();
+else
+rootCause = null;
}
}
@@ -346,7 +352,7 @@
Writer writer = response.getReporter();
if (writer != null) {
-
+
Locale locale = Locale.getDefault();
try {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/docs/faq/printer version.html misc.html connectors.html classnotfound.html
funkman 2003/06/23 19:07:02 Modified:xdocs-faq version.xml misc.xml connectors.xml classnotfound.xml docs/faq version.html misc.html connectors.html classnotfound.html docs/faq/printer version.html misc.html connectors.html classnotfound.html Log: FAQ update, added questions: - When is the next release? - Tagpool.release - jk2 link - java.lang.NoClassDefFoundError help - Fixed minor formatting In my diff - lots of html showed as changed - not sure why yet. Sorry for the big email commit message. Revision ChangesPath 1.2 +22 -3 jakarta-tomcat-site/xdocs-faq/version.xml Index: version.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/version.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- version.xml 12 Jun 2003 00:31:14 - 1.1 +++ version.xml 24 Jun 2003 02:07:01 - 1.2 @@ -25,9 +25,17 @@ section name=Questions ul - lia href=#which -Which tomcat version should I use? - /a /li + li + a href=#which + Which tomcat version should I use? + /a + /li + + li + a href=#when +When will the next version be released? + /a + /li /ul /section @@ -66,6 +74,17 @@ tomcat home page /a should have the correct recommendation. /answer + +question + a name=when +When will the next version be released? + /a +/question +answer + a href=http://marc.theaimsgroup.com/?l=tomcat-useramp;m=102351104906437amp;w=2; +When it is ready. + /a +/answer /section 1.2 +21 -2 jakarta-tomcat-site/xdocs-faq/misc.xml Index: misc.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/misc.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- misc.xml 12 Jun 2003 00:31:14 - 1.1 +++ misc.xml 24 Jun 2003 02:07:01 - 1.2 @@ -111,7 +111,11 @@ from a servlet? (or jsp) /a /li - +li + a href=#tagbroken +Is tag pooling broken? It doesn't call release! + /a +/li /ul /p @@ -312,7 +316,7 @@ question -a name=properties +a name=error How do I get a customized error page? /a /question @@ -473,6 +477,21 @@ header. /answer + + + question + a name=#tagbroken +Is tag pooling broken? It doesn't call release! + /a + /question + answer +It is not broken, your tag probably is. Many bug reports +have been filed about this. + a href=http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16001; +Here + /a +is the bug report with all the gory details. + /answer 1.2 +6 -0 jakarta-tomcat-site/xdocs-faq/connectors.xml Index: connectors.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/connectors.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- connectors.xml12 Jun 2003 00:31:14 - 1.1 +++ connectors.xml24 Jun 2003 02:07:01 - 1.2 @@ -58,6 +58,12 @@ /a /li + li[link] +a href=http://www.greenfieldresearch.ca/technical/jk2_config.html; + Tomcat-Apache using JK2 connector +/a + /li + li[thread] a href=http://marc.theaimsgroup.com/?t=10404005824amp;r=1amp;w=2; Configuring mod_jk - Again! 1.2 +20 -0 jakarta-tomcat-site/xdocs-faq/classnotfound.xml Index: classnotfound.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/classnotfound.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- classnotfound.xml 12 Jun 2003 00:31:14 - 1.1 +++ classnotfound.xml 24 Jun 2003 02:07:01 - 1.2 @@ -62,6 +62,9 @@ /a /li /ul +If you get a +codeNoClassDefFoundError/code exception, the root might be the +same reason as a codeClassNotFound/code exception. /section section name=Questions @@ -76,6 +79,11 @@ javax/servlet/Filter/code /a /li +li + a href=#xml +Why do I get codeNoClassDefFoundError: org/xml/sax/InputSource/code? +/a + /li /ul /p /section @@ -115,6 +123,18 @@ This really messes up the classloaders since Tomcat's classloaders don't act quite as normal
cvs commit: jakarta-tomcat-catalina/webapps/docs manager-howto.xml
funkman 2003/06/24 19:24:51 Modified:webapps/docs manager-howto.xml Log: add some docs about the JMXProxy servlet Revision ChangesPath 1.6 +100 -9jakarta-tomcat-catalina/webapps/docs/manager-howto.xml Index: manager-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/manager-howto.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- manager-howto.xml 12 May 2003 21:30:39 - 1.5 +++ manager-howto.xml 25 Jun 2003 02:24:51 - 1.6 @@ -38,6 +38,13 @@ /blockquote a href=#Executing Manager Commands With Ant Executing Manager Commands With Ant/abr / +a href=#Using the JMX Proxy Servlet +Using the JMX Proxy Servlet/abr / +blockquote +a href=#What is JMX Proxy ServletWhat is JMX Proxy Servlet?/abr / +a href=#JMX Query commandQuery command/abr / +a href=#JMX Set commandSet command/abr / +/blockquote /p /section @@ -283,8 +290,8 @@ ul licodeupdate/code: When set to true, any existing update will be undeployed first. The default value is set to false./li -licodetag/code: Specifying a tag name, this allows associating the -deployed webapp with a version number. The application version can +licodetag/code: Specifying a tag name, this allows associating the +deployed webapp with a version number. The application version can be later redeployed when needed using only the tag./li licodepause/code: Pause webapps so that incoming connections are not lost during an application update. This option is only used with the update @@ -312,7 +319,7 @@ application using this context path, or choose a different context path for the new one. The codeupdate/code parameter may be specified as a parameter on the URL, with a value of codetrue/code to avoid this -error. In that case, an undeploy will be performed on an existing +error. In that case, an undeploy will be performed on an existing application before performing the deployment./p /blockquote/li liemEncountered exception/em @@ -348,8 +355,8 @@ h3Install a version of a previously deployed webapp/h3 pThis can be used to deploy a previous version of a web applicaion, which -has been deployed using the codetag/code attribute. Note that the work -directory for the manager webapp will contain the previously deployed WARs; +has been deployed using the codetag/code attribute. Note that the work +directory for the manager webapp will contain the previously deployed WARs; removing it would make the deployment fail. source http://localhost:8080/manager/deploy?path=/footooamp;tag=footag @@ -368,7 +375,7 @@ the entire WAR file./p pIn this example the web application located in the directory -code/path/to/foo/code on the Tomcat server is installed as the +code/path/to/foo/code on the Tomcat server is installed as the web application context named code/footoo/code. source http://localhost:8080/manager/deploy?path=/footooamp;war=file:/path/to/foo @@ -488,7 +495,7 @@ application using this context path, or choose a different context path for the new one. The codeupdate/code parameter may be specified as a parameter on the URL, with a value of codetrue/code to avoid this -error. In that case, an undeploy will be performed on an existing +error. In that case, an undeploy will be performed on an existing application before performing the deployment./p /blockquote/li liemDocument base does not exist or is not a readable directory/em @@ -858,8 +865,8 @@ pstrongfont color=redWARNING/font - This command will delete the contents of the web application directory if it exists within the codeappBase/code directory (typically webapps) for this virtual host -/strong. This will also delete the source .WAR if expanding occurred, as -well as the XML Context definition. If you simply want to take an application +/strong. This will also delete the source .WAR if expanding occurred, as +well as the XML Context definition. If you simply want to take an application out of service, you should use the code/stop/code command instead./p pSignal an existing application to gracefully shut itself down, and @@ -993,6 +1000,90 @@ /pre /section + +section name=Using the JMX Proxy Servlet + + subsection name=What is JMX Proxy Servlet +The JMX Proxy Servlet is a lightweight proxy to get and set the +tomcat internals. (Or any class that has been exposed via an MBean) +Its usage is not very user friendly but the UI is +extremely help for integrating command line scripts for monitoring +and changing the internals of tomcat. You can do two things with the proxy: +get information and set information. For you to really
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java AccessLogValve.java
funkman 2003/07/08 16:12:51 Modified:catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml catalina/src/share/org/apache/catalina/valves AccessLogValve.java Added: catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java Log: Backport changes from tomcat 5 This is literally a copy from the 5 version - New (from 5) ExtendAccessLogValve - Fix bz - 20380 AccessLogValve incorrectly calculates timezone - Enc bz - 16374 Date in file name configurable - Enc bz - 16400 Allow logging to be conditional Also get Costin's %D Revision ChangesPath 1.76 +116 -46 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- mbeans-descriptors.xml19 Feb 2003 01:04:44 - 1.75 +++ mbeans-descriptors.xml8 Jul 2003 23:12:51 - 1.76 @@ -10,53 +10,60 @@ -- mbeans-descriptors - - - mbean name=AccessLogValve -className=org.apache.catalina.mbeans.ClassNameMBean - description=Valve that generates a web server access log - domain=Catalina -group=Valve - type=org.apache.catalina.valves.AccessLogValve - -attribute name=className - description=Fully qualified class name of the managed object - type=java.lang.String -writeable=false/ - -attribute name=debug - description=The debugging detail level for this component - type=int/ - -attribute name=directory - description=The directory in which log files are created - type=java.lang.String/ + mbean name=AccessLogValve + description=Valve that generates a web server access log + domain=Catalina + group=Valve + type=org.apache.catalina.valves.AccessLogValve + +attribute name=className + description=Fully qualified class name of the managed object + type=java.lang.String + writeable=false/ + +attribute name=debug + description=The debugging detail level for this component + type=int/ + +attribute name=containerName + description=Object name of the container + type=javax.management.ObjectName/ + +attribute name=directory + description=The directory in which log files are created + type=java.lang.String/ attribute name=pattern - description=The pattern used to format our access log lines - type=java.lang.String/ - -attribute name=prefix - description=The prefix that is added to log file filenames - type=java.lang.String/ - -attribute name=resolveHosts - description=Resolve hosts - is=true - type=boolean/ - -attribute name=rotatable - description=Rotate log - is=true - type=boolean/ - -attribute name=suffix - description=The suffix that is added to log file filenames - type=java.lang.String/ + description=The pattern used to format our access log lines + type=java.lang.String/ +attribute name=prefix + description=The prefix that is added to log file filenames + type=java.lang.String/ + +attribute name=resolveHosts + description=Resolve hosts + is=true + type=boolean/ + +attribute name=rotatable + description=Flag to indicate automatic log rotation. + is=true + type=boolean/ + +attribute name=suffix + description=The suffix that is added to log file filenames + type=java.lang.String/ + +attribute name=condition + description=The value to look for conditional logging. + type=java.lang.String/ + +attribute name=fileDateFormat + description=The format for the date date based log rotation. + type=java.lang.String/ /mbean - mbean name=BasicAuthenticator className=org.apache.catalina.mbeans.ClassNameMBean description=An Authenticator and Valve implementation of HTTP BASIC @@ -320,7 +327,7
cvs commit: jakarta-tomcat-site/xdocs-faq connectors.xml
funkman 2003/07/11 03:57:20 Modified:docs/faq connectors.html docs/faq/printer connectors.html xdocs-faq connectors.xml Log: Add q about jk2 config file location based on tomcat user conversation http://marc.theaimsgroup.com/?t=10578489323amp;r=1amp;w=2 Revision ChangesPath 1.5 +33 -0 jakarta-tomcat-site/docs/faq/connectors.html Index: connectors.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/connectors.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connectors.html 11 Jul 2003 01:57:37 - 1.4 +++ connectors.html 11 Jul 2003 10:57:19 - 1.5 @@ -101,6 +101,14 @@ At boot, is order of start up (Apache vs Tomcat) important? /a /li +li + a href=#jkloc + JK2 doesn't seem to be using my settings in my + codeworkers2.properties/code file + such as creating the shm file or mapping the URIs listed to Tomcat, + what's wrong? + /a +/li /ul /p /blockquote/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote @@ -241,6 +249,31 @@ No. This way - either apache or tomcat can be restarted at any time independent of one another. /divbr + + b style=font-size: larger +a name=jkloc + JK2 doesn't seem to be using my settings in my + codeworkers2.properties/code file + such as creating the shm file or mapping the URIs listed to Tomcat, + what's wrong? +/a + /b + div style=padding-left : 20px; +JK2 is not finding your codeworkers2.properties/code file. +Specify it's location in your codehttpd.conf/code file by adding: + +brbr +code +JkSet config.file /full/system/path/to/workers2.properties +/code +brbr +a href=http://marc.theaimsgroup.com/?t=10578489323r=1w=2; +Thread which spawned this question. +/a + /divbr + + + /blockquote/td/tr/table/td/tr!--FOOTER SEPARATOR--trtd colspan=2hr size=1 noshade=/td/tr!--PAGE FOOTER--trtd colspan=2div align=centerfont size=-1 color=#525D76em 1.4 +33 -0 jakarta-tomcat-site/docs/faq/printer/connectors.html Index: connectors.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/printer/connectors.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- connectors.html 11 Jul 2003 01:57:39 - 1.3 +++ connectors.html 11 Jul 2003 10:57:20 - 1.4 @@ -100,6 +100,14 @@ At boot, is order of start up (Apache vs Tomcat) important? /a /li +li + a href=#jkloc + JK2 doesn't seem to be using my settings in my + codeworkers2.properties/code file + such as creating the shm file or mapping the URIs listed to Tomcat, + what's wrong? + /a +/li /ul /p /blockquote/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote @@ -240,6 +248,31 @@ No. This way - either apache or tomcat can be restarted at any time independent of one another. /divbr + + b style=font-size: larger +a name=jkloc + JK2 doesn't seem to be using my settings in my + codeworkers2.properties/code file + such as creating the shm file or mapping the URIs listed to Tomcat, + what's wrong? +/a + /b + div style=padding-left : 20px; +JK2 is not finding your codeworkers2.properties/code file. +Specify it's location in your codehttpd.conf/code file by adding: + +brbr +code +JkSet config.file /full/system/path/to/workers2.properties +/code +brbr +a href=http://marc.theaimsgroup.com/?t=10578489323r=1w=2; +Thread which spawned this question. +/a + /divbr + + + /blockquote/td/tr/table/td/tr!--FOOTER SEPARATOR--trtd colspan=2hr size=1 noshade=/td/tr!--PAGE FOOTER--trtd colspan=2div align=centerfont size=-1 color=#525D76em 1.4 +33 -0 jakarta-tomcat-site/xdocs-faq/connectors.xml Index: connectors.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/connectors.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- connectors.xml11 Jul 2003 01:57:39 - 1.3 +++ connectors.xml11 Jul 2003 10:57:20 - 1.4 @@ -114,6 +114,14 @@ At boot, is order of start up (Apache vs Tomcat) important
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java
funkman 2003/07/17 18:24:19
Modified:catalina/src/share/org/apache/catalina/valves
ExtendedAccessLogValve.java
Log:
If bytes are requested, then print bytes, not the date.
Revision ChangesPath
1.4 +11 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtendedAccessLogValve.java 4 Jun 2003 16:58:21 - 1.3
+++ ExtendedAccessLogValve.java 18 Jul 2003 01:24:19 - 1.4
@@ -637,9 +637,13 @@
result.append(timeTakenFormatter.format(runTime/1000d));
else if (FieldInfo.SPECIAL_TIME==fieldInfos[i].location)
result.append(timeFormatter.format(date));
-else if (FieldInfo.SPECIAL_BYTES==fieldInfos[i].location)
-result.append(dateFormatter.format(date));
-else if (FieldInfo.SPECIAL_CACHED==fieldInfos[i].location)
+else if (FieldInfo.SPECIAL_BYTES==fieldInfos[i].location) {
+int length = response.getContentCount();
+if (length 0)
+result.append(length);
+else
+result.append(-);
+} else if (FieldInfo.SPECIAL_CACHED==fieldInfos[i].location)
result.append('-'); /* I don't know how to evaluate this! */
else
result.append(?WTF?); /* This should never happen! */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java
funkman 2003/07/17 18:24:45
Modified:catalina/src/share/org/apache/catalina/valves
ExtendedAccessLogValve.java
Log:
Port from 5: If bytes are requested, then print bytes not the date.
Revision ChangesPath
1.2 +11 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtendedAccessLogValve.java 8 Jul 2003 23:12:51 - 1.1
+++ ExtendedAccessLogValve.java 18 Jul 2003 01:24:45 - 1.2
@@ -637,9 +637,13 @@
result.append(timeTakenFormatter.format(runTime/1000d));
else if (FieldInfo.SPECIAL_TIME==fieldInfos[i].location)
result.append(timeFormatter.format(date));
-else if (FieldInfo.SPECIAL_BYTES==fieldInfos[i].location)
-result.append(dateFormatter.format(date));
-else if (FieldInfo.SPECIAL_CACHED==fieldInfos[i].location)
+else if (FieldInfo.SPECIAL_BYTES==fieldInfos[i].location) {
+int length = response.getContentCount();
+if (length 0)
+result.append(length);
+else
+result.append(-);
+} else if (FieldInfo.SPECIAL_CACHED==fieldInfos[i].location)
result.append('-'); /* I don't know how to evaluate this! */
else
result.append(?WTF?); /* This should never happen! */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves AccessLogValve.java
funkman 2003/07/19 06:16:25
Modified:catalina/src/share/org/apache/catalina/valves
AccessLogValve.java
Log:
per http://marc.theaimsgroup.com/?l=tomcat-devm=105853698814388w=2
Add leading + to timezone offset.
This also makes = + which I think is OK.
Revision ChangesPath
1.5 +3 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Index: AccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AccessLogValve.java 4 Jun 2003 16:58:21 - 1.4
+++ AccessLogValve.java 19 Jul 2003 13:16:25 - 1.5
@@ -1049,6 +1049,8 @@
if ((offset0)) {
tz.append(-);
offset = -offset;
+} else {
+tz.append(+);
}
long hourOffset = offset/(1000*60*60);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves AccessLogValve.java
funkman 2003/07/19 06:17:47
Modified:catalina/src/share/org/apache/catalina/valves
AccessLogValve.java
Log:
(backport from 5)
per http://marc.theaimsgroup.com/?l=tomcat-devm=105853698814388w=2
Add leading + to timezone offset.
This also makes = + which I think is OK.
Revision ChangesPath
1.17 +3 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Index: AccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AccessLogValve.java 8 Jul 2003 23:12:51 - 1.16
+++ AccessLogValve.java 19 Jul 2003 13:17:46 - 1.17
@@ -1049,6 +1049,8 @@
if ((offset0)) {
tz.append(-);
offset = -offset;
+} else {
+tz.append(+);
}
long hourOffset = offset/(1000*60*60);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
funkman 2003/07/22 17:36:41
Modified:.build.xml
Log:
Only checkout modeler from commons instead of all of commons.
Revision ChangesPath
1.144 +1 -1 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- build.xml 21 Jul 2003 17:47:46 - 1.143
+++ build.xml 23 Jul 2003 00:36:41 - 1.144
@@ -1694,7 +1694,7 @@
command=checkout -P ${cvstag} ${commons-daemon.cvs.loc}
dest=${cvs.base}/
cvs cvsroot=${cvsroot} quiet=true
- command=checkout -P ${cvstag} jakarta-commons
+ command=checkout -P ${cvstag} ${commons-modeler.cvs.loc}
dest=${cvs.base}/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RELEASE-NOTES
funkman 2003/07/24 05:01:15 Modified:.RELEASE-NOTES Log: Removed javac leak reference Added FAQ reference SSI-CGI web.xml line #'s were wrong Revision ChangesPath 1.4 +30 -20jakarta-tomcat-5/RELEASE-NOTES Index: RELEASE-NOTES === RCS file: /home/cvs/jakarta-tomcat-5/RELEASE-NOTES,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RELEASE-NOTES 26 Jun 2003 00:03:49 - 1.3 +++ RELEASE-NOTES 24 Jul 2003 12:01:14 - 1.4 @@ -49,15 +49,18 @@ Tomcat 5.0 Standard APIs Available: -- -A standard installation of Tomcat 4 makes all of the following APIs available +A standard installation of Tomcat 5 makes all of the following APIs available for use by web applications (by placing them in common/lib or shared/lib): * ant.jar (Apache Ant) * commons-collections.jar (Commons Collections) * commons-dbcp.jar (Commons DBCP 1.0) +* commons-el.jar (Commons Expression Language 1.0) * commons-logging-api.jar (Commons Logging) * commons-pool.jar (Commons Pool) * jasper-compiler.jar (Jasper 2 Compiler) * jasper-runtime.jar (Jasper 2 Runtime) +* jmx.jar (From mx4j-1.1.1) +* jmx-tools.jar (From mx4j-1.1.1) * jsp-api.jar (JSP 2.0 API) * commons-el.jar (JSP 2.0 Expression Language) * naming-common.jar (JNDI Context implementation) @@ -79,7 +82,7 @@ As described above, Tomcat 5.0 makes an XML parser (and many other standard APIs) available to web applications. This parser is also used internally to parse web.xml files and the server.xml configuration file. If you wish, -you may replace the xercesImpl.jar file in common/endorsed with another +you may replace the xercesImpl.jar file in common/endorsed with another XML parser, as long as it is compatible with the JAXP 1.1 APIs. @@ -89,12 +92,12 @@ Some shared libraries (many are part of the JDK) keep references to objects instantiated by the web application. To avoid class loading related problems -(ClassCastExceptions, messages indicating that the classloader +(ClassCastExceptions, messages indicating that the classloader is stopped, etc.), the shared libraries state should be reinitialized. -Something which might help is to avoid putting classes which would be -referenced by a shared static field in the web application classloader, -and putting them in the shared classloader instead (JARs should be put in the +Something which might help is to avoid putting classes which would be +referenced by a shared static field in the web application classloader, +and putting them in the shared classloader instead (JARs should be put in the lib folder, and classes should be put in the classes folder). @@ -103,8 +106,8 @@ The Java compiler leaks memory each time a class is compiled. Web applications -containing hundreds of JSP files may as a result trigger out of memory errors -once a significant number of pages have been accessed. The memory can only be +containing hundreds of JSP files may as a result trigger out of memory errors +once a significant number of pages have been accessed. The memory can only be freed by stopping Tomcat and then restarting it. The JSP command line compiler (JSPC) can also be used to precompile the JSPs. @@ -115,11 +118,11 @@ --- Virtual machine crashes may be experienced when using certain combinations of -kernel / glibc under Linux with Sun Hotspot 1.2 to 1.3. The crashes were +kernel / glibc under Linux with Sun Hotspot 1.2 to 1.3. The crashes were reported to occur mostly on startup. Sun JDK 1.4 does not exhibit the problems, and neither does IBM JDK for Linux. -The problems can be fixed by reducing the default stack size. From a bash shell, +The problems can be fixed by reducing the default stack size. From a bash shell, use ulimit -s 2048; use limit stacksize 2048 for tcsh. GLIBC 2.2 / Linux 2.4 users should also define an environment variable: @@ -131,9 +134,9 @@ Having CGI and SSI available to web applications created security problems when -using a security manager (as a malicious web application could use them to +using a security manager (as a malicious web application could use them to sidestep the security manager access control). In Tomcat 5.0, they have been -disabled by default, as our goal is to provide a fully secure default +disabled by default, as our goal is to provide a fully secure default configuration. However, CGI and SSI remain available. To enable CGI and SSI on Windows: @@ -142,8 +145,8 @@ * rename the file %CATALINA_HOME%\server\lib\servlets-ssi.renametojar to %CATALINA_HOME%\server\lib\servlets-ssi.jar
cvs commit: jakarta-tomcat-catalina/webapps/docs introduction.xml
funkman 2003/07/24 05:03:57 Modified:webapps/docs introduction.xml Log: Added link to FAQ and Wiki Revision ChangesPath 1.4 +2 -0 jakarta-tomcat-catalina/webapps/docs/introduction.xml Index: introduction.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/introduction.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- introduction.xml 15 Jan 2003 03:40:43 - 1.3 +++ introduction.xml 24 Jul 2003 12:03:57 - 1.4 @@ -101,6 +101,8 @@ to fully read the relevant documentation as it will save you much time and effort. There's nothing like scouring the web only to find out that the answer was right in front of you all along!/li +lia href=http://jakarta.apache.org/tomcat/faq/;Tomcat FAQ/a as maintained by the developers./li +lia href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat;Tomcat WIKI/a/li liJakarta a href=http://jakarta.apache.org:8080/jyve-faq/Turbine/screen/MainMenu/action/SetAll/screen/DisplayTopics/faq_id/12/project_id/2;jsessionid=36lqy9k9x1;FAQ-o-matic/a - a repository of FAQs for the various Jakarta subprojects, including Tomcat of course./li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config valve.xml
funkman 2003/07/24 05:52:55
Modified:webapps/docs/config valve.xml
Log:
Update for AccessLogValve
Revision ChangesPath
1.4 +41 -0 jakarta-tomcat-catalina/webapps/docs/config/valve.xml
Index: valve.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/valve.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- valve.xml 15 Jan 2003 03:40:44 - 1.3
+++ valve.xml 24 Jul 2003 12:52:55 - 1.4
@@ -99,6 +99,32 @@
use a zero-length string./p
/attribute
+ attribute name=rotatable required=false
+pDeafult true. Flag to determine if log rotation should occur.
+ If set to false, then this file is never rotated and
+ ttfileDateFormat/tt is ignored. Use with caution!
+/p
+ /attribute
+
+ attribute name=condition required=false
+pTurns on conditional logging. If set, requests will be
+ logged only if ttServletRequest.getAttribute()/tt is
+ null. For example, if this value is set to
+ ttjunk/tt, then a particular request will only be logged
+ if ttServletRequest.getAttribute(junk) == null/tt.
+ The use of Filters is an easy way to set/unset the attribute
+ in the ServletRequest on many different requests.
+/p
+ /attribute
+
+ attribute name=fileDateFormat required=false
+pAllows a customized date format in the access log file name.
+ The date format also decides how often the file is rotated.
+ If you wish to rotate every hour, then set this value
+ to: tt-MM-dd.HH/tt
+/p
+ /attribute
+
/attributes
pValues for the codepattern/code attribute are made up of literal
@@ -126,7 +152,22 @@
lib%u/b - Remote user that was authenticated (if any), else '-'/li
lib%U/b - Requested URL path/li
lib%v/b - Local server name/li
+lib%D/b - Time taken to process the request, in millis/li
+lib%T/b - Time taken to process the request, in seconds/li
/ul
+
+p
+There is also support to write information from the cookie, incoming
+header, the Session or something else in the ServletRequest.
+It is modeled after the apache syntax:
+ul
+libcode%{xxx}i/code/b for incoming headers/li
+libcode%{xxx}c/code/b for a specific cookie/li
+libcode%{xxx}r/code/b xxx is an attribute in the ServletRequest/li
+libcode%{xxx}s/code/b xxx is an attribute in the HttpSession/li
+/ul
+/p
+
pThe shorthand pattern name codecommon/code (which is also the
default) corresponds to strong%h %l %u %t %r %s %b/strong./p
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
funkman 2003/07/25 12:25:07
Modified:util/java/org/apache/tomcat/util/http/mapper Mapper.java
Log:
correct welcome file processing under certain conditions
replace rule 6 with new rule 4c
[My text editor strips trailing spaces]
Revision ChangesPath
1.25 +72 -82
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Mapper.java 23 Jul 2003 04:25:28 - 1.24
+++ Mapper.java 25 Jul 2003 19:25:06 - 1.25
@@ -3,7 +3,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
+ *notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
@@ -19,15 +19,15 @@
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
- *any, must include the following acknowlegement:
- * This product includes software developed by the
+ *any, must include the following acknowlegement:
+ * This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Tomcat, and Apache Software
*Foundation must not be used to endorse or promote products derived
- *from this software without prior written permission. For written
+ *from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
@@ -55,7 +55,7 @@
*
* [Additional notices, if required by prior licensing conditions]
*
- */
+ */
package org.apache.tomcat.util.http.mapper;
import javax.naming.NamingException;
@@ -75,7 +75,7 @@
public final class Mapper {
-private static org.apache.commons.logging.Log logger =
+private static org.apache.commons.logging.Log logger =
org.apache.commons.logging.LogFactory.getLog(Mapper.class);
// - Instance Variables
@@ -102,7 +102,7 @@
/**
* Get default host.
- *
+ *
* @return Default host name
*/
public String getDefaultHostName() {
@@ -112,7 +112,7 @@
/**
* Set default host.
- *
+ *
* @param name Default host name
*/
public void setDefaultHostName(String defaultHostName) {
@@ -121,11 +121,11 @@
/**
* Add a new host to the mapper.
- *
+ *
* @param name Virtual host name
* @param host Host object
*/
-public synchronized void addHost(String name, String[] aliases,
+public synchronized void addHost(String name, String[] aliases,
Object host) {
Host[] newHosts = new Host[hosts.length + 1];
Host newHost = new Host();
@@ -151,7 +151,7 @@
/**
* Remove a host from the mapper.
- *
+ *
* @param name Virtual host name
*/
public synchronized void removeHost(String name, String[] aliases) {
@@ -178,11 +178,11 @@
/**
* Set context, used for wrapper mapping (request dispatcher).
- *
+ *
* @param welcomeResources Welcome files defined for this context
* @param resources Static resources of the context
*/
-public void setContext(String path, String[] welcomeResources,
+public void setContext(String path, String[] welcomeResources,
javax.naming.Context resources) {
context.name = path;
context.welcomeResources = welcomeResources;
@@ -192,7 +192,7 @@
/**
* Add a new Context to an existing Host.
- *
+ *
* @param hostName Virtual host name this context belongs to
* @param path Context path
* @param context Context object
@@ -200,7 +200,7
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
funkman 2003/07/25 12:26:31
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
remove welcome file processing since it is done by the mapper
Revision ChangesPath
1.14 +9 -89
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultServlet.java 19 Jun 2003 12:23:47 - 1.13
+++ DefaultServlet.java 25 Jul 2003 19:26:31 - 1.14
@@ -161,7 +161,7 @@
/**
- * Should we generate directory listings when no welcome file is present?
+ * Should we generate directory listings?
*/
protected boolean listings = true;
@@ -179,12 +179,6 @@
/**
- * The set of welcome files for this web application
- */
-protected String welcomes[] = new String[0];
-
-
-/**
* MD5 message digest provider.
*/
protected static MessageDigest md5Helper;
@@ -322,18 +316,9 @@
if (output 256)
output = 256;
-// Initialize the set of welcome files for this application
-welcomes = (String[]) getServletContext().getAttribute
-(Globals.WELCOME_FILES_ATTR);
-if (welcomes == null)
-welcomes = new String[0];
-
if (debug 0) {
log(DefaultServlet.init: input buffer size= + input +
, output buffer size= + output);
-for (int i = 0; i welcomes.length; i++)
-log(DefaultServlet.init: welcome file= +
-welcomes[i]);
}
// Load the MD5 helper used to calculate signatures.
@@ -956,36 +941,9 @@
}
}
-// If the resource is a collection (aka a directory), we check
-// the welcome files list.
-if (resourceInfo.collection) {
-
-if (!request.getRequestURI().endsWith(/)) {
-String redirectPath = path;
-String contextPath = request.getContextPath();
-if ((contextPath != null) (!contextPath.equals(/))) {
-redirectPath = contextPath + redirectPath;
-}
-if (!(redirectPath.endsWith(/)))
-redirectPath = redirectPath + /;
-redirectPath = appendParameters(request, redirectPath);
-response.sendRedirect(redirectPath);
-return;
-}
-
-ResourceInfo welcomeFileInfo = checkWelcomeFiles(path, resources);
-if (welcomeFileInfo != null) {
-String redirectPath = welcomeFileInfo.path;
-String contextPath = request.getContextPath();
-if ((contextPath != null) (!contextPath.equals(/))) {
-redirectPath = contextPath + redirectPath;
-}
-redirectPath = appendParameters(request, redirectPath);
-response.sendRedirect(redirectPath);
-return;
-}
-
-} else {
+// Check if the conditions specified in the optional If headers are
+// satisfied.
+if (!resourceInfo.collection) {
// Checking If headers
boolean included =
@@ -2292,7 +2250,7 @@
long start, long end) {
if (debug 10)
-System.out.println(Serving bytes: + start + - + end);
+log(Serving bytes: + start + - + end);
try {
istream.skip(start);
@@ -2375,44 +2333,6 @@
}
-
-/**
- * Check to see if a default page exists.
- *
- * @param pathname Pathname of the file to be served
- */
-private ResourceInfo checkWelcomeFiles(String pathname,
- DirContext resources) {
-
-String collectionName = pathname;
-if (!pathname.endsWith(/)) {
-collectionName += /;
-}
-
-// Refresh our currently defined set of welcome files
-synchronized (welcomes) {
-welcomes = (String[]) getServletContext().getAttribute
-(Globals.WELCOME_FILES_ATTR);
-if (welcomes == null)
-welcomes = new String[0];
-}
-
-// Serve a welcome resource or file if one exists
-for (int i = 0; i welcomes.length; i++) {
-
-// Does the specified resource exist?
-String resourceName
cvs commit: jakarta-tomcat-4.0/catalina/src/bin setclasspath.sh
funkman 2003/07/26 07:27:54 Modified:catalina/src/bin setclasspath.sh Log: Per bugzilla 21908 Thanks jcorley1 AT nc.rr dot com (Jason Corley) Revision ChangesPath 1.10 +2 -2 jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh Index: setclasspath.sh === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- setclasspath.sh 8 May 2003 08:19:58 - 1.9 +++ setclasspath.sh 26 Jul 2003 14:27:54 - 1.10 @@ -10,7 +10,7 @@ echo This environment variable is needed to run this program exit 1 fi -if $os400; then +if [ ! $os400 ]; then if [ ! -r $JAVA_HOME/bin/java -o ! -r $JAVA_HOME/bin/javac ]; then echo The JAVA_HOME environment variable is not defined correctly echo This environment variable is needed to run this program - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/bin setclasspath.sh
funkman 2003/07/28 08:36:23 Modified:catalina/src/bin setclasspath.sh Log: per bugzilla 21908 undo my previous commit since I evidently didn't read the patch correctly and apply the correct patch Revision ChangesPath 1.11 +2 -2 jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh Index: setclasspath.sh === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/setclasspath.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- setclasspath.sh 26 Jul 2003 14:27:54 - 1.10 +++ setclasspath.sh 28 Jul 2003 15:36:23 - 1.11 @@ -10,7 +10,7 @@ echo This environment variable is needed to run this program exit 1 fi -if [ ! $os400 ]; then +if $os400; then if [ ! -r $JAVA_HOME/bin/java -o ! -r $JAVA_HOME/bin/javac ]; then echo The JAVA_HOME environment variable is not defined correctly echo This environment variable is needed to run this program @@ -53,7 +53,7 @@ # Set standard commands for invoking Java. _RUNJAVA=$JAVA_HOME/bin/java -if ! $os400; then +if [ ! $os400 ]; then _RUNJDB=$JAVA_HOME/bin/jdb fi _RUNJAVAC=$JAVA_HOME/bin/javac - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh
funkman 2003/07/31 08:03:04
Modified:catalina/src/bin catalina.sh
Log:
Port os400 change from 4.1.
Actually just copied the entire file from 4.1 to here. And kept the
-force logic.
This worked fine with cygwin. The diff seems innocent.
Comments on -sourcepath
$CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share ?
Does anyone debug with a debugger on 5? Should this be removed?
Revision ChangesPath
1.7 +50 -26jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
Index: catalina.sh
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- catalina.sh 20 Mar 2003 23:30:45 - 1.6
+++ catalina.sh 31 Jul 2003 15:03:04 - 1.7
@@ -40,8 +40,10 @@
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
+os400=false
case `uname` in
CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
esac
# resolve links - $0 may be a softlink
@@ -68,10 +70,23 @@
if $cygwin; then
[ -n $JAVA_HOME ] JAVA_HOME=`cygpath --unix $JAVA_HOME`
[ -n $CATALINA_HOME ] CATALINA_HOME=`cygpath --unix $CATALINA_HOME`
+ [ -n $CATALINA_BASE ] CATALINA_BASE=`cygpath --unix $CATALINA_BASE`
[ -n $CLASSPATH ] CLASSPATH=`cygpath --path --unix $CLASSPATH`
[ -n $JSSE_HOME ] JSSE_HOME=`cygpath --path --unix $JSSE_HOME`
fi
+# For OS400
+if $os400; then
+ # Set job priority to standard for interactive (interactive - 6) by using
+ # the interactive priority - 6, the helper threads that respond to requests
+ # will be running at the same priority as interactive jobs.
+ COMMAND='chgjob job('$JOBNAME') runpty(6)'
+ system $COMMAND
+
+ # Enable multi threading
+ export QIBM_MULTI_THREADED=Y
+fi
+
# Get standard Java environment variables
if [ -r $CATALINA_HOME/bin/setclasspath.sh ]; then
BASEDIR=$CATALINA_HOME
@@ -130,27 +145,32 @@
if [ $1 = debug ] ; then
- shift
- if [ $1 = -security ] ; then
-echo Using Security Manager
-shift
-exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
- -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
- -Djava.security.manager \
- -Djava.security.policy==$CATALINA_BASE/conf/catalina.policy \
- -Dcatalina.base=$CATALINA_BASE \
- -Dcatalina.home=$CATALINA_HOME \
- -Djava.io.tmpdir=$CATALINA_TMPDIR \
- org.apache.catalina.startup.Bootstrap $@ start
+ if $os400; then
+echo Debug command not available on OS400
+exit 1
else
-exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
- -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
- -Dcatalina.base=$CATALINA_BASE \
- -Dcatalina.home=$CATALINA_HOME \
- -Djava.io.tmpdir=$CATALINA_TMPDIR \
- org.apache.catalina.startup.Bootstrap $@ start
+shift
+if [ $1 = -security ] ; then
+ echo Using Security Manager
+ shift
+ exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
+-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
+-sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
+-Djava.security.manager \
+-Djava.security.policy==$CATALINA_BASE/conf/catalina.policy \
+-Dcatalina.base=$CATALINA_BASE \
+-Dcatalina.home=$CATALINA_HOME \
+-Djava.io.tmpdir=$CATALINA_TMPDIR \
+org.apache.catalina.startup.Bootstrap $@ start
+else
+ exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
+-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
+-sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
+-Dcatalina.base=$CATALINA_BASE \
+-Dcatalina.home=$CATALINA_HOME \
+-Djava.io.tmpdir=$CATALINA_TMPDIR \
+org.apache.catalina.startup.Bootstrap $@ start
+fi
fi
elif [ $1 = embedded ] ; then
@@ -206,7 +226,7 @@
if [ ! -z $CATALINA_PID ]; then
echo $! $CATALINA_PID
- fi
+ fi
else
$_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
@@ -218,7 +238,7 @@
if [ ! -z $CATALINA_PID ]; then
echo $! $CATALINA_PID
- fi
+ fi
fi
elif [ $1 = stop ] ; then
@@ -239,13 +259,17 @@
fi
fi
-
else
echo Usage: catalina.sh ( commands ... )
echo commands:
- echo debug Start Catalina in a debugger
- echo debug -security Debug Catalina with a security manager
cvs commit: jakarta-tomcat-catalina/catalina/src/bin setclasspath.sh
funkman 2003/07/31 08:17:55 Modified:catalina/src/bin setclasspath.sh Log: os400 port from 4.1 Revision ChangesPath 1.5 +16 -6 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh Index: setclasspath.sh === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- setclasspath.sh 17 Jan 2003 10:05:40 - 1.4 +++ setclasspath.sh 31 Jul 2003 15:17:55 - 1.5 @@ -10,10 +10,18 @@ echo This environment variable is needed to run this program exit 1 fi -if [ ! -r $JAVA_HOME/bin/java -o ! -r $JAVA_HOME/bin/jdb -o ! -r $JAVA_HOME/bin/javac ]; then - echo The JAVA_HOME environment variable is not defined correctly - echo This environment variable is needed to run this program - exit 1 +if $os400; then + if [ ! -r $JAVA_HOME/bin/java -o ! -r $JAVA_HOME/bin/javac ]; then +echo The JAVA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +exit 1 + fi +else + if [ ! -r $JAVA_HOME/bin/java -o ! -r $JAVA_HOME/bin/jdb -o ! -r $JAVA_HOME/bin/javac ]; then +echo The JAVA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +exit 1 + fi fi if [ -z $BASEDIR ]; then echo The BASEDIR environment variable is not defined @@ -45,5 +53,7 @@ # Set standard commands for invoking Java. _RUNJAVA=$JAVA_HOME/bin/java -_RUNJDB=$JAVA_HOME/bin/jdb +if [ ! $os400 ]; then + _RUNJDB=$JAVA_HOME/bin/jdb +fi _RUNJAVAC=$JAVA_HOME/bin/javac - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
funkman 2003/08/04 17:54:26
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Fix bugs:
18698 - Exception message in JNDI realm is not Socket closed on different ldap
implementations
11678 - JNDIRealm times out/prompts for password with BASIC authentication
19864 - JNDIRealm NullPointerException / CommunicationException when Context Closed
20518 - JNDIRealm not retrying primary LDAP server after failed attempt against
alternate server
Thanks to Bradley M. Handy bhandy aT users dot sf (another dot) net for 20518
For the first 3 bugs:
When CommunicationException is thrown, check that message is not null.
When CommunicationException is thrown close the connection if
- Message is null
- Message contains closed (was Socket closed)
For the last bug:
Put connectionAttempt = 0 in a finally block
Other thanks to David DeWolf (david at daviddewolf com) and
Jeff Tulley (jtulley at novell com)
Committing to 4.1 first since this has a better chance of being tested there first.
My text editor strips trailing white space (for seemingly unchanged lines)
In reality, about 4 lines of code really changed.
Revision ChangesPath
1.12 +103 -95
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JNDIRealm.java11 Jan 2003 01:47:13 - 1.11
+++ JNDIRealm.java5 Aug 2003 00:54:26 - 1.12
@@ -107,7 +107,7 @@
* substituting the presented username into a pattern configured by the
* codeuserPattern/code property./li
*
- * liAlternatively, if the codeuserPattern/code property is not
+ * liAlternatively, if the codeuserPattern/code property is not
* specified, a unique element can be located by searching the directory
* context. In this case:
* ul
@@ -122,7 +122,7 @@
* requests a search of only the current level./li
*/ul
* /li
- *
+ *
* liThe user may be authenticated by binding to the directory with the
* username and password presented. This method is used when the
* codeuserPassword/code property is not specified./li
@@ -244,19 +244,20 @@
/**
- * The protocol that will be used in the communication with the directory
server.
+ * The protocol that will be used in the communication with the
+ * directory server.
*/
protected String protocol = null;
/**
- * How should we handle referrals? Microsoft Active Directory can't handle
- * the default case, so an application authenticating against AD must
+ * How should we handle referrals? Microsoft Active Directory can't handle
+ * the default case, so an application authenticating against AD must
* set referrals to follow.
*/
protected String referrals = null;
-
-
+
+
/**
* The base element for user searches.
*/
@@ -292,7 +293,7 @@
/**
* The message format used to form the distinguished name of a
* user, with {0} marking the spot where the specified username
- * goes.
+ * goes.
*/
protected String userPattern = null;
@@ -342,11 +343,11 @@
*/
protected boolean roleSubtree = false;
-/**
+/**
* An alternate URL, to which, we should connect if connectionURL fails.
*/
-protected String alternateURL;
-
+protected String alternateURL;
+
/**
* The number of connection attempts. If greater than zero we use the
* alternate url.
@@ -357,24 +358,24 @@
/**
* Return the type of authentication to use.
- */
+ */
public String getAuthentication() {
return authentication;
-
+
}
-
+
/**
* Set the type of authentication to use.
*
* @param authentication The authentication
*/
public void setAuthentication(String authentication) {
-
+
this.authentication = authentication;
-
+
}
-
+
/**
* Return the connection username for this Realm.
*/
@@ -467,20 +468,20 @@
* Return the protocol to be used.
*/
public String getProtocol() {
-
+
return protocol;
-
+
}
-
+
/**
* Set the protocol for this Realm.
*
* @param protocol The new protocol.
*/
public void setProtocol(String protocol) {
-
+
this.protocol = protocol;
-
+
}
@@ -493,13
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
funkman 2003/08/06 11:51:27
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Resync with 4.1 for the many bug fixes for JNDIRealm
Revision ChangesPath
1.5 +127 -98
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JNDIRealm.java11 Jan 2003 01:57:39 - 1.4
+++ JNDIRealm.java6 Aug 2003 18:51:27 - 1.5
@@ -86,7 +86,7 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Realm;
import org.apache.catalina.util.StringManager;
-
+import org.apache.catalina.util.Base64;
/**
* pImplementation of strongRealm/strong that works with a directory
@@ -107,7 +107,7 @@
* substituting the presented username into a pattern configured by the
* codeuserPattern/code property./li
*
- * liAlternatively, if the codeuserPattern/code property is not
+ * liAlternatively, if the codeuserPattern/code property is not
* specified, a unique element can be located by searching the directory
* context. In this case:
* ul
@@ -122,7 +122,7 @@
* requests a search of only the current level./li
*/ul
* /li
- *
+ *
* liThe user may be authenticated by binding to the directory with the
* username and password presented. This method is used when the
* codeuserPassword/code property is not specified./li
@@ -183,6 +183,13 @@
* format objects) so that codeauthenticate()/code does not have to be
* synchronized./p
*
+ * pstrongWARNING/strong - There is a reported bug against the Netscape
+ * provider code (com.netscape.jndi.ldap.LdapContextFactory) with respect to
+ * successfully authenticated a non-existing user. The
+ * report is here: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11210 .
+ * With luck, Netscape has updated their provider code and this is not an
+ * issue. /p
+ *
* @author John Holman
* @author Craig R. McClanahan
* @version $Revision$ $Date$
@@ -244,19 +251,20 @@
/**
- * The protocol that will be used in the communication with the directory
server.
+ * The protocol that will be used in the communication with the
+ * directory server.
*/
protected String protocol = null;
/**
- * How should we handle referrals? Microsoft Active Directory can't handle
- * the default case, so an application authenticating against AD must
+ * How should we handle referrals? Microsoft Active Directory can't handle
+ * the default case, so an application authenticating against AD must
* set referrals to follow.
*/
protected String referrals = null;
-
-
+
+
/**
* The base element for user searches.
*/
@@ -292,7 +300,7 @@
/**
* The message format used to form the distinguished name of a
* user, with {0} marking the spot where the specified username
- * goes.
+ * goes.
*/
protected String userPattern = null;
@@ -342,11 +350,11 @@
*/
protected boolean roleSubtree = false;
-/**
+/**
* An alternate URL, to which, we should connect if connectionURL fails.
*/
-protected String alternateURL;
-
+protected String alternateURL;
+
/**
* The number of connection attempts. If greater than zero we use the
* alternate url.
@@ -357,24 +365,24 @@
/**
* Return the type of authentication to use.
- */
+ */
public String getAuthentication() {
return authentication;
-
+
}
-
+
/**
* Set the type of authentication to use.
*
* @param authentication The authentication
*/
public void setAuthentication(String authentication) {
-
+
this.authentication = authentication;
-
+
}
-
+
/**
* Return the connection username for this Realm.
*/
@@ -467,20 +475,20 @@
* Return the protocol to be used.
*/
public String getProtocol() {
-
+
return protocol;
-
+
}
-
+
/**
* Set the protocol for this Realm.
*
* @param protocol The new protocol.
*/
public void setProtocol(String protocol) {
-
+
this.protocol = protocol;
-
+
}
@@ -493,13 +501,13 @@
/**
- * How do we handle JNDI referrals? ignore, follow, or throw
+ * How do we handle JNDI
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java
funkman 2003/08/06 17:56:25
Modified:catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
Use PropertyUtils to aggressively get the real rootCause as previously
committed in StandardWrapperValve and ErrorReportValve
Revision ChangesPath
1.23 +26 -12
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ApplicationDispatcher.java5 Aug 2003 13:22:03 - 1.22
+++ ApplicationDispatcher.java7 Aug 2003 00:56:25 - 1.23
@@ -97,6 +97,7 @@
import org.apache.catalina.core.StandardWrapper;
import org.apache.catalina.util.InstanceSupport;
import org.apache.catalina.util.StringManager;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
@@ -630,7 +631,7 @@
if (queryString != null) {
wrequest.setAttribute(Globals.INCLUDE_QUERY_STRING_ATTR,
queryString);
- wrequest.setQueryParams(queryString);
+wrequest.setQueryParams(queryString);
}
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
@@ -774,14 +775,27 @@
support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
servlet, request, response);
Throwable rootCause = e;
-while (rootCause instanceof ServletException) {
-Throwable t = ((ServletException) rootCause).getRootCause();
-if (t != null) {
-rootCause = t;
-} else {
-break;
+Throwable rootCauseCheck = null;
+
+// Extra aggressive rootCause finding
+do {
+try {
+rootCauseCheck = (Throwable)PropertyUtils.getProperty
+(rootCause, rootCause);
+if (rootCauseCheck!=null)
+rootCause = rootCauseCheck;
+
+} catch (ClassCastException ex) {
+rootCauseCheck = null;
+} catch (IllegalAccessException ex) {
+rootCauseCheck = null;
+} catch (NoSuchMethodException ex) {
+rootCauseCheck = null;
+} catch (java.lang.reflect.InvocationTargetException ex) {
+rootCauseCheck = null;
}
-}
+} while (rootCauseCheck != null);
+
log(sm.getString(applicationDispatcher.serviceException,
wrapper.getName()), rootCause);
servletException = e;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
funkman 2003/08/08 09:40:13
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Fix bug 22236.
addAttributeValues may return null. This could trigger a NPE
if debugging was turned up =2
Also addAttributeValues() returns null if attrId or attrs is null while
ignoring the third parameter values. So always return
values. I think this behavior is more consistent with the javadocs too.
Revision ChangesPath
1.14 +14 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JNDIRealm.java6 Aug 2003 18:43:00 - 1.13
+++ JNDIRealm.java8 Aug 2003 16:40:13 - 1.14
@@ -1304,11 +1304,15 @@
list = addAttributeValues(roleName, attrs, list);
}
-// Return the augmented list of roles
+
if (debug = 2) {
-log( Returning + list.size() + roles);
-for (int i=0; ilist.size(); i++)
-log(Found role + list.get(i));
+if (list != null) {
+log( Returning + list.size() + roles);
+for (int i=0; ilist.size(); i++)
+log(Found role + list.get(i));
+} else {
+log( getRoles about to return null );
+}
}
return (list);
@@ -1366,12 +1370,12 @@
if (debug = 3)
log( retrieving values for attribute + attrId);
if (attrId == null || attrs == null)
-return null;
+return values;
if (values == null)
values = new ArrayList();
Attribute attr = attrs.get(attrId);
if (attr == null)
-return (null);
+return (values);
NamingEnumeration e = attr.getAll();
while(e.hasMore()) {
String value = (String)e.next();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
funkman 2003/08/06 11:43:00
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Fix bug 14817 - JNDIRealm SHA digest implementation incorrect
Add Javadoc note for bug 11210
Revision ChangesPath
1.13 +28 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JNDIRealm.java5 Aug 2003 00:54:26 - 1.12
+++ JNDIRealm.java6 Aug 2003 18:43:00 - 1.13
@@ -86,7 +86,7 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Realm;
import org.apache.catalina.util.StringManager;
-
+import org.apache.catalina.util.Base64;
/**
* pImplementation of strongRealm/strong that works with a directory
@@ -183,6 +183,13 @@
* format objects) so that codeauthenticate()/code does not have to be
* synchronized./p
*
+ * pstrongWARNING/strong - There is a reported bug against the Netscape
+ * provider code (com.netscape.jndi.ldap.LdapContextFactory) with respect to
+ * successfully authenticated a non-existing user. The
+ * report is here: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11210 .
+ * With luck, Netscape has updated their provider code and this is not an
+ * issue. /p
+ *
* @author John Holman
* @author Craig R. McClanahan
* @version $Revision$ $Date$
@@ -1144,8 +1151,22 @@
boolean validated = false;
if (hasMessageDigest()) {
-// Hex hashes should be compared case-insensitive
-validated = (digest(credentials).equalsIgnoreCase(password));
+// iPlanet support if the values starts with {SHA1}
+// The string is in a format compatible with Base64.encode not
+// the Hex encoding of the parent class.
+if (password.startsWith({SHA})) {
+/* sync since super.digest() does this same thing */
+synchronized (this) {
+password = password.substring(5);
+md.reset();
+md.update(credentials.getBytes());
+String digestedPassword = new
String(Base64.encode(md.digest()));
+validated = password.equals(digestedPassword);
+}
+} else {
+// Hex hashes should be compared case-insensitive
+validated = (digest(credentials).equalsIgnoreCase(password));
+}
} else
validated = (digest(credentials).equals(password));
return (validated);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
funkman 2003/08/08 09:39:54
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Fix bug 22236.
addAttributeValues may return null. This could trigger a NPE
if debugging was turned up =2
Also addAttributeValues() returns null if attrId or attrs is null while
ignoring the third parameter values. So always return
values. I think this behavior is more consistent with the javadocs too.
Revision ChangesPath
1.6 +14 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JNDIRealm.java6 Aug 2003 18:51:27 - 1.5
+++ JNDIRealm.java8 Aug 2003 16:39:54 - 1.6
@@ -1304,11 +1304,15 @@
list = addAttributeValues(roleName, attrs, list);
}
-// Return the augmented list of roles
+
if (debug = 2) {
-log( Returning + list.size() + roles);
-for (int i=0; ilist.size(); i++)
-log(Found role + list.get(i));
+if (list != null) {
+log( Returning + list.size() + roles);
+for (int i=0; ilist.size(); i++)
+log(Found role + list.get(i));
+} else {
+log( getRoles about to return null );
+}
}
return (list);
@@ -1366,12 +1370,12 @@
if (debug = 3)
log( retrieving values for attribute + attrId);
if (attrId == null || attrs == null)
-return null;
+return values;
if (values == null)
values = new ArrayList();
Attribute attr = attrs.get(attrId);
if (attr == null)
-return (null);
+return (values);
NamingEnumeration e = attr.getAll();
while(e.hasMore()) {
String value = (String)e.next();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardWrapperValve.java
funkman 2003/08/05 11:41:50
Modified:catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
catalina/src/share/org/apache/catalina/core
StandardWrapperValve.java
Log:
Experiment: Use PropertyUtils to obtain the rootCause. This way we can
also drill into nested JspExceptions or another Throwable object
which has a 'rootCause' property which returns a Throwable.
Revision ChangesPath
1.9 +16 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ErrorReportValve.java 2 Aug 2003 17:31:04 - 1.8
+++ ErrorReportValve.java 5 Aug 2003 18:41:49 - 1.9
@@ -95,6 +95,7 @@
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.StringManager;
+import org.apache.commons.beanutils.PropertyUtils;
/**
* pImplementation of a Valve that outputs HTML error pages./p
@@ -335,10 +336,18 @@
sb.append(stackTrace);
sb.append(/pre/p);
// In case root cause is somehow heavily nested
-if (rootCause instanceof ServletException)
-rootCause = ((ServletException) rootCause).getRootCause();
-else
+try {
+rootCause = (Throwable)PropertyUtils.getProperty
+(rootCause, rootCause);
+} catch (ClassCastException e) {
rootCause = null;
+} catch (IllegalAccessException e) {
+rootCause = null;
+} catch (NoSuchMethodException e) {
+rootCause = null;
+} catch (java.lang.reflect.InvocationTargetException e) {
+rootCause = null;
+}
}
sb.append(pb);
1.20 +30 -16
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StandardWrapperValve.java 22 Jul 2003 21:01:26 - 1.19
+++ StandardWrapperValve.java 5 Aug 2003 18:41:50 - 1.20
@@ -82,6 +82,7 @@
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -145,7 +146,7 @@
HttpRequest hrequest = (HttpRequest) request;
Servlet servlet = null;
HttpServletRequest hreq = (HttpServletRequest) request.getRequest();
-HttpServletResponse hres =
+HttpServletResponse hres =
(HttpServletResponse) response.getResponse();
// Check for the application being marked unavailable
@@ -157,7 +158,7 @@
// Check for the servlet being marked unavailable
if (!unavailable wrapper.isUnavailable()) {
-log(sm.getString(standardWrapper.isUnavailable,
+log(sm.getString(standardWrapper.isUnavailable,
wrapper.getName()));
if (hres == null) {
; // NOTE - Not much we can do generically
@@ -232,13 +233,13 @@
(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
ApplicationFilterFactory.REQUEST_INTEGER);
hreq.setAttribute
-(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
+(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
requestPathMB);
// Create the filter chain for this request
-ApplicationFilterFactory factory =
+ApplicationFilterFactory factory =
ApplicationFilterFactory.getInstance();
-ApplicationFilterChain filterChain =
-factory.createFilterChain((ServletRequest) request,
+ApplicationFilterChain filterChain =
+factory.createFilterChain((ServletRequest) request,
wrapper, servlet);
// Call the filter chain for this request
@@ -276,20 +277,33 @@
hres.sendError(HttpServletResponse.SC_NOT_FOUND
cvs commit: jakarta-tomcat-site/xdocs-faq bugs.xml classnotfound.xml memory.xml misc.xml performance.xml security.xml version.xml
funkman 2003/08/20 17:53:56 Modified:xdocs-faq bugs.xml classnotfound.xml memory.xml misc.xml performance.xml security.xml version.xml Log: Per bz 22279 fix FAQ typos. Thanks to yannc76 at yahoo.de (Yann C?bron) html commit coming in sperate email since it usually get rejected Revision ChangesPath 1.3 +2 -2 jakarta-tomcat-site/xdocs-faq/bugs.xml Index: bugs.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/bugs.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bugs.xml 11 Jul 2003 01:57:39 - 1.2 +++ bugs.xml 21 Aug 2003 00:53:56 - 1.3 @@ -78,7 +78,7 @@ Can a developer beasily/b reproduce the bug in their own environment? /li li -Have you provided a patch? Is against cvs? using the correct file? Using +Have you provided a patch? Is it against cvs? Using the correct file? Using codecvs diff -u/code /li li @@ -90,7 +90,7 @@ /ul Some developers are uncomfortable submitting patches to code they are -unfamiliar with. The committers are not experts in all areas of tomcat. +unfamiliar with. The committers are not experts in all areas of Tomcat. It may be that the developer who has the ability to adequately review the patch may be too busy or unable to review the bug. That is the bad news, the good news is Tomcat is Open Source and you can build and use your own 1.3 +5 -5 jakarta-tomcat-site/xdocs-faq/classnotfound.xml Index: classnotfound.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/classnotfound.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- classnotfound.xml 24 Jun 2003 02:07:01 - 1.2 +++ classnotfound.xml 21 Aug 2003 00:53:56 - 1.3 @@ -71,12 +71,12 @@ p ul li - a href=#usebeanWhy is codejsp:useBean/code not working!/a + a href=#usebeanWhy is codejsp:useBean/code not working?/a /li li a href=#filter Why do I get codejava.lang.NoClassDefFoundError: -javax/servlet/Filter/code +javax/servlet/Filter/code? /a /li li @@ -101,7 +101,7 @@ Your bean is packaged in a class. /li li -You have fully qualifies your class name +You have fully qualified your class name (eg:codecom.bar.package.MyClass/code) OR /li li @@ -115,7 +115,7 @@ question a name=filter Why do I get codejava.lang.NoClassDefFoundError: - javax/servlet/Filter/code + javax/servlet/Filter/code? /a /question answer @@ -129,7 +129,7 @@ question a name=xml Why do I get codejava.lang.NoClassDefFoundError: - org/xml/sax/InputSource/code + org/xml/sax/InputSource/code? /a /question answer 1.3 +6 -6 jakarta-tomcat-site/xdocs-faq/memory.xml Index: memory.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/memory.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- memory.xml11 Jul 2003 01:57:39 - 1.2 +++ memory.xml21 Aug 2003 00:53:56 - 1.3 @@ -94,9 +94,9 @@ Many reasons. ul li - Your out of memory. Simple as that - add more to your heap. + You're out of memory. Simple as that - add more to your heap. /li - liYour out of memory. You have code which is hanging onto object + liYou're out of memory. You have code which is hanging onto object references and the garbage collector can't do its job. Get a profiler to debug this one. /li @@ -128,22 +128,22 @@ question a name=howmuch - How much memory is tomcat/webapp/??? using? + How much memory is Tomcat/webapp/??? using? /a /question answer ul li -To find out how much memory tomcat is using, you might be able to +To find out how much memory Tomcat is using, you might be able to use the codeRuntime/code class provided by the JDK. /li li You can't find out how much memory a webapp is using. The JVM -doesn't give us this detail. +doesn't give us these detail. /li li You can't find out how much memory a i???/i is using. The JVM -doesn't give us this detail. +doesn't give us these detail. /li li That being said, a memory
cvs commit: jakarta-tomcat-site/docs/faq/printer bugs.html classnotfound.html memory.html misc.html performance.html security.html version.html
funkman 2003/08/20 17:56:41 Modified:docs/faq bugs.html classnotfound.html memory.html misc.html performance.html security.html version.html docs/faq/printer bugs.html classnotfound.html memory.html misc.html performance.html security.html version.html Log: Per bz 22279 fix FAQ typos. Thanks to yannc76 at yahoo.de (Yann C?bron) Revision ChangesPath 1.5 +86 -86jakarta-tomcat-site/docs/faq/bugs.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/bugs.html.diff?r1=1.4r2=1.5 1.5 +5 -5 jakarta-tomcat-site/docs/faq/classnotfound.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/classnotfound.html.diff?r1=1.4r2=1.5 1.5 +144 -144 jakarta-tomcat-site/docs/faq/memory.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/memory.html.diff?r1=1.4r2=1.5 1.6 +542 -541 jakarta-tomcat-site/docs/faq/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/misc.html.diff?r1=1.5r2=1.6 1.5 +50 -50jakarta-tomcat-site/docs/faq/performance.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/performance.html.diff?r1=1.4r2=1.5 1.5 +90 -90jakarta-tomcat-site/docs/faq/security.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/security.html.diff?r1=1.4r2=1.5 1.6 +76 -76jakarta-tomcat-site/docs/faq/version.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/version.html.diff?r1=1.5r2=1.6 1.3 +2 -2 jakarta-tomcat-site/docs/faq/printer/bugs.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/bugs.html.diff?r1=1.2r2=1.3 1.3 +5 -5 jakarta-tomcat-site/docs/faq/printer/classnotfound.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/classnotfound.html.diff?r1=1.2r2=1.3 1.3 +6 -6 jakarta-tomcat-site/docs/faq/printer/memory.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/memory.html.diff?r1=1.2r2=1.3 1.4 +9 -8 jakarta-tomcat-site/docs/faq/printer/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/misc.html.diff?r1=1.3r2=1.4 1.3 +1 -1 jakarta-tomcat-site/docs/faq/printer/performance.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/performance.html.diff?r1=1.2r2=1.3 1.3 +1 -1 jakarta-tomcat-site/docs/faq/printer/security.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/security.html.diff?r1=1.2r2=1.3 1.4 +7 -7 jakarta-tomcat-site/docs/faq/printer/version.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/version.html.diff?r1=1.3r2=1.4 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm JDBCRealm.java
funkman 2003/08/25 18:10:20
Modified:catalina/src/share/org/apache/catalina/realm JDBCRealm.java
Log:
Big JDBCRealm cleanup
7116 - JDBC realm doesn't handle NULL passwords
10623 - JDBCRealm lacks one DB commit, preventing sucessfull authentication under
certain circunstances
11929 - In case db connection is bad (stale due to firewall ...) - retry
authenticating (2 tries total)
And many dups
8091 - Allow tomcat to startup even if the database isn't available
(and some other dup bz items)
Make authenticate synchronized since there are race conditions between the
connection being
opened, used and exceptions occuring.
Revision ChangesPath
1.2 +107 -81
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
Index: JDBCRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCRealm.java18 Jul 2002 16:47:55 - 1.1
+++ JDBCRealm.java26 Aug 2003 01:10:20 - 1.2
@@ -65,7 +65,6 @@
import java.io.File;
-import java.security.MessageDigest;
import java.security.Principal;
import java.sql.Connection;
import java.sql.Driver;
@@ -74,17 +73,8 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Properties;
-import org.apache.catalina.Container;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.Logger;
-import org.apache.catalina.Realm;
-import org.apache.catalina.util.HexUtils;
-import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.util.Base64;
/**
@@ -95,7 +85,7 @@
*
* pstrongTODO/strong - Support connection pooling (including message
* format objects) so that codeauthenticate()/code does not have to be
-* synchronized./p
+* synchronized and would fix the ugly connection logic. /p
*
* @author Craig R. McClanahan
* @author Carson McDonald
@@ -377,43 +367,53 @@
* event is also logged, and the connection will be closed so that
* a subsequent request will automatically re-open it.
*
+ *
* @param username Username of the Principal to look up
* @param credentials Password or other credentials to use in
* authenticating this username
*/
-public Principal authenticate(String username, String credentials) {
-
-Connection dbConnection = null;
+public synchronized Principal authenticate(String username, String credentials)
{
-try {
+// Number of tries is the numebr of attempts to connect to the database
+// during this login attempt (if we need to open the database)
+// This needs rewritten wuth better pooling support, the existing code
+// needs signature changes since the Prepared statements needs cached
+// with the connections.
+// The code below will try twice if there is a SQLException so the
+// connection may try to be opened again. On normal conditions (including
+// invalid login - the above is only used once.
+int numberOfTries = 2;
+while (numberOfTries0) {
+try {
-// Ensure that we have an open database connection
-dbConnection = open();
+// Ensure that we have an open database connection
+open();
-// Acquire a Principal object for this user
-Principal principal = authenticate(dbConnection,
- username, credentials);
+// Acquire a Principal object for this user
+Principal principal = authenticate(dbConnection,
+ username, credentials);
-// Release the database connection we just used
-release(dbConnection);
-// Return the Principal (if any)
-return (principal);
+// Return the Principal (if any)
+return (principal);
-} catch (SQLException e) {
+} catch (SQLException e) {
-// Log the problem for posterity
-log(sm.getString(jdbcRealm.exception), e);
+// Log the problem for posterity
+log(sm.getString(jdbcRealm.exception), e);
-// Close the connection so that it gets reopened next time
-if (dbConnection != null)
-close(dbConnection);
+// Close
cvs commit: jakarta-tomcat-site/xdocs-faq misc.xml performance.xml security.xml
funkman 2003/08/27 17:20:56
Modified:docs/faq misc.html performance.html security.html
docs/faq/printer misc.html performance.html security.html
xdocs-faq misc.xml performance.xml security.xml
Log:
FAQ Updates (Questions added)
- How do I make a scheduled event on Tomcat?
- What is the default login for the manager and admin app?
- What is codeElement web-app does not allow servlet here/code?
- Is Tomcat faster than serving static HTML pages than apache?
Revision ChangesPath
1.8 +584 -542 jakarta-tomcat-site/docs/faq/misc.html
Index: misc.html
===
RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/misc.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- misc.html 26 Aug 2003 09:08:17 - 1.7
+++ misc.html 28 Aug 2003 00:20:56 - 1.8
@@ -1,543 +1,585 @@
-htmlheadMETA http-equiv=Content-Type content=text/html;
charset=iso-8859-1titleTomcat FAQ - Miscellaneous Questions/titlemeta
value=Tim Funk name=authormeta value=[EMAIL PROTECTED] name=emailstyle
- dt { font-size : larger; font-weight : bold }
- dd {padding-bottom : 10px;}
-/style/headbody vlink=#525D76 alink=#525D76 link=#525D76
text=#00 bgcolor=#fftable cellspacing=4 width=100%
border=0!--PAGE HEADER--trtd colspan=2!--JAKARTA LOGO--a
href=http://jakarta.apache.org/;img border=0 alt=The Jakarta Project
align=left src=http://jakarta.apache.org//images/jakarta-logo.gif;/a!--PROJECT
LOGO--a href=http://jakarta.apache.org/tomcat/;img border=0 alt=
- Tomcat FAQ
- align=right src=../images/tomcat.gif/a/td/tr!--HEADER
SEPARATOR--trtd colspan=2hr size=1 noshade=/td/trtr!--LEFT SIDE
NAVIGATION--td nowrap=true valign=top
width=20%pstrongLinks/strong/pullia href=..Tomcat
Home/a/lilia href=index.htmlFAQ
Home/a/li/ulpstrongContents/strong/pullia
href=bugs.htmlBugs/a/lilia href=classnotfound.htmlClass Not
Found/a/lilia href=connectors.htmlConnectors/a/lilia
href=database.htmlDatabase/a/lilia
href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Howto;How do
I/a/lilia href=unix.htmlLinux / Unix/a/lilia
href=memory.htmlMemory/a/lilia href=meta.htmlMeta/a/lilia
href=misc.htmlMiscellaneous/a/lilia href=performance.htmlMonitoring /
Performance/a/lilia
href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Links;Other
Resources/a/lilia href=security.htmlSecurity/a/lilia
href=version.htmlWhich Version/a/lilia href=tomcatuser.htmlTomcat User
List/a/lilia href=windows.htmlWindows/a/li/ul/td!--RIGHT SIDE MAIN
BODY--td align=left valign=top width=80%table cellspacing=4 width=100%
border=0trtd nowrap=true valign=top align=lefth1Tomcat
FAQ/h1h2Miscellaneous Questions/h2/tdtd nowrap=true valign=top
align=rightsmalla href=printer/misc.htmlimg alt=Printer Friendly Version
border=0 src=../images/printer.gifbrprint-friendlybrversion
-/a/small/td/tr/tabletable cellpadding=2
cellspacing=0 border=0trtd bgcolor=#525D76font
face=arial,helvetica.sanserif color=#ffa
name=PrefacestrongPreface/strong/a/font/td/trtrtdblockquote
-p
-Questions that were not categorized.
-/p
-/blockquote/td/tr/tabletable cellpadding=2 cellspacing=0
border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif
color=#ffa
name=QuestionsstrongQuestions/strong/a/font/td/trtrtdblockquote
-p
- ul
-li
- a href=#compile
-I am unable to compile my JSP!
- /a
-/li
-li
- a href=#invoker
-I can't get servlets to work under code/servlet/*/code!
- /a
-/li
-li
- a href=#evil
-Why is the invoker evil?
- /a
-/li
-li
- a href=#version
-How to I get Tomcat's version number?
- /a
-/li
-li
- a href=#cpu
-Tomcat eats 100% of the CPU!
- /a
-/li
-li
- a href=#properties
-How do I set system properties at startup?
- /a
-/li
-li
- a href=#error
-How do I get a customized error page?
- /a
-/li
-li
- a href=#le
-Should I use the LE version?
- /a
-/li
-li
- a href=#persist
-How do I configure Tomcat to NOT to store the sessions during shutdown?
- /a
-/li
-li
- a href=#tagpool
-How do I disable tag pooling?
- /a
-/li
-li
- a href=#dtd
-Is there a DTD for server.xml?
- /a
-/li
-li
- a href=#welcome
-How do I change the welcome file?
-(I want to show index.jsp instead of index.html)
- /a
-/li
-li
- a href=#listing
-How do I enable/disable directory listings?
- /a
-/li
-li
- a href=#ip
-How do I make Tomcat listen on a specific IP
cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm - New directory
funkman 2003/09/04 12:58:03 jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm JNDIRealmTestCase.java
funkman 2003/09/04 12:59:47
Modified:catalina build.xml
webapps/tomcat-docs realm-howto.xml
catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Added: catalina/src/test/org/apache/catalina/realm
JNDIRealmTestCase.java
Log:
Per http://marc.theaimsgroup.com/?l=tomcat-devm=106254937722504w=2
Allow Multiple user patterns in JNDIRealm and doc patch.
Patch provided by Jeff Tulley (jtulley at novell.com)
Revision ChangesPath
1.133 +11 -1 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.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build.xml 12 Mar 2003 21:38:05 - 1.132
+++ build.xml 4 Sep 2003 19:59:46 - 1.133
@@ -979,7 +979,7 @@
!-- TEST: Execute Unit Tests == --
target name=test if=junit.present
description=Run all unit test cases
- depends=build-tests,test-dir-context,test-util
+ depends=build-tests,test-dir-context,test-realm,test-util
/target
target name=test-dir-context if=junit.present
@@ -1004,6 +1004,16 @@
/java
delete file=${test.webapp.war}/
+ /target
+
+ target name=test-realm if=junit.present
+
+echo message=Running Realm tests/
+java classname=${test.runner} fork=yes
+failonerror=${test.failonerror}
+ arg value=org.apache.catalina.realm.JNDIRealmTestCase/
+ classpath refid=test.classpath/
+/java
/target
target name=test-util if=junit.present
1.13 +56 -14jakarta-tomcat-4.0/webapps/tomcat-docs/realm-howto.xml
Index: realm-howto.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/realm-howto.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- realm-howto.xml 7 May 2003 15:56:00 - 1.12
+++ realm-howto.xml 4 Sep 2003 19:59:47 - 1.13
@@ -362,7 +362,7 @@
liPassword to be recognized by Tomcat when the user logs in.
This value may in cleartext or digested - see below for more
information./li
-/ul/li
+/ul/li
liThere must be a table, referenced below as the emuser roles/em table,
that contains one row for every valid role that is assigned to a
particular user. It is legal for a user to have zero, one, or more than
@@ -373,13 +373,13 @@
liUsername to be recognized by Tomcat (same value as is specified
in the emusers/em table)./li
liRole name of a valid role associated with this user./li
-/ul/li
+/ul/li
/ul
h3Quick Start/h3
-
+
pTo set up Tomcat to use DataSourceRealm, you will need to follow these steps:/p
-ol
+ol
liIf you have not yet done so, create tables and columns in your database
that conform to the requirements described above./li
liConfigure a database username and password for use by Tomcat, that has
@@ -418,7 +418,7 @@
generate more detailed output. If not specified, the default
debugging detail level is zero (0)./p
/attribute
-
+
attribute name=digest required=false
pThe digest algorithm used to store passwords in non-plaintext formats.
Valid values are those accepted for the algorithm name by the
@@ -426,18 +426,18 @@
a href=#Digested PasswordsDigested Passwords/a for more
information. If not specified, passwords are stored in clear text./p
/attribute
-
+
attribute name=roleNameCol required=true
pThe name of the column, in the emuser roles/em table, that
contains the name of a role assigned to this user./p
/attribute
-
+
attribute name=userCredCol required=true
pThe name of the column, in the emusers/em table, that contains
the password for this user (either in clear text, or digested if the
codedigest/code attribute is set)./p
/attribute
-
+
attribute name=userNameCol required=true
pThe name of the column, in the emusers/em and emuser roles/em
tables, that contains the username of this user./p
@@ -559,11 +559,19 @@
attribute containing the username that is presented for
authentication./p
-pOften the distinguished name of the user's entry contains the
-username presented for authentication but is otherwise the same for
-all users. In this case the stronguserPattern/strong attribute may
-be used to specify the DN, with {0} marking where
-the username should be substituted./p
+pThere are multiple options for specifying where to look for users.
+One is through the use of stronguserPattern
cvs commit: jakarta-tomcat-site/xdocs-faq connectors.xml
funkman 2003/09/08 18:21:39 Modified:docs/faq connectors.html docs/faq/printer connectors.html xdocs-faq connectors.xml Log: FAQ update per bz - 22995 Patch submitted by tagunov at motor.ru Revision ChangesPath 1.6 +21 -1 jakarta-tomcat-site/docs/faq/connectors.html Index: connectors.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/connectors.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- connectors.html 11 Jul 2003 10:57:19 - 1.5 +++ connectors.html 9 Sep 2003 01:21:38 - 1.6 @@ -109,6 +109,14 @@ what's wrong? /a /li + +li + a href=#generated + Is there any way to control the content of automatically generated + codemod_jk.conf-auto/code? I need my own specific commands added to it. + /a +/li + /ul /p /blockquote/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote @@ -273,7 +281,19 @@ /divbr - + b style=font-size: larger +a name=generated +Is there any way to control the content of automatically generated +codemod_jk.conf-auto/code? I need my own specific commands added +to it. +/a + /b + div style=padding-left : 20px; +There really is no need to. Just copy the automatically generated +codemod_jk.conf-auto/code and edit it manually to your preference. +None of production tomcat installations really use codemod_jk.conf-auto/code +as it is. + /divbr /blockquote/td/tr/table/td/tr!--FOOTER SEPARATOR--trtd colspan=2hr size=1 noshade=/td/tr!--PAGE FOOTER--trtd colspan=2div align=centerfont size=-1 color=#525D76em 1.5 +21 -1 jakarta-tomcat-site/docs/faq/printer/connectors.html Index: connectors.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/printer/connectors.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connectors.html 11 Jul 2003 10:57:20 - 1.4 +++ connectors.html 9 Sep 2003 01:21:39 - 1.5 @@ -108,6 +108,14 @@ what's wrong? /a /li + +li + a href=#generated + Is there any way to control the content of automatically generated + codemod_jk.conf-auto/code? I need my own specific commands added to it. + /a +/li + /ul /p /blockquote/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote @@ -272,7 +280,19 @@ /divbr - + b style=font-size: larger +a name=generated +Is there any way to control the content of automatically generated +codemod_jk.conf-auto/code? I need my own specific commands added +to it. +/a + /b + div style=padding-left : 20px; +There really is no need to. Just copy the automatically generated +codemod_jk.conf-auto/code and edit it manually to your preference. +None of production tomcat installations really use codemod_jk.conf-auto/code +as it is. + /divbr /blockquote/td/tr/table/td/tr!--FOOTER SEPARATOR--trtd colspan=2hr size=1 noshade=/td/tr!--PAGE FOOTER--trtd colspan=2div align=centerfont size=-1 color=#525D76em 1.5 +21 -1 jakarta-tomcat-site/xdocs-faq/connectors.xml Index: connectors.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/connectors.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connectors.xml11 Jul 2003 10:57:20 - 1.4 +++ connectors.xml9 Sep 2003 01:21:39 - 1.5 @@ -122,6 +122,14 @@ what's wrong? /a /li + +li + a href=#generated + Is there any way to control the content of automatically generated + codemod_jk.conf-auto/code? I need my own specific commands added to it. + /a +/li + /ul /p /section @@ -289,7 +297,19 @@ /answer - + question +a name=generated +Is there any way to control the content of automatically generated +codemod_jk.conf-auto/code? I need my own specific commands added +to it. +/a + /question + answer +There really is no need to. Just copy the automatically generated +codemod_jk.conf-auto/code and edit it manually to your preference. +None of production tomcat installations really use codemod_jk.conf-auto/code +as it is. + /answer /section
cvs commit: jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/compressionFilters CompressionResponseStream.java
funkman 2003/09/13 07:28:46
Modified:webapps/examples/WEB-INF/classes/compressionFilters
CompressionResponseStream.java
Log:
Per BZ 21933
Add header possibly ignored if buffer is too large.
Patch submitted by ckessel at tripwires dot com (Chris Kessel)
Revision ChangesPath
1.7 +5 -5
jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Index: CompressionResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompressionResponseStream.java16 Jul 2002 17:15:18 - 1.6
+++ CompressionResponseStream.java13 Sep 2003 14:28:46 - 1.7
@@ -343,8 +343,8 @@
if (debug 1) {
System.out.println(new GZIPOutputStream);
}
-gzipstream = new GZIPOutputStream(output);
response.addHeader(Content-Encoding, gzip);
+gzipstream = new GZIPOutputStream(output);
}
gzipstream.write(b, off, len);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs class-loader-howto.xml
funkman 2003/09/13 07:57:54 Modified:webapps/tomcat-docs class-loader-howto.xml Log: typo fix per Per 9766 Revision ChangesPath 1.10 +1 -1 jakarta-tomcat-4.0/webapps/tomcat-docs/class-loader-howto.xml Index: class-loader-howto.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/class-loader-howto.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- class-loader-howto.xml17 Mar 2003 09:39:54 - 1.9 +++ class-loader-howto.xml13 Sep 2003 14:57:54 - 1.10 @@ -21,7 +21,7 @@ files to make them available to web applications:/p ul liFor classes and resources specific to a particular web application, -place unpacked classes and resources under code/WEB-INF/classe/code +place unpacked classes and resources under code/WEB-INF/classes/code of your web application archive, or place JAR files containing those classes and resources under code/WEB-INF/lib/code of your web application archive./li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs class-loader-howto.xml
funkman 2003/09/13 07:58:09 Modified:webapps/docs class-loader-howto.xml Log: typo fix per Per 9766 Revision ChangesPath 1.7 +1 -1 jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml Index: class-loader-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- class-loader-howto.xml8 Sep 2003 22:03:32 - 1.6 +++ class-loader-howto.xml13 Sep 2003 14:58:09 - 1.7 @@ -21,7 +21,7 @@ files to make them available to web applications:/p ul liFor classes and resources specific to a particular web application, -place unpacked classes and resources under code/WEB-INF/classe/code +place unpacked classes and resources under code/WEB-INF/classes/code of your web application archive, or place JAR files containing those classes and resources under code/WEB-INF/lib/code of your web application archive./li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote Constants.java Response.java
funkman 2003/09/21 08:25:41
Modified:coyote/src/java/org/apache/coyote Tag: coyote_10
Constants.java Response.java
Log:
Fix BZ 18092. If content type not set, don't set it with a default. Per
the spec SRV.5.2 Headers
(Very similar to the fix in 5 which was 18202)
Revision ChangesPath
No revision
No revision
1.2.2.1 +6 -9
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Constants.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Constants.java8 Apr 2002 22:49:52 - 1.2
+++ Constants.java21 Sep 2003 15:25:41 - 1.2.2.1
@@ -3,7 +3,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
+ *notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
@@ -19,15 +19,15 @@
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
- *any, must include the following acknowlegement:
- * This product includes software developed by the
+ *any, must include the following acknowlegement:
+ * This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Tomcat, and Apache Software
*Foundation must not be used to endorse or promote products derived
- *from this software without prior written permission. For written
+ *from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
@@ -55,7 +55,7 @@
*
* [Additional notices, if required by prior licensing conditions]
*
- */
+ */
package org.apache.coyote;
import java.util.Locale;
@@ -69,9 +69,6 @@
// -- Constants
-
-
-public static final String DEFAULT_CONTENT_TYPE = text/plain;
public static final String DEFAULT_CHARACTER_ENCODING=ISO-8859-1;
1.19.2.1 +40 -38
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java
Index: Response.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- Response.java 3 Dec 2002 16:37:59 - 1.19
+++ Response.java 21 Sep 2003 15:25:41 - 1.19.2.1
@@ -65,14 +65,13 @@
import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.res.StringManager;
-
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.ContentType;
+
/**
* Response object.
- *
+ *
* @author James Duncan Davidson [EMAIL PROTECTED]
* @author Jason Hunter [EMAIL PROTECTED]
* @author James Todd [EMAIL PROTECTED]
@@ -91,14 +90,14 @@
// - Instance Variables
-
-
+
+
/**
* Default locale as mandated by the spec.
*/
private static Locale DEFAULT_LOCALE = new Locale(en, US);
-
-
+
+
/**
* Status code.
*/
@@ -144,7 +143,7 @@
/**
* HTTP specific fields.
*/
-protected String contentType = Constants.DEFAULT_CONTENT_TYPE;
+protected String contentType = null;
protected String contentLanguage = null;
protected String characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
protected int contentLength = -1;
@@ -216,7 +215,7 @@
public void action(ActionCode actionCode, Object param) {
if (hook != null) {
-if( param==null )
+if( param==null )
hook.action(actionCode, this);
else
cvs commit: jakarta-tomcat-catalina/webapps/docs building.xml
funkman 2003/09/21 08:36:53 Modified:webapps/docs building.xml Log: Typo per bz 23290 Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-catalina/webapps/docs/building.xml Index: building.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/building.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- building.xml 8 Sep 2003 10:16:02 - 1.1 +++ building.xml 21 Sep 2003 15:36:53 - 1.2 @@ -25,7 +25,7 @@ section name=Download and install a Java Development Kit 1.4.x or later p -Ealier releases would also work, but are harder to work with due to the need to +Earlier releases would also work, but are harder to work with due to the need to download additional dependencies. Tomcat also runs much faster on the latest 1.4 JDK. /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq connectors.xml misc.xml security.xml
funkman 2003/10/15 18:42:04 Modified:docs/faq connectors.html misc.html security.html docs/faq/printer connectors.html misc.html security.html xdocs-faq connectors.xml misc.xml security.xml Log: Clarify error handling, system.out, new links for connector, configure ip address for connector, restrict connections by ip address. Revision ChangesPath 1.7 +31 -1 jakarta-tomcat-site/docs/faq/connectors.html Index: connectors.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/connectors.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- connectors.html 9 Sep 2003 01:21:38 - 1.6 +++ connectors.html 16 Oct 2003 01:42:04 - 1.7 @@ -15,7 +15,11 @@ ul li[link] a href=http://www.johnturner.com/howto/apache-tomcat-howto.html; -John Turner's HOWTO +John Turner's HOWTO, +/a also there is + +a href=http://johnturner.com/howto/apache2-tomcat4127-jk-rh9-howto.html; + Apache 2.0.47 / Tomcat 4.1.27 / mod_jk for Red Hat 9.0 /a /li li[link] @@ -117,6 +121,13 @@ /a /li + +li + a href=#bind + How do I bind to a specific ip address? + /a +/li + /ul /p /blockquote/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote @@ -293,6 +304,25 @@ codemod_jk.conf-auto/code and edit it manually to your preference. None of production tomcat installations really use codemod_jk.conf-auto/code as it is. + /divbr + + b style=font-size: larger +a name=bind +How do I bind to a specific ip address? +/a + /b + div style=padding-left : 20px; +Each Connector element allows an address property. For example: +div align=lefttable border=0 cellpadding=0 cellspacing=4trtd height=1 width=1 bgcolor=#023264img border=0 hspace=0 vspace=0 height=1 width=1 src=../images/void.gif/tdtd height=1 bgcolor=#023264img border=0 hspace=0 vspace=0 height=1 width=1 src=../images/void.gif/tdtd height=1 width=1 bgcolor=#023264img border=0 hspace=0 vspace=0 height=1 width=1 src=../images/void.gif/td/trtrtd width=1 bgcolor=#023264img border=0 hspace=0 vspace=0 height=1 width=1 src=../images/void.gif/tdtd height=1 bgcolor=#ffpre +lt;Connector className=org.apache.coyote.tomcat4.CoyoteConnector + address=192.168.1.1 + port=8080 minProcessors=5 maxProcessors=75 + enableLookups=true redirectPort=8443 + acceptCount=100 debug=0 connectionTimeout=2 + useURIValidationHack=false disableUploadTimeout=true /gt; +/pre/tdtd width=1 bgcolor=#023264img border=0 hspace=0 vspace=0 height=1 width=1 src=../images/void.gif/td/trtrtd height=1 width=1 bgcolor=#023264img border=0 hspace=0 vspace=0 height=1 width=1 src=../images/void.gif/tdtd height=1 bgcolor=#023264img border=0 hspace=0 vspace=0 height=1 width=1 src=../images/void.gif/tdtd height=1 width=1 bgcolor=#023264img border=0 hspace=0 vspace=0 height=1 width=1 src=../images/void.gif/td/tr/table/div + + /divbr 1.9 +42 -0 jakarta-tomcat-site/docs/faq/misc.html Index: misc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/misc.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- misc.html 28 Aug 2003 00:20:56 - 1.8 +++ misc.html 16 Oct 2003 01:42:04 - 1.9 @@ -119,6 +119,17 @@ What is codeElement web-app does not allow servlet here/code? /a /li +li + a href=#catalina.out +Where does System.out go? br +How do I rotate catalina.out? + /a +/li +li + a href=#getResourceAsStream +How do open a file for reading in my webapp? + /a +/li /ul /p @@ -330,6 +341,9 @@ lt;/error-pagegt; /pre +You may also catch error 500's as well as other specific exceptions or +exceptions which extend ttThrowable/tt. +br For more information, see the Servlet Specification for all the gory details of how you can play with this. /divbr @@ -579,6 +593,34 @@ your web.xml file is ok. /divbr + + b style=font-size: larger + a name=catalina.out +Where does System.out go? br +How do I rotate catalina.out? + /a + /b + div style=padding-left : 20px; +codeSystem.out/code and codeSystem.err/code both print to +catalina.out. But you can suppress this via the swallowOutput property and +sent to different log files. +br
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
funkman 2003/11/21 11:00:52
Modified:catalina/src/conf web.xml
catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
Allow welcome files and directory redirects to be urlEncoded to satisfy
many tomcat-user complaints. I thought there were Bugzilla reports
too but can't find them
Default behavior is to not encode for backwards compatibility.
Revision ChangesPath
1.51 +3 -0 jakarta-tomcat-4.0/catalina/src/conf/web.xml
Index: web.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- web.xml 18 Jun 2003 20:52:54 - 1.50
+++ web.xml 21 Nov 2003 19:00:52 - 1.51
@@ -39,6 +39,9 @@
!-- readonlyIs this context read only, so HTTP --
!-- commands like PUT and DELETE are --
!-- rejected? [true] --
+ !-- --
+ !-- encodeRedirects Call encodeRedirectURL() on welcomefile or --
+ !-- directory redirects. [false] --
servlet
servlet-namedefault/servlet-name
1.60 +46 -28
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- DefaultServlet.java 8 Jan 2003 19:38:05 - 1.59
+++ DefaultServlet.java 21 Nov 2003 19:00:52 - 1.60
@@ -165,6 +165,12 @@
/**
+ * Calls encodeRedirectURL on redirects? default=false
+ */
+protected boolean encodeRedirects = false;
+
+
+/**
* The set of welcome files for this web application
*/
protected String welcomes[] = new String[0];
@@ -294,6 +300,12 @@
} catch (Throwable t) {
;
}
+try {
+value = getServletConfig().getInitParameter(encodeRedirects);
+encodeRedirects = (new Boolean(value)).booleanValue();
+} catch (Throwable t) {
+;
+}
// Sanity check on the specified buffer sizes
if (input 256)
@@ -627,12 +639,12 @@
/**
- * Handle a partial PUT. New content specified in request is appended to
- * existing content in oldRevisionContent (if present). This code does
+ * Handle a partial PUT. New content specified in request is appended to
+ * existing content in oldRevisionContent (if present). This code does
* not support simultaneous partial updates to the same resource.
*/
-protected File executePartialPut(HttpServletRequest req, Range range,
- String path)
+protected File executePartialPut(HttpServletRequest req, Range range,
+ String path)
throws IOException {
// Append data specified in ranges to existing content for this
@@ -648,7 +660,7 @@
contentFile.deleteOnExit();
}
-RandomAccessFile randAccessContentFile =
+RandomAccessFile randAccessContentFile =
new RandomAccessFile(contentFile, rw);
Resource oldResource = null;
@@ -661,8 +673,8 @@
// Copy data in oldRevisionContent to contentFile
if (oldResource != null) {
-BufferedInputStream bufOldRevStream =
-new BufferedInputStream(oldResource.streamContent(),
+BufferedInputStream bufOldRevStream =
+new BufferedInputStream(oldResource.streamContent(),
BUFFER_SIZE);
int numBytesRead;
@@ -763,9 +775,9 @@
ResourceInfo resourceInfo)
throws IOException {
-return checkIfMatch(request, response, resourceInfo)
- checkIfModifiedSince(request, response, resourceInfo)
- checkIfNoneMatch(request, response, resourceInfo)
+return checkIfMatch(request, response, resourceInfo)
+ checkIfModifiedSince(request, response, resourceInfo)
+ checkIfNoneMatch(request, response, resourceInfo)
checkIfUnmodifiedSince(request, response, resourceInfo);
}
@@ -784,7 +796,7 @@
} else if (resourceInfo.weakETag != null) {
return
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JDBCRealm.java
funkman 2003/11/21 11:09:22
Modified:catalina/src/share/org/apache/catalina/realm JDBCRealm.java
Log:
Backport JDBCRealm from 5 which had the following fixes:
7116 - JDBC realm doesn't handle NULL passwords
10623 - JDBCRealm lacks one DB commit, preventing sucessfull authentication under
certain circunstances
11929 - In case db connection is bad (stale due to firewall ...) - retry
authenticating (2 tries total)
And many dups
8091 - Allow tomcat to startup even if the database isn't available
(and some other dup bz items)
Import cleanup
Revision ChangesPath
1.22 +109 -83
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java
Index: JDBCRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JDBCRealm.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JDBCRealm.java9 Jun 2002 02:19:43 - 1.21
+++ JDBCRealm.java21 Nov 2003 19:09:22 - 1.22
@@ -64,8 +64,6 @@
package org.apache.catalina.realm;
-import java.io.File;
-import java.security.MessageDigest;
import java.security.Principal;
import java.sql.Connection;
import java.sql.Driver;
@@ -74,17 +72,9 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Properties;
-import org.apache.catalina.Container;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
+
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.Logger;
-import org.apache.catalina.Realm;
-import org.apache.catalina.util.HexUtils;
-import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.util.Base64;
/**
@@ -95,13 +85,12 @@
*
* pstrongTODO/strong - Support connection pooling (including message
* format objects) so that codeauthenticate()/code does not have to be
-* synchronized./p
+* synchronized and would fix the ugly connection logic. /p
*
* @author Craig R. McClanahan
* @author Carson McDonald
* @author Ignacio Ortega
-* @version $Revision$ $Date$
-*/
+* @version $Revision$ $Date$*/
public class JDBCRealm
extends RealmBase {
@@ -377,43 +366,53 @@
* event is also logged, and the connection will be closed so that
* a subsequent request will automatically re-open it.
*
+ *
* @param username Username of the Principal to look up
* @param credentials Password or other credentials to use in
* authenticating this username
*/
-public Principal authenticate(String username, String credentials) {
+public synchronized Principal authenticate(String username, String credentials)
{
-Connection dbConnection = null;
+// Number of tries is the numebr of attempts to connect to the database
+// during this login attempt (if we need to open the database)
+// This needs rewritten wuth better pooling support, the existing code
+// needs signature changes since the Prepared statements needs cached
+// with the connections.
+// The code below will try twice if there is a SQLException so the
+// connection may try to be opened again. On normal conditions (including
+// invalid login - the above is only used once.
+int numberOfTries = 2;
+while (numberOfTries0) {
+try {
-try {
+// Ensure that we have an open database connection
+open();
-// Ensure that we have an open database connection
-dbConnection = open();
+// Acquire a Principal object for this user
+Principal principal = authenticate(dbConnection,
+ username, credentials);
-// Acquire a Principal object for this user
-Principal principal = authenticate(dbConnection,
- username, credentials);
-// Release the database connection we just used
-release(dbConnection);
+// Return the Principal (if any)
+return (principal);
-// Return the Principal (if any)
-return (principal);
+} catch (SQLException e) {
-} catch (SQLException e) {
+// Log the problem for posterity
+log(sm.getString(jdbcRealm.exception), e);
-// Log the problem for posterity
-log(sm.getString(jdbcRealm.exception), e);
+// Close the connection so that it gets reopened next time
cvs commit: jakarta-tomcat-4.0/webapps/ROOT index.jsp
funkman 2003/11/21 12:11:14 Modified:webapps/ROOT index.jsp Log: BZ - 15879 default tomcat homepage index.jsp says it's index.html Revision ChangesPath 1.9 +3 -3 jakarta-tomcat-4.0/webapps/ROOT/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/index.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- index.jsp 15 Jan 2003 12:02:28 - 1.8 +++ index.jsp 21 Nov 2003 20:11:14 - 1.9 @@ -144,14 +144,14 @@ pAs you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at: blockquote -p class=code$CATALINA_HOME/webapps/ROOT/index.html/p +p class=code$CATALINA_HOME/webapps/ROOT/index.jsp/p /blockquote /p pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=tomcat-docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p -pbNOTE: For security reasons, using the administration webapp -is restricted to users with role admin. The manager webapp +pbNOTE: For security reasons, using the administration webapp +is restricted to users with role admin. The manager webapp is restricted to users with role manager./b Users are defined in code$CATALINA_HOME/conf/tomcat-users.xml/code./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RELEASE-NOTES
funkman 2003/11/29 12:11:11 Modified:.RELEASE-NOTES Log: The line numbers for uncommenting cgi and ssi keeps on getting out of sync with web.xml. An attempt at rewording to not have them get out of sync. Revision ChangesPath 1.11 +40 -18jakarta-tomcat-5/RELEASE-NOTES Index: RELEASE-NOTES === RCS file: /home/cvs/jakarta-tomcat-5/RELEASE-NOTES,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- RELEASE-NOTES 25 Nov 2003 14:57:59 - 1.10 +++ RELEASE-NOTES 29 Nov 2003 20:11:10 - 1.11 @@ -72,7 +72,7 @@ putting unpacked classes into a classes directory (not created by default), or by placing them in JAR files in the lib directory. -Tomcat 5.0 also makes Xerces 2 and the Commons Logging API (release 1.0.3) +Tomcat 5.0 also makes Xerces 2 and the Commons Logging API (release 1.0.3) available to web applications. @@ -123,17 +123,17 @@ --- Virtual machine crashes can be experienced when using certain combinations of -kernel / glibc under Linux with Sun Hotspot 1.2 to 1.3. The crashes were +kernel / glibc under Linux with Sun Hotspot 1.2 to 1.3. The crashes were reported to occur mostly on startup. Sun JDK 1.4 does not exhibit the problems, and neither does IBM JDK for Linux. -The problems can be fixed by reducing the default stack size. At bash shell, +The problems can be fixed by reducing the default stack size. At bash shell, do ulimit -s 2048; use limit stacksize 2048 for tcsh. GLIBC 2.2 / Linux 2.4 users should also define an environment variable: export LD_ASSUME_KERNEL=2.2.5 -Additionally, Redhat Linux 9.0 users should use the same setting, to avoid +Additionally, Redhat Linux 9.0 users should use the same setting, to avoid stability problems. @@ -147,25 +147,47 @@ disabled by default, as our goal is to provide a fully secure default configuration. However, CGI and SSI remain available. -To enable CGI and SSI on Windows: -* rename the file %CATALINA_HOME%\server\lib\servlets-cgi.renametojar to - %CATALINA_HOME%\server\lib\servlets-cgi.jar. -* rename the file %CATALINA_HOME%\server\lib\servlets-ssi.renametojar to - %CATALINA_HOME%\server\lib\servlets-ssi.jar. -* in %CATALINA_HOME%\conf\web.xml, uncomment the servlet declarations starting - on lines 226 and 250, as well as the associated servlet mappings - on lines 276 and 294. Alternately, these servlet declarations and mappings - can be added to your web application deployment descriptor. -To enable CGI and SSI on Unix: +To enable CGI: * rename the file $CATALINA_HOME/server/lib/servlets-cgi.renametojar to $CATALINA_HOME/server/lib/servlets-cgi.jar. +* in $CATALINA_HOME/conf/web.xml, you will need to uncomment 2 areas, the + servlet declaration and the servlet mapping. The servlet declaration + looks similar to this: +servlet +servlet-namecgi/servlet-name +... +/servlet + + While the servlet mapping looks similar to this: +servlet-mapping +servlet-namecgi/servlet-name +url-pattern/cgi-bin/*/url-pattern +/servlet-mapping + + Alternately, these servlet declarations and mappings + can be added to your web application deployment descriptor. + +To enable SSI: * rename the file $CATALINA_HOME/server/lib/servlets-ssi.renametojar to $CATALINA_HOME/server/lib/servlets-ssi.jar. -* in $CATALINA_HOME/conf/web.xml, uncomment the servlet declarations starting - on lines 226 and 250, as well as the associated servlet mappings - on lines 276 and 294. Alternately, these servlet declarations and mappings +* in $CATALINA_HOME/conf/web.xml, you will need to uncomment 2 areas, the + servlet declaration and the servlet mapping. The servlet declaration + looks similar to this: +servlet +servlet-namessi/servlet-name +... +/servlet + + While the servlet mapping looks similar to this: +servlet-mapping +servlet-namessi/servlet-name +url-pattern*.shtml/url-pattern +/servlet-mapping + + Alternately, these servlet declarations and mappings can be added to your web application deployment descriptor. + - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq version.xml
funkman 2003/12/03 15:41:03
Modified:docs/faq version.html
docs/faq/printer version.html
xdocs-faq version.xml
Log:
Update the FAQ that tomcat 5 is not alpha
Revision ChangesPath
1.8 +76 -76jakarta-tomcat-site/docs/faq/version.html
Index: version.html
===
RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/version.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- version.html 26 Aug 2003 09:08:17 - 1.7
+++ version.html 3 Dec 2003 23:41:03 - 1.8
@@ -1,77 +1,77 @@
-htmlheadMETA http-equiv=Content-Type content=text/html;
charset=iso-8859-1titleTomcat FAQ - Which Version/titlemeta value=Tim Funk
name=authormeta value=[EMAIL PROTECTED] name=emailstyle
- dt { font-size : larger; font-weight : bold }
- dd {padding-bottom : 10px;}
-/style/headbody vlink=#525D76 alink=#525D76 link=#525D76
text=#00 bgcolor=#fftable cellspacing=4 width=100%
border=0!--PAGE HEADER--trtd colspan=2!--JAKARTA LOGO--a
href=http://jakarta.apache.org/;img border=0 alt=The Jakarta Project
align=left src=http://jakarta.apache.org//images/jakarta-logo.gif;/a!--PROJECT
LOGO--a href=http://jakarta.apache.org/tomcat/;img border=0 alt=
- Tomcat FAQ
- align=right src=../images/tomcat.gif/a/td/tr!--HEADER
SEPARATOR--trtd colspan=2hr size=1 noshade=/td/trtr!--LEFT SIDE
NAVIGATION--td nowrap=true valign=top
width=20%pstrongLinks/strong/pullia href=..Tomcat
Home/a/lilia href=index.htmlFAQ
Home/a/li/ulpstrongContents/strong/pullia
href=bugs.htmlBugs/a/lilia href=classnotfound.htmlClass Not
Found/a/lilia href=connectors.htmlConnectors/a/lilia
href=database.htmlDatabase/a/lilia
href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Howto;How do
I/a/lilia href=unix.htmlLinux / Unix/a/lilia
href=memory.htmlMemory/a/lilia href=meta.htmlMeta/a/lilia
href=misc.htmlMiscellaneous/a/lilia href=performance.htmlMonitoring /
Performance/a/lilia
href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Links;Other
Resources/a/lilia href=security.htmlSecurity/a/lilia
href=version.htmlWhich Version/a/lilia href=tomcatuser.htmlTomcat User
List/a/lilia href=windows.htmlWindows/a/li/ul/td!--RIGHT SIDE MAIN
BODY--td align=left valign=top width=80%table cellspacing=4 width=100%
border=0trtd nowrap=true valign=top align=lefth1Tomcat
FAQ/h1h2Which Version/h2/tdtd nowrap=true valign=top
align=rightsmalla href=printer/version.htmlimg alt=Printer Friendly
Version border=0 src=../images/printer.gifbrprint-friendlybrversion
-/a/small/td/tr/tabletable cellpadding=2
cellspacing=0 border=0trtd bgcolor=#525D76font
face=arial,helvetica.sanserif color=#ffa
name=PrefacestrongPreface/strong/a/font/td/trtrtdblockquote
- p
-This page discusses the differences between the different Tomcat versions.
-If you
-want to know more about which connector to use, see the
-a href=connectors.htmlConnectors/a section.
- /p
-/blockquote/td/tr/tabletable cellpadding=2 cellspacing=0
border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif
color=#ffa
name=QuestionsstrongQuestions/strong/a/font/td/trtrtdblockquote
- ul
-
- li
- a href=#which
- Which Tomcat version should I use?
- /a
- /li
-
- li
- a href=#when
-When will the next version be released?
- /a
- /li
-
- /ul
-/blockquote/td/tr/tabletable cellpadding=2 cellspacing=0
border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif
color=#ffa
name=AnswersstrongAnswers/strong/a/font/td/trtrtdblockquote
-
-b style=font-size: larger
- a name=whichWhich Tomcat version should I use?/a
-/b
-div style=padding-left : 20px;
-It depends on the version of the
-a href=http://java.sun.com/products/servlet/;Servlet API/a you need.
-
-ul
- liTomcat 3 supports the 2.2 API/li
- liTomcat 4 supports the 2.3 API/li
- liTomcat 5 supports the 2.4 API/li
-/ul
-
- Tomcat 5 is alpha quality. It isn't ready for production.
-brbr
-
- There are 2 flavors of Tomcat 4: 4.0.X and 4.1.X. The 4.1.x version is
- still slowly receiving new enhancements but this
- trend is subsiding while more attention is paid to Tomcat5.
- Version 4.0.X is only receiving security fixes. Both (4.0 and 4.1)
- are suitable for production. (YMMV).
- Version 4.1.X is significantly faster than 4.0.X.
-brbr
-
- Tomcat 3 I know nothing about with respect to performance and
- maintenance. AFAIK - it
- is still receiving security fixes. The
- a href=http://jakarta.apache.org/tomcat/;
- Tomcat home page /a should have the correct recommendation.
-/divbr
-
-
-b style=font-size: larger
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspC.java
funkman 2004/04/06 10:58:59
Modified:jasper2/src/share/org/apache/jasper JspC.java
Log:
Allow disable tag pooling for ant task (and command line option)
also detabbed
Revision ChangesPath
1.69 +97 -85
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- JspC.java 17 Mar 2004 19:23:03 - 1.68
+++ JspC.java 6 Apr 2004 17:58:59 - 1.69
@@ -1,12 +1,12 @@
/*
* Copyright 1999,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -108,6 +108,7 @@
private static final String SWITCH_TRIM_SPACES = -trimSpaces;
private static final String SWITCH_CLASSPATH = -classpath;
private static final String SWITCH_DIE = -die;
+private static final String SWITCH_POOLING = -poolingEnabled;
private static final String SHOW_SUCCESS =-s;
private static final String LIST_ERRORS = -l;
private static final int NO_WEBXML = 0;
@@ -116,19 +117,20 @@
private static final int DEFAULT_DIE_LEVEL = 1;
private static final int NO_DIE_LEVEL = 0;
-private static final String[] insertBefore =
-{ /web-app, servlet-mapping, session-config,
+private static final String[] insertBefore =
+{ /web-app, servlet-mapping, session-config,
mime-mapping, welcome-file-list, error-page, taglib,
resource-env-ref, resource-ref, security-constraint,
- login-config, security-role, env-entry, ejb-ref,
+ login-config, security-role, env-entry, ejb-ref,
ejb-local-ref };
-private static int die;
+private static int die;
private String classPath = null;
private URLClassLoader loader = null;
private boolean trimSpaces = false;
private boolean xpoweredBy;
private boolean mappedFile = false;
+private boolean poolingEnabled = true;
private File scratchDir;
private String ieClassId = DEFAULT_IE_CLASS_ID;
private String targetPackage;
@@ -261,6 +263,13 @@
die = dieLevel;
} else if (tok.equals(SWITCH_HELP)) {
helpNeeded = true;
+} else if (tok.equals(SWITCH_POOLING)) {
+tok = nextArg();
+if (false.equals(tok)) {
+poolingEnabled = false;
+} else {
+poolingEnabled = true;
+}
} else {
if (tok.startsWith(-)) {
throw new JasperException(Unrecognized option: + tok +
@@ -296,7 +305,11 @@
}
public boolean isPoolingEnabled() {
-return true;
+return poolingEnabled;
+}
+
+public void setPoolingEnabled(boolean poolingEnabled) {
+this.poolingEnabled = poolingEnabled;
}
public boolean isXpoweredBy() {
@@ -312,19 +325,19 @@
}
public int getTagPoolSize() {
- return Constants.MAX_POOL_SIZE;
+return Constants.MAX_POOL_SIZE;
}
/**
* Are we supporting HTML mapped servlets?
*/
public boolean getMappedFile() {
- return mappedFile;
+return mappedFile;
}
// Off-line compiler, no need for security manager
public Object getProtectionDomain() {
- return null;
+return null;
}
public boolean getSendErrorToClient() {
@@ -366,14 +379,14 @@
* Is the generation of SMAP info for JSR45 debuggin suppressed?
*/
public boolean isSmapSuppressed() {
- return true;
+return true;
}
/**
* Should SMAP info for JSR45 debugging be dumped to a file?
*/
public boolean isSmapDumped() {
- return false;
+return false;
}
/**
@@ -413,7 +426,7 @@
}
public TldLocationsCache getTldLocationsCache() {
- return tldLocationsCache;
+return tldLocationsCache;
}
/**
@@ -423,14 +436,14 @@
* @return String The encoding
*/
public String getJavaEncoding() {
- return javaEncoding;
+return javaEncoding;
}
/**
* Sets
hey you
Norton AntiVirus gelöscht1.txt Description: plain/text - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RUNNING.txt
funkman 2004/05/11 16:38:37 Modified:.RUNNING.txt Log: BZ 28910 RUNNING.txt has wrong info for admin.xml and manager.xml (documentation) Revision ChangesPath 1.4 +9 -9 jakarta-tomcat-5/RUNNING.txt Index: RUNNING.txt === RCS file: /home/cvs/jakarta-tomcat-5/RUNNING.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RUNNING.txt 8 Sep 2003 10:10:23 - 1.3 +++ RUNNING.txt 11 May 2004 23:38:37 - 1.4 @@ -96,12 +96,12 @@ The administration and manager web applications, which are defined in the $CATALINA_BASE/webapps/admin.xml and $CATALINA_BASE/webapps/manager.xml files, will not run in that configuration, unless either: -- The path specified in the docBase attribute of the Context element is made - absolute, and replaced respectively by $CATALINA_HOME/server/webapps/admin +- The path specified in the docBase attribute of the Context element is made + absolute, and replaced respectively by $CATALINA_HOME/server/webapps/admin and $CATALINA_HOME/server/webapps/manager - Both web applications are copied or moved to $CATALINA_BASE, and the path specified in the docBase attribute of the Context element is modified appropriately. -- Both web applications are disabled by removing $CATALINA_BASE/webapps/admin.xml - and $CATALINA_BASE/webapps/manager.xml +- Both web applications are disabled by removing $CATALINA_BASE/conf/Catalina/localhost/admin.xml + and $CATALINA_BASE/conf/Catalina/localhost/manager.xml (5) Troubleshooting: @@ -114,11 +114,11 @@ Tomcat attempts to bind to at startup. To change this, open the file: $CATALINA_HOME/conf/server.xml - + and search for '8080'. Change it to a port that isn't in use, and is greater than 1024, as ports less than or equal to 1024 require superuser access to bind under UNIX. - + Restart Tomcat and you're in business. Be sure that you replace the 8080 in the URL you're using to access Tomcat. For example, if you change the port to 1977, you would request the URL http://localhost:1977/ in your browser. @@ -129,13 +129,13 @@ Right-click on the STARTUP.BAT and SHUTDOWN.BAT files. Click on Properties, then on the Memory tab. For the Initial environment field, enter in something like 4096. - + After you click apply, Windows will create shortcuts which you can use to start and stop the container. 3) The 'localhost' machine isn't found. This could happen if you're behind a proxy. If that's the case, make sure the proxy configuration for your browser knows that you shouldn't be going through the proxy to access the localhost. - + In Netscape, this is under Edit/Preferences - Advanced/Proxies, and in Internet Explorer, Tools - Internet Options - Connections - LAN Settings. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 RUNNING.txt
funkman 2004/05/11 16:45:33 Modified:.RUNNING.txt Log: Also fix previous paragraph for BZ 28910 since it was still out of sync. This paragraph could use a better rewording since system properties can be used in config files. Revision ChangesPath 1.5 +2 -2 jakarta-tomcat-5/RUNNING.txt Index: RUNNING.txt === RCS file: /home/cvs/jakarta-tomcat-5/RUNNING.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- RUNNING.txt 11 May 2004 23:38:37 - 1.4 +++ RUNNING.txt 11 May 2004 23:45:33 - 1.5 @@ -94,7 +94,7 @@ If you do not pass the -Dcatalina.base=$CATALINA_BASE argument to the startup command, $CATALINA_BASE will default to the same value as $CATALINA_HOME (which means that the same directory is used for all relative path resolutions). The administration and manager web applications, which are defined in the -$CATALINA_BASE/webapps/admin.xml and $CATALINA_BASE/webapps/manager.xml files, will +$CATALINA_BASE/conf/Catalina/localhost/admin.xml and $CATALINA_BASE/conf/Catalina/localhost/manager.xml files, will not run in that configuration, unless either: - The path specified in the docBase attribute of the Context element is made absolute, and replaced respectively by $CATALINA_HOME/server/webapps/admin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util ServerInfo.java
funkman 2004/06/30 08:25:32 Modified:catalina/src/bin catalina.bat catalina.sh catalina/src/share/org/apache/catalina/util ServerInfo.java Added: catalina/src/bin version.bat version.sh Log: Add new version utility. Allows one to see their version of tomcat without having to startup tomcat or anything else special. This should get rid of the common question: What version of tomcat am I running This worked fine in windows[cmd shell] and cygwin. Revision ChangesPath 1.10 +8 -1 jakarta-tomcat-catalina/catalina/src/bin/catalina.bat Index: catalina.bat === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.bat,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- catalina.bat 26 May 2004 20:04:01 - 1.9 +++ catalina.bat 30 Jun 2004 15:25:31 - 1.10 @@ -106,6 +106,7 @@ if %1 == run goto doRun if %1 == start goto doStart if %1 == stop goto doStop +if %1 == version goto doVersion echo Usage: catalina ( commands ... ) echo commands: @@ -117,6 +118,7 @@ echo start Start Catalina in a separate window echo start -security Start in a separate window with security manager echo stop Stop Catalina +echo version What version of tomcat are you running? goto end :doDebug @@ -155,6 +157,11 @@ shift set ACTION=stop goto execCmd + +:doVersion +%_EXECJAVA% -classpath %CATALINA_HOME%\server\lib\catalina.jar org.apache.catalina.util.ServerInfo +goto end + :execCmd rem Get remaining unshifted command line arguments and save them in the 1.14 +8 -1 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh Index: catalina.sh === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- catalina.sh 26 May 2004 19:45:33 - 1.13 +++ catalina.sh 30 Jun 2004 15:25:31 - 1.14 @@ -254,6 +254,12 @@ fi fi +elif [ $1 = version ] ; then + +$_RUNJAVA \ + -classpath $CATALINA_HOME/server/lib/catalina.jar \ + org.apache.catalina.util.ServerInfo + else echo Usage: catalina.sh ( commands ... ) @@ -272,6 +278,7 @@ echo start -security Start in a separate window with security manager echo stop Stop Catalina echo stop -force Stop Catalina (followed by kill -KILL) + echo version What version of tomcat are you running? exit 1 fi 1.1 jakarta-tomcat-catalina/catalina/src/bin/version.bat Index: version.bat === @echo off if %OS% == Windows_NT setlocal rem --- rem Version script for the CATALINA Server rem rem $Id: version.bat,v 1.1 2004/06/30 15:25:31 funkman Exp $ rem --- rem Guess CATALINA_HOME if not defined set CURRENT_DIR=%cd% if not %CATALINA_HOME% == goto gotHome set CATALINA_HOME=%CURRENT_DIR% if exist %CATALINA_HOME%\bin\catalina.bat goto okHome cd .. set CATALINA_HOME=%cd% cd %CURRENT_DIR% :gotHome if exist %CATALINA_HOME%\bin\catalina.bat goto okHome echo The CATALINA_HOME environment variable is not defined correctly echo This environment variable is needed to run this program goto end :okHome set EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat rem Check that target executable exists if exist %EXECUTABLE% goto okExec echo Cannot find %EXECUTABLE% echo This file is needed to run this program goto end :okExec rem Get remaining unshifted command line arguments and save them in the set CMD_LINE_ARGS= :setArgs if %1== goto doneSetArgs set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 shift goto setArgs :doneSetArgs call %EXECUTABLE% version %CMD_LINE_ARGS% :end 1.1 jakarta-tomcat-catalina/catalina/src/bin/version.sh Index: version.sh === #!/bin/sh # - # Version Script for the CATALINA Server # # $Id: version.sh,v 1.1 2004/06/30 15:25:31 funkman Exp $ # - # resolve links - $0 may be a softlink PRG=$0 while [ -h $PRG ] ; do ls=`ls -ld $PRG` link=`expr $ls : '.*- \(.*\)$'` if expr $link : '.*/.*' /dev/null; then PRG=$link else PRG=`dirname $PRG`/$link
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources FileDirContext.java LocalStrings.properties
funkman 2004/07/02 09:25:31
Modified:catalina/src/share/org/apache/naming/resources
FileDirContext.java LocalStrings.properties
Log:
If the dir listing errors, return an empty array instead of ending up with
a NPE.
Occured when a non-readable dir appeared inside the classes dir and
TldLocationsCache was trying to init. An error was thrown and it said null.
Now it keeps going and logs a warning message stating a directory
could not be listed.
Revision ChangesPath
1.5 +278 -268
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Index: FileDirContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileDirContext.java 27 Feb 2004 14:58:54 - 1.4
+++ FileDirContext.java 2 Jul 2004 16:25:31 - 1.5
@@ -1,18 +1,18 @@
/*
* Copyright 1999,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.naming.resources;
@@ -49,6 +49,8 @@
public class FileDirContext extends BaseDirContext {
+private static org.apache.commons.logging.Log log=
+org.apache.commons.logging.LogFactory.getLog( FileDirContext.class );
// -- Constants
@@ -110,9 +112,9 @@
/**
* Set the document root.
- *
+ *
* @param docBase The new document root
- *
+ *
* @exception IllegalArgumentException if the specified value is not
* supported by this implementation
* @exception IllegalArgumentException if this would create a
@@ -120,23 +122,23 @@
*/
public void setDocBase(String docBase) {
- // Validate the format of the proposed document root
- if (docBase == null)
- throw new IllegalArgumentException
- (sm.getString(resources.null));
+// Validate the format of the proposed document root
+if (docBase == null)
+throw new IllegalArgumentException
+(sm.getString(resources.null));
- // Calculate a File object referencing this document base directory
- base = new File(docBase);
+// Calculate a File object referencing this document base directory
+base = new File(docBase);
try {
base = base.getCanonicalFile();
} catch (IOException e) {
// Ignore
}
- // Validate that the document base is an existing directory
- if (!base.exists() || !base.isDirectory() || !base.canRead())
- throw new IllegalArgumentException
- (sm.getString(fileResources.base, docBase));
+// Validate that the document base is an existing directory
+if (!base.exists() || !base.isDirectory() || !base.canRead())
+throw new IllegalArgumentException
+(sm.getString(fileResources.base, docBase));
this.absoluteBase = base.getAbsolutePath();
super.setDocBase(docBase);
@@ -197,7 +199,7 @@
/**
* Retrieves the named object.
- *
+ *
* @param name the name of the object to look up
* @return the object bound to name
* @exception NamingException if a naming exception is encountered
@@ -206,11 +208,11 @@
throws NamingException {
Object result = null;
File file = file(name);
-
+
if (file == null)
throw new NamingException
(sm.getString(resources.notFound, name));
-
+
if (file.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
tempContext.setDocBase(file.getPath());
@@ -218,23 +220,23 @@
} else {
result = new FileResource(file);
}
-
+
return result;
-
+
}
/**
- * Unbinds the named object. Removes the terminal atomic name in name
- * from the target context--that named by all but the terminal atomic
+ * Unbinds the named object
cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh
funkman 2004/07/27 17:47:47 Modified:catalina/src/bin catalina.sh Log: BZ 29938 Cygwin fixes Patch from amoebaworks at yahoo .ca Revision ChangesPath 1.15 +7 -7 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh Index: catalina.sh === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- catalina.sh 30 Jun 2004 15:25:31 - 1.14 +++ catalina.sh 28 Jul 2004 00:47:47 - 1.15 @@ -72,7 +72,7 @@ [ -n $CATALINA_HOME ] CATALINA_HOME=`cygpath --unix $CATALINA_HOME` [ -n $CATALINA_BASE ] CATALINA_BASE=`cygpath --unix $CATALINA_BASE` [ -n $CLASSPATH ] CLASSPATH=`cygpath --path --unix $CLASSPATH` - [ -n $JSSE_HOME ] JSSE_HOME=`cygpath --path --unix $JSSE_HOME` + [ -n $JSSE_HOME ] JSSE_HOME=`cygpath --absolute --unix $JSSE_HOME` fi # For OS400 @@ -114,12 +114,12 @@ # For Cygwin, switch paths to Windows format before running java if $cygwin; then - JAVA_HOME=`cygpath --path --windows $JAVA_HOME` - CATALINA_HOME=`cygpath --path --windows $CATALINA_HOME` - CATALINA_BASE=`cygpath --path --windows $CATALINA_BASE` - CATALINA_TMPDIR=`cygpath --path --windows $CATALINA_TMPDIR` + JAVA_HOME=`cygpath --absolute --windows $JAVA_HOME` + CATALINA_HOME=`cygpath --absolute --windows $CATALINA_HOME` + CATALINA_BASE=`cygpath --absolute --windows $CATALINA_BASE` + CATALINA_TMPDIR=`cygpath --absolute --windows $CATALINA_TMPDIR` CLASSPATH=`cygpath --path --windows $CLASSPATH` - JSSE_HOME=`cygpath --path --windows $JSSE_HOME` + [ -n $JSSE_HOME ] JSSE_HOME=`cygpath --absolute --windows $JSSE_HOME` JAVA_ENDORSED_DIRS=`cygpath --path --windows $JAVA_ENDORSED_DIRS` fi - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm JNDIRealmTestCase.java
funkman 2003/12/12 13:31:56
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
catalina/src/test/org/apache/catalina/realm
JNDIRealmTestCase.java
Log:
BZ 23190 16541
Make JNDIRealm escape search filters
Patch by Jeff Tulley jtulley AT novell dot com
Revision ChangesPath
1.16 +51 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JNDIRealm.java4 Sep 2003 19:59:47 - 1.15
+++ JNDIRealm.java12 Dec 2003 21:31:56 - 1.16
@@ -90,6 +90,7 @@
import org.apache.catalina.util.StringManager;
import org.apache.catalina.util.Base64;
+
/**
* pImplementation of strongRealm/strong that works with a directory
* server accessed via the Java Naming and Directory Interface (JNDI) APIs.
@@ -1340,6 +1341,7 @@
// Set up parameters for an appropriate search
String filter = roleFormat.format(new String[] { dn, username });
+filter = doRFC2254Encoding(filter);
SearchControls controls = new SearchControls();
if (roleSubtree)
controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
@@ -1671,6 +1673,51 @@
return null;
}
+
+
+/**
+ * Given an LDAP search string, returns the string with certain characters
+ * escaped according to RFC 2254 guidelines.
+ * The character mapping is as follows:
+ * char - Replacement
+ *---
+ * * - \2a
+ * ( - \28
+ * ) - \29
+ * \ - \5c
+ * \0 - \00
+ * @param inString string to escape according to RFC 2254 guidelines
+ * @return
+ */
+protected String doRFC2254Encoding(String inString) {
+StringBuffer buf = new StringBuffer(inString.length());
+for (int i = 0; i inString.length(); i++) {
+char c = inString.charAt(i);
+switch (c) {
+case '\\':
+buf.append(\\5c);
+break;
+case '*':
+buf.append(\\2a);
+break;
+case '(':
+buf.append(\\28);
+break;
+case ')':
+buf.append(\\29);
+break;
+case '\0':
+buf.append(\\00);
+break;
+default:
+buf.append(c);
+break;
+}
+}
+return buf.toString();
+}
+
+
}
// -- Private Classes
1.2 +69 -2
jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm/JNDIRealmTestCase.java
Index: JNDIRealmTestCase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/test/org/apache/catalina/realm/JNDIRealmTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JNDIRealmTestCase.java4 Sep 2003 19:59:47 - 1.1
+++ JNDIRealmTestCase.java12 Dec 2003 21:31:56 - 1.2
@@ -247,6 +247,73 @@
assertStringArraysEquals(expected, actual);
}
+
+public void testRFC2254EncodingEmptyString() {
+JNDIRealm realm = new JNDIRealm();
+String actual = realm.doRFC2254Encoding();
+Assert.assertEquals(empty, , actual);
+}
+
+public void testRFC2254EncodingNoChange() {
+JNDIRealm realm = new JNDIRealm();
+String actual = realm.doRFC2254Encoding(cn=aname,o=acontext);
+Assert.assertEquals(no change, cn=aname,o=acontext, actual);
+}
+
+public void testRFC2254EncodingAsterisk() {
+JNDIRealm realm = new JNDIRealm();
+String actual = realm.doRFC2254Encoding(cn=some*name,o=somecontext);
+Assert.assertEquals(asterisk, cn=some\\2aname,o=somecontext, actual);
+}
+
+public void testRFC2254EncodingAsteriskAtEnd() {
+JNDIRealm realm = new JNDIRealm();
+String actual = realm.doRFC2254Encoding(cn=somename,o=somecontext*);
+Assert.assertEquals(asterisk, cn=somename,o=somecontext\\2a, actual);
+}
+
+public void testRFC2254EncodingAsteriskAtBeginning() {
+JNDIRealm realm = new JNDIRealm();
+String actual = realm.doRFC2254Encoding(cn=*somename,o=somecontext);
+Assert.assertEquals(asterisk, cn=\\2asomename,o
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
funkman 2003/12/12 13:43:26
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Resync with 4.1 fixes, in particular - they include:
BZ 23190 16541
And Allow Multiple user patterns per
http://marc.theaimsgroup.com/?l=tomcat-devm=106254937722504w=2
Revision ChangesPath
1.8 +185 -37
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JNDIRealm.java2 Sep 2003 21:22:05 - 1.7
+++ JNDIRealm.java12 Dec 2003 21:43:26 - 1.8
@@ -61,6 +61,8 @@
*/
+
+
package org.apache.catalina.realm;
@@ -70,24 +72,25 @@
import java.util.Hashtable;
import java.util.List;
-import javax.naming.AuthenticationException;
-import javax.naming.CommunicationException;
import javax.naming.Context;
-import javax.naming.Name;
+import javax.naming.CommunicationException;
+import javax.naming.InvalidNameException;
import javax.naming.NameNotFoundException;
-import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
+import javax.naming.NameParser;
+import javax.naming.Name;
+import javax.naming.AuthenticationException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-
import org.apache.catalina.LifecycleException;
import org.apache.catalina.util.Base64;
+
/**
* pImplementation of strongRealm/strong that works with a directory
* server accessed via the Java Naming and Directory Interface (JNDI) APIs.
@@ -298,6 +301,17 @@
/**
+ * A string of LDAP user patterns or paths, :-separated
+ * These will be used to form the distinguished name of a
+ * user, with {0} marking the spot where the specified username
+ * goes.
+ * This is similar to userPattern, but allows for multiple searches
+ * for a user.
+ */
+protected String[] userPatternArray = null;
+
+
+/**
* The message format used to form the distinguished name of a
* user, with {0} marking the spot where the specified username
* goes.
@@ -306,10 +320,10 @@
/**
- * The MessageFormat object associated with the current
- * codeuserPattern/code.
+ * An array of MessageFormat objects associated with the current
+ * codeuserPatternArray/code.
*/
-protected MessageFormat userPatternFormat = null;
+protected MessageFormat[] userPatternFormatArray = null;
/**
@@ -361,6 +375,11 @@
*/
protected int connectionAttempt = 0;
+/**
+ * The current user pattern to be used for lookup and binding of a user.
+ */
+protected int curUserPattern = 0;
+
// - Properties
/**
@@ -726,6 +745,11 @@
/**
* Set the message format pattern for selecting users in this Realm.
+ * This may be one simple pattern, or multiple patterns to be tried,
+ * separated by parentheses. (for example, either cn={0}, or
+ * (cn={0})(cn={0},o=myorg) Full LDAP search strings are also supported,
+ * but only the OR, | syntax, so (|(cn={0})(cn={0},o=myorg)) is
+ * also valid. Complex search strings with , etc are NOT supported.
*
* @param userPattern The new user pattern
*/
@@ -733,12 +757,19 @@
this.userPattern = userPattern;
if (userPattern == null)
-userPatternFormat = null;
-else
-userPatternFormat = new MessageFormat(userPattern);
-
+userPatternArray = null;
+else {
+userPatternArray = parseUserPatternString(userPattern);
+int len = this.userPatternArray.length;
+userPatternFormatArray = new MessageFormat[len];
+for (int i=0; i len; i++) {
+userPatternFormatArray[i] =
+new MessageFormat(userPatternArray[i]);
+}
+}
}
+
/**
* Getter for property alternateURL.
*
@@ -750,6 +781,7 @@
}
+
/**
* Setter for property alternateURL.
*
@@ -870,21 +902,50 @@
|| credentials == null || credentials.equals())
return (null);
-// Retrieve user information
-User user = getUser
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties
funkman 2003/12/12 14:37:58
Modified:catalina/src/share/org/apache/catalina/realm
LocalStrings.properties LocalStrings_es.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
Log:
BZ 23885
JAASRealm looks for jaasRealm.authenticateSuccess not
jaasRealm.authenticatedSuccess
Revision ChangesPath
1.5 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings.properties 6 Oct 2003 09:19:40 - 1.4
+++ LocalStrings.properties 12 Dec 2003 22:37:58 - 1.5
@@ -1,11 +1,11 @@
# $Id$
-# language
+# language
# package org.apache.catalina.realm
jaasRealm.accountExpired=Username {0} NOT authenticated due to expired account
-jaasRealm.authenticatedSuccess=Username {0} successfully authenticated
+jaasRealm.authenticateSuccess=Username {0} successfully authenticated
jaasRealm.credentialExpired=Username {0} NOT authenticated due to expired credential
jaasRealm.failedLogin=Username {0} NOT authenticated due to failed login
jaasRealm.loginException=Login exception authenticating username {0}
1.3 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings_es.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings_es.properties7 Aug 2002 20:51:44 - 1.2
+++ LocalStrings_es.properties12 Dec 2003 22:37:58 - 1.3
@@ -6,7 +6,7 @@
jaasRealm.accountExpired=El usuario {0} NO ha sido autentificado porque ha expirado
su cuenta
-jaasRealm.authenticatedSuccess=El usuario {0} ha sido autentificado con éxito
+jaasRealm.authenticateSuccess=El usuario {0} ha sido autentificado con éxito
jaasRealm.credentialExpired=El usuario {0} NO ha sido autentificado porque ha
expirado su credencial
jaasRealm.failedLogin=El usuario {0} NO ha sido autentificado porque ha fallado el
login
jaasRealm.loginException=Login exception authenticating username {0}
1.2 +7 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings_fr.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalStrings_fr.properties6 Nov 2002 09:23:37 - 1.1
+++ LocalStrings_fr.properties12 Dec 2003 22:37:58 - 1.2
@@ -1,25 +1,25 @@
# $Id$
-# language
+# language
# package org.apache.catalina.realm
jaasRealm.accountExpired=le nom d''utilisateur {0} N''A PAS été authentifié car le
compte a expiré
-jaasRealm.authenticatedSuccess=le nom d''utilisateur {0} a été authentifié avec
succès
+jaasRealm.authenticateSuccess=le nom d''utilisateur {0} a été authentifié avec
succès
jaasRealm.credentialExpired=le nom d''utilisateur {0} N''A PAS été authentifié car
son crédit a expiré (expired credential)
jaasRealm.failedLogin=le nom d''utilisateur {0} N''A PAS été authentifié car son
contrôle d''accès (login) a échoué
jaasRealm.loginException=Exception lors de l''authentification par login du nom
d''utilisateur {0}
-jdbcRealm.authenticateFailure=le nom d''utilisateur {0} N''A PAS été authentifié
+jdbcRealm.authenticateFailure=le nom d''utilisateur {0} N''A PAS été authentifié
jdbcRealm.authenticateSuccess=le nom d''utilisateur {0} a été authentifié avec
succès
jdbcRealm.close=Exception lors de la fermeture de la connexion à la base de données
jdbcRealm.exception=Exception pendant le traitement de l''authentification
jdbcRealm.open=Exception lors de l''ouverture de la base de données
-jndiRealm.authenticateFailure=Le nom d''utilisateur {0} N''A PAS été authentifié
+jndiRealm.authenticateFailure=Le nom d''utilisateur {0} N''A PAS été authentifié
jndiRealm.authenticateSuccess=Le nom d''utilisateur {0} a été authentifié avec
succès
jndiRealm.close=Exception lors de la fermeture de la connexion au serveur d''accès
(directory server)
jndiRealm.exception=Exception pendant le traitement de l''authentification
jndiRealm.open=Exception lors de l''ouverture de la
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties
funkman 2003/12/12 14:39:22
Modified:catalina/src/share/org/apache/catalina/realm
LocalStrings.properties LocalStrings_es.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
Log:
BZ 23885
JAASRealm looks for jaasRealm.authenticateSuccess not
jaasRealm.authenticatedSuccess
Revision ChangesPath
1.9 +3 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/LocalStrings.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalStrings.properties 7 Dec 2002 17:42:11 - 1.8
+++ LocalStrings.properties 12 Dec 2003 22:39:22 - 1.9
@@ -1,11 +1,11 @@
# $Id$
-# language
+# language
# package org.apache.catalina.realm
jaasRealm.accountExpired=Username {0} NOT authenticated due to expired account
-jaasRealm.authenticatedSuccess=Username {0} successfully authenticated
+jaasRealm.authenticateSuccess=Username {0} successfully authenticated
jaasRealm.credentialExpired=Username {0} NOT authenticated due to expired credential
jaasRealm.failedLogin=Username {0} NOT authenticated due to failed login
jaasRealm.loginException=Login exception authenticating username {0}
1.3 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/LocalStrings_es.properties
Index: LocalStrings_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/LocalStrings_es.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings_es.properties21 Nov 2001 18:04:22 - 1.2
+++ LocalStrings_es.properties12 Dec 2003 22:39:22 - 1.3
@@ -6,7 +6,7 @@
jaasRealm.accountExpired=El usuario {0} NO ha sido autentificado porque ha expirado
su cuenta
-jaasRealm.authenticatedSuccess=El usuario {0} ha sido autentificado con éxito
+jaasRealm.authenticateSuccess=El usuario {0} ha sido autentificado con éxito
jaasRealm.credentialExpired=El usuario {0} NO ha sido autentificado porque ha
expirado su credencial
jaasRealm.failedLogin=El usuario {0} NO ha sido autentificado porque ha fallado el
login
jaasRealm.loginException=Login exception authenticating username {0}
1.2 +7 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/LocalStrings_fr.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalStrings_fr.properties6 Nov 2002 09:21:19 - 1.1
+++ LocalStrings_fr.properties12 Dec 2003 22:39:22 - 1.2
@@ -1,25 +1,25 @@
# $Id$
-# language
+# language
# package org.apache.catalina.realm
jaasRealm.accountExpired=le nom d''utilisateur {0} N''A PAS été authentifié car le
compte a expiré
-jaasRealm.authenticatedSuccess=le nom d''utilisateur {0} a été authentifié avec
succès
+jaasRealm.authenticateSuccess=le nom d''utilisateur {0} a été authentifié avec
succès
jaasRealm.credentialExpired=le nom d''utilisateur {0} N''A PAS été authentifié car
son crédit a expiré (expired credential)
jaasRealm.failedLogin=le nom d''utilisateur {0} N''A PAS été authentifié car son
contrôle d''accès (login) a échoué
jaasRealm.loginException=Exception lors de l''authentification par login du nom
d''utilisateur {0}
-jdbcRealm.authenticateFailure=le nom d''utilisateur {0} N''A PAS été authentifié
+jdbcRealm.authenticateFailure=le nom d''utilisateur {0} N''A PAS été authentifié
jdbcRealm.authenticateSuccess=le nom d''utilisateur {0} a été authentifié avec
succès
jdbcRealm.close=Exception lors de la fermeture de la connexion à la base de données
jdbcRealm.exception=Exception pendant le traitement de l''authentification
jdbcRealm.open=Exception lors de l''ouverture de la base de données
-jndiRealm.authenticateFailure=Le nom d''utilisateur {0} N''A PAS été authentifié
+jndiRealm.authenticateFailure=Le nom d''utilisateur {0} N''A PAS été authentifié
jndiRealm.authenticateSuccess=Le nom d''utilisateur {0} a été authentifié avec
succès
jndiRealm.close=Exception lors de la fermeture de la connexion au serveur d''accès
(directory server)
jndiRealm.exception=Exception pendant le traitement de l''authentification
jndiRealm.open=Exception lors de l''ouverture de la connexion au serveur d''accès
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java
funkman 2003/12/22 12:31:15 Modified:catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java Log: BZ 25703 - ExtendedLogValve use wrong filename after rotate or checkexits case Patch submitted by Peter Rossbach pr at webapp dot de Revision ChangesPath 1.6 +7 -9 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java Index: ExtendedAccessLogValve.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ExtendedAccessLogValve.java 2 Sep 2003 21:22:03 - 1.5 +++ ExtendedAccessLogValve.java 22 Dec 2003 20:31:15 - 1.6 @@ -680,9 +680,8 @@ } /* Make sure date is correct */ -currentDate = new Date(); -fileDateFormatter = new SimpleDateFormat(-MM-dd); -dateStamp = dateFormatter.format(currentDate); +currentDate = new Date(System.currentTimeMillis()); +dateStamp = fileDateFormatter.format(currentDate); open(); return true; @@ -953,8 +952,7 @@ /* Make sure date is correct */ currentDate = new Date(System.currentTimeMillis()); -fileDateFormatter = new SimpleDateFormat(-MM-dd); -dateStamp = dateFormatter.format(currentDate); +dateStamp = fileDateFormatter.format(currentDate); open(); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java
funkman 2003/12/22 12:37:25 Modified:catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java Log: port patch from 5 Revision ChangesPath 1.3 +7 -9 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java Index: ExtendedAccessLogValve.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ExtendedAccessLogValve.java 18 Jul 2003 01:24:45 - 1.2 +++ ExtendedAccessLogValve.java 22 Dec 2003 20:37:24 - 1.3 @@ -682,9 +682,8 @@ } /* Make sure date is correct */ -currentDate = new Date(); -fileDateFormatter = new SimpleDateFormat(-MM-dd); -dateStamp = dateFormatter.format(currentDate); +currentDate = new Date(System.currentTimeMillis()); +dateStamp = fileDateFormatter.format(currentDate); open(); return true; @@ -955,8 +954,7 @@ /* Make sure date is correct */ currentDate = new Date(System.currentTimeMillis()); -fileDateFormatter = new SimpleDateFormat(-MM-dd); -dateStamp = dateFormatter.format(currentDate); +dateStamp = fileDateFormatter.format(currentDate); open(); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq connectors.xml misc.xml windows.xml
funkman 2004/01/16 17:20:09 Modified:docs/faq connectors.html misc.html windows.html docs/faq/printer connectors.html misc.html windows.html xdocs-faq connectors.xml misc.xml windows.xml Log: Windows, Connectors - Remove preface links since they are in wiki (Other resources link) Connectors - Misc word cleanup Misc - Add request encoding preface with links to lots of bugzilla reports. Revision ChangesPath 1.9 +265 -330 jakarta-tomcat-site/docs/faq/connectors.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/connectors.html.diff?r1=1.8r2=1.9 1.15 +695 -682 jakarta-tomcat-site/docs/faq/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/misc.html.diff?r1=1.14r2=1.15 1.4 +6 -32 jakarta-tomcat-site/docs/faq/windows.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/windows.html.diff?r1=1.3r2=1.4 1.8 +264 -329 jakarta-tomcat-site/docs/faq/printer/connectors.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/connectors.html.diff?r1=1.7r2=1.8 1.12 +694 -681 jakarta-tomcat-site/docs/faq/printer/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/misc.html.diff?r1=1.11r2=1.12 1.3 +94 -120 jakarta-tomcat-site/docs/faq/printer/windows.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/windows.html.diff?r1=1.2r2=1.3 1.7 +21 -86jakarta-tomcat-site/xdocs-faq/connectors.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-site/xdocs-faq/connectors.xml.diff?r1=1.6r2=1.7 1.11 +16 -3 jakarta-tomcat-site/xdocs-faq/misc.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-site/xdocs-faq/misc.xml.diff?r1=1.10r2=1.11 1.2 +6 -32 jakarta-tomcat-site/xdocs-faq/windows.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-site/xdocs-faq/windows.xml.diff?r1=1.1r2=1.2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
funkman 2004/02/05 17:49:48
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Bugzilla 26487
RFC 2254 done on whole string instead of just DN
Patch submitted by Jeff Tulley - jtulley A T novell.com
Revision ChangesPath
1.17 +5 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JNDIRealm.java12 Dec 2003 21:31:56 - 1.16
+++ JNDIRealm.java6 Feb 2004 01:49:48 - 1.17
@@ -1340,8 +1340,7 @@
return (list);
// Set up parameters for an appropriate search
-String filter = roleFormat.format(new String[] { dn, username });
-filter = doRFC2254Encoding(filter);
+String filter = roleFormat.format(new String[] { doRFC2254Encoding(dn),
username });
SearchControls controls = new SearchControls();
if (roleSubtree)
controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm JNDIRealm.java
funkman 2004/02/05 17:50:02
Modified:catalina/src/share/org/apache/catalina/realm JNDIRealm.java
Log:
Bugzilla 26487
RFC 2254 done on whole string instead of just DN
Patch submitted by Jeff Tulley - jtulley A T novell.com
Revision ChangesPath
1.10 +5 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JNDIRealm.java26 Jan 2004 19:47:16 - 1.9
+++ JNDIRealm.java6 Feb 2004 01:50:02 - 1.10
@@ -1340,8 +1340,7 @@
return (list);
// Set up parameters for an appropriate search
-String filter = roleFormat.format(new String[] { dn, username });
-filter = doRFC2254Encoding(filter);
+String filter = roleFormat.format(new String[] { doRFC2254Encoding(dn),
username });
SearchControls controls = new SearchControls();
if (roleSubtree)
controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/docs/faq tomcatuser.html
funkman 2004/02/26 09:30:01 Modified:xdocs-faq tomcatuser.xml docs/faq/printer tomcatuser.html docs/faq tomcatuser.html Log: Change wording for the links to good etiquette. The good etiquette links were non-tomcat related but users were still emailing those authors questions about tomcat. Added snippet on when to post to tomcat-user vs tomcat-dev Revision ChangesPath 1.3 +56 -10jakarta-tomcat-site/xdocs-faq/tomcatuser.xml Index: tomcatuser.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/tomcatuser.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomcatuser.xml11 Jul 2003 01:57:39 - 1.2 +++ tomcatuser.xml26 Feb 2004 17:30:01 - 1.3 @@ -16,7 +16,7 @@ section name=Preface p -This is about the tomcat user list. +This is about the Tomcat user list. a href=mailto:[EMAIL PROTECTED]Subscribe/a and a href=http://jakarta.apache.org/site/mail.html;general information/a @@ -28,16 +28,31 @@ digest form. /a -If you post -to tomcat-user, use -a href=http://www.rfc-editor.org/rfc/rfc1855.txt;good etiquette/a, -a href=http://www.catb.org/~esr/faqs/smart-questions.html; -ask good questions, -/a -and use -a href=http://nagoya.apache.org/wiki/apachewiki.cgi?MailListUserBestPractices; -Best Practices/a, and also please read the docs, faqs, readme, + +If you post to tomcat-user, use good etiquette, ask good questions, +and use Best Practices, and also please read the docs, faqs, readme, and search the archives before asking a question. + +br/br/ +Here are some links about how to use mailing lists and standard etiquette +in using mailing lists. These links are not Tomcat specific! Please do +not contact the author of these documents with questions. +ul + li +a href=http://www.rfc-editor.org/rfc/rfc1855.txt; + Netiquette Guidelines (RFC 1855) +/a/li + li +a href=http://www.catb.org/~esr/faqs/smart-questions.html; +How To Ask Questions The Smart Way +/a + /li + li +a href=http://nagoya.apache.org/wiki/apachewiki.cgi?MailListUserBestPractices; +Mailing List Best Practices/a + /li +/ul + /p /section @@ -57,6 +72,14 @@ /a /li + + + li + a href=#wheretopost + Should I post to tomcat-user or tomcat-dev? +/a + /li + !-- li a href=#connectors @@ -150,6 +173,29 @@ the moderator has an opportunity to remove you from the list. /answer + + question + a name=wheretopost + Should I post to tomcat-user or tomcat-dev? + /a + /question + answer +tomcat-user is for user based questions for tomcat. That means anyone who is +developing any type of software to be used with tomcat. +br/br/ + +tomcat-dev is the forum to discuss changes to the Tomcat's source code. If your question +is not related to changing the source code as maintained by the tomcat committers, +then it does not belong here, it belongs in tomcat-user. + +br/br/ + +If you wish to extend tomcat using your own Valve, Realm, or anything else ... those +discussions belong in tomcat-user. You might be using Tomcat's internal API but unless +your changes are going back into the official source tree, the question belongs +in tomcat-user. + + /answer /section 1.3 +56 -10jakarta-tomcat-site/docs/faq/printer/tomcatuser.html Index: tomcatuser.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/printer/tomcatuser.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomcatuser.html 11 Jul 2003 01:57:39 - 1.2 +++ tomcatuser.html 26 Feb 2004 17:30:01 - 1.3 @@ -5,7 +5,7 @@ Tomcat FAQ align=right src=../../images/tomcat.gif/a/td/tr!--HEADER SEPARATOR--trtd colspan=2hr size=1 noshade=/td/trtr!--RIGHT SIDE MAIN BODY--td align=left valign=top width=80%table cellspacing=4 width=100% border=0trtd nowrap=true valign=top align=lefth1Tomcat FAQ/h1h2About Tomcat User/h2/tdtd nowrap=true valign=top align=rightimg border=0 hspace=0 vspace=0 height=1 width=1 src=../../images/void.gif/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=PrefacestrongPreface/strong/a/font/td/trtrtdblockquote p -This is about the tomcat user list. +This is about the Tomcat user list
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util ServerInfo.java
funkman 2004/08/24 05:25:03
Modified:catalina/src/share/org/apache/catalina/util Tag: TOMCAT_5_0
ServerInfo.java
Log:
Backport support for version.sh and version.bat to 5.0
Revision ChangesPath
No revision
No revision
1.2.2.1 +7 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/ServerInfo.java
Index: ServerInfo.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/ServerInfo.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ServerInfo.java 27 Feb 2004 14:58:50 - 1.2
+++ ServerInfo.java 24 Aug 2004 12:25:03 - 1.2.2.1
@@ -1,12 +1,12 @@
/*
* Copyright 1999,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -71,5 +71,8 @@
}
+public static void main(String args[]) {
+System.out.println(Version: + getServerInfo());
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
funkman 2004/08/24 05:30:03 Modified:webapps/docs changelog.xml Log: add version.sh to changelog Revision ChangesPath 1.92 +389 -385 jakarta-tomcat-catalina/webapps/docs/changelog.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml.diff?r1=1.91r2=1.92 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
funkman 2004/08/24 05:31:40 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml Log: add version.sh to changelog [backport] Revision ChangesPath No revision No revision 1.70.2.10 +389 -385 jakarta-tomcat-catalina/webapps/docs/changelog.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml.diff?r1=1.70.2.9r2=1.70.2.10 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader StandardClassLoader.java
funkman 2004/09/01 08:02:34
Modified:catalina/src/share/org/apache/catalina/loader Tag:
TOMCAT_5_0 StandardClassLoader.java
Log:
Output the name of the repository if it failed to load.
(I borked one of my jars one day and had to open each one to discover one was
bad)
Revision ChangesPath
No revision
No revision
1.13.2.1 +7 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java
Index: StandardClassLoader.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/StandardClassLoader.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- StandardClassLoader.java 26 May 2004 15:47:34 - 1.13
+++ StandardClassLoader.java 1 Sep 2004 15:02:34 - 1.13.2.1
@@ -1,12 +1,12 @@
/*
* Copyright 1999,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -394,7 +394,7 @@
/**
* Return a String array of the current repositories for this class
* loader. If there are no repositories, a zero-length array is
- * returned. For security reason, returns a clone of the Array (since
+ * returned. For security reason, returns a clone of the Array (since
* String are immutable).
*/
public String[] findRepositories() {
@@ -955,7 +955,8 @@
}
} catch (Throwable t) {
IllegalArgumentException iae = new IllegalArgumentException
-(addRepositoryInternal);
+(addRepositoryInternal: repository=' +
+ repository + ');
jdkCompat.chainException(iae, t);
throw iae;
} finally {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java ResponseIncludeWrapper.java SSICommand.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java SSIFlastmod.java SSIFsize.java SSIInclude.java SSIMediator.java SSIPrintenv.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java SSIServletRequestUtil.java SSISet.java SSIStopProcessingException.java
funkman 2004/09/01 09:31:02 Modified:catalina/src/share/org/apache/catalina Tag: TOMCAT_5_0 Globals.java catalina/src/share/org/apache/catalina/ssi Tag: TOMCAT_5_0 ByteArrayServletOutputStream.java ResponseIncludeWrapper.java SSICommand.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java SSIFlastmod.java SSIFsize.java SSIInclude.java SSIMediator.java SSIPrintenv.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java SSIServletRequestUtil.java SSISet.java SSIStopProcessingException.java Log: Backport from 4.1 to get if else logic. Revision ChangesPath No revision No revision 1.9.2.1 +29 -18 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java.diff?r1=1.9r2=1.9.2.1 No revision No revision 1.3.2.1 +26 -27 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java.diff?r1=1.3r2=1.3.2.1 1.4.2.1 +57 -57 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java.diff?r1=1.4r2=1.4.2.1 1.3.2.1 +29 -28 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSICommand.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSICommand.java.diff?r1=1.3r2=1.3.2.1 1.3.2.1 +34 -40 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java.diff?r1=1.3r2=1.3.2.1 1.2.2.1 +44 -53 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java.diff?r1=1.2r2=1.2.2.1 1.3.2.1 +49 -55 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExec.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExec.java.diff?r1=1.3r2=1.3.2.1 1.3.2.1 +46 -39 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExternalResolver.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExternalResolver.java.diff?r1=1.3r2=1.3.2.1 1.3.2.1 +47 -52 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java.diff?r1=1.3r2=1.3.2.1 1.2.2.1 +76 -82 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFsize.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFsize.java.diff?r1=1.2r2=1.2.2.1 1.3.2.1 +39 -45 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIInclude.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIInclude.java.diff?r1=1.3r2=1.3.2.1 1.3.2.1 +258 -176 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIMediator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIMediator.java.diff?r1=1.3r2=1.3.2.1 1.2.2.1 +36 -43 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIPrintenv.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIPrintenv.java.diff?r1=1.2r2=1.2.2.1 1.3.2.1 +224 -193 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIProcessor.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIProcessor.java.diff?r1=1.3r2=1.3.2.1 1.6.2.2 +87 -99 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java.diff?r1=1.6.2.1r2=1.6.2.2 1.3.2.1 +379 -356 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi ExpressionParseTree.java ExpressionTokenizer.java SSIConditional.java SSIConditionalState.java
funkman 2004/09/01 09:32:06 Added: catalina/src/share/org/apache/catalina/ssi Tag: TOMCAT_5_0 ExpressionParseTree.java ExpressionTokenizer.java SSIConditional.java SSIConditionalState.java Log: New files with backport of if else logic from 4.1 branch Revision ChangesPath No revision No revision 1.1.2.1 +383 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/Attic/ExpressionParseTree.java 1.1.2.1 +171 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/Attic/ExpressionTokenizer.java 1.1.2.1 +129 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/Attic/SSIConditional.java 1.1.2.1 +38 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/Attic/SSIConditionalState.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi ExpressionParseTree.java ExpressionTokenizer.java SSIConditional.java SSIConditionalState.java ByteArrayServletOutputStream.java ResponseIncludeWrapper.java SSICommand.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java SSIFlastmod.java SSIFsize.java SSIInclude.java SSIMediator.java SSIPrintenv.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java SSIServletRequestUtil.java SSISet.java SSIStopProcessingException.java
funkman 2004/09/01 11:33:34 Modified:catalina/src/share/org/apache/catalina Globals.java catalina/src/share/org/apache/catalina/ssi ByteArrayServletOutputStream.java ResponseIncludeWrapper.java SSICommand.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java SSIFlastmod.java SSIFsize.java SSIInclude.java SSIMediator.java SSIPrintenv.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java SSIServletRequestUtil.java SSISet.java SSIStopProcessingException.java Added: catalina/src/share/org/apache/catalina/ssi ExpressionParseTree.java ExpressionTokenizer.java SSIConditional.java SSIConditionalState.java Log: Backport from 4.1 the ssi if else logic Revision ChangesPath 1.11 +12 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java.diff?r1=1.10r2=1.11 1.5 +23 -21 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java.diff?r1=1.4r2=1.5 1.5 +57 -57 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java.diff?r1=1.4r2=1.5 1.4 +29 -28 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSICommand.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSICommand.java.diff?r1=1.3r2=1.4 1.4 +34 -40 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java.diff?r1=1.3r2=1.4 1.3 +44 -53 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java.diff?r1=1.2r2=1.3 1.4 +49 -55 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExec.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExec.java.diff?r1=1.3r2=1.4 1.4 +46 -39 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExternalResolver.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExternalResolver.java.diff?r1=1.3r2=1.4 1.4 +47 -52 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java.diff?r1=1.3r2=1.4 1.3 +76 -82 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFsize.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFsize.java.diff?r1=1.2r2=1.3 1.4 +39 -45 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIInclude.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIInclude.java.diff?r1=1.3r2=1.4 1.4 +258 -176 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIMediator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIMediator.java.diff?r1=1.3r2=1.4 1.3 +36 -43 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIPrintenv.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIPrintenv.java.diff?r1=1.2r2=1.3 1.4 +224 -193 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIProcessor.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIProcessor.java.diff?r1=1.3r2=1.4 1.8 +87 -99 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java.diff?r1=1.7r2=1.8 1.4 +379 -356 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java http://cvs.apache.org/viewcvs/jakarta-tomcat
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
funkman 2004/09/01 11:47:54 Modified:webapps/docs changelog.xml Log: start 5.5.1 changelog Revision ChangesPath 1.95 +43 -11jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- changelog.xml 1 Sep 2004 10:06:25 - 1.94 +++ changelog.xml 1 Sep 2004 18:47:54 - 1.95 @@ -26,6 +26,38 @@ /p /section + +section name=Tomcat 5.5.1 (yoavs) + subsection name=General +changelog +/changelog + /subsection + + subsection name=Catalina +changelog + update +Backport if-else logic for SSI servlet from 4.1 (funkman) + /update +/changelog + /subsection + + subsection name=Coyote + /subsection + + subsection name=Jasper +changelog +/changelog + /subsection + + subsection name=Cluster + /subsection + + subsection name=Webapps +changelog +/changelog + /subsection +/section + section name=Tomcat 5.5.0 (yoavs) subsection name=General changelog @@ -35,14 +67,14 @@ update Designed and tested Tomcat on J2SE 5.0 (aka JDK 1.5). (everyone) /update - update + update Bundled Eclipse JDT (new dependency) to allow Tomcat to run on a JRE only, i.e. no JDK required. (remm) /update - update + update Repackage commons-dbcp and its dependencies as a sigle smaller WAR, with renamed packages. (remm) /update - update -Removed dependencies on commons-digester, commons-beanutils, and commons-collections. + update +Removed dependencies on commons-digester, commons-beanutils, and commons-collections. The relevant digester functionality is now merged in tomcat-util. (remm) /update /changelog @@ -62,21 +94,21 @@ update Extensively profiled and optimized the server startup performance as well as the request mapping and processing pipeline. (remm) /update - update + update The container will now always process a /META-INF/context.xml resource, unless the webapp has a specified external context file. (remm) /update - update + update New default configuration mechanism for web applications, replacing DefaultContext. This uses a shared context file located in conf/context.xml. (remm) /update - update + update Revamped deployer, alloying full hotdeploy (note: on Windows, this requires the anti file locking features). (remm) /update - update + update Remove verbosity from the JNDI resources configuration, by allowing arbitrary attributes on the Resource element. (remm) /update - update + update Simpler Valve interface, to allow smaller stack traces and reducing the amount of method calls. (remm) /update /changelog @@ -87,11 +119,11 @@ subsection name=Jasper changelog - update + update Eclipse JDT is now the default Java compiler in Jasper. Source dependencies are now loaded from the container classloader, and compilation times are much faster. (remm) /update - update + update Jasper development mode should now have acceptable performance for heavily accessed pages. Precompiling JSPs is still significantly more efficient, however. (remm) /update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
funkman 2004/09/01 11:49:53 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml Log: ssi and StandardClassLoader msg Revision ChangesPath No revision No revision 1.70.2.23 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.22 retrieving revision 1.70.2.23 diff -u -r1.70.2.22 -r1.70.2.23 --- changelog.xml 31 Aug 2004 14:50:41 - 1.70.2.22 +++ changelog.xml 1 Sep 2004 18:49:53 - 1.70.2.23 @@ -45,6 +45,12 @@ update Added processTlds context attribute to allow disabling TLD processing. (yoavs) /update + update +Backport if-else logic for SSI servlet from 4.1 (funkman) + /update + update +StandardClassLoader: Output the name of the repository if it failed to load. (funkman) + /update /changelog /subsection subsection name=Webapps - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Collector.java Generator.java PageInfo.java
funkman 2004/09/09 07:26:53
Modified:jasper2/src/share/org/apache/jasper/compiler Collector.java
Generator.java PageInfo.java
Log:
- Remove maxTagNesting and curTagNesting since they are unused.
- Formatting.
- Fix the java.util.* import
Revision ChangesPath
1.15 +116 -126
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Collector.java
Index: Collector.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Collector.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Collector.java17 Mar 2004 19:23:03 - 1.14
+++ Collector.java9 Sep 2004 14:26:52 - 1.15
@@ -1,12 +1,12 @@
/*
* Copyright 1999,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,97 +34,87 @@
*/
static class CollectVisitor extends Node.Visitor {
-private int maxTagNesting = 0;
-private int curTagNesting = 0;
- private boolean scriptingElementSeen = false;
- private boolean usebeanSeen = false;
- private boolean includeActionSeen = false;
- private boolean paramActionSeen = false;
- private boolean setPropertySeen = false;
- private boolean hasScriptingVars = false;
-
- public void visit(Node.ParamAction n) throws JasperException {
- if (n.getValue().isExpression()) {
- scriptingElementSeen = true;
- }
- paramActionSeen = true;
- }
-
- public void visit(Node.IncludeAction n) throws JasperException {
- if (n.getPage().isExpression()) {
- scriptingElementSeen = true;
- }
- includeActionSeen = true;
-visitBody(n);
- }
+private boolean scriptingElementSeen = false;
+private boolean usebeanSeen = false;
+private boolean includeActionSeen = false;
+private boolean paramActionSeen = false;
+private boolean setPropertySeen = false;
+private boolean hasScriptingVars = false;
+
+public void visit(Node.ParamAction n) throws JasperException {
+if (n.getValue().isExpression()) {
+scriptingElementSeen = true;
+}
+paramActionSeen = true;
+}
- public void visit(Node.ForwardAction n) throws JasperException {
- if (n.getPage().isExpression()) {
- scriptingElementSeen = true;
- }
+public void visit(Node.IncludeAction n) throws JasperException {
+if (n.getPage().isExpression()) {
+scriptingElementSeen = true;
+}
+includeActionSeen = true;
visitBody(n);
- }
+}
- public void visit(Node.SetProperty n) throws JasperException {
- if (n.getValue() != null n.getValue().isExpression()) {
- scriptingElementSeen = true;
- }
- setPropertySeen = true;
- }
-
- public void visit(Node.UseBean n) throws JasperException {
- if (n.getBeanName() != null n.getBeanName().isExpression()) {
- scriptingElementSeen = true;
- }
- usebeanSeen = true;
+public void visit(Node.ForwardAction n) throws JasperException {
+if (n.getPage().isExpression()) {
+scriptingElementSeen = true;
+}
visitBody(n);
- }
+}
- public void visit(Node.PlugIn n) throws JasperException {
- if (n.getHeight() != null n.getHeight().isExpression()) {
- scriptingElementSeen = true;
- }
- if (n.getWidth() != null n.getWidth().isExpression()) {
- scriptingElementSeen = true;
- }
-visitBody(n);
- }
+public void visit(Node.SetProperty n) throws JasperException {
+if (n.getValue() != null n.getValue().isExpression()) {
+scriptingElementSeen = true;
+}
+setPropertySeen = true;
+}
-public void visit(Node.CustomTag n) throws JasperException {
+public void visit(Node.UseBean n) throws JasperException {
+if (n.getBeanName() != null n.getBeanName().isExpression
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
funkman 2004/09/09 09:52:21 Modified:webapps/docs changelog.xml Log: Start 5.5.2 section and document jasper commit Revision ChangesPath 1.102 +46 -12jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- changelog.xml 6 Sep 2004 21:56:55 - 1.101 +++ changelog.xml 9 Sep 2004 16:52:21 - 1.102 @@ -25,6 +25,40 @@ only in the above changelog. /p /section +section name=Tomcat 5.5.2 (yoavs) + subsection name=General +changelog +/changelog + /subsection + + subsection name=Catalina +changelog +/changelog + /subsection + + subsection name=Coyote +changelog +/changelog + /subsection + + subsection name=Jasper +changelog + fix +Remove maxTagNesting and curTagNesting since they are unused. (funkman) + /fix +/changelog + /subsection + + subsection name=Cluster +changelog +/changelog + /subsection + + subsection name=Webapps +changelog +/changelog + /subsection +/section section name=Tomcat 5.5.1 (yoavs) subsection name=General @@ -110,7 +144,7 @@ subsection name=Webapps changelog - update + update Major documentation update with current Tomcat 5.5 changes. (remm) /update update @@ -129,14 +163,14 @@ update Designed and tested Tomcat on J2SE 5.0 (aka JDK 1.5). (everyone) /update - update + update Bundled Eclipse JDT (new dependency) to allow Tomcat to run on a JRE only, i.e. no JDK required. (remm) /update - update + update Repackage commons-dbcp and its dependencies as a sigle smaller WAR, with renamed packages. (remm) /update - update -Removed dependencies on commons-digester, commons-beanutils, and commons-collections. + update +Removed dependencies on commons-digester, commons-beanutils, and commons-collections. The relevant digester functionality is now merged in tomcat-util. (remm) /update /changelog @@ -156,21 +190,21 @@ update Extensively profiled and optimized the server startup performance as well as the request mapping and processing pipeline. (remm) /update - update + update The container will now always process a /META-INF/context.xml resource, unless the webapp has a specified external context file. (remm) /update - update + update New default configuration mechanism for web applications, replacing DefaultContext. This uses a shared context file located in conf/context.xml. (remm) /update - update + update Revamped deployer, alloying full hotdeploy (note: on Windows, this requires the anti file locking features). (remm) /update - update + update Remove verbosity from the JNDI resources configuration, by allowing arbitrary attributes on the Resource element. (remm) /update - update + update Simpler Valve interface, to allow smaller stack traces and reducing the amount of method calls. (remm) /update /changelog @@ -181,11 +215,11 @@ subsection name=Jasper changelog - update + update Eclipse JDT is now the default Java compiler in Jasper. Source dependencies are now loaded from the container classloader, and compilation times are much faster. (remm) /update - update + update Jasper development mode should now have acceptable performance for heavily accessed pages. Precompiling JSPs is still significantly more efficient, however. (remm) /update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/xdocs-faq classnotfound.xml connectors.xml database.xml misc.xml unix.xml version.xml
funkman 2004/09/11 07:59:57 Modified:xdocs-faq classnotfound.xml connectors.xml database.xml misc.xml unix.xml version.xml Log: Faq update. 4.1 - not really under dev add 5.5 classloader howto link link to 5.0 AJP, HTTP Connectors for configuring address for 5.0.28 or better mention version.sh (version.bat) mention java.awt.headless Revision ChangesPath 1.5 +4 -2 jakarta-tomcat-site/xdocs-faq/classnotfound.xml Index: classnotfound.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/classnotfound.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- classnotfound.xml 2 Mar 2004 17:04:01 - 1.4 +++ classnotfound.xml 11 Sep 2004 14:59:57 - 1.5 @@ -19,11 +19,13 @@ very similar errors. It is strongly advised you read the following topics: ul li -Classloader HOWTO pages: +Classloader HOWTO pages: a href=http://jakarta.apache.org/tomcat/tomcat-4.1-doc/class-loader-howto.html; Tomcat 4.1/a, a href=http://jakarta.apache.org/tomcat/tomcat-5.0-doc/class-loader-howto.html; - Tocmat 5.0/a. + Tocmat 5.0/a, +a href=http://jakarta.apache.org/tomcat/tomcat-5.5-doc/class-loader-howto.html; + Tocmat 5.5/a. /li li a href=http://marc.theaimsgroup.com/?t=10431752924amp;r=1amp;w=2; 1.10 +8 -1 jakarta-tomcat-site/xdocs-faq/connectors.xml Index: connectors.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/connectors.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- connectors.xml5 Apr 2004 17:01:20 - 1.9 +++ connectors.xml11 Sep 2004 14:59:57 - 1.10 @@ -270,7 +270,7 @@ /a /question answer -Each Connector element allows an address property. For example: +Each Connector element allows an ttaddress/tt property. For example: source lt;Connector className=org.apache.coyote.tomcat4.CoyoteConnector address=192.168.1.1 @@ -279,6 +279,13 @@ acceptCount=100 debug=0 connectionTimeout=2 useURIValidationHack=false disableUploadTimeout=true /gt; /source + +For a more complete description of the Connector config, +a href=http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/http.html;see the +HTTP Connector docs/a +or the +a href=http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/http.html;see the +AJP Connector docs/a. /answer 1.3 +1 -1 jakarta-tomcat-site/xdocs-faq/database.xml Index: database.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/database.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- database.xml 11 Jul 2003 01:57:39 - 1.2 +++ database.xml 11 Sep 2004 14:59:57 - 1.3 @@ -57,7 +57,7 @@ bOther notes:/b ul li -Do not use JDBC-ODBC bundled with Sun's JDK with Tomcat. It was never +bDo not use JDBC-ODBC bridge/b bundled with Sun's JDK with Tomcat. It was never meant for a production server environment. If you ask a question about it, everyone will tell you to not use it. If you do need to use ODBC, there are 3rd party drivers which do a pretty good job at being thread 1.23 +9 -2 jakarta-tomcat-site/xdocs-faq/misc.xml Index: misc.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/misc.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- misc.xml 7 Sep 2004 14:32:50 - 1.22 +++ misc.xml 11 Sep 2004 14:59:57 - 1.23 @@ -371,7 +371,14 @@ a name=versionHow to I get Tomcat's version number?/a /question answer +p codejavax.servlet.ServletContext.getServerInfo();/code +/p +p +Starting with tomcat 5.0.28 - there is now a ttversion.sh/tt +(or ttversion.bat/tt) program in the bin directory. +It will print the version number of tomcat to Standard output. +/p /answer question @@ -758,7 +765,7 @@ lia href=http://www.friendster.com;Friendster/a./li lia href=http://www.webshots.com;WebShots/a./li lia href=http://marc.theaimsgroup.com/?l=tomcat-devamp;m=109396561900857amp;w=2;University of Florida/a./li - lia href=http://archives.real-time.com/pipermail/cocoon-users/2003-October/040770.html;Various Cocoon on tomcat applications/a./li + lia href=http
cvs commit: jakarta-tomcat-site/docs/faq/printer bugs.html classnotfound.html connectors.html database.html index.html memory.html misc.html security.html tomcatuser.html unix.html version.html
funkman 2004/09/11 08:00:52 Modified:docs/faq bugs.html classnotfound.html connectors.html database.html deployment.html index.html logging.html memory.html meta.html misc.html os2.html performance.html security.html tomcatuser.html unix.html version.html windows.html docs/faq/printer bugs.html classnotfound.html connectors.html database.html index.html memory.html misc.html security.html tomcatuser.html unix.html version.html Log: The HTML portion of the previous FAQ update commit. Revision ChangesPath 1.7 +86 -86jakarta-tomcat-site/docs/faq/bugs.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/bugs.html.diff?r1=1.6r2=1.7 1.8 +131 -129 jakarta-tomcat-site/docs/faq/classnotfound.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/classnotfound.html.diff?r1=1.7r2=1.8 1.12 +291 -284 jakarta-tomcat-site/docs/faq/connectors.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/connectors.html.diff?r1=1.11r2=1.12 1.5 +74 -74jakarta-tomcat-site/docs/faq/database.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/database.html.diff?r1=1.4r2=1.5 1.4 +60 -60jakarta-tomcat-site/docs/faq/deployment.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/deployment.html.diff?r1=1.3r2=1.4 1.10 +86 -86jakarta-tomcat-site/docs/faq/index.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/index.html.diff?r1=1.9r2=1.10 1.2 +185 -185 jakarta-tomcat-site/docs/faq/logging.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/logging.html.diff?r1=1.1r2=1.2 1.8 +158 -158 jakarta-tomcat-site/docs/faq/memory.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/memory.html.diff?r1=1.7r2=1.8 1.5 +64 -64jakarta-tomcat-site/docs/faq/meta.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/meta.html.diff?r1=1.4r2=1.5 1.27 +773 -766 jakarta-tomcat-site/docs/faq/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/misc.html.diff?r1=1.26r2=1.27 1.4 +65 -65jakarta-tomcat-site/docs/faq/os2.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/os2.html.diff?r1=1.3r2=1.4 1.8 +1 -1 jakarta-tomcat-site/docs/faq/performance.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/performance.html.diff?r1=1.7r2=1.8 1.12 +162 -162 jakarta-tomcat-site/docs/faq/security.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/security.html.diff?r1=1.11r2=1.12 1.7 +173 -173 jakarta-tomcat-site/docs/faq/tomcatuser.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/tomcatuser.html.diff?r1=1.6r2=1.7 1.5 +98 -92jakarta-tomcat-site/docs/faq/unix.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/unix.html.diff?r1=1.4r2=1.5 1.9 +5 -6 jakarta-tomcat-site/docs/faq/version.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/version.html.diff?r1=1.8r2=1.9 1.5 +1 -1 jakarta-tomcat-site/docs/faq/windows.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/windows.html.diff?r1=1.4r2=1.5 1.5 +85 -85jakarta-tomcat-site/docs/faq/printer/bugs.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/bugs.html.diff?r1=1.4r2=1.5 1.6 +130 -128 jakarta-tomcat-site/docs/faq/printer/classnotfound.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/classnotfound.html.diff?r1=1.5r2=1.6 1.11 +290 -283 jakarta-tomcat-site/docs/faq/printer/connectors.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/connectors.html.diff?r1=1.10r2=1.11 1.3 +1 -1 jakarta-tomcat-site/docs/faq/printer/database.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/database.html.diff?r1=1.2r2=1.3 1.8 +85 -85jakarta-tomcat-site/docs/faq/printer/index.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/index.html.diff?r1=1.7r2=1.8 1.5 +157 -157 jakarta-tomcat-site/docs/faq/printer/memory.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/memory.html.diff?r1=1.4r2=1.5 1.24 +772 -765 jakarta-tomcat-site/docs/faq/printer/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/misc.html.diff?r1=1.23r2=1.24 1.9 +161 -161 jakarta-tomcat-site/docs/faq/printer/security.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq
cvs commit: jakarta-tomcat-site/xdocs-faq misc.xml project.xml
funkman 2004/09/13 17:04:08 Modified:xdocs-faq misc.xml project.xml Log: Add wiki to left nav. Move wiki links to new wiki. Move the powered by blurb to the wiki Revision ChangesPath 1.24 +3 -21 jakarta-tomcat-site/xdocs-faq/misc.xml Index: misc.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/misc.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- misc.xml 11 Sep 2004 14:59:57 - 1.23 +++ misc.xml 14 Sep 2004 00:04:08 - 1.24 @@ -754,27 +754,9 @@ /a /question answer -Numerous organizations across various industries all over the world. -Examples includes: -ul - lia href=http://www.computerworld.com/developmenttopics/websitemgmt/story/0,10801,92583,00.html;The Weather Channel/a./li - lia href=http://screaming-penguin.com/main.php?storyid=2579;EdSyndicate/a./li - lia href=http://developers.slashdot.org/developers/02/08/19/2042235.shtml?tid=108;Various (from Slashdot)/a./li - lia href=http://www.theserverside.com/news/thread.tss?thread_id=15073;TheServerSide.com/a take on the Slashdot discussion above, with many more references./li - lia href=http://www.cofax.org;Cofax/a./li - lia href=http://www.friendster.com;Friendster/a./li - lia href=http://www.webshots.com;WebShots/a./li - lia href=http://marc.theaimsgroup.com/?l=tomcat-devamp;m=109396561900857amp;w=2;University of Florida/a./li - lia href=http://archives.real-time.com/pipermail/cocoon-users/2003-October/040770.html;Various Cocoon on tomcat applications/a./li - lia href=http://marc.theaimsgroup.com/?l=tomcat-useramp;m=108334244910127amp;w=2;Another mailing list thread with production system references.../a/li -/ul -This list is limited mostly by our free time. There are numerous other -examples and references available by searching online, and undoubtedly -many cases where the organization does not want to reveal it's using -tomcat for various (e.g. security) reasons. (This is true for many -software products, not just tomcat). We'll keep adding to the list, -but please let us know (by sending a message to [EMAIL PROTECTED]) -if your site is using tomcat in production. +Numerous organizations across various industries all over the world. A full +listing can be found at the +a href=http://wiki.apache.org/jakarta-tomcat/PoweredBy;Wiki./a /answer question 1.7 +3 -2 jakarta-tomcat-site/xdocs-faq/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-site/xdocs-faq/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 7 Sep 2004 14:32:50 - 1.6 +++ project.xml 14 Sep 2004 00:04:08 - 1.7 @@ -22,7 +22,7 @@ item name=Connectors href=connectors.html/ item name=Database href=database.html/ item name=Deployment href=deployment.html / -item name=How do I href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Howto/ +item name=How do I href=http://wiki.apache.org/jakarta-tomcat/HowTo/ item name=Linux / Unix href=unix.html/ item name=Logginghref=logging.html / item name=OS/2, z/OS href=os2.html/ @@ -30,10 +30,11 @@ item name=Meta href=meta.html/ item name=Miscellaneous href=misc.html/ item name=Monitoring / Performance href=performance.html/ -item name=Other Resources href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat/Links/ +item name=Other Resources href=http://wiki.apache.org/jakarta-tomcat/UsefulLinks/ item name=Security href=security.html/ item name=Which Version href=version.html/ item name=Tomcat User List href=tomcatuser.html/ +item name=Wiki href=http://wiki.apache.org/jakarta-tomcat// item name=Windowshref=windows.html/ /menu - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-site/docs/faq/printer deployment.html logging.html os2.html misc.html
funkman 2004/09/13 17:04:45 Modified:docs bugreport.html index.html irc.html resources.html docs/faq bugs.html classnotfound.html connectors.html database.html deployment.html index.html logging.html memory.html meta.html misc.html os2.html performance.html security.html tomcatuser.html unix.html version.html windows.html docs/faq/printer misc.html Added: docs/faq/printer deployment.html logging.html os2.html Log: HTML version of the commits - add the missing files Revision ChangesPath 1.24 +1 -17 jakarta-tomcat-site/docs/bugreport.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/bugreport.html.diff?r1=1.23r2=1.24 1.67 +1 -17 jakarta-tomcat-site/docs/index.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/index.html.diff?r1=1.66r2=1.67 1.23 +1 -17 jakarta-tomcat-site/docs/irc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/irc.html.diff?r1=1.22r2=1.23 1.27 +1 -17 jakarta-tomcat-site/docs/resources.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/resources.html.diff?r1=1.26r2=1.27 1.8 +1 -1 jakarta-tomcat-site/docs/faq/bugs.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/bugs.html.diff?r1=1.7r2=1.8 1.9 +1 -1 jakarta-tomcat-site/docs/faq/classnotfound.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/classnotfound.html.diff?r1=1.8r2=1.9 1.13 +1 -1 jakarta-tomcat-site/docs/faq/connectors.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/connectors.html.diff?r1=1.12r2=1.13 1.6 +1 -1 jakarta-tomcat-site/docs/faq/database.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/database.html.diff?r1=1.5r2=1.6 1.5 +1 -1 jakarta-tomcat-site/docs/faq/deployment.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/deployment.html.diff?r1=1.4r2=1.5 1.11 +1 -1 jakarta-tomcat-site/docs/faq/index.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/index.html.diff?r1=1.10r2=1.11 1.3 +1 -1 jakarta-tomcat-site/docs/faq/logging.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/logging.html.diff?r1=1.2r2=1.3 1.9 +1 -1 jakarta-tomcat-site/docs/faq/memory.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/memory.html.diff?r1=1.8r2=1.9 1.6 +1 -1 jakarta-tomcat-site/docs/faq/meta.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/meta.html.diff?r1=1.5r2=1.6 1.28 +4 -22 jakarta-tomcat-site/docs/faq/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/misc.html.diff?r1=1.27r2=1.28 1.5 +1 -1 jakarta-tomcat-site/docs/faq/os2.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/os2.html.diff?r1=1.4r2=1.5 1.9 +1 -1 jakarta-tomcat-site/docs/faq/performance.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/performance.html.diff?r1=1.8r2=1.9 1.13 +1 -1 jakarta-tomcat-site/docs/faq/security.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/security.html.diff?r1=1.12r2=1.13 1.8 +1 -1 jakarta-tomcat-site/docs/faq/tomcatuser.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/tomcatuser.html.diff?r1=1.7r2=1.8 1.6 +1 -1 jakarta-tomcat-site/docs/faq/unix.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/unix.html.diff?r1=1.5r2=1.6 1.10 +1 -1 jakarta-tomcat-site/docs/faq/version.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/version.html.diff?r1=1.9r2=1.10 1.6 +1 -1 jakarta-tomcat-site/docs/faq/windows.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/windows.html.diff?r1=1.5r2=1.6 1.25 +3 -21 jakarta-tomcat-site/docs/faq/printer/misc.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/misc.html.diff?r1=1.24r2=1.25 1.1 jakarta-tomcat-site/docs/faq/printer/deployment.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/deployment.html?rev=1.1 1.1 jakarta-tomcat-site/docs/faq/printer/logging.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/logging.html?rev=1.1 1.1 jakarta-tomcat-site/docs/faq/printer/os2.html http://cvs.apache.org/viewcvs/jakarta-tomcat-site/docs/faq/printer/os2.html?rev=1.1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL
cvs commit: jakarta-tomcat-site/docs bugreport.html index.html irc.html resources.html
funkman 2004/09/13 18:08:16 Modified:docs bugreport.html index.html irc.html resources.html Log: Fix(add back) LICENSE since my last commit didn't have jakarta-site up to date locally. Revision ChangesPath 1.25 +17 -1 jakarta-tomcat-site/docs/bugreport.html Index: bugreport.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- bugreport.html14 Sep 2004 00:04:43 - 1.24 +++ bugreport.html14 Sep 2004 01:08:15 - 1.25 @@ -1,5 +1,21 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +!-- +Copyright 1999-2004 The Apache Software Foundation +Licensed under the Apache License, Version 2.0 (the License); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an AS IS BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +-- + + !-- Content Stylesheet for Site -- @@ -334,7 +350,7 @@ /td/tr trtd colspan=2 div align=centerfont color=#525D76 size=-1em -Copyright #169; 1999-2004, Apache Software Foundation +Copyright #169; 1999-2004, The Apache Software Foundation /em/font/div /td/tr /table 1.68 +17 -1 jakarta-tomcat-site/docs/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- index.html14 Sep 2004 00:04:43 - 1.67 +++ index.html14 Sep 2004 01:08:15 - 1.68 @@ -1,5 +1,21 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +!-- +Copyright 1999-2004 The Apache Software Foundation +Licensed under the Apache License, Version 2.0 (the License); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an AS IS BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +-- + + !-- Content Stylesheet for Site -- @@ -366,7 +382,7 @@ /td/tr trtd colspan=2 div align=centerfont color=#525D76 size=-1em -Copyright #169; 1999-2004, Apache Software Foundation +Copyright #169; 1999-2004, The Apache Software Foundation /em/font/div /td/tr /table 1.24 +17 -1 jakarta-tomcat-site/docs/irc.html Index: irc.html === RCS file: /home/cvs/jakarta-tomcat-site/docs/irc.html,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- irc.html 14 Sep 2004 00:04:43 - 1.23 +++ irc.html 14 Sep 2004 01:08:15 - 1.24 @@ -1,5 +1,21 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +!-- +Copyright 1999-2004 The Apache Software Foundation +Licensed under the Apache License, Version 2.0 (the License); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an AS IS BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +-- + + !-- Content Stylesheet for Site -- @@ -145,7 +161,7 @@ /td/tr trtd colspan=2 div align=centerfont color=#525D76 size=-1em -Copyright #169; 1999-2004, Apache Software Foundation +Copyright #169; 1999-2004, The Apache Software Foundation
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java Http11Protocol.java
funkman 2004/09/14 17:16:05
Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java Http11Protocol.java
Log:
Allow for customized server header at config time.
So now one can do this:
Connector port=8080 server=TinFoil Hats R US (1.00) /
Revision ChangesPath
1.110 +116 -90
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Http11Processor.java 13 Sep 2004 21:39:39 - 1.109
+++ Http11Processor.java 15 Sep 2004 00:16:05 - 1.110
@@ -56,7 +56,7 @@
/**
* Processes HTTP requests.
- *
+ *
* @author Remy Maucherat
*/
public class Http11Processor implements Processor, ActionHook {
@@ -65,7 +65,7 @@
/**
* Logger.
*/
-protected static org.apache.commons.logging.Log log
+protected static org.apache.commons.logging.Log log
= org.apache.commons.logging.LogFactory.getLog(Http11Processor.class);
@@ -210,31 +210,31 @@
* Remote Host associated with the current connection.
*/
protected String remoteHost = null;
-
-
+
+
/**
* Local Host associated with the current connection.
*/
protected String localName = null;
-
-
-
+
+
+
/**
* Local port to which the socket is connected
*/
protected int localPort = -1;
-
-
+
+
/**
* Remote port to which the socket is connected
*/
protected int remotePort = -1;
-
-
+
+
/**
* The local Host address.
*/
-protected String localAddr = null;
+protected String localAddr = null;
/**
@@ -277,11 +277,11 @@
* List of user agents to not use gzip with
*/
protected Pattern noCompressionUserAgents[] = null;
-
+
/**
* List of MIMES which could be gzipped
*/
-protected String[] compressableMimeTypes =
+protected String[] compressableMimeTypes =
{ text/html, text/xml, text/plain };
@@ -297,6 +297,12 @@
protected ThreadPool threadPool;
+/**
+ * Allow a customized the server header for the tin-foil hat folks.
+ */
+protected String server = Constants.SERVER;
+
+
// - Properties
@@ -344,7 +350,7 @@
public void setCompressionMinSize(int compressionMinSize) {
this.compressionMinSize = compressionMinSize;
}
-
+
public void setThreadPool(ThreadPool threadPool) {
this.threadPool = threadPool;
@@ -354,13 +360,13 @@
* Add user-agent for which gzip compression didn't works
* The user agent String given will be exactly matched
* to the user-agent header submitted by the client.
- *
+ *
* @param userAgent user-agent string
*/
public void addNoCompressionUserAgent(String userAgent) {
try {
Pattern nRule = Pattern.compile(userAgent);
-noCompressionUserAgents =
+noCompressionUserAgents =
addREArray(noCompressionUserAgents, nRule);
} catch (PatternSyntaxException pse) {
log.error(Error parsing regular expression: + userAgent, pse);
@@ -369,8 +375,8 @@
/**
- * Set no compression user agent list (this method is best when used with
- * a large number of connectors, where it would be better to have all of
+ * Set no compression user agent list (this method is best when used with
+ * a large number of connectors, where it would be better to have all of
* them referenced a single array).
*/
public void setNoCompressionUserAgents(Pattern[] noCompressionUserAgents) {
@@ -381,13 +387,13 @@
/**
* Set no compression user agent list.
* List contains users agents separated by ',' :
- *
+ *
* ie: gorilla,desesplorer,tigrus
*/
public void setNoCompressionUserAgents(String noCompressionUserAgents) {
if (noCompressionUserAgents != null) {
StringTokenizer st = new StringTokenizer(noCompressionUserAgents, ,);
-
+
while (st.hasMoreTokens()) {
addNoCompressionUserAgent(st.nextToken().trim());
}
@@ -398,18 +404,18 @@
* Add a mime-type which will be compressable
* The mime-type String will be exactly matched
* in the response
cvs commit: jakarta-tomcat-catalina/webapps/docs/config http.xml
funkman 2004/09/14 17:21:22 Modified:webapps/docs/config http.xml Log: Document the server attribute. Revision ChangesPath 1.14 +30 -25jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- http.xml 1 Sep 2004 22:04:29 - 1.13 +++ http.xml 15 Sep 2004 00:21:22 - 1.14 @@ -79,9 +79,9 @@ /attribute attribute name=maxPostSize required=false - pThe maximum size in bytes of the POST which will be handled by - the container FORM URL parameter parsing. The feature can be disbled by - setting this attribute to a value inferior or equal to 0. + pThe maximum size in bytes of the POST which will be handled by + the container FORM URL parameter parsing. The feature can be disbled by + setting this attribute to a value inferior or equal to 0. If not specified, this attribute is set to 2097152 (2 megabytes)./p /attribute @@ -116,9 +116,9 @@ attribute name=useBodyEncodingForURI required=false pThis specifies if the encoding specified in contentType should be used - for URI query parameters, instead of using the URIEncoding. This - setting is present for compatibility with Tomcat 4.1.x, where the - encoding specified in the contentType, or explicitely set using + for URI query parameters, instead of using the URIEncoding. This + setting is present for compatibility with Tomcat 4.1.x, where the + encoding specified in the contentType, or explicitely set using Request.setCharacterEncoding method was also used for the parameters from the URL. The default value is codefalse/code. /p @@ -130,8 +130,8 @@ subsection name=Standard Implementation - pThe standard implementation of the strongHTTP - Connector/strong is + pThe standard implementation of the strongHTTP + Connector/strong is strongorg.apache.coyote.tomcat5.CoyoteConnector/strong. It supports the following additional attributes (in addition to the common attributes listed above):/p @@ -171,7 +171,7 @@ attribute name=connectionLinger required=false pThe number of milliseconds during which the sockets used by this - strongConnector/strong will linger when they are closed. + strongConnector/strong will linger when they are closed. The default value is -1 (socket linger is disabled)./p /attribute @@ -185,7 +185,7 @@ pThis flag allows the servlet container to use a different, longer connection timeout while a servlet is being executed, which in the end allows either the servlet a longer amount of time to complete its - execution, or a longer timeout during data upload. If not specified, + execution, or a longer timeout during data upload. If not specified, this attribute is set to false./p /attribute @@ -198,14 +198,14 @@ attribute name=maxKeepAliveRequests required=false pThe maximum number of HTTP requests which can be pipelined until the connection is closed by the server. Setting this attribute to 1 will - disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and - pipelining. Setting this to -1 will allow an unlimited amount of - pipelined or keep-alive HTTP requests. + disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and + pipelining. Setting this to -1 will allow an unlimited amount of + pipelined or keep-alive HTTP requests. If not specified, this attribute is set to 100./p /attribute attribute name=maxSpareThreads required=false - pThe maximum number of unused request processing threads that + pThe maximum number of unused request processing threads that will be allowed to exist until the thread pool starts stopping the unnecessary threads. The default value is 50./p /attribute @@ -221,14 +221,14 @@ pThe number of request processing threads that will be created when this strongConnector/strong is first started. The connector will also make sure it has the specified number of idle processing - threads available. This attribute should be set to a value smaller + threads available. This attribute should be set to a value smaller than that set for codemaxThreads/code. The default value is 4./p /attribute attribute name=noCompressionUserAgents required=false pThe value is a comma separated list of regular expressions matching - user-agents of HTTP clients for which compression should
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
funkman 2004/09/15 05:59:46 Modified:webapps/docs changelog.xml Log: Start 5.5.3 - Server Header config Revision ChangesPath 1.104 +27 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- changelog.xml 10 Sep 2004 18:54:04 - 1.103 +++ changelog.xml 15 Sep 2004 12:59:46 - 1.104 @@ -25,6 +25,33 @@ only in the above changelog. /p /section + +section name=Tomcat 5.5.3 (yoavs) + subsection name=General + /subsection + + subsection name=Catalina + /subsection + + subsection name=Coyote +changelog + update +Allow customized server header for Standalone. (funkman) + /update +/changelog + /subsection + + subsection name=Jasper + /subsection + + subsection name=Cluster + /subsection + + subsection name=Webapps + /subsection +/section + + section name=Tomcat 5.5.2 (yoavs) subsection name=General changelog - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
funkman 2004/09/15 11:40:38 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml Log: Use CatalinaDigester on shutdown instead of Digester Revision ChangesPath No revision No revision 1.70.2.33 +5 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.32 retrieving revision 1.70.2.33 diff -u -r1.70.2.32 -r1.70.2.33 --- changelog.xml 10 Sep 2004 07:33:53 - 1.70.2.32 +++ changelog.xml 15 Sep 2004 18:40:38 - 1.70.2.33 @@ -30,6 +30,11 @@ /subsection subsection name=Catalina changelog + update +Use CatalinaDigester on shutdown so you can use a sytem property to +configure the port. (funkman) + /update + update fix bug28914/bug: threadPriority attribute ignored. (yoavs) /fix - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java WebdavServlet.java
funkman 2004/09/18 18:20:10
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java WebdavServlet.java
Log:
md5Helper, md5Encoder, and normalize are used by WebdavServlet,
not DefaultServelt so move them into WebdavServlet.
Remove unused method appendParameters
Revision ChangesPath
1.28 +16 -120
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- DefaultServlet.java 29 Aug 2004 16:46:12 - 1.27
+++ DefaultServlet.java 19 Sep 2004 01:20:10 - 1.28
@@ -1,12 +1,12 @@
/*
* Copyright 1999,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,8 +32,6 @@
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.util.Enumeration;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -56,7 +54,6 @@
import javax.xml.transform.stream.StreamSource;
import org.apache.catalina.Globals;
-import org.apache.catalina.util.MD5Encoder;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.util.URLEncoder;
@@ -113,18 +110,6 @@
/**
- * MD5 message digest provider.
- */
-protected static MessageDigest md5Helper;
-
-
-/**
- * The MD5 helper object for this class.
- */
-protected static final MD5Encoder md5Encoder = new MD5Encoder();
-
-
-/**
* Array containing the safe characters set.
*/
protected static URLEncoder urlEncoder;
@@ -259,13 +244,6 @@
, output buffer size= + output);
}
-// Load the MD5 helper used to calculate signatures.
-try {
-md5Helper = MessageDigest.getInstance(MD5);
-} catch (NoSuchAlgorithmException e) {
-throw new UnavailableException(No MD5);
-}
-
// Load the proxy dir context.
try {
resources = (ProxyDirContext) getServletContext()
@@ -288,7 +266,7 @@
if (resources == null) {
throw new UnavailableException(No resources);
}
-
+
}
@@ -345,7 +323,7 @@
serveResource(request, response, true);
} catch( IOException ex ) {
// we probably have this check somewhere else too.
-if( ex.getMessage() != null
+if( ex.getMessage() != null
ex.getMessage().indexOf(Broken pipe) = 0 ) {
// ignore it.
}
@@ -619,71 +597,6 @@
/**
- * Return a context-relative path, beginning with a /, that represents
- * the canonical version of the specified path after .. and . elements
- * are resolved out. If the specified path attempts to go outside the
- * boundaries of the current context (i.e. too many .. path elements
- * are present), return codenull/code instead.
- *
- * @param path Path to be normalized
- */
-protected String normalize(String path) {
-
-if (path == null)
-return null;
-
-// Create a place for the normalized path
-String normalized = path;
-
-if (normalized == null)
-return (null);
-
-if (normalized.equals(/.))
-return /;
-
-// Normalize the slashes and add leading slash if necessary
-if (normalized.indexOf('\\') = 0)
-normalized = normalized.replace('\\', '/');
-if (!normalized.startsWith(/))
-normalized = / + normalized;
-
-// Resolve occurrences of // in the normalized path
-while (true) {
-int index = normalized.indexOf(//);
-if (index 0)
-break;
-normalized = normalized.substring(0, index) +
-normalized.substring(index + 1);
-}
-
-// Resolve occurrences
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
funkman 2004/09/20 10:00:04 Modified:webapps/docs changelog.xml Log: document md5 move from defaultservelt to webdav servlet add changelog around the fixes in Catalina Revision ChangesPath 1.110 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- changelog.xml 20 Sep 2004 16:31:17 - 1.109 +++ changelog.xml 20 Sep 2004 17:00:03 - 1.110 @@ -31,6 +31,7 @@ /subsection subsection name=Catalina +changelog update Remove Digester code for Xerces workaround. (jfarcand) /update @@ -40,6 +41,11 @@ fix bug30869/bug: Make sure JAAS realm name is legal. (yoavs) /fix + update + md5Helper, md5Encoder, and normalize are used by WebdavServlet, + not DefaultServelt so move them into WebdavServlet. + /update +/changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/ROOT index.jsp
funkman 2004/10/03 05:57:56 Modified:webapps/ROOT index.jsp Log: Add a small comment to note changing index.jsp does nothing since it was precompiled. Revision ChangesPath 1.16 +5 -0 jakarta-tomcat-catalina/webapps/ROOT/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/ROOT/index.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- index.jsp 27 May 2004 13:23:14 - 1.15 +++ index.jsp 3 Oct 2004 12:57:56 - 1.16 @@ -155,6 +155,11 @@ pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=tomcat-docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p +pbNOTE:/b This page is precompiled. If you change it, this page will not change since + it was compiled into a servlet at build time. + (See tt$CATALINA_HOME/webapps/ROOT/WEB-INF/web.xml/tt as to how it was mapped.) +/p + pbNOTE: For security reasons, using the administration webapp is restricted to users with role admin. The manager webapp is restricted to users with role manager./b - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs tomcat-docs.xsl
funkman 2004/10/03 06:07:36 Modified:webapps/docs tomcat-docs.xsl Log: Allow word wrapping on the title to get rid of the horizontal scrolls. Revision ChangesPath 1.9 +2 -2 jakarta-tomcat-catalina/webapps/docs/tomcat-docs.xsl Index: tomcat-docs.xsl === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/tomcat-docs.xsl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tomcat-docs.xsl 23 Sep 2004 06:55:25 - 1.8 +++ tomcat-docs.xsl 3 Oct 2004 13:07:36 - 1.9 @@ -115,7 +115,7 @@ td width=80% valign=top align=left table border=0 width=100% cellspacing=4 tr - td align=left valign=top nowrap=true + td align=left valign=top h1xsl:value-of select=project/title//h1 h2xsl:value-of select=properties/title//h2 /td - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs introduction.xml
funkman 2004/10/03 06:10:27 Modified:webapps/docs introduction.xml Log: Fix wiki link Revision ChangesPath 1.7 +1 -1 jakarta-tomcat-catalina/webapps/docs/introduction.xml Index: introduction.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/introduction.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- introduction.xml 1 Mar 2004 14:01:28 - 1.6 +++ introduction.xml 3 Oct 2004 13:10:27 - 1.7 @@ -100,7 +100,7 @@ and effort. There's nothing like scouring the web only to find out that the answer was right in front of you all along!/li lia href=http://jakarta.apache.org/tomcat/faq/;Tomcat FAQ/a as maintained by the developers./li -lia href=http://nagoya.apache.org/wiki/apachewiki.cgi?Tomcat;Tomcat WIKI/a/li +lia href=http://wiki.apache.org/jakarta-tomcat/;Tomcat WIKI/a/li liTomcat FAQ at a href=http://www.jguru.com/faq/home.jsp?topic=Tomcat;jGuru/a/li liTomcat mailing list archives - numerous sites archive the Tomcat mailing lists. Since the links change over time, clicking here will search - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Protected Mail Delivery
Encrypted message is available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
