remm 2005/01/11 05:37:46 Modified: jk/java/org/apache/jk/server JkMain.java JkCoyoteHandler.java jk/java/org/apache/jk/core JkHandler.java JkChannel.java jk/java/org/apache/jk/common WorkerDummy.java ChannelSocket.java JniHandler.java HandlerRequest.java ModJkMX.java ChannelUn.java Log: - Remove most deprecation problems. Revision Changes Path 1.48 +5 -5 jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java Index: JkMain.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- JkMain.java 10 Oct 2004 23:43:20 -0000 1.47 +++ JkMain.java 11 Jan 2005 13:37:45 -0000 1.48 @@ -68,7 +68,6 @@ * to see configs based on registry, LDAP, db, etc. ( XML is not necesarily better ) * * @author Costin Manolache - * @deprecated Will be replaced with JMX operations */ public class JkMain implements MBeanRegistration { @@ -362,7 +361,7 @@ */ public void setBeanProperty( Object target, String name, String val ) { if( val!=null ) - val=IntrospectionUtils.replaceProperties( val, props ); + val=IntrospectionUtils.replaceProperties( val, props, null ); if( log.isDebugEnabled()) log.debug( "setProperty " + target + " " + name + "=" + val ); @@ -468,7 +467,7 @@ File outFile= new File(propsF.getParentFile(), propsF.getName()+".save"); log.debug("Saving properties " + outFile ); try { - props.save( new FileOutputStream(outFile), "AUTOMATICALLY GENERATED" ); + props.store( new FileOutputStream(outFile), "AUTOMATICALLY GENERATED" ); } catch(IOException ex ){ log.warn("Unable to save to "+outFile,ex); } @@ -583,8 +582,9 @@ } if( this.domain != null ) { try { - Registry.getRegistry().registerComponent(handler, this.domain, classN, - "type=JkHandler,name=" + fullName); + ObjectName handlerOname = new ObjectName + (this.domain + ":" + "type=JkHandler,name=" + fullName); + Registry.getRegistry(null, null).registerComponent(handler, handlerOname, classN); } catch (Exception e) { log.error( "Error registering " + fullName, e ); } 1.58 +5 -4 jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java Index: JkCoyoteHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- JkCoyoteHandler.java 11 Nov 2004 14:55:28 -0000 1.57 +++ JkCoyoteHandler.java 11 Jan 2005 13:37:45 -0000 1.58 @@ -46,7 +46,6 @@ import org.apache.jk.core.Msg; import org.apache.jk.core.MsgContext; import org.apache.jk.core.WorkerEnv; -import org.apache.jk.core.JkChannel; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.C2BConverter; import org.apache.tomcat.util.buf.MessageBytes; @@ -189,8 +188,10 @@ try { if( oname != null && getJkMain().getDomain() == null) { try { - Registry.getRegistry().registerComponent(getJkMain(), oname.getDomain(), - "JkMain", "type=JkMain"); + ObjectName jkmainOname = + new ObjectName(oname.getDomain() + ":type=JkMain"); + Registry.getRegistry(null, null) + .registerComponent(getJkMain(), jkmainOname, "JkMain"); } catch (Exception e) { log.error( "Error registering jkmain " + e ); } @@ -356,7 +357,7 @@ MessageBytes mb=(MessageBytes)ep.getNote( tmpMessageBytesNote ); if( mb==null ) { - mb=new MessageBytes(); + mb=MessageBytes.newInstance(); ep.setNote( tmpMessageBytesNote, mb ); } String message=res.getMessage(); 1.17 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java Index: JkHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- JkHandler.java 24 Feb 2004 08:48:43 -0000 1.16 +++ JkHandler.java 11 Jan 2005 13:37:45 -0000 1.17 @@ -169,7 +169,7 @@ wEnv=new WorkerEnv(); } if( ! mserver.isRegistered(wEnvName )) { - Registry.getRegistry().registerComponent(wEnv, wEnvName, null); + Registry.getRegistry(null, null).registerComponent(wEnv, wEnvName, null); } mserver.invoke( wEnvName, "addHandler", new Object[] {name, this}, 1.4 +0 -4 jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkChannel.java Index: JkChannel.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkChannel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JkChannel.java 31 May 2004 04:48:54 -0000 1.3 +++ JkChannel.java 11 Jan 2005 13:37:45 -0000 1.4 @@ -18,11 +18,7 @@ import java.io.IOException; -import javax.management.ObjectName; - -import org.apache.commons.modeler.Registry; import org.apache.coyote.Request; -import org.apache.tomcat.util.threads.ThreadPool; /** * A Channel represents a connection point to the outside world. 1.10 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java Index: WorkerDummy.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- WorkerDummy.java 17 Sep 2004 21:57:55 -0000 1.9 +++ WorkerDummy.java 11 Jan 2005 13:37:46 -0000 1.10 @@ -46,7 +46,7 @@ headersMsgNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "headerMsg" ); } - MessageBytes body=new MessageBytes(); + MessageBytes body=MessageBytes.newInstance(); private int headersMsgNote; public int invoke( Msg in, MsgContext ep ) 1.51 +4 -4 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java Index: ChannelSocket.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ChannelSocket.java 11 Dec 2004 06:32:13 -0000 1.50 +++ ChannelSocket.java 11 Jan 2005 13:37:46 -0000 1.51 @@ -433,7 +433,7 @@ getChannelName()+",name=JkRequest" +count); ep.setNote(JMXRequestNote, roname); - Registry.getRegistry().registerComponent( rp, roname, null); + Registry.getRegistry(null, null).registerComponent( rp, roname, null); } catch( Exception ex ) { log.warn("Error registering request"); } @@ -480,10 +480,10 @@ sSocket.close(); // XXX? if( tpOName != null ) { - Registry.getRegistry().unregisterComponent(tpOName); + Registry.getRegistry(null, null).unregisterComponent(tpOName); } if( rgOName != null ) { - Registry.getRegistry().unregisterComponent(rgOName); + Registry.getRegistry(null, null).unregisterComponent(rgOName); } } catch(Exception e) { log.info("Error shutting down the channel " + port + " " + @@ -704,7 +704,7 @@ if( req != null ) { ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote); if( roname != null ) { - Registry.getRegistry().unregisterComponent(roname); + Registry.getRegistry(null, null).unregisterComponent(roname); } req.getRequestProcessor().setGlobalProcessor(null); } 1.17 +3 -3 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java Index: JniHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- JniHandler.java 31 May 2004 04:48:54 -0000 1.16 +++ JniHandler.java 11 Jan 2005 13:37:46 -0000 1.17 @@ -96,7 +96,7 @@ if( oname != null ) { ObjectName aprname=new ObjectName(oname.getDomain() + ":type=JkHandler, name=apr"); - Registry.getRegistry().registerComponent(apr, aprname, null); + Registry.getRegistry(null, null).registerComponent(apr, aprname, null); } } catch( Throwable t ) { log.debug("Can't load apr", t); @@ -180,7 +180,7 @@ C2BConverter c2b=new C2BConverter( "iso-8859-1" ); msgCtx.setNote( C2B_NOTE, c2b ); - MessageBytes tmpMB=new MessageBytes(); + MessageBytes tmpMB= MessageBytes.newInstance(); msgCtx.setNote( MB_NOTE, tmpMB ); return msgCtx; } catch( Exception ex ) { @@ -284,7 +284,7 @@ // Will process the message in the current thread. // No wait needed to receive the response, if any - int status=apr.jkInvoke( xEnv, + int status=AprImpl.jkInvoke( xEnv, nativeJkHandlerP, nativeContext, code, msg.getBuffer(), 0, msg.getLen(), raw ); 1.42 +3 -6 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java Index: HandlerRequest.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- HandlerRequest.java 17 Dec 2004 03:02:41 -0000 1.41 +++ HandlerRequest.java 11 Jan 2005 13:37:46 -0000 1.42 @@ -22,11 +22,8 @@ import java.io.CharConversionException; import java.net.InetAddress; import java.util.Properties; -import javax.management.ObjectName; -import org.apache.commons.modeler.Registry; import org.apache.coyote.Request; -import org.apache.coyote.RequestGroupInfo; import org.apache.coyote.RequestInfo; import org.apache.coyote.Response; import org.apache.coyote.Constants; @@ -321,7 +318,7 @@ } FileOutputStream stopF=new FileOutputStream( sf ); - props.save( stopF, "Automatically generated, don't edit" ); + props.store( stopF, "Automatically generated, don't edit" ); } catch( IOException ex ) { log.debug( "Can't create stop file: "+sf ); ex.printStackTrace(); @@ -351,7 +348,7 @@ MessageBytes tmpMB=(MessageBytes)ep.getNote( tmpBufNote ); if( tmpMB==null ) { - tmpMB=new MessageBytes(); + tmpMB= MessageBytes.newInstance(); ep.setNote( tmpBufNote, tmpMB); } if( log.isDebugEnabled() ) @@ -604,7 +601,7 @@ // Transform the string into certificate. MessageBytes tmpMB2 = (MessageBytes)req.getNote(WorkerEnv.SSL_CERT_NOTE); if(tmpMB2 == null) { - tmpMB2 = new MessageBytes(); + tmpMB2 = MessageBytes.newInstance(); req.setNote(WorkerEnv.SSL_CERT_NOTE, tmpMB2); } // SSL certificate extraction is costy, moved to JkCoyoteHandler 1.9 +3 -3 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ModJkMX.java Index: ModJkMX.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ModJkMX.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ModJkMX.java 24 Feb 2004 08:48:42 -0000 1.8 +++ ModJkMX.java 11 Jan 2005 13:37:46 -0000 1.9 @@ -131,7 +131,7 @@ // We should keep track of loaded beans and call stop. // Modeler should do it... Iterator mbeansIt=mbeans.values().iterator(); - MBeanServer mbserver = Registry.getRegistry().getMBeanServer(); + MBeanServer mbserver = Registry.getRegistry(null, null).getMBeanServer(); while( mbeansIt.hasNext()) { MBeanProxy proxy=(MBeanProxy)mbeansIt.next(); Object ooname = proxy.getObjectName(); @@ -156,7 +156,7 @@ try { //if( log.isDebugEnabled() ) log.info("init " + webServerHost + " " + webServerPort); - reg=Registry.getRegistry(); + reg=Registry.getRegistry(null, null); refreshMetadata(); refreshAttributes(); } catch( Throwable t ) { @@ -383,7 +383,7 @@ this.setModelMBeanInfo(mbean.createMBeanInfo()); - MBeanServer mserver=Registry.getRegistry().getMBeanServer(); + MBeanServer mserver=Registry.getRegistry(null, null).getMBeanServer(); oname=new ObjectName("apache:type=" + type + ",id=" + id); mserver.registerMBean(this, oname); } 1.30 +4 -4 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java Index: ChannelUn.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ChannelUn.java 20 Nov 2004 02:39:34 -0000 1.29 +++ ChannelUn.java 11 Jan 2005 13:37:46 -0000 1.30 @@ -182,10 +182,10 @@ super.destroyJkComponent(); if(tpOName != null) { - Registry.getRegistry().unregisterComponent(tpOName); + Registry.getRegistry(null, null).unregisterComponent(tpOName); } if(rgOName != null) { - Registry.getRegistry().unregisterComponent(rgOName); + Registry.getRegistry(null, null).unregisterComponent(rgOName); } } catch(Exception e) { log.error("Error in destroy",e); @@ -203,7 +203,7 @@ getChannelName()+",name=JkRequest" +count); ep.setNote(JMXRequestNote, roname); - Registry.getRegistry().registerComponent( rp, roname, null); + Registry.getRegistry(null, null).registerComponent( rp, roname, null); } catch( Exception ex ) { log.warn("Error registering request"); } @@ -313,7 +313,7 @@ if( req != null ) { ObjectName roname = (ObjectName)ep.getNote(JMXRequestNote); if( roname != null ) { - Registry.getRegistry().unregisterComponent(roname); + Registry.getRegistry(null, null).unregisterComponent(roname); } req.getRequestProcessor().setGlobalProcessor(null); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]