remm 2004/01/26 12:19:11
Modified: catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java MapperListener.java
catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java StandardServer.java
StandardWrapper.java StandardService.java
StandardEngine.java StandardContext.java
StandardPipeline.java ContainerBase.java
StandardHost.java
catalina/src/share/org/apache/catalina/logger
LoggerBase.java
catalina/src/share/org/apache/catalina/loader
WebappLoader.java
catalina/src/share/org/apache/catalina/realm RealmBase.java
catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
catalina/src/share/org/apache/catalina/session
ManagerBase.java
Log:
- Remove compilation warnings related to modeler.
Revision Changes Path
1.39 +15 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- CoyoteConnector.java 26 Jan 2004 18:15:01 -0000 1.38
+++ CoyoteConnector.java 26 Jan 2004 20:19:10 -0000 1.39
@@ -1364,7 +1364,8 @@
String addSuffix=(getAddress()==null) ?"": ",address=" +
encodedAddr;
oname=new ObjectName(cb.getName() + ":type=Connector,port="+
getPort() + addSuffix);
- Registry.getRegistry().registerComponent(this, oname, null);
+ Registry.getRegistry(null, null)
+ .registerComponent(this, oname, null);
controller=oname;
} catch (Exception e) {
log.error( "Error registering connector ", e);
@@ -1528,10 +1529,9 @@
if ( this.oname != null ) {
// We are registred - register the adapter as well.
try {
- Registry.getRegistry().registerComponent
- (protocolHandler, this.domain, "protocolHandler",
- "type=protocolHandler,className="
- + protocolHandlerClassName);
+ Registry.getRegistry(null, null).registerComponent
+ (protocolHandler, this.domain +
":type=protocolHandler,className="
+ + protocolHandlerClassName, "protocolHandler");
} catch (Exception ex) {
log.error(sm.getString
("coyoteConnector.protocolRegistrationFailed"), ex);
@@ -1554,9 +1554,8 @@
//mapperListener.setEngine( service.getContainer().getName() );
mapperListener.init();
try {
- Registry.getRegistry().registerComponent
- (mapper, this.domain, "Mapper",
- "type=Mapper");
+ Registry.getRegistry(null, null).registerComponent
+ (mapper, this.domain + ":type=Mapper", "Mapper");
} catch (Exception ex) {
log.error(sm.getString
("coyoteConnector.protocolRegistrationFailed"), ex);
@@ -1582,10 +1581,12 @@
started = false;
try {
- Registry.getRegistry().unregisterComponent(new
ObjectName(domain,"type", "Mapper"));
- Registry.getRegistry().unregisterComponent(new ObjectName(domain
- + ":type=protocolHandler,className="
- + protocolHandlerClassName));
+ Registry.getRegistry(null, null).unregisterComponent
+ (new ObjectName(domain,"type", "Mapper"));
+ Registry.getRegistry(null, null).unregisterComponent
+ (new ObjectName(domain
+ + ":type=protocolHandler,className="
+ + protocolHandlerClassName));
} catch (MalformedObjectNameException e) {
log.info( "Error unregistering mapper ", e);
}
@@ -1897,7 +1898,7 @@
public void destroy() throws Exception {
if( oname!=null && controller==oname ) {
log.debug("Unregister itself " + oname );
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
}
if( getService() == null)
return;
1.15 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/MapperListener.java
Index: MapperListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/MapperListener.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MapperListener.java 2 Jan 2004 01:23:28 -0000 1.14
+++ MapperListener.java 26 Jan 2004 20:19:10 -0000 1.15
@@ -148,7 +148,7 @@
try {
- mBeanServer = Registry.getServer();
+ mBeanServer = Registry.getRegistry(null, null).getMBeanServer();
registerEngine();
1.11 +10 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StandardDefaultContext.java 30 Nov 2003 14:33:29 -0000 1.10
+++ StandardDefaultContext.java 26 Jan 2004 20:19:10 -0000 1.11
@@ -1823,7 +1823,8 @@
nresources.addEnvironment(env);
// Return the corresponding MBean name
- ManagedBean managed =
Registry.getRegistry().findManagedBean("ContextEnvironment");
+ ManagedBean managed = Registry.getRegistry(null, null)
+ .findManagedBean("ContextEnvironment");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), env);
return (oname.toString());
@@ -1854,7 +1855,8 @@
nresources.addResource(resource);
// Return the corresponding MBean name
- ManagedBean managed =
Registry.getRegistry().findManagedBean("ContextResource");
+ ManagedBean managed = Registry.getRegistry(null, null)
+ .findManagedBean("ContextResource");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), resource);
@@ -1888,7 +1890,8 @@
nresources.addResourceLink(resourceLink);
// Return the corresponding MBean name
- ManagedBean managed =
Registry.getRegistry().findManagedBean("ContextResourceLink");
+ ManagedBean managed = Registry.getRegistry(null, null)
+ .findManagedBean("ContextResourceLink");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), resourceLink);
return (oname.toString());
1.25 +6 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StandardServer.java 20 Dec 2003 23:04:02 -0000 1.24
+++ StandardServer.java 26 Jan 2004 20:19:10 -0000 1.25
@@ -2404,7 +2404,8 @@
if( oname==null ) {
try {
oname=new ObjectName( "Catalina:type=Server");
- Registry.getRegistry().registerComponent(this, oname, null );
+ Registry.getRegistry(null, null)
+ .registerComponent(this, oname, null );
} catch (Exception e) {
log.error("Error registering ",e);
}
1.36 +7 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- StandardWrapper.java 22 Dec 2003 17:47:43 -0000 1.35
+++ StandardWrapper.java 26 Jan 2004 20:19:10 -0000 1.36
@@ -1610,7 +1610,7 @@
}
if( oname != null ) {
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
// Send j2ee.object.deleted notification
Notification notification =
@@ -1635,7 +1635,8 @@
oname=new ObjectName(onameStr);
controller=oname;
- Registry.getRegistry().registerComponent(this, oname, null );
+ Registry.getRegistry(null, null)
+ .registerComponent(this, oname, null );
// Send j2ee.object.created notification
if (this.getObjectName() != null) {
1.10 +3 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java
Index: StandardService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StandardService.java 26 Jan 2004 19:47:03 -0000 1.9
+++ StandardService.java 26 Jan 2004 20:19:10 -0000 1.10
@@ -595,7 +595,7 @@
// we registered ourself on init().
// That should be the typical case - this object is just for
// backward compat, nobody should bother to load it explicitely
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
}
@@ -626,7 +626,8 @@
domain=engine.getName();
oname=new ObjectName(domain + ":type=Service,serviceName="+name);
this.controller=oname;
- Registry.getRegistry().registerComponent(this, oname, null);
+ Registry.getRegistry(null, null)
+ .registerComponent(this, oname, null);
} catch (Exception e) {
log.error("Error registering ",e);
}
1.23 +15 -12
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- StandardEngine.java 21 Oct 2003 00:18:25 -0000 1.22
+++ StandardEngine.java 26 Jan 2004 20:19:10 -0000 1.23
@@ -403,7 +403,8 @@
log.debug( "Register " + domain );
oname=new ObjectName(domain + ":type=Engine");
controller=oname;
- Registry.getRegistry().registerComponent(this, oname, null);
+ Registry.getRegistry(null, null)
+ .registerComponent(this, oname, null);
} catch( Throwable t ) {
log.info("Error registering ", t );
}
@@ -419,7 +420,7 @@
}
if( mbeans != null ) {
try {
- Registry.getRegistry().invoke(mbeans, "init", false);
+ Registry.getRegistry(null, null).invoke(mbeans, "init", false);
} catch (Exception e) {
log.error("Error in init() for " + mbeansFile, e);
}
@@ -467,7 +468,8 @@
if( mbeans != null ) {
try {
- Registry.getRegistry().invoke(mbeans, "destroy", false);
+ Registry.getRegistry(null, null)
+ .invoke(mbeans, "destroy", false);
} catch (Exception e) {
log.error("Error in destroy() for " + mbeansFile, e);
}
@@ -476,7 +478,8 @@
if( mbeans != null ) {
try {
for( int i=0; i<mbeans.size() ; i++ ) {
-
Registry.getRegistry().unregisterComponent((ObjectName)mbeans.get(i));
+ Registry.getRegistry(null, null)
+ .unregisterComponent((ObjectName)mbeans.get(i));
}
} catch (Exception e) {
log.error("Error in destroy() for " + mbeansFile, e);
@@ -486,9 +489,8 @@
// force all metadata to be reloaded.
// That doesn't affect existing beans. We should make it per
// registry - and stop using the static.
- Registry.getRegistry().resetMetadata();
+ Registry.getRegistry(null, null).resetMetadata();
-
}
/**
@@ -508,7 +510,8 @@
log.info( "Starting Servlet Engine: " + ServerInfo.getServerInfo());
if( mbeans != null ) {
try {
- Registry.getRegistry().invoke(mbeans, "start", false);
+ Registry.getRegistry(null, null)
+ .invoke(mbeans, "start", false);
} catch (Exception e) {
log.error("Error in start() for " + mbeansFile, e);
}
@@ -523,7 +526,7 @@
super.stop();
if( mbeans != null ) {
try {
- Registry.getRegistry().invoke(mbeans, "stop", false);
+ Registry.getRegistry(null, null).invoke(mbeans, "stop", false);
} catch (Exception e) {
log.error("Error in stop() for " + mbeansFile, e);
}
@@ -585,11 +588,11 @@
File mbeansF=new File( mbeansFile );
mbeansMB.setSource(mbeansF);
- Registry.getRegistry().registerComponent(mbeansMB,
- domain + ":type=MbeansFile", null);
+ Registry.getRegistry(null, null).registerComponent
+ (mbeansMB, domain + ":type=MbeansFile", null);
mbeansMB.load();
mbeansMB.init();
- mbeansMB.setRegistry(Registry.getRegistry());
+ mbeansMB.setRegistry(Registry.getRegistry(null, null));
mbeans=mbeansMB.getMBeans();
} catch( Throwable t ) {
1.113 +18 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- StandardContext.java 26 Jan 2004 19:47:03 -0000 1.112
+++ StandardContext.java 26 Jan 2004 20:19:10 -0000 1.113
@@ -3867,7 +3867,7 @@
new ObjectName(this.getDomain() + ":type=Cache,host="
+ getHostname() + ",path="
+ (("".equals(getPath()))?"/":getPath()));
- Registry.getRegistry().registerComponent
+ Registry.getRegistry(null, null).registerComponent
(proxyDirContext.getCache(), resourcesName, null);
}
this.resources = proxyDirContext;
@@ -3904,7 +3904,8 @@
+ getHostname() + ",path="
+ (("".equals(getPath()))?"/"
:getPath()));
- Registry.getRegistry().unregisterComponent(resourcesName);
+ Registry.getRegistry(null, null)
+ .unregisterComponent(resourcesName);
}
}
} catch (Throwable t) {
@@ -3999,10 +4000,10 @@
preRegisterJMX();
if ((oname != null) &&
- (Registry.getRegistry().getMBeanServer().isRegistered(oname))) {
+ (Registry.getRegistry(null,
null).getMBeanServer().isRegistered(oname))) {
// As things depend on the JMX registration, the context
// must be reregistered again once properly initialized
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
}
// Notify our interested LifecycleListeners
@@ -5108,7 +5109,8 @@
nresources.addEnvironment(env);
// Return the corresponding MBean name
- ManagedBean managed =
Registry.getRegistry().findManagedBean("ContextEnvironment");
+ ManagedBean managed = Registry.getRegistry(null, null)
+ .findManagedBean("ContextEnvironment");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), env);
return (oname.toString());
@@ -5139,7 +5141,8 @@
nresources.addResource(resource);
// Return the corresponding MBean name
- ManagedBean managed =
Registry.getRegistry().findManagedBean("ContextResource");
+ ManagedBean managed = Registry.getRegistry(null, null)
+ .findManagedBean("ContextResource");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), resource);
return (oname.toString());
@@ -5172,7 +5175,8 @@
nresources.addResourceLink(resourceLink);
// Return the corresponding MBean name
- ManagedBean managed =
Registry.getRegistry().findManagedBean("ContextResourceLink");
+ ManagedBean managed = Registry.getRegistry(null, null)
+ .findManagedBean("ContextResourceLink");
ObjectName oname =
MBeanUtils.createObjectName(managed.getDomain(), resourceLink);
return (oname.toString());
@@ -5271,9 +5275,11 @@
if (log.isDebugEnabled()) {
log.debug("Checking for " + oname );
}
- if(! Registry.getRegistry().getMBeanServer().isRegistered(oname)) {
+ if(! Registry.getRegistry(null, null)
+ .getMBeanServer().isRegistered(oname)) {
controller = oname;
- Registry.getRegistry().registerComponent(this, oname, null);
+ Registry.getRegistry(null, null)
+ .registerComponent(this, oname, null);
// Send j2ee.object.created notification
if (this.getObjectName() != null) {
@@ -5338,7 +5344,8 @@
StandardHost host=new StandardHost();
host.setName(hostName);
host.setAutoDeploy(false);
- Registry.getRegistry().registerComponent(host, parentName, null);
+ Registry.getRegistry(null, null)
+ .registerComponent(host, parentName, null);
mserver.invoke(parentName, "init", new Object[] {}, new String[] {}
);
}
ContextConfig config = new ContextConfig();
1.18 +9 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java
Index: StandardPipeline.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StandardPipeline.java 13 Nov 2003 08:29:33 -0000 1.17
+++ StandardPipeline.java 26 Jan 2004 20:19:10 -0000 1.18
@@ -358,8 +358,10 @@
((ContainerBase)container).getJmxName());
if( vname != null ) {
((ValveBase)valve).setObjectName(vname);
- Registry.getRegistry().registerComponent(valve, vname,
valve.getClass().getName());
-
((ValveBase)valve).setController(((ContainerBase)container).getJmxName());
+ Registry.getRegistry(null, null).registerComponent
+ (valve, vname, valve.getClass().getName());
+ ((ValveBase)valve).setController
+ (((ContainerBase)container).getJmxName());
}
} catch( Throwable t ) {
log.info( "Can't register valve " + valve , t );
@@ -376,7 +378,8 @@
((ContainerBase)container).getJmxName() ) {
ObjectName vname=vb.getObjectName();
- Registry.getRegistry().getMBeanServer().unregisterMBean(vname);
+ Registry.getRegistry(null, null).getMBeanServer()
+ .unregisterMBean(vname);
((ValveBase)valve).setObjectName(null);
}
} catch( Throwable t ) {
1.31 +6 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ContainerBase.java 31 Oct 2003 21:45:25 -0000 1.30
+++ ContainerBase.java 26 Jan 2004 20:19:10 -0000 1.31
@@ -1092,7 +1092,8 @@
if( lb.getObjectName()==null ) {
ObjectName lname=lb.createObjectName();
try {
- Registry.getRegistry().registerComponent(lb, lname, null);
+ Registry.getRegistry(null, null)
+ .registerComponent(lb, lname, null);
} catch( Exception ex ) {
log.error( "Can't register logger " + lname, ex);
}
@@ -1206,7 +1207,8 @@
LoggerBase lb=(LoggerBase)logger;
if( lb.getObjectName()!=null ) {
try {
- Registry.getRegistry().unregisterComponent(lb.getObjectName());
+ Registry.getRegistry(null, null)
+ .unregisterComponent(lb.getObjectName());
} catch( Exception ex ) {
log.error( "Can't unregister logger " + lb.getObjectName(), ex);
}
@@ -1259,7 +1261,8 @@
if ( oname != null ) {
try {
if( controller == oname ) {
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null)
+ .unregisterComponent(oname);
log.debug("unregistering " + oname);
}
} catch( Throwable t ) {
1.28 +3 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StandardHost.java 8 Jan 2004 05:32:25 -0000 1.27
+++ StandardHost.java 26 Jan 2004 20:19:10 -0000 1.28
@@ -1103,7 +1103,8 @@
log.debug( "Register " + domain );
oname=new ObjectName(domain + ":type=Host,host=" +
this.getName());
- Registry.getRegistry().registerComponent(this, oname, null);
+ Registry.getRegistry(null, null)
+ .registerComponent(this, oname, null);
} catch( Throwable t ) {
log.info("Error registering ", t );
}
1.7 +6 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LoggerBase.java
Index: LoggerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LoggerBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoggerBase.java 28 Sep 2003 00:43:28 -0000 1.6
+++ LoggerBase.java 26 Jan 2004 20:19:11 -0000 1.7
@@ -533,7 +533,7 @@
if ( getObjectName()==null ) {
ObjectName oname = createObjectName();
try {
- Registry.getRegistry().registerComponent(this, oname, null);
+ Registry.getRegistry(null, null).registerComponent(this, oname,
null);
log.debug( "registering logger " + oname );
} catch( Exception ex ) {
log.error( "Can't register logger " + oname, ex);
@@ -557,7 +557,7 @@
if ( getObjectName()!=null ) {
ObjectName oname = createObjectName();
try {
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
log.info( "unregistering logger " + oname );
} catch( Exception ex ) {
log.error( "Can't unregister logger " + oname, ex);
1.25 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Index: WebappLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- WebappLoader.java 26 Nov 2003 18:46:02 -0000 1.24
+++ WebappLoader.java 26 Jan 2004 20:19:11 -0000 1.25
@@ -653,7 +653,7 @@
}
oname=new ObjectName(ctx.getEngineName() + ":type=Loader,path="
+
path + ",host=" + ctx.getParent().getName());
- Registry.getRegistry().registerComponent(this, oname, null);
+ Registry.getRegistry(null, null).registerComponent(this, oname,
null);
controller=oname;
} catch (Exception e) {
log.error("Error registering loader", e );
@@ -671,7 +671,7 @@
public void destroy() {
if( controller==oname ) {
// Self-registration, undo it
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
oname = null;
}
initialized = false;
1.27 +6 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Index: RealmBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- RealmBase.java 21 Jan 2004 18:46:19 -0000 1.26
+++ RealmBase.java 26 Jan 2004 20:19:11 -0000 1.27
@@ -966,7 +966,7 @@
// unregister this realm
if ( oname!=null ) {
try {
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
log.debug( "unregistering realm " + oname );
} catch( Exception ex ) {
log.error( "Can't unregister realm " + oname, ex);
@@ -1236,7 +1236,7 @@
try {
ContainerBase cb=(ContainerBase)container;
oname=new ObjectName(cb.getDomain()+":type=Realm" +
cb.getContainerSuffix());
- Registry.getRegistry().registerComponent(this, oname, null );
+ Registry.getRegistry(null, null).registerComponent(this, oname,
null );
log.debug("Register Realm "+oname);
} catch (Throwable e) {
log.error( "Can't register " + oname, e);
1.23 +6 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MBeanUtils.java 25 Sep 2003 12:49:01 -0000 1.22
+++ MBeanUtils.java 26 Jan 2004 20:19:11 -0000 1.23
@@ -1640,7 +1640,7 @@
public synchronized static Registry createRegistry() {
if (registry == null) {
- registry = Registry.getRegistry();
+ registry = Registry.getRegistry(null, null);
ClassLoader cl=ServerLifecycleListener.class.getClassLoader();
registry.loadDescriptors("org.apache.catalina.mbeans", cl);
@@ -1697,7 +1697,7 @@
try {
//Trace.parseTraceProperties();
//mserver = MBeanServerFactory.createMBeanServer();
- mserver = Registry.getServer();
+ mserver = Registry.getRegistry(null, null).getMBeanServer();
} catch (Throwable t) {
t.printStackTrace(System.out);
System.exit(1);
1.24 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ManagerBase.java 26 Jan 2004 19:47:48 -0000 1.23
+++ ManagerBase.java 26 Jan 2004 20:19:11 -0000 1.24
@@ -612,7 +612,7 @@
public void destroy() {
if( oname != null )
- Registry.getRegistry().unregisterComponent(oname);
+ Registry.getRegistry(null, null).unregisterComponent(oname);
initialized=false;
oname = null;
}
@@ -633,7 +633,7 @@
}
oname=new ObjectName(domain + ":type=Manager,path="
+ path + ",host=" + hst.getName());
- Registry.getRegistry().registerComponent(this, oname, null );
+ Registry.getRegistry(null, null).registerComponent(this, oname,
null );
} catch (Exception e) {
log.error("Error registering ",e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
