You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/07/11 02:46:53 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/session ManagerBase.java
craigmcc 00/07/10 17:46:52
Modified: proposals/catalina build.xml
proposals/catalina/src/share/org/apache/tomcat Manager.java
proposals/catalina/src/share/org/apache/tomcat/deploy
package.html
proposals/catalina/src/share/org/apache/tomcat/security
package.html
proposals/catalina/src/share/org/apache/tomcat/session
ManagerBase.java
Log:
Clean up warnings from Ant (<chmod> changed to "file" instead of "src")
and Javadoc.
NOTE: You will need the most up-to-date version of Ant to build Catalina!
Revision Changes Path
1.23 +7 -6 jakarta-tomcat/proposals/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 2000/07/08 02:50:00 1.22
+++ build.xml 2000/07/11 00:46:46 1.23
@@ -37,9 +37,9 @@
<copydir src="src/bin" dest="${catalina.build}/bin"/>
<fixcrlf srcdir="${catalina.build}/bin" includes="*.sh" cr="remove"/>
<fixcrlf srcdir="${catalina.build}/bin" includes="*.bat" cr="add"/>
- <chmod perm="+x" src="${catalina.build}/bin/catalina.sh"/>
- <chmod perm="+x" src="${catalina.build}/bin/startup.sh"/>
- <chmod perm="+x" src="${catalina.build}/bin/shutdown.sh"/>
+ <chmod perm="+x" file="${catalina.build}/bin/catalina.sh"/>
+ <chmod perm="+x" file="${catalina.build}/bin/startup.sh"/>
+ <chmod perm="+x" file="${catalina.build}/bin/shutdown.sh"/>
<copydir src="src/conf" dest="${catalina.build}/conf"/>
</target>
@@ -93,6 +93,7 @@
<target name="javadoc" depends="tomcat">
<mkdir dir="${catalina.build}/webapps/ROOT/javadoc"/>
<javadoc packagenames="org.apache.tomcat.*"
+ classpath="${regexp.jar}:${servlet.jar}:${catalina.build}/classes"
sourcepath="src/share"
destdir="${catalina.build}/webapps/ROOT/javadoc"
author="true"
@@ -154,9 +155,9 @@
<copydir src="${catalina.build}/bin" dest="${catalina.dist}/bin" />
<fixcrlf srcdir="${catalina.build}/bin" includes="*.sh" cr="remove"/>
<fixcrlf srcdir="${catalina.build}/bin" includes="*.bat" cr="add"/>
- <chmod perm="+x" src="${catalina.dist}/bin/catalina.sh"/>
- <chmod perm="+x" src="${catalina.dist}/bin/startup.sh"/>
- <chmod perm="+x" src="${catalina.dist}/bin/shutdown.sh"/>
+ <chmod perm="+x" file="${catalina.dist}/bin/catalina.sh"/>
+ <chmod perm="+x" file="${catalina.dist}/bin/startup.sh"/>
+ <chmod perm="+x" file="${catalina.dist}/bin/shutdown.sh"/>
<copydir src="${catalina.build}/conf" dest="${catalina.dist}/conf" />
<copydir src="." dest="${catalina.dist}/etc">
<include name="build.*"/>
1.5 +4 -6 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Manager.java
Index: Manager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Manager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Manager.java 2000/05/12 22:13:38 1.4
+++ Manager.java 2000/07/11 00:46:47 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Manager.java,v 1.4 2000/05/12 22:13:38 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2000/05/12 22:13:38 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/Manager.java,v 1.5 2000/07/11 00:46:47 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/07/11 00:46:47 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2000/05/12 22:13:38 $
+ * @version $Revision: 1.5 $ $Date: 2000/07/11 00:46:47 $
*/
public interface Manager {
@@ -180,8 +180,6 @@
*
* @param id The session id for the session to be returned
*
- * @exception ClassNotFoundException if a deserialization error occurs
- * while processing this request
* @exception IllegalStateException if a new session cannot be
* instantiated for any reason
* @exception IOException if an input/output error occurs while
1.2 +6 -2 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/deploy/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/deploy/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/10 22:55:22 1.1
+++ package.html 2000/07/11 00:46:48 1.2
@@ -1,6 +1,10 @@
-This package contains Java objects that represent complex data structures
+<body>
+
+<p>This package contains Java objects that represent complex data structures
from the web application deployment descriptor file (<code>web.xml</code>).
It is assumed that these objects will be initialized within the context of
a single thread, and then referenced in a read-only manner subsequent to that
time. Therefore, no multi-thread synchronization is utilized within the
-implementation classes.
+implementation classes.</p>
+
+</body>
1.2 +3 -0 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/security/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/security/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/10 23:54:15 1.1
+++ package.html 2000/07/11 00:46:49 1.2
@@ -1,3 +1,5 @@
+<body>
+
<p>This package contains <code>Authenticator</code> implementations for the
various supported authentication methods (BASIC, DIGEST, and FORM). In
addition, there is a convenience base class,
@@ -14,3 +16,4 @@
src/share/org/apache/tomcat/startup/Authenticators.properties
</pre>
+</body>
1.7 +4 -6 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/session/ManagerBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ManagerBase.java 2000/05/23 21:44:57 1.6
+++ ManagerBase.java 2000/07/11 00:46:51 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/session/ManagerBase.java,v 1.6 2000/05/23 21:44:57 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2000/05/23 21:44:57 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/session/ManagerBase.java,v 1.7 2000/07/11 00:46:51 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/07/11 00:46:51 $
*
* ====================================================================
*
@@ -87,7 +87,7 @@
* be subclassed to create more sophisticated Manager implementations.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2000/05/23 21:44:57 $
+ * @version $Revision: 1.7 $ $Date: 2000/07/11 00:46:51 $
*/
public abstract class ManagerBase implements Manager {
@@ -487,8 +487,6 @@
*
* @param id The session id for the session to be returned
*
- * @exception ClassNotFoundException if a deserialization error occurs
- * while processing this request
* @exception IllegalStateException if a new session cannot be
* instantiated for any reason
* @exception IOException if an input/output error occurs while