costin 01/02/19 19:16:53
Modified: src/share/org/apache/tomcat/modules/aaa
AccessInterceptor.java CredentialsInterceptor.java
JDBCRealm.java
src/share/org/apache/tomcat/modules/config ApacheConfig.java
AutoDeploy.java ContextXmlReader.java
LogSetter.java NSConfig.java PathSetter.java
PolicyInterceptor.java ServerXmlReader.java
src/share/org/apache/tomcat/modules/generators
ErrorHandler.java StaticInterceptor.java
src/share/org/apache/tomcat/modules/mappers
SimpleMapper1.java
src/share/org/apache/tomcat/modules/server Ajp13.java
Http10.java Http10Interceptor.java
Log:
Changed import statements, explicit imports.
Revision Changes Path
1.7 +2 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java
Index: AccessInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AccessInterceptor.java 2001/02/16 19:37:09 1.6
+++ AccessInterceptor.java 2001/02/20 03:16:51 1.7
@@ -60,7 +60,8 @@
package org.apache.tomcat.modules.aaa;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.io.FileUtil;
import org.apache.tomcat.util.http.*;
import java.util.*;
import java.io.*;
1.3 +1 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/CredentialsInterceptor.java
Index: CredentialsInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/CredentialsInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CredentialsInterceptor.java 2001/01/06 23:25:55 1.2
+++ CredentialsInterceptor.java 2001/02/20 03:16:51 1.3
@@ -59,8 +59,7 @@
package org.apache.tomcat.modules.aaa;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-//import org.apache.tomcat.session.ServerSession;
+import org.apache.tomcat.util.buf.Base64;
import org.apache.tomcat.util.xml.*;
import java.io.*;
import java.net.*;
1.4 +5 -4
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/JDBCRealm.java
Index: JDBCRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/JDBCRealm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCRealm.java 2001/02/06 02:05:46 1.3
+++ JDBCRealm.java 2001/02/20 03:16:51 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/JDBCRealm.java,v 1.3
2001/02/06 02:05:46 nacho Exp $
- * $Revision: 1.3 $
- * $Date: 2001/02/06 02:05:46 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/JDBCRealm.java,v 1.4
2001/02/20 03:16:51 costin Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/02/20 03:16:51 $
*
* The Apache Software License, Version 1.1
*
@@ -62,7 +62,8 @@
package org.apache.tomcat.modules.aaa;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.buf.HexUtils;
import java.security.*;
//import java.security.Principal;
//import java.io.File;
1.5 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApacheConfig.java 2001/02/05 23:29:56 1.4
+++ ApacheConfig.java 2001/02/20 03:16:51 1.5
@@ -59,7 +59,7 @@
package org.apache.tomcat.modules.config;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.io.FileUtil;
import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
1.3 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoDeploy.java
Index: AutoDeploy.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoDeploy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AutoDeploy.java 2001/02/03 05:19:45 1.2
+++ AutoDeploy.java 2001/02/20 03:16:51 1.3
@@ -60,7 +60,7 @@
package org.apache.tomcat.modules.config;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.io.FileUtil;
import java.io.*;
import java.net.*;
import java.util.*;
1.5 +2 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java
Index: ContextXmlReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextXmlReader.java 2001/02/11 02:26:04 1.4
+++ ContextXmlReader.java 2001/02/20 03:16:51 1.5
@@ -64,11 +64,11 @@
import java.util.Hashtable;
import java.util.*;
import java.net.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.xml.*;
import org.apache.tomcat.core.*;
import org.apache.tomcat.modules.server.*;
-import org.apache.tomcat.util.log.*;
+import org.apache.tomcat.util.log.Log;
import org.xml.sax.*;
/**
1.8 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LogSetter.java
Index: LogSetter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LogSetter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LogSetter.java 2001/02/17 07:10:15 1.7
+++ LogSetter.java 2001/02/20 03:16:51 1.8
@@ -61,7 +61,7 @@
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.FileUtil;
+import org.apache.tomcat.util.io.FileUtil;
import java.io.*;
import java.net.*;
import java.util.*;
1.2 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/NSConfig.java
Index: NSConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/NSConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NSConfig.java 2000/12/28 19:50:42 1.1
+++ NSConfig.java 2001/02/20 03:16:51 1.2
@@ -59,7 +59,7 @@
package org.apache.tomcat.modules.config;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.io.FileUtil;
import org.apache.tomcat.util.log.*;
import java.io.*;
import java.net.*;
1.5 +4 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PathSetter.java
Index: PathSetter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PathSetter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PathSetter.java 2001/02/06 06:43:59 1.4
+++ PathSetter.java 2001/02/20 03:16:51 1.5
@@ -65,8 +65,10 @@
import java.util.*;
import java.security.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.log.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.log.Log;
+import org.apache.tomcat.util.io.FileUtil;
+import org.apache.tomcat.util.IntrospectionUtils;
/**
* Set ( and guess ) the paths to absolute ( and canonical ) directories.
1.8 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
Index: PolicyInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PolicyInterceptor.java 2001/02/09 07:49:09 1.7
+++ PolicyInterceptor.java 2001/02/20 03:16:52 1.8
@@ -60,7 +60,7 @@
package org.apache.tomcat.modules.config;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.io.FileUtil;
import java.io.*;
import java.net.*;
import java.util.*;
1.6 +2 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java
Index: ServerXmlReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServerXmlReader.java 2001/02/09 07:49:10 1.5
+++ ServerXmlReader.java 2001/02/20 03:16:52 1.6
@@ -64,7 +64,8 @@
import java.util.Hashtable;
import java.util.*;
import java.net.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.io.FileUtil;
import org.apache.tomcat.util.xml.*;
import org.apache.tomcat.core.*;
import org.apache.tomcat.modules.server.*;
1.7 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java
Index: ErrorHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ErrorHandler.java 2001/02/06 06:46:29 1.6
+++ ErrorHandler.java 2001/02/20 03:16:52 1.7
@@ -60,7 +60,7 @@
package org.apache.tomcat.modules.generators;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
import java.io.*;
import java.net.*;
import java.util.*;
1.5 +2 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java
Index: StaticInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StaticInterceptor.java 2001/01/29 07:08:52 1.4
+++ StaticInterceptor.java 2001/02/20 03:16:52 1.5
@@ -59,7 +59,8 @@
package org.apache.tomcat.modules.generators;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.io.FileUtil;
import org.apache.tomcat.util.http.*;
import java.io.*;
import java.net.*;
1.2 +3 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/SimpleMapper1.java
Index: SimpleMapper1.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/SimpleMapper1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleMapper1.java 2001/01/01 02:01:30 1.1
+++ SimpleMapper1.java 2001/02/20 03:16:52 1.2
@@ -60,7 +60,9 @@
package org.apache.tomcat.modules.mappers;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.io.FileUtil;
+import org.apache.tomcat.util.PrefixMapper;
import org.apache.tomcat.util.collections.*;
import java.util.*;
1.14 +2 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java
Index: Ajp13.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Ajp13.java 2001/02/14 22:18:36 1.13
+++ Ajp13.java 2001/02/20 03:16:53 1.14
@@ -67,8 +67,8 @@
import java.util.Enumeration;
import org.apache.tomcat.core.Request;
-import org.apache.tomcat.util.MimeHeaders;
-import org.apache.tomcat.util.MessageBytes;
+import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.HttpMessages;
/**
1.8 +8 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java
Index: Http10.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Http10.java 2001/01/23 05:08:39 1.7
+++ Http10.java 2001/02/20 03:16:53 1.8
@@ -61,8 +61,10 @@
package org.apache.tomcat.modules.server;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.log.*;
+import org.apache.tomcat.util.http.*;
+import org.apache.tomcat.util.buf.*;
+import org.apache.tomcat.util.io.*;
+import org.apache.tomcat.util.log.Log;
import java.io.*;
import java.net.*;
import java.util.*;
@@ -193,7 +195,7 @@
while ((c = b[off++]) != ':' && c != ' ') {
if (c == '\n') {
loghelper.log("Parse error, empty line: " +
- new String( b, off, len ), Logger.ERROR);
+ new String( b, off, len ), Log.ERROR);
return false;
}
}
@@ -207,9 +209,9 @@
if (c != ':') {
loghelper.log("Parse error, missing : in " +
- new String( b, off, len ), Logger.ERROR);
+ new String( b, off, len ), Log.ERROR);
loghelper.log("Full " + new String( b, 0, b.length ),
- Logger.ERROR);
+ Log.ERROR);
return false;
}
@@ -469,7 +471,7 @@
if ((c & 0xff00) != 0) { // high order byte must be zero
// XXX will go away after we change the I/O system
loghelper.log("Header character is not iso8859_1, " +
- "not supported yet: " + c, Logger.ERROR ) ;
+ "not supported yet: " + c, Log.ERROR ) ;
}
if( oBufferCount >= oBuffer.length ) {
byte bufferNew[]=new byte[ oBuffer.length * 2 ];
1.14 +2 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java
Index: Http10Interceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Http10Interceptor.java 2001/02/07 07:01:27 1.13
+++ Http10Interceptor.java 2001/02/20 03:16:53 1.14
@@ -64,7 +64,8 @@
import java.net.*;
import java.util.*;
import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.*;
import org.apache.tomcat.util.net.*;
import org.apache.tomcat.util.net.ServerSocketFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
