Author: billbarker
Date: Sat Mar 11 15:29:48 2006
New Revision: 385199
URL: http://svn.apache.org/viewcvs?rev=385199&view=rev
Log:
Quit wimping out on the Java5 build.
The default is still to build for 1.2, but now TC 3 builds happily if you
override the defaults to specify 1.5.
This should make it possible for anybody that is interested to be able to
develop a facade25 ;-).
Modified:
tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java
tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/jasper/compiler/JspUtil.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/core/ContextManager.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/IISConfig.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/JservConfig.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/NSConfig.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/util/log/LogManager.java
Modified:
tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/admin/WEB-INF/classes/tadm/TomcatIterate.java
Sat Mar 11 15:29:48 2006
@@ -27,7 +27,7 @@
*/
public class TomcatIterate extends BodyTagSupport {
PageContext pageContext;
- Enumeration enum;
+ Enumeration enumx;
Object array[];
int pos=0;
String name;
@@ -36,7 +36,7 @@
public TomcatIterate() {}
public void setEnumeration( Enumeration e ) {
- enum=e;
+ enumx=e;
}
public void setArray( Object array[] ) {
@@ -61,12 +61,12 @@
}
public int doStartTag() throws JspException {
- if( enum == null && array == null )
+ if( enumx == null && array == null )
return SKIP_BODY;
- if( enum !=null ) {
- if( ! enum.hasMoreElements() )
+ if( enumx !=null ) {
+ if( ! enumx.hasMoreElements() )
return SKIP_BODY;
- pageContext.setAttribute( name , enum.nextElement(),
+ pageContext.setAttribute( name , enumx.nextElement(),
PageContext.PAGE_SCOPE );
return EVAL_BODY_TAG;
}
@@ -82,9 +82,9 @@
}
public int doAfterBody() throws JspException {
- if( enum!=null )
- if( enum.hasMoreElements() ) {
- pageContext.setAttribute( name , enum.nextElement(),
+ if( enumx!=null )
+ if( enumx.hasMoreElements() ) {
+ pageContext.setAttribute( name , enumx.nextElement(),
PageContext.PAGE_SCOPE );
return EVAL_BODY_TAG;
}
Modified:
tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/examples/WEB-INF/classes/SnoopServlet.java
Sat Mar 11 15:29:48 2006
@@ -59,18 +59,18 @@
out.println("Context init parameters:");
ServletContext context = getServletContext();
- Enumeration enum = context.getInitParameterNames();
- while (enum.hasMoreElements()) {
- String key = (String)enum.nextElement();
+ Enumeration enumx = context.getInitParameterNames();
+ while (enumx.hasMoreElements()) {
+ String key = (String)enumx.nextElement();
Object value = context.getInitParameter(key);
out.println(" " + key + " = " + value);
}
out.println();
out.println("Context attributes:");
- enum = context.getAttributeNames();
- while (enum.hasMoreElements()) {
- String key = (String)enum.nextElement();
+ enumx = context.getAttributeNames();
+ while (enumx.hasMoreElements()) {
+ String key = (String)enumx.nextElement();
Object value = context.getAttribute(key);
out.println(" " + key + " = " + value);
}
Modified:
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/JspInterceptor.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
Sat Mar 11 15:29:48 2006
@@ -319,9 +319,9 @@
}
if( debug>-1)
log( "jspServlet=" + jspServlet.getServletClassName());
- Enumeration enum=args.keys();
- while( enum.hasMoreElements() ) {
- String s=(String)enum.nextElement();
+ Enumeration enumx=args.keys();
+ while( enumx.hasMoreElements() ) {
+ String s=(String)enumx.nextElement();
String v=(String)args.get(s);
if( debug>0 ) log( "Setting " + s + "=" + v );
jspServlet.getServletInfo().addInitParam(s, v );
Modified:
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java
Sat Mar 11 15:29:48 2006
@@ -136,9 +136,9 @@
// Old logic from Context - probably something cleaner can replace it.
void init(Context ctx, Hashtable loadableServlets ) {
- Enumeration enum=ctx.getServletNames();
- while(enum.hasMoreElements()) {
- String name=(String)enum.nextElement();
+ Enumeration enumx=ctx.getServletNames();
+ while(enumx.hasMoreElements()) {
+ String name=(String)enumx.nextElement();
Handler h=ctx.getServletByName( name );
if( ! ( h instanceof ServletHandler ) )
continue;
Modified:
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java
Sat Mar 11 15:29:48 2006
@@ -89,9 +89,9 @@
throws TomcatException
{
// shut down and servlets
- Enumeration enum = ctx.getServletNames();
- while (enum.hasMoreElements()) {
- String key = (String)enum.nextElement();
+ Enumeration enumx = ctx.getServletNames();
+ while (enumx.hasMoreElements()) {
+ String key = (String)enumx.nextElement();
Handler wrapper = ctx.getServletByName( key );
if( ! (wrapper instanceof ServletHandler) )
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/jasper/compiler/JspUtil.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/jasper/compiler/JspUtil.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/jasper/compiler/JspUtil.java
Sat Mar 11 15:29:48 2006
@@ -183,12 +183,12 @@
/**
* Now check to see if the rest of the attributes are valid too.
*/
- Enumeration enum = temp.keys ();
+ Enumeration enumx = temp.keys ();
String attribute = null;
- while (enum.hasMoreElements ()) {
+ while (enumx.hasMoreElements ()) {
valid = false;
- attribute = (String) enum.nextElement ();
+ attribute = (String) enumx.nextElement ();
for (int i = 0; i < validAttributes.length; i++) {
if (attribute.equals(validAttributes[i].name)) {
valid = true;
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/ant/Tomcat3Precompiler.java
Sat Mar 11 15:29:48 2006
@@ -50,10 +50,10 @@
getJspc().log("Using Tomcat 3 precompiler", Project.MSG_VERBOSE);
Vector sources = getJspc().getCompileList();
- Enumeration enum = sources.elements();
- while (enum.hasMoreElements()) {
+ Enumeration enumx = sources.elements();
+ while (enumx.hasMoreElements()) {
CommandlineJava cmd = setupJasperCommand();
- String source = (String) enum.nextElement();
+ String source = (String) enumx.nextElement();
String base = getBase(source);
String classname = base + "_1";
addArg(cmd, "-c", classname);
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/core/ContextManager.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/core/ContextManager.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/core/ContextManager.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/core/ContextManager.java
Sat Mar 11 15:29:48 2006
@@ -409,9 +409,9 @@
if( state== STATE_CONFIG ) return;
// addContext hook for all existing contexts
- Enumeration enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ Enumeration enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
try {
ri.addContext( this, ctx );
} catch( TomcatException ex ) {
@@ -420,9 +420,9 @@
}
// contextInit hook if we're started
- enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
try {
ri.contextInit( ctx );
} catch( TomcatException ex ) {
@@ -458,9 +458,9 @@
ri.engineStop(this);
if( state >= STATE_INIT ) {
- Enumeration enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ Enumeration enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
try {
ri.contextShutdown( ctx );
} catch( TomcatException ex ) {
@@ -468,9 +468,9 @@
}
}
- enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
try {
ri.removeContext( this, ctx );
} catch( TomcatException ex ) {
@@ -512,17 +512,17 @@
// ( by user or modules during engineInit )
// first trusted apps - they may do special actions
- Enumeration enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ Enumeration enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
if( ctx.isTrusted() )
fireAddContext(ctx, existingI );
}
// Initialize the contexts
- enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
if( ctx.isTrusted() ) {
try {
ctx.init();
@@ -538,17 +538,17 @@
existingI=defaultContainer.getInterceptors();
// Same thing for untrusted apps
- enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
if( ! ctx.isTrusted() )
fireAddContext(ctx, existingI );
}
// Initialize the contexts
- enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
if( ! ctx.isTrusted() ) {
try {
ctx.init();
@@ -618,9 +618,9 @@
public void shutdown() throws TomcatException {
if( state==STATE_START ) stop();
- Enumeration enum = getContexts();
- while (enum.hasMoreElements()) {
- Context ctx = (Context)enum.nextElement();
+ Enumeration enumx = getContexts();
+ while (enumx.hasMoreElements()) {
+ Context ctx = (Context)enumx.nextElement();
try {
ctx.shutdown();
} catch( TomcatException ex ) {
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/ApacheConfig.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
Sat Mar 11 15:29:48 2006
@@ -270,9 +270,9 @@
// Set up contexts
// XXX deal with Virtual host configuration !!!!
- Enumeration enum = cm.getContexts();
- while (enum.hasMoreElements()) {
- Context context = (Context)enum.nextElement();
+ Enumeration enumx = cm.getContexts();
+ while (enumx.hasMoreElements()) {
+ Context context = (Context)enumx.nextElement();
String host = context.getHost();
if( host == null ) {
if( forwardAll )
@@ -289,9 +289,9 @@
}
}
- enum = vhosts.elements();
- while( enum.hasMoreElements() ) {
- Vector vhostContexts = (Vector)enum.nextElement();
+ enumx = vhosts.elements();
+ while( enumx.hasMoreElements() ) {
+ Vector vhostContexts = (Vector)enumx.nextElement();
for( int i = 0; i < vhostContexts.size(); i++ ) {
Context context = (Context)vhostContexts.elementAt(i);
if( i == 0 )
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/IISConfig.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/IISConfig.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/IISConfig.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/IISConfig.java
Sat Mar 11 15:29:48 2006
@@ -209,9 +209,9 @@
// Set up contexts
// XXX deal with Virtual host configuration !!!!
- Enumeration enum = cm.getContexts();
- while (enum.hasMoreElements()) {
- Context context = (Context)enum.nextElement();
+ Enumeration enumx = cm.getContexts();
+ while (enumx.hasMoreElements()) {
+ Context context = (Context)enumx.nextElement();
String vhost = context.getHost();
if(vhost != null) {
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/JservConfig.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/JservConfig.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/JservConfig.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/JservConfig.java
Sat Mar 11 15:29:48 2006
@@ -309,9 +309,9 @@
// Set up contexts
// XXX deal with Virtual host configuration !!!!
- Enumeration enum = cm.getContexts();
- while (enum.hasMoreElements()) {
- Context context = (Context)enum.nextElement();
+ Enumeration enumx = cm.getContexts();
+ while (enumx.hasMoreElements()) {
+ Context context = (Context)enumx.nextElement();
String host = context.getHost();
if( host == null ) {
if( forwardAll )
@@ -328,9 +328,9 @@
}
}
- enum = vhosts.elements();
- while( enum.hasMoreElements() ) {
- Vector vhostContexts = (Vector)enum.nextElement();
+ enumx = vhosts.elements();
+ while( enumx.hasMoreElements() ) {
+ Vector vhostContexts = (Vector)enumx.nextElement();
for( int i = 0; i < vhostContexts.size(); i++ ) {
Context context = (Context)vhostContexts.elementAt(i);
if( i == 0 )
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/NSConfig.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/NSConfig.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/NSConfig.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/NSConfig.java
Sat Mar 11 15:29:48 2006
@@ -204,9 +204,9 @@
// Set up contexts
// XXX deal with Virtual host configuration !!!!
- Enumeration enum = cm.getContexts();
- while (enum.hasMoreElements()) {
- Context context = (Context)enum.nextElement();
+ Enumeration enumx = cm.getContexts();
+ while (enumx.hasMoreElements()) {
+ Context context = (Context)enumx.nextElement();
String vhost = context.getHost();
if(vhost != null) {
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
Sat Mar 11 15:29:48 2006
@@ -216,9 +216,9 @@
Policy.getPolicy().refresh();
PermissionCollection pFileP=Policy.getPolicy().getPermissions(cs);
if( pFileP!= null ) {
- Enumeration enum=pFileP.elements();
- while(enum.hasMoreElements()) {
- p.add((Permission)enum.nextElement());
+ Enumeration enumx=pFileP.elements();
+ while(enumx.hasMoreElements()) {
+ p.add((Permission)enumx.nextElement());
}
}
Modified:
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/util/log/LogManager.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/util/log/LogManager.java?rev=385199&r1=385198&r2=385199&view=diff
==============================================================================
---
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/util/log/LogManager.java
(original)
+++
tomcat/container/branches/tc3.3.x/src/share/org/apache/tomcat/util/log/LogManager.java
Sat Mar 11 15:29:48 2006
@@ -54,9 +54,9 @@
if(name==null) name="";
channels.put( name, logH );
- Enumeration enum=loggers.keys();
- while( enum.hasMoreElements() ) {
- String k=(String)enum.nextElement();
+ Enumeration enumx=loggers.keys();
+ while( enumx.hasMoreElements() ) {
+ String k=(String)enumx.nextElement();
Log l=(Log)loggers.get( k );
if( name.equals( l.getChannel( this ) )) {
l.setProxy( this, logH );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
