costin 2003/02/16 18:12:46
Modified: jk/java/org/apache/jk/common JkMX.java
Log:
If the RMI adapter fails, we can still load http.
This should be deprecated/removed - there are better ways to load jmx console,
and the magic it is doing to avoid deps on JMX is no longer needed.
Revision Changes Path
1.9 +37 -33 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java
Index: JkMX.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JkMX.java 20 Jan 2003 19:20:32 -0000 1.8
+++ JkMX.java 17 Feb 2003 02:12:46 -0000 1.9
@@ -116,40 +116,7 @@
if( host!=null )
mserver.setAttribute(serverName, new Attribute("Host", host));
mserver.setAttribute(serverName, new Attribute("Port", new
Integer(port)));
-
- ObjectName serverName2 = new ObjectName("Naming:name=rmiregistry");
- mserver.createMBean("mx4j.tools.naming.NamingService", serverName2,
null);
- mserver.invoke(serverName2, "start", null, null);
- log.info( "Creating " + serverName2 );
-
- // Create the JRMP adaptor
- ObjectName adaptor = new ObjectName("Adaptor:protocol=jrmp");
- mserver.createMBean("mx4j.adaptor.rmi.jrmp.JRMPAdaptor", adaptor, null);
-
- // mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean mbean =
(mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean)mx4j.util.StandardMBeanProxy.
- // create(mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean.class, mserver,
adaptor);
- mserver.setAttribute(adaptor, new Attribute("JNDIName", "jrmp"));
-
- mserver.invoke( adaptor, "putNamingProperty",
- new Object[] {
- javax.naming.Context.INITIAL_CONTEXT_FACTORY,
- "com.sun.jndi.rmi.registry.RegistryContextFactory"},
- new String[] { "java.lang.Object", "java.lang.Object"
});
-
- mserver.invoke( adaptor, "putNamingProperty",
- new Object[] {
- javax.naming.Context.PROVIDER_URL,
- "rmi://localhost:1099"},
- new String[] { "java.lang.Object", "java.lang.Object"
});
-
- //mbean.putNamingProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.rmi.registry.RegistryContextFactory");
- //mbean.putNamingProperty(javax.naming.Context.PROVIDER_URL,
"rmi://localhost:1099");
- // Registers the JRMP adaptor in JNDI and starts it
- mserver.invoke(adaptor, "start", null, null);
- // mbean.start();
- log.info( "Creating " + adaptor );
-
ObjectName processorName = new ObjectName("Http:name=XSLTProcessor");
mserver.createMBean("mx4j.adaptor.http.XSLTProcessor", processorName,
null);
@@ -182,6 +149,43 @@
} catch( Throwable t ) {
log.error( "Can't load the MX4J http adapter " + t.toString() );
}
+ try {
+ ObjectName serverName2 = new ObjectName("Naming:name=rmiregistry");
+ mserver.createMBean("mx4j.tools.naming.NamingService", serverName2,
null);
+ mserver.invoke(serverName2, "start", null, null);
+ log.info( "Creating " + serverName2 );
+
+ // Create the JRMP adaptor
+ ObjectName adaptor = new ObjectName("Adaptor:protocol=jrmp");
+ mserver.createMBean("mx4j.adaptor.rmi.jrmp.JRMPAdaptor", adaptor, null);
+
+ // mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean mbean =
(mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean)mx4j.util.StandardMBeanProxy.
+ // create(mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean.class, mserver,
adaptor);
+
+ mserver.setAttribute(adaptor, new Attribute("JNDIName", "jrmp"));
+
+ mserver.invoke( adaptor, "putNamingProperty",
+ new Object[] {
+ javax.naming.Context.INITIAL_CONTEXT_FACTORY,
+ "com.sun.jndi.rmi.registry.RegistryContextFactory"},
+ new String[] { "java.lang.Object", "java.lang.Object" });
+
+ mserver.invoke( adaptor, "putNamingProperty",
+ new Object[] {
+ javax.naming.Context.PROVIDER_URL,
+ "rmi://localhost:1099"},
+ new String[] { "java.lang.Object", "java.lang.Object" });
+
+ //mbean.putNamingProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.rmi.registry.RegistryContextFactory");
+ //mbean.putNamingProperty(javax.naming.Context.PROVIDER_URL,
"rmi://localhost:1099");
+ // Registers the JRMP adaptor in JNDI and starts it
+ mserver.invoke(adaptor, "start", null, null);
+ // mbean.start();
+ log.info( "Creating " + adaptor );
+ } catch( Exception ex ) {
+ log.info( "MX4j RMI adapter not loaded: " + ex.toString());
+ }
+
try {
Class c=Class.forName( "com.sun.jdmk.comm.HtmlAdaptorServer" );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
