Author: markt
Date: Sun Nov 23 05:49:26 2008
New Revision: 719988
URL: http://svn.apache.org/viewvc?rev=719988&view=rev
Log:
Generics fixes for o.a.jk
Modified:
tomcat/trunk/java/org/apache/jk/apr/AprImpl.java
tomcat/trunk/java/org/apache/jk/apr/TomcatStarter.java
tomcat/trunk/java/org/apache/jk/common/ChannelNioSocket.java
tomcat/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/trunk/java/org/apache/jk/common/ChannelUn.java
tomcat/trunk/java/org/apache/jk/common/HandlerRequest.java
tomcat/trunk/java/org/apache/jk/common/JkMX.java
tomcat/trunk/java/org/apache/jk/common/Shm.java
tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java
tomcat/trunk/java/org/apache/jk/config/GeneratorApache2.java
tomcat/trunk/java/org/apache/jk/config/GeneratorJk1.java
tomcat/trunk/java/org/apache/jk/config/GeneratorJk2.java
tomcat/trunk/java/org/apache/jk/config/WebXml2Jk.java
tomcat/trunk/java/org/apache/jk/core/WorkerEnv.java
tomcat/trunk/java/org/apache/jk/server/JkMain.java
Modified: tomcat/trunk/java/org/apache/jk/apr/AprImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/apr/AprImpl.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/apr/AprImpl.java (original)
+++ tomcat/trunk/java/org/apache/jk/apr/AprImpl.java Sun Nov 23 05:49:26 2008
@@ -40,7 +40,7 @@
static boolean ok=true;
boolean initialized=false;
// Handlers for native callbacks
- Hashtable jkHandlers=new Hashtable();
+ Hashtable<String, JkHandler> jkHandlers= new Hashtable<String,
JkHandler>();
// Name of the so used in inprocess mode
String jniModeSo="inprocess";
Modified: tomcat/trunk/java/org/apache/jk/apr/TomcatStarter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/apr/TomcatStarter.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/apr/TomcatStarter.java (original)
+++ tomcat/trunk/java/org/apache/jk/apr/TomcatStarter.java Sun Nov 23 05:49:26
2008
@@ -27,7 +27,7 @@
*
*/
public class TomcatStarter implements Runnable {
- Class c;
+ Class<?> c;
String args[];
AprImpl apr = new AprImpl();
@@ -45,7 +45,7 @@
try {
AprImpl.jniMode();
// Find the class
- Class c=null;
+ Class<?> c=null;
for( int i=0; i<mainClasses.length; i++ ) {
try {
System.err.println("Try " + mainClasses[i]);
@@ -69,7 +69,7 @@
}
}
- public TomcatStarter( Class c, String args[] ) {
+ public TomcatStarter( Class<?> c, String args[] ) {
this.c=c;
this.args=args;
}
@@ -77,7 +77,7 @@
public void run() {
System.err.println("Starting " + c.getName());
try {
- Class argClass=args.getClass();
+ Class<?> argClass=args.getClass();
Method m=c.getMethod( "main", new Class[] {argClass} );
m.invoke( c, new Object[] { args } );
System.out.println("TomcatStarter: Done");
Modified: tomcat/trunk/java/org/apache/jk/common/ChannelNioSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/ChannelNioSocket.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/ChannelNioSocket.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/ChannelNioSocket.java Sun Nov 23
05:49:26 2008
@@ -917,7 +917,7 @@
log.error("Error closing connection", e);
}
try{
- Request req = (Request)ep.getRequest();
+ Request req = ep.getRequest();
if( req != null ) {
ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote);
if( roname != null ) {
@@ -958,10 +958,10 @@
if(log.isDebugEnabled())
log.debug("Selecting "+ns+" channels");
if(ns > 0) {
- Set sels = selector.selectedKeys();
- Iterator it = sels.iterator();
+ Set<SelectionKey> sels = selector.selectedKeys();
+ Iterator<SelectionKey> it = sels.iterator();
while(it.hasNext()) {
- SelectionKey sk = (SelectionKey)it.next();
+ SelectionKey sk = it.next();
if(sk.isAcceptable()) {
acceptConnections();
} else {
Modified: tomcat/trunk/java/org/apache/jk/common/ChannelSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/ChannelSocket.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/ChannelSocket.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/ChannelSocket.java Sun Nov 23
05:49:26 2008
@@ -722,7 +722,7 @@
log.error( "Error, closing connection", e);
}
try{
- Request req = (Request)ep.getRequest();
+ Request req = ep.getRequest();
if( req != null ) {
ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote);
if( roname != null ) {
Modified: tomcat/trunk/java/org/apache/jk/common/ChannelUn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/ChannelUn.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/ChannelUn.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/ChannelUn.java Sun Nov 23 05:49:26
2008
@@ -310,7 +310,7 @@
if( log.isDebugEnabled() )
log.debug( "Closing un channel");
try{
- Request req = (Request)ep.getRequest();
+ Request req = ep.getRequest();
if( req != null ) {
ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote);
if( roname != null ) {
Modified: tomcat/trunk/java/org/apache/jk/common/HandlerRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/HandlerRequest.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/HandlerRequest.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/HandlerRequest.java Sun Nov 23
05:49:26 2008
@@ -261,8 +261,7 @@
decodeRequest( msg, ep, tmpMB );
if (twa != null) {
twa.setCurrentStage(control, "JkService");
- twa.setParam(control,
- ((Request)ep.getRequest()).unparsedURI());
+ twa.setParam(control, ep.getRequest().unparsedURI());
}
} catch( Exception ex ) {
log.error( "Error decoding request ", ex );
@@ -377,7 +376,7 @@
// Translate the HTTP method code to a String.
byte methodCode = msg.getByte();
if (methodCode != AjpConstants.SC_M_JK_STORED) {
- String mName=AjpConstants.methodTransArray[(int)methodCode - 1];
+ String mName=AjpConstants.methodTransArray[methodCode - 1];
req.method().setString(mName);
}
@@ -652,7 +651,7 @@
int port = 0;
int mult = 1;
for (int i = valueL - 1; i > colonPos; i--) {
- int charValue = HexUtils.DEC[(int) valueB[i + valueS]];
+ int charValue = HexUtils.DEC[valueB[i + valueS]];
if (charValue == -1) {
// Invalid character
throw new CharConversionException("Invalid char in port: "
+ valueB[i + valueS]);
Modified: tomcat/trunk/java/org/apache/jk/common/JkMX.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/JkMX.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/JkMX.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/JkMX.java Sun Nov 23 05:49:26 2008
@@ -380,7 +380,7 @@
private ObjectName registerObject(String className, String oName)
throws Exception {
- Class c = Class.forName(className);
+ Class<?> c = Class.forName(className);
Object o = c.newInstance();
ObjectName objN = new ObjectName(oName);
mserver.registerMBean(o, objN);
Modified: tomcat/trunk/java/org/apache/jk/common/Shm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/common/Shm.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/common/Shm.java (original)
+++ tomcat/trunk/java/org/apache/jk/common/Shm.java Sun Nov 23 05:49:26 2008
@@ -51,7 +51,7 @@
boolean reset=false;
String dumpFile=null;
- Vector groups=new Vector();
+ Vector<String> groups = new Vector<String>();
// Will be dynamic ( getMethodId() ) after things are stable
static final int SHM_WRITE_SLOT=2;
@@ -149,7 +149,7 @@
public void resetScoreboard() throws IOException {
if( apr==null ) return;
MsgContext mCtx=createMsgContext();
- Msg msg=(Msg)mCtx.getMsg(0);
+ Msg msg=mCtx.getMsg(0);
msg.reset();
msg.appendByte( SHM_RESET );
@@ -160,7 +160,7 @@
public void dumpScoreboard(String fname) throws IOException {
if( apr==null ) return;
MsgContext mCtx=createMsgContext();
- Msg msg=(Msg)mCtx.getMsg(0);
+ Msg msg=mCtx.getMsg(0);
C2BConverter c2b=mCtx.getConverter();
msg.reset();
@@ -181,7 +181,7 @@
String slotName="TOMCAT:" + instanceId;
MsgContext mCtx=createMsgContext();
- Msg msg=(Msg)mCtx.getMsg(0);
+ Msg msg=mCtx.getMsg(0);
msg.reset();
C2BConverter c2b=mCtx.getConverter();
@@ -194,7 +194,7 @@
// number of groups. 0 means the default lb.
msg.appendInt( groups.size() );
for( int i=0; i<groups.size(); i++ ) {
- appendString( msg, (String)groups.elementAt( i ), c2b);
+ appendString( msg, groups.elementAt( i ), c2b);
appendString( msg, instanceId, c2b);
}
@@ -224,7 +224,7 @@
{
String slotName="TOMCAT:" + host + ":" + port;
MsgContext mCtx=createMsgContext();
- Msg msg=(Msg)mCtx.getMsg(0);
+ Msg msg=mCtx.getMsg(0);
msg.reset();
C2BConverter c2b=mCtx.getConverter();
Modified: tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java (original)
+++ tomcat/trunk/java/org/apache/jk/config/ApacheConfig.java Sun Nov 23
05:49:26 2008
@@ -153,7 +153,7 @@
private String sslCipherIndicator="SSL_CIPHER";
private String sslCertsIndicator="SSL_CLIENT_CERT";
- Hashtable NamedVirtualHosts=null;
+ Hashtable<String, String> NamedVirtualHosts=null;
public ApacheConfig() {
}
Modified: tomcat/trunk/java/org/apache/jk/config/GeneratorApache2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/config/GeneratorApache2.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/config/GeneratorApache2.java (original)
+++ tomcat/trunk/java/org/apache/jk/config/GeneratorApache2.java Sun Nov 23
05:49:26 2008
@@ -98,10 +98,10 @@
}
private void generateWelcomeFiles( PrintWriter out ) {
- Vector wf= wxml.getWellcomeFiles();
+ Vector<String> wf= wxml.getWellcomeFiles();
out.print(" DirectoryIndex ");
for( int i=0; i<wf.size(); i++ ) {
- out.print( " " + (String)wf.elementAt(i));
+ out.print( " " + wf.elementAt(i));
}
out.println();
}
@@ -161,16 +161,17 @@
}
// XXX Only if BASIC/DIGEST and 'integrated auth'
- public void generateConstraints( Vector urls, Vector methods, Vector
roles, boolean isSSL ) {
+ public void generateConstraints( Vector<String> urls, Vector<String>
methods,
+ Vector<String> roles, boolean isSSL ) {
for( int i=0; i<urls.size(); i++ ) {
- String url=(String)urls.elementAt(i);
+ String url = urls.elementAt(i);
out.println( "<Location \"" + cpath + url + "\" >");
if( methods.size() > 0 ) {
out.print(" <Limit ");
for( int j=0; j<methods.size(); j++ ) {
- String m=(String)methods.elementAt(j);
+ String m = methods.elementAt(j);
out.print( " " + m);
}
out.println( " >" );
@@ -179,7 +180,7 @@
out.println( " AuthType basic" );
out.print( " Require group " );
for( int j=0; j<roles.size(); j++ ) {
- String role=(String)roles.elementAt(j);
+ String role = roles.elementAt(j);
out.print( " " + role);
}
out.println();
Modified: tomcat/trunk/java/org/apache/jk/config/GeneratorJk1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/config/GeneratorJk1.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/config/GeneratorJk1.java (original)
+++ tomcat/trunk/java/org/apache/jk/config/GeneratorJk1.java Sun Nov 23
05:49:26 2008
@@ -98,14 +98,15 @@
}
- public void generateWelcomeFiles( Vector wf ) {
+ public void generateWelcomeFiles( Vector<String> wf ) {
}
- public void generateConstraints( Vector urls, Vector methods, Vector
roles, boolean isSSL ) {
+ public void generateConstraints( Vector<String> urls, Vector<String>
methods,
+ Vector<String> roles, boolean isSSL ) {
for( int i=0; i<urls.size(); i++ ) {
- String url=(String)urls.elementAt(i);
+ String url = urls.elementAt(i);
out.println( "JkMount " + cpath + url + " " + worker);
}
Modified: tomcat/trunk/java/org/apache/jk/config/GeneratorJk2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/config/GeneratorJk2.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/config/GeneratorJk2.java (original)
+++ tomcat/trunk/java/org/apache/jk/config/GeneratorJk2.java Sun Nov 23
05:49:26 2008
@@ -116,25 +116,26 @@
}
- public void generateWelcomeFiles( Vector wf ) {
+ public void generateWelcomeFiles( Vector<String> wf ) {
}
- public void generateConstraints( Vector urls, Vector methods, Vector
roles, boolean isSSL ) {
+ public void generateConstraints(Vector<String> urls, Vector<String>
methods,
+ Vector<String> roles, boolean isSSL ) {
for( int i=0; i<urls.size(); i++ ) {
- String url=(String)urls.elementAt(i);
+ String url=urls.elementAt(i);
out.println("[url:" + vhost + cpath + url + "]");
out.println( "group=" + worker );
out.println( "host=" + vhost);
out.println( "context=" + cpath);
for( int j=0; j<roles.size(); j++ ) {
- String role=(String)roles.elementAt(j);
+ String role=roles.elementAt(j);
out.println( "role=" + role);
}
for( int j=0; j<methods.size(); j++ ) {
- String m=(String)methods.elementAt(j);
+ String m=methods.elementAt(j);
out.println( "method=" + m);
}
if( isSSL )
Modified: tomcat/trunk/java/org/apache/jk/config/WebXml2Jk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/config/WebXml2Jk.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/config/WebXml2Jk.java (original)
+++ tomcat/trunk/java/org/apache/jk/config/WebXml2Jk.java Sun Nov 23 05:49:26
2008
@@ -147,7 +147,8 @@
void generateErrorPage( int err, String location ) throws IOException ;
- void generateConstraints( Vector urls, Vector methods, Vector roles,
boolean isSSL ) throws IOException ;
+ void generateConstraints( Vector<String> urls, Vector<String> methods,
+ Vector<String> roles, boolean isSSL ) throws IOException ;
}
// -------------------- Implementation --------------------
@@ -164,11 +165,11 @@
return jkDir;
}
- /** Extract the wellcome files from the web.xml
+ /** Extract the welcome files from the web.xml
*/
- public Vector getWellcomeFiles() {
+ public Vector<String> getWellcomeFiles() {
Node n0=getChild( webN, "welcome-file-list" );
- Vector wF=new Vector();
+ Vector<String> wF = new Vector<String>();
if( n0!=null ) {
for( Node mapN=getChild( webN, "welcome-file" );
mapN != null; mapN = getNext( mapN ) ) {
@@ -240,9 +241,9 @@
for( Node mapN=getChild( webN, "security-constraint" );
mapN != null; mapN = getNext( mapN )) {
- Vector methods=new Vector();
- Vector urls=new Vector();
- Vector roles=new Vector();
+ Vector<String> methods = new Vector<String>();
+ Vector<String> urls= new Vector<String>();
+ Vector<String> roles= new Vector<String>();
boolean isSSL=false;
Node wrcN=getChild( mapN, "web-resource-collection");
@@ -340,7 +341,7 @@
/* do ant-style property setting */
IntrospectionUtils.processArgs( w2jk, args, new String[] {},
- null, new Hashtable());
+ null, new Hashtable<Object,
Object>());
w2jk.execute();
} catch( Exception ex ) {
ex.printStackTrace();
Modified: tomcat/trunk/java/org/apache/jk/core/WorkerEnv.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/core/WorkerEnv.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/core/WorkerEnv.java (original)
+++ tomcat/trunk/java/org/apache/jk/core/WorkerEnv.java Sun Nov 23 05:49:26 2008
@@ -33,7 +33,7 @@
*/
public class WorkerEnv {
- Hashtable properties;
+ Hashtable<Object, Object> properties;
public static final int ENDPOINT_NOTE=0;
public static final int REQUEST_NOTE=1;
@@ -42,7 +42,8 @@
String noteName[][]=new String[4][];
private Object notes[]=new Object[32];
- Hashtable handlersMap=new Hashtable();
+ Hashtable<String, JkHandler> handlersMap =
+ new Hashtable<String, JkHandler>();
JkHandler handlersTable[]=new JkHandler[20];
int handlerCount=0;
@@ -122,7 +123,7 @@
}
public final JkHandler getHandler( String name ) {
- return (JkHandler)handlersMap.get(name);
+ return handlersMap.get(name);
}
public final JkHandler getHandler( int id ) {
Modified: tomcat/trunk/java/org/apache/jk/server/JkMain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jk/server/JkMain.java?rev=719988&r1=719987&r2=719988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jk/server/JkMain.java (original)
+++ tomcat/trunk/java/org/apache/jk/server/JkMain.java Sun Nov 23 05:49:26 2008
@@ -159,7 +159,7 @@
* Retrieve a property.
*/
public Object getProperty(String name) {
- String alias = (String)replacements.get(name);
+ String alias = replacements.get(name);
Object result = null;
if(alias != null) {
result = props.get(alias);
@@ -419,7 +419,7 @@
jkMain=new JkMain();
IntrospectionUtils.processArgs( jkMain, args, new String[] {},
- null, new Hashtable());
+ null, new
Hashtable<Object,Object>());
jkMain.init();
jkMain.start();
@@ -476,7 +476,8 @@
}
// translate top-level keys ( from coyote or generic ) into component keys
- static Hashtable replacements=new Hashtable();
+ static Hashtable<String,String> replacements =
+ new Hashtable<String,String>();
static {
replacements.put("port","channelSocket.port");
replacements.put("maxThreads", "channelSocket.maxThreads");
@@ -493,11 +494,12 @@
}
private void preProcessProperties() {
- Enumeration keys=props.keys();
- Vector v=new Vector();
+ // TODO This can be fixed in Java 6
+ Enumeration<String> keys = (Enumeration) props.keys();
+ Vector<String> v=new Vector<String>();
while( keys.hasMoreElements() ) {
- String key=(String)keys.nextElement();
+ String key=keys.nextElement();
Object newName=replacements.get(key);
if( newName !=null ) {
v.addElement(key);
@@ -505,9 +507,9 @@
}
keys=v.elements();
while( keys.hasMoreElements() ) {
- String key=(String)keys.nextElement();
- Object propValue=props.getProperty( key );
- String replacement=(String)replacements.get(key);
+ String key = keys.nextElement();
+ Object propValue = props.getProperty( key );
+ String replacement = replacements.get(key);
props.put(replacement, propValue);
if( log.isDebugEnabled())
log.debug("Substituting " + key + " " + replacement + " " +
@@ -517,10 +519,10 @@
private void processProperties() {
preProcessProperties();
- Enumeration keys=props.keys();
+ Enumeration<String> keys = (Enumeration) props.keys();
while( keys.hasMoreElements() ) {
- String name=(String)keys.nextElement();
+ String name= keys.nextElement();
String propValue=props.getProperty( name );
processProperty( name, propValue );
@@ -577,7 +579,7 @@
return null;
}
try {
- Class channelclass = Class.forName(classN);
+ Class<?> channelclass = Class.forName(classN);
handler=(JkHandler)channelclass.newInstance();
} catch (Throwable ex) {
handler=null;
@@ -599,11 +601,11 @@
}
private void processModules() {
- Enumeration keys=props.keys();
+ Enumeration<String> keys = (Enumeration)props.keys();
int plen=6;
while( keys.hasMoreElements() ) {
- String k=(String)keys.nextElement();
+ String k=keys.nextElement();
if( ! k.startsWith( "class." ) )
continue;
@@ -616,14 +618,14 @@
}
private String[] split(String s, String delim ) {
- Vector v=new Vector();
+ Vector<String> v = new Vector<String>();
StringTokenizer st=new StringTokenizer(s, delim );
while( st.hasMoreTokens() ) {
v.addElement( st.nextToken());
}
String res[]=new String[ v.size() ];
for( int i=0; i<res.length; i++ ) {
- res[i]=(String)v.elementAt(i);
+ res[i]=v.elementAt(i);
}
return res;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
