You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by yo...@apache.org on 2004/08/29 18:46:15 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources ResourceAttributes.java
yoavs 2004/08/29 09:46:15
Modified: catalina/src/share/org/apache/catalina Valve.java
catalina/src/share/org/apache/catalina/ant JMXQueryTask.java
catalina/src/share/org/apache/catalina/authenticator
AuthenticatorBase.java SingleSignOn.java
catalina/src/share/org/apache/catalina/connector
Connector.java CoyoteAdapter.java InputBuffer.java
Response.java
catalina/src/share/org/apache/catalina/core
StandardContext.java StandardServer.java
catalina/src/share/org/apache/catalina/deploy
NamingResources.java
catalina/src/share/org/apache/catalina/launcher
CatalinaLaunchFilter.java
catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
catalina/src/share/org/apache/catalina/mbeans
DefaultContextMBean.java MBeanFactory.java
MBeanUtils.java NamingResourcesMBean.java
StandardContextMBean.java
catalina/src/share/org/apache/catalina/realm
UserDatabaseRealm.java
catalina/src/share/org/apache/catalina/servlets
CGIServlet.java DefaultServlet.java
WebdavServlet.java
catalina/src/share/org/apache/catalina/ssi
ByteArrayServletOutputStream.java
catalina/src/share/org/apache/catalina/startup Embedded.java
SetNextNamingRule.java
catalina/src/share/org/apache/catalina/users
AbstractGroup.java AbstractUser.java
MemoryGroup.java MemoryRole.java MemoryUser.java
catalina/src/share/org/apache/catalina/util Base64.java
CGIProcessEnvironment.java CharsetMapper.java
InstanceSupport.java Strftime.java
catalina/src/share/org/apache/catalina/valves
AccessLogValve.java ErrorReportValve.java
ExtendedAccessLogValve.java JDBCAccessLogValve.java
PersistentValve.java RemoteAddrValve.java
RemoteHostValve.java RequestDumperValve.java
RequestFilterValve.java ValveBase.java
catalina/src/share/org/apache/naming
ContextAccessController.java JndiPermission.java
NamingContext.java ResourceEnvRef.java
TransactionRef.java
catalina/src/share/org/apache/naming/resources
ResourceAttributes.java
Log:
JavaDoc fixes.
Revision Changes Path
1.4 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Valve.java
Index: Valve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Valve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Valve.java 23 Jun 2004 08:24:59 -0000 1.3
+++ Valve.java 29 Aug 2004 16:46:08 -0000 1.4
@@ -111,8 +111,6 @@
*
* @param request The servlet request to be processed
* @param response The servlet response to be created
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs, or is thrown
* by a subsequently invoked Valve, Filter, or Servlet
1.4 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXQueryTask.java
Index: JMXQueryTask.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXQueryTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMXQueryTask.java 27 Feb 2004 14:58:40 -0000 1.3
+++ JMXQueryTask.java 29 Aug 2004 16:46:09 -0000 1.4
@@ -34,7 +34,7 @@
/**
* The JMX query string
- * @see setQuery()
+ * @see #setQuery(String)
*/
protected String query = null;
1.24 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
Index: AuthenticatorBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AuthenticatorBase.java 7 Jul 2004 16:39:46 -0000 1.23
+++ AuthenticatorBase.java 29 Aug 2004 16:46:09 -0000 1.24
@@ -349,8 +349,6 @@
*
* @param request Request to be processed
* @param response Response to be processed
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if thrown by a processing element
1.17 +4 -6 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java
Index: SingleSignOn.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SingleSignOn.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SingleSignOn.java 13 Aug 2004 20:19:50 -0000 1.16
+++ SingleSignOn.java 29 Aug 2004 16:46:09 -0000 1.17
@@ -326,8 +326,6 @@
*
* @param request The servlet request we are processing
* @param response The servlet response we are creating
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
@@ -516,9 +514,9 @@
* <p>
* If reauthentication is successful, the <code>Principal</code> and
* authorization type associated with the SSO session will be bound
- * to the given <code>HttpRequest</code> object via calls to
- * {@link HttpRequest#setAuthType HttpRequest.setAuthType()} and
- * {@link HttpRequest#setUserPrincipal HttpRequest.setUserPrincipal()}
+ * to the given <code>Request</code> object via calls to
+ * {@link Request#setAuthType Request.setAuthType()} and
+ * {@link Request#setUserPrincipal Request.setUserPrincipal()}
* </p>
*
* @param ssoId identifier of SingleSignOn session with which the
1.4 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java
Index: Connector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Connector.java 23 Jun 2004 16:59:41 -0000 1.3
+++ Connector.java 29 Aug 2004 16:46:09 -0000 1.4
@@ -423,7 +423,7 @@
/**
* Set the connection linger for this Connector.
*
- * @param count The new connection linge
+ * @param connectionLinger The new connection linger
*/
public void setConnectionLinger(int connectionLinger) {
@@ -446,7 +446,7 @@
/**
* Set the connection timeout for this Connector.
*
- * @param count The new connection timeout
+ * @param connectionTimeout The new connection timeout
*/
public void setConnectionTimeout(int connectionTimeout) {
@@ -492,7 +492,7 @@
/**
* Set the server socket timeout for this Connector.
*
- * @param connectionUploadTimeout The new server socket timeout
+ * @param serverSocketTimeout The new server socket timeout
*/
public void setServerSocketTimeout(int serverSocketTimeout) {
1.5 +1 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoyoteAdapter.java 25 Jun 2004 23:56:25 -0000 1.4
+++ CoyoteAdapter.java 29 Aug 2004 16:46:09 -0000 1.5
@@ -62,7 +62,6 @@
* Construct a new CoyoteProcessor associated with the specified connector.
*
* @param connector CoyoteConnector that owns this processor
- * @param id Identifier of this CoyoteProcessor (unique per connector)
*/
public CoyoteAdapter(Connector connector) {
1.3 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/InputBuffer.java
Index: InputBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/InputBuffer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InputBuffer.java 23 Jun 2004 16:59:41 -0000 1.2
+++ InputBuffer.java 29 Aug 2004 16:46:09 -0000 1.3
@@ -263,9 +263,9 @@
/**
* Reads new bytes in the byte chunk.
*
- * @param buf Byte buffer to be written to the response
+ * @param cbuf Byte buffer to be written to the response
* @param off Offset
- * @param cnt Length
+ * @param len Length
*
* @throws IOException An underlying IOException occurred
*/
1.8 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java
Index: Response.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Response.java 11 Aug 2004 23:54:27 -0000 1.7
+++ Response.java 29 Aug 2004 16:46:09 -0000 1.8
@@ -137,7 +137,7 @@
/**
* Set the Coyote response.
*
- * @param response The Coyote response
+ * @param coyoteResponse The Coyote response
*/
public void setCoyoteResponse(org.apache.coyote.Response coyoteResponse) {
this.coyoteResponse = coyoteResponse;
1.142 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- StandardContext.java 28 Aug 2004 13:54:16 -0000 1.141
+++ StandardContext.java 29 Aug 2004 16:46:09 -0000 1.142
@@ -846,9 +846,9 @@
/**
- * Set the application available flag for this Context.
+ * Set the antiJARLocking feature for this Context.
*
- * @param available The new application available flag
+ * @param antiJARLocking The new flag value
*/
public void setAntiJARLocking(boolean antiJARLocking) {
@@ -862,9 +862,9 @@
/**
- * Set the application available flag for this Context.
+ * Set the antiResourceLocking feature for this Context.
*
- * @param available The new application available flag
+ * @param antiResourceLocking The new flag value
*/
public void setAntiResourceLocking(boolean antiResourceLocking) {
1.36 +4 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- StandardServer.java 16 Aug 2004 09:31:06 -0000 1.35
+++ StandardServer.java 29 Aug 2004 16:46:09 -0000 1.36
@@ -571,8 +571,9 @@
}
- /** @jmx:attribute List services
- */
+ /**
+ * Return the JMX service names.
+ */
public ObjectName[] getServiceNames() {
ObjectName onames[]=new ObjectName[ services.length ];
for( int i=0; i<services.length; i++ ) {
1.8 +2 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
Index: NamingResources.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/NamingResources.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NamingResources.java 26 Jul 2004 16:04:02 -0000 1.7
+++ NamingResources.java 29 Aug 2004 16:46:10 -0000 1.8
@@ -279,8 +279,7 @@
/**
* Add a resource environment reference for this web application.
*
- * @param name The resource environment reference name
- * @param type The resource environment reference type
+ * @param resource The resource
*/
public void addResourceEnvRef(ContextResourceEnvRef resource) {
1.3 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/launcher/CatalinaLaunchFilter.java
Index: CatalinaLaunchFilter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/launcher/CatalinaLaunchFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CatalinaLaunchFilter.java 27 Feb 2004 14:58:44 -0000 1.2
+++ CatalinaLaunchFilter.java 29 Aug 2004 16:46:10 -0000 1.3
@@ -50,7 +50,7 @@
* "classname" attribute, may force the application to run
* in the foreground by forcing the "waitforchild" attribute to "true".
*
- * @param launchCommand a configured instance of the {@link LaunchTask}
+ * @param launchCommand a configured instance of the {@link LaunchCommand}
* class
* @throws BuildException if any errors occur
*/
1.42 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- WebappClassLoader.java 30 Jul 2004 09:43:32 -0000 1.41
+++ WebappClassLoader.java 29 Aug 2004 16:46:10 -0000 1.42
@@ -475,7 +475,7 @@
/**
* If there is a Java SecurityManager create a Permission.
*
- * @param url URL for a file or directory on local system
+ * @param permission The permission
*/
public void addPermission(Permission permission) {
if ((securityManager != null) && (permission != null)) {
1.8 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
Index: DefaultContextMBean.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultContextMBean.java 16 Aug 2004 09:31:08 -0000 1.7
+++ DefaultContextMBean.java 29 Aug 2004 16:46:11 -0000 1.8
@@ -275,7 +275,7 @@
/**
* Remove any environment entry with the specified name.
*
- * @param name Name of the environment entry to remove
+ * @param envName Name of the environment entry to remove
*/
public void removeEnvironment(String envName) {
@@ -317,7 +317,7 @@
/**
* Remove any resource link with the specified name.
*
- * @param resourceName Name of the resource reference to remove
+ * @param resourceLinkName Name of the resource reference to remove
*/
public void removeResourceLink(String resourceLinkName) {
1.30 +5 -6 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- MBeanFactory.java 16 Aug 2004 09:31:08 -0000 1.29
+++ MBeanFactory.java 29 Aug 2004 16:46:11 -0000 1.30
@@ -722,8 +722,9 @@
* Create a new StandardEngine.
*
* @param parent MBean Name of the associated parent component
- * @param name Unique name of this Engine
+ * @param engineName Unique name of this Engine
* @param defaultHost Default hostname of this Engine
+ * @param serviceName Unique name of this Service
*
* @exception Exception if an MBean cannot be created or registered
*/
@@ -930,9 +931,7 @@
/**
* Remove an existing Connector.
*
- * @param name MBean Name of the comonent to remove
- *
- * @param serviceName Service name of the connector to remove
+ * @param name MBean Name of the component to remove
*
* @exception Exception if a component cannot be removed
*/
@@ -972,7 +971,7 @@
/**
* Remove an existing Context.
*
- * @param name MBean Name of the comonent to remove
+ * @param contextName MBean Name of the comonent to remove
*
* @exception Exception if a component cannot be removed
*/
1.32 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- MBeanUtils.java 16 Aug 2004 09:31:09 -0000 1.31
+++ MBeanUtils.java 29 Aug 2004 16:46:11 -0000 1.32
@@ -836,7 +836,7 @@
* <code>Service</code> object.
*
* @param domain Domain in which this name is to be created
- * @param context The ContextEnvironment to be named
+ * @param environment The ContextEnvironment to be named
*
* @exception MalformedObjectNameException if a name cannot be created
*/
1.9 +2 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NamingResourcesMBean.java 29 Jul 2004 22:11:59 -0000 1.8
+++ NamingResourcesMBean.java 29 Aug 2004 16:46:11 -0000 1.9
@@ -236,7 +236,6 @@
/**
* Add a resource link reference for this web application.
*
- * @param global New resource link reference global name
* @param resourceLinkName New resource link reference name
* @param type New resource link reference type
*/
@@ -270,7 +269,7 @@
/**
* Remove any environment entry with the specified name.
*
- * @param name Name of the environment entry to remove
+ * @param envName Name of the environment entry to remove
*/
public void removeEnvironment(String envName) {
1.9 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
Index: StandardContextMBean.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StandardContextMBean.java 29 Jul 2004 22:11:59 -0000 1.8
+++ StandardContextMBean.java 29 Aug 2004 16:46:11 -0000 1.9
@@ -304,7 +304,7 @@
/**
* Remove any environment entry with the specified name.
*
- * @param name Name of the environment entry to remove
+ * @param envName Name of the environment entry to remove
*/
public void removeEnvironment(String envName) {
@@ -346,7 +346,7 @@
/**
* Remove any resource link with the specified name.
*
- * @param resourceName Name of the resource reference to remove
+ * @param resourceLinkName Name of the resource reference to remove
*/
public void removeResourceLink(String resourceLinkName) {
1.9 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
Index: UserDatabaseRealm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UserDatabaseRealm.java 13 Jul 2004 09:43:59 -0000 1.8
+++ UserDatabaseRealm.java 29 Aug 2004 16:46:12 -0000 1.9
@@ -34,7 +34,7 @@
/**
- * <p>Implementation of {@link Realm} that is based on an implementation of
+ * <p>Implementation of {@link org.apache.catalina.Realm} that is based on an implementation of
* {@link UserDatabase} made available through the global JNDI resources
* configured for this instance of Catalina. Set the <code>resourceName</code>
* parameter to the global JNDI resources name for the configured instance
1.25 +5 -8 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- CGIServlet.java 17 Aug 2004 21:54:20 -0000 1.24
+++ CGIServlet.java 29 Aug 2004 16:46:12 -0000 1.25
@@ -709,7 +709,6 @@
* <p>
* </p>
*
- * @author Martin Dengler [root@martindengler.com]
* @version $Revision$, $Date$
* @since Tomcat 4.0
*
@@ -887,7 +886,6 @@
* cgi script, or null if no cgi was found
* </ul>
*
- * @author Martin Dengler [root@martindengler.com]
* @since Tomcat 4.0
*/
protected String[] findCGI(String pathInfo, String webAppRootDir,
@@ -1425,7 +1423,6 @@
* and <code>setResponse</code> methods, respectively.
* </p>
*
- * @author Martin Dengler [root@martindengler.com]
* @version $Revision$, $Date$
*/
1.27 +5 -5 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultServlet.java 23 Jul 2004 22:41:32 -0000 1.26
+++ DefaultServlet.java 29 Aug 2004 16:46:12 -0000 1.27
@@ -534,8 +534,8 @@
/**
* Process a POST request for the specified resource.
*
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
+ * @param req The servlet request we are processing
+ * @param resp The servlet response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet-specified error occurs
@@ -582,7 +582,7 @@
*
* @param request The servlet request we are processing
* @param response The servlet response we are creating
- * @param resourceInfo File object
+ * @param resourceAttributes The resource information
* @return boolean true if the resource meets all the specified conditions,
* and false if any of the conditions is not satisfied, in which case
* request processing is stopped
@@ -603,7 +603,7 @@
/**
* Get the ETag associated with a file.
*
- * @param resourceInfo File object
+ * @param resourceAttributes The resource information
*/
protected String getETag(ResourceAttributes resourceAttributes) {
String result = null;
1.17 +7 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WebdavServlet.java 23 Jul 2004 22:41:32 -0000 1.16
+++ WebdavServlet.java 29 Aug 2004 16:46:12 -0000 1.17
@@ -270,7 +270,7 @@
*
* @param request The servlet request we are processing
* @param response The servlet response we are creating
- * @param resourceInfo File object
+ * @param resourceAttributes The resource information
* @return boolean true if the resource meets all the specified conditions,
* and false if any of the conditions is not satisfied, in which case
* request processing is stopped
@@ -291,6 +291,11 @@
/**
* OPTIONS Method.
+ *
+ * @param req The request
+ * @param resp The response
+ * @throws ServletException If an error occurs
+ * @throws IOException If an IO error occurs
*/
protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
1.4 +1 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
Index: ByteArrayServletOutputStream.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ByteArrayServletOutputStream.java 27 Feb 2004 14:58:47 -0000 1.3
+++ ByteArrayServletOutputStream.java 29 Aug 2004 16:46:13 -0000 1.4
@@ -44,9 +44,6 @@
/**
* Write our stream to the <code>OutputStream</code> provided.
- *
- * @param out the OutputStream to write this stream to
- * @exception IOException if an input/output error occurs
*/
public byte[] toByteArray() {
return _buf.toByteArray();
1.20 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java
Index: Embedded.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Embedded.java 23 Jun 2004 16:59:41 -0000 1.19
+++ Embedded.java 29 Aug 2004 16:46:13 -0000 1.20
@@ -121,8 +121,6 @@
/**
* Construct a new instance of this class with specified properties.
*
- * @param logger Logger implementation to be inherited by all components
- * (unless overridden further down the container hierarchy)
* @param realm Realm implementation to be inherited by all components
* (unless overridden further down the container hierarchy)
*/
1.2 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetNextNamingRule.java
Index: SetNextNamingRule.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetNextNamingRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetNextNamingRule.java 26 Jul 2004 16:04:01 -0000 1.1
+++ SetNextNamingRule.java 29 Aug 2004 16:46:13 -0000 1.2
@@ -32,7 +32,7 @@
* <p>This rule now supports more flexible method matching by default.
* It is possible that this may break (some) code
* written against release 1.1.1 or earlier.
- * See {@link #isExactMatch()} for more details.</p>
+ * </p>
*/
public class SetNextNamingRule extends Rule {
1.4 +3 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/AbstractGroup.java
Index: AbstractGroup.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/AbstractGroup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractGroup.java 27 Feb 2004 14:58:50 -0000 1.3
+++ AbstractGroup.java 29 Aug 2004 16:46:13 -0000 1.4
@@ -113,7 +113,8 @@
/**
- * Return the set of {@link User}s that are members of this group.
+ * Return an Iterator over the set of {@link org.apache.catalina.User}s that
+ * are members of this group.
*/
public abstract Iterator getUsers();
1.3 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/AbstractUser.java
Index: AbstractUser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/AbstractUser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractUser.java 27 Feb 2004 14:58:50 -0000 1.2
+++ AbstractUser.java 29 Aug 2004 16:46:13 -0000 1.3
@@ -121,7 +121,7 @@
/**
* Return the logon username of this user, which must be unique
- * within the scope of a {@link UserDatabase}.
+ * within the scope of a {@link org.apache.catalina.UserDatabase}.
*/
public String getUsername() {
@@ -132,7 +132,7 @@
/**
* Set the logon username of this user, which must be unique within
- * the scope of a {@link UserDatabase}.
+ * the scope of a {@link org.apache.catalina.UserDatabase}.
*
* @param username The new logon username
*/
1.4 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryGroup.java
Index: MemoryGroup.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryGroup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryGroup.java 27 Feb 2004 14:58:50 -0000 1.3
+++ MemoryGroup.java 29 Aug 2004 16:46:13 -0000 1.4
@@ -26,7 +26,7 @@
/**
- * <p>Concrete implementation of {@link Group} for the
+ * <p>Concrete implementation of {@link org.apache.catalina.Group} for the
* {@link MemoryUserDatabase} implementation of {@link UserDatabase}.</p>
*
* @author Craig R. McClanahan
@@ -100,7 +100,7 @@
/**
- * Return the set of {@link User}s that are members of this group.
+ * Return the set of {@link org.apache.catalina.User}s that are members of this group.
*/
public Iterator getUsers() {
1.4 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryRole.java
Index: MemoryRole.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryRole.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryRole.java 27 Feb 2004 14:58:50 -0000 1.3
+++ MemoryRole.java 29 Aug 2004 16:46:13 -0000 1.4
@@ -22,7 +22,7 @@
/**
- * <p>Concrete implementation of {@link Role} for the
+ * <p>Concrete implementation of {@link org.apache.catalina.Role} for the
* {@link MemoryUserDatabase} implementation of {@link UserDatabase}.</p>
*
* @author Craig R. McClanahan
1.5 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUser.java
Index: MemoryUser.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/users/MemoryUser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MemoryUser.java 27 Feb 2004 14:58:50 -0000 1.4
+++ MemoryUser.java 29 Aug 2004 16:46:13 -0000 1.5
@@ -27,7 +27,7 @@
import org.apache.catalina.util.RequestUtil;
/**
- * <p>Concrete implementation of {@link User} for the
+ * <p>Concrete implementation of {@link org.apache.catalina.User} for the
* {@link MemoryUserDatabase} implementation of {@link UserDatabase}.</p>
*
* @author Craig R. McClanahan
1.5 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/Base64.java
Index: Base64.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/Base64.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Base64.java 15 Jul 2004 14:38:00 -0000 1.4
+++ Base64.java 29 Aug 2004 16:46:13 -0000 1.5
@@ -205,8 +205,8 @@
/**
* Decodes Base64 data into octects
*
- * @param base64Data Byte array containing Base64 data
- * @return Array containing decoded data.
+ * @param base64DataBC Byte array containing Base64 data
+ * @param decodedDataCC The decoded data chars
*/
public static void decode( ByteChunk base64DataBC, CharChunk decodedDataCC)
{
1.5 +1 -10 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
Index: CGIProcessEnvironment.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CGIProcessEnvironment.java 26 May 2004 16:20:54 -0000 1.4
+++ CGIProcessEnvironment.java 29 Aug 2004 16:46:13 -0000 1.5
@@ -27,11 +27,6 @@
import javax.servlet.http.HttpServletRequest;
-
-// import org.apache.catalina.util.StringManager;
-
-
-
/**
* Encapsulates the CGI Process' environment and rules to derive
* that environment from the servlet container and request information.
@@ -41,9 +36,6 @@
*/
public class CGIProcessEnvironment extends ProcessEnvironment {
-
-
-
/** cgi command's query parameters */
private Hashtable queryParameters = null;
@@ -328,7 +320,6 @@
* the cgi script, or null if no cgi
* was found
* </ul>
- * @author Martin Dengler [root@martindengler.com]
* @since Tomcat 4.0
*/
protected String[] findCGI(String pathInfo, String webAppRootDir,
1.4 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CharsetMapper.java
Index: CharsetMapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CharsetMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CharsetMapper.java 27 Feb 2004 14:58:50 -0000 1.3
+++ CharsetMapper.java 29 Aug 2004 16:46:13 -0000 1.4
@@ -39,7 +39,7 @@
* your own version for a particular web application.
*
* @author Craig R. McClanahan
- * @revision $Date$ $Version$
+ * @version $Date$ $Version$
*/
public class CharsetMapper {
1.3 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/InstanceSupport.java
Index: InstanceSupport.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/InstanceSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstanceSupport.java 27 Feb 2004 14:58:50 -0000 1.2
+++ InstanceSupport.java 29 Aug 2004 16:46:13 -0000 1.3
@@ -45,7 +45,7 @@
* Construct a new InstanceSupport object associated with the specified
* Instance component.
*
- * @param lifecycle The Instance component that will be the source
+ * @param wrapper The component that will be the source
* of events that we fire
*/
public InstanceSupport(Wrapper wrapper) {
1.4 +8 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/Strftime.java
Index: Strftime.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/Strftime.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Strftime.java 26 May 2004 16:26:22 -0000 1.3
+++ Strftime.java 29 Aug 2004 16:46:13 -0000 1.4
@@ -221,11 +221,14 @@
}
/**
- * try to get the Java Date/Time formating associated with
- * the C standard provided
+ * Try to get the Java Date/Time formatting associated with
+ * the C standard provided.
*
- * @param c The C equivalent to translate
- * @return The Java formatting rule to use
+ * @param buf The buffer
+ * @param pattern The date/time pattern
+ * @param index The char index
+ * @param oldInside Flag value
+ * @return True if new is inside buffer
*/
protected boolean translateCommand( StringBuffer buf, String pattern, int index, boolean oldInside ) {
char firstChar = pattern.charAt( index );
1.13 +1 -3 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AccessLogValve.java 24 Jun 2004 16:20:21 -0000 1.12
+++ AccessLogValve.java 29 Aug 2004 16:46:14 -0000 1.13
@@ -513,8 +513,6 @@
*
* @param request Request being processed
* @param response Response being processed
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error has occurred
* @exception ServletException if a servlet error has occurred
1.23 +1 -3 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ErrorReportValve.java 28 Jul 2004 15:00:32 -0000 1.22
+++ ErrorReportValve.java 29 Aug 2004 16:46:14 -0000 1.23
@@ -95,8 +95,6 @@
*
* @param request The servlet request to be processed
* @param response The servlet response to be created
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
1.11 +1 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExtendedAccessLogValve.java 11 Aug 2004 16:33:56 -0000 1.10
+++ ExtendedAccessLogValve.java 29 Aug 2004 16:46:14 -0000 1.11
@@ -513,8 +513,6 @@
*
* @param request Request being processed
* @param response Response being processed
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error has occurred
* @exception ServletException if a servlet error has occurred
1.9 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java
Index: JDBCAccessLogValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JDBCAccessLogValve.java 23 Jun 2004 13:51:34 -0000 1.8
+++ JDBCAccessLogValve.java 29 Aug 2004 16:46:14 -0000 1.9
@@ -428,7 +428,7 @@
*
* @param request The Request object.
* @param response The Response object.
- * @param context The ValveContext object.
+ *
* @exception IOException Should not be thrown.
* @exception ServletException Database SQLException is wrapped
* in a ServletException.
1.9 +1 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
Index: PersistentValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/PersistentValve.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PersistentValve.java 24 Jun 2004 16:20:20 -0000 1.8
+++ PersistentValve.java 29 Aug 2004 16:46:14 -0000 1.9
@@ -89,7 +89,6 @@
*
* @param request Request to be processed
* @param response Response to be produced
- * @param valveContext Valve context used to forward to the next Valve
*
* @exception IOException if an input/output error occurred
* @exception ServletException if a servlet error occurred
1.4 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RemoteAddrValve.java
Index: RemoteAddrValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RemoteAddrValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoteAddrValve.java 23 Jun 2004 08:24:57 -0000 1.3
+++ RemoteAddrValve.java 29 Aug 2004 16:46:14 -0000 1.4
@@ -70,8 +70,6 @@
*
* @param request The servlet request to be processed
* @param response The servlet response to be created
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
1.4 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RemoteHostValve.java
Index: RemoteHostValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RemoteHostValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoteHostValve.java 23 Jun 2004 08:24:57 -0000 1.3
+++ RemoteHostValve.java 29 Aug 2004 16:46:14 -0000 1.4
@@ -70,8 +70,6 @@
*
* @param request The servlet request to be processed
* @param response The servlet response to be created
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
1.7 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java
Index: RequestDumperValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestDumperValve.java 23 Jun 2004 13:51:34 -0000 1.6
+++ RequestDumperValve.java 29 Aug 2004 16:46:14 -0000 1.7
@@ -86,8 +86,6 @@
*
* @param request The servlet request to be processed
* @param response The servlet response to be created
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
1.8 +1 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java
Index: RequestFilterValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/RequestFilterValve.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RequestFilterValve.java 24 Jun 2004 16:20:20 -0000 1.7
+++ RequestFilterValve.java 29 Aug 2004 16:46:14 -0000 1.8
@@ -193,8 +193,6 @@
*
* @param request The servlet request to be processed
* @param response The servlet response to be created
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
@@ -255,8 +253,6 @@
* @param property The request property on which to filter
* @param request The servlet request to be processed
* @param response The servlet response to be processed
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
1.15 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java
Index: ValveBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ValveBase.java 23 Jun 2004 13:51:34 -0000 1.14
+++ ValveBase.java 29 Aug 2004 16:46:14 -0000 1.15
@@ -156,8 +156,6 @@
*
* @param request The servlet request to be processed
* @param response The servlet response to be created
- * @param context The valve context used to invoke the next valve
- * in the current processing pipeline
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
1.4 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ContextAccessController.java
Index: ContextAccessController.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ContextAccessController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextAccessController.java 27 Feb 2004 14:58:53 -0000 1.3
+++ ContextAccessController.java 29 Aug 2004 16:46:15 -0000 1.4
@@ -51,7 +51,7 @@
* Set a security token for a context. Can be set only once.
*
* @param name Name of the context
- * @param context Security token
+ * @param token Security token
*/
public static void setSecurityToken(Object name, Object token) {
if ((!securityTokens.containsKey(name)) && (token != null)) {
@@ -64,7 +64,7 @@
* Remove a security token for a context.
*
* @param name Name of the context
- * @param context Security token
+ * @param token Security token
*/
public static void unsetSecurityToken(Object name, Object token) {
if (checkSecurityToken(name, token)) {
@@ -79,7 +79,7 @@
* context, then returns true.
*
* @param name Name of the context
- * @param context Submitted security token
+ * @param token Submitted security token
*/
public static boolean checkSecurityToken
(Object name, Object token) {
1.4 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/JndiPermission.java
Index: JndiPermission.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/JndiPermission.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JndiPermission.java 27 Feb 2004 14:58:53 -0000 1.3
+++ JndiPermission.java 29 Aug 2004 16:46:15 -0000 1.4
@@ -42,7 +42,7 @@
/**
* Creates a new JndiPermission with no actions
*
- * @param String - JNDI resource path name
+ * @param name - JNDI resource path name
*/
public JndiPermission(String name) {
super(name);
@@ -51,8 +51,8 @@
/**
* Creates a new JndiPermission with actions
*
- * @param String - JNDI resource path name
- * @param String - JNDI actions (none defined)
+ * @param name - JNDI resource path name
+ * @param actions - JNDI actions (none defined)
*/
public JndiPermission(String name, String actions) {
super(name,actions);
1.6 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContext.java
Index: NamingContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NamingContext.java 16 Jul 2004 17:09:50 -0000 1.5
+++ NamingContext.java 29 Aug 2004 16:46:15 -0000 1.6
@@ -817,7 +817,7 @@
* must already exist.
*
* @param name the name to bind; may not be empty
- * @param object the object to bind; possibly null
+ * @param obj the object to bind; possibly null
* @param rebind if true, then perform a rebind (ie, overwrite)
* @exception NameAlreadyBoundException if name is already bound
* @exception InvalidAttributesException if object did not supply all
1.4 +5 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ResourceEnvRef.java
Index: ResourceEnvRef.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ResourceEnvRef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceEnvRef.java 27 Feb 2004 14:58:53 -0000 1.3
+++ ResourceEnvRef.java 29 Aug 2004 16:46:15 -0000 1.4
@@ -47,7 +47,7 @@
/**
* Resource env reference.
*
- * @param type Type
+ * @param resourceType Type
*/
public ResourceEnvRef(String resourceType) {
super(resourceType);
@@ -57,7 +57,9 @@
/**
* Resource env reference.
*
- * @param type Type
+ * @param resourceType Type
+ * @param factory The factory class
+ * @param factoryLocation The factory location
*/
public ResourceEnvRef(String resourceType, String factory,
String factoryLocation) {
1.4 +4 -9 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/TransactionRef.java
Index: TransactionRef.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/TransactionRef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransactionRef.java 27 Feb 2004 14:58:53 -0000 1.3
+++ TransactionRef.java 29 Aug 2004 16:46:15 -0000 1.4
@@ -46,10 +46,6 @@
/**
* Resource Reference.
- *
- * @param resourceClass Resource class
- * @param scope Resource scope
- * @param auth Resource authetication
*/
public TransactionRef() {
this(null, null);
@@ -58,10 +54,9 @@
/**
* Resource Reference.
- *
- * @param resourceClass Resource class
- * @param scope Resource scope
- * @param auth Resource authetication
+ *
+ * @param factory The factory class
+ * @param factoryLocation The factory location
*/
public TransactionRef(String factory, String factoryLocation) {
super("javax.transaction.UserTransaction", factory, factoryLocation);
1.5 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ResourceAttributes.java
Index: ResourceAttributes.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ResourceAttributes.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceAttributes.java 13 Jul 2004 09:40:47 -0000 1.4
+++ ResourceAttributes.java 29 Aug 2004 16:46:15 -0000 1.5
@@ -271,8 +271,8 @@
/**
* Set collection flag.
- *
- * @return value of the collection flag
+ *
+ * @param collection New flag value
*/
public void setCollection(boolean collection) {
this.collection = collection;
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org