remm 2004/07/23 15:45:38
Modified: jasper2/src/share/org/apache/jasper/runtime
PerThreadTagHandlerPool.java
jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java Generator.java
JspRuntimeContext.java
jasper2/src/share/org/apache/jasper
EmbeddedServletOptions.java
Log:
- enum -> enumeration (JDK 1.5 update).
Revision Changes Path
1.7 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PerThreadTagHandlerPool.java
Index: PerThreadTagHandlerPool.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PerThreadTagHandlerPool.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PerThreadTagHandlerPool.java 17 Mar 2004 19:23:04 -0000 1.6
+++ PerThreadTagHandlerPool.java 23 Jul 2004 22:45:38 -0000 1.7
@@ -117,9 +117,9 @@
* Calls the release() method of all tag handlers in this tag handler pool.
*/
public void release() {
- Enumeration enum = perThreadDataVector.elements();
- while (enum.hasMoreElements()) {
- PerThreadData ptd = (PerThreadData)enum.nextElement();
+ Enumeration enumeration = perThreadDataVector.elements();
+ while (enumeration.hasMoreElements()) {
+ PerThreadData ptd = (PerThreadData)enumeration.nextElement();
if (ptd.handlers != null) {
for (int i=ptd.current; i>=0; i--) {
if (ptd.handlers[i] != null) {
1.56 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- TagLibraryInfoImpl.java 7 May 2004 19:37:36 -0000 1.55
+++ TagLibraryInfoImpl.java 23 Jul 2004 22:45:38 -0000 1.56
@@ -292,9 +292,9 @@
this.functions = new FunctionInfo[functionTable.size()];
int i=0;
- Enumeration enum = functionTable.elements();
- while (enum.hasMoreElements()) {
- this.functions[i++] = (FunctionInfo) enum.nextElement();
+ Enumeration enumeration = functionTable.elements();
+ while (enumeration.hasMoreElements()) {
+ this.functions[i++] = (FunctionInfo) enumeration.nextElement();
}
}
1.235 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- Generator.java 11 Jun 2004 00:29:56 -0000 1.234
+++ Generator.java 23 Jul 2004 22:45:38 -0000 1.235
@@ -1821,9 +1821,9 @@
out.print(" + " + elemName);
// Write remaining attributes
- Enumeration enum = map.keys();
- while (enum.hasMoreElements()) {
- String attrName = (String)enum.nextElement();
+ Enumeration enumeration = map.keys();
+ while (enumeration.hasMoreElements()) {
+ String attrName = (String)enumeration.nextElement();
out.print((String)map.get(attrName));
}
1.24 +3 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
Index: JspRuntimeContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JspRuntimeContext.java 15 Jun 2004 04:58:38 -0000 1.23
+++ JspRuntimeContext.java 23 Jul 2004 22:45:38 -0000 1.24
@@ -24,6 +24,7 @@
import java.security.CodeSource;
import java.security.PermissionCollection;
import java.security.Policy;
+import java.security.cert.Certificate;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -369,7 +370,7 @@
}
File contextDir = new File(codeBase);
URL url = contextDir.getCanonicalFile().toURL();
- codeSource = new CodeSource(url,null);
+ codeSource = new CodeSource(url,(Certificate[])null);
permissionCollection = policy.getPermissions(codeSource);
// Create a file read permission for web app context directory
1.11 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
Index: EmbeddedServletOptions.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- EmbeddedServletOptions.java 17 Mar 2004 19:23:03 -0000 1.10
+++ EmbeddedServletOptions.java 23 Jul 2004 22:45:38 -0000 1.11
@@ -330,9 +330,9 @@
public EmbeddedServletOptions(ServletConfig config,
ServletContext context) {
- Enumeration enum=config.getInitParameterNames();
- while( enum.hasMoreElements() ) {
- String k=(String)enum.nextElement();
+ Enumeration enumeration=config.getInitParameterNames();
+ while( enumeration.hasMoreElements() ) {
+ String k=(String)enumeration.nextElement();
String v=config.getInitParameter( k );
setProperty( k, v);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
