tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JkMX.java
Date Thu, 17 Jun 2004 06:31:12 GMT
billbarker    2004/06/16 23:31:12

  Modified:    jk/java/org/apache/jk/common JkMX.java
  Log:
  Add support for the mx4j 2.x HttpAdapter.
  
  Also added option to turn off the XSLTProcessor, and cleaned up some dead code.
  
  Partial fix for Bug #29259
  
  Revision  Changes    Path
  1.23      +40 -26    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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JkMX.java	9 Apr 2004 08:22:29 -0000	1.22
  +++ JkMX.java	17 Jun 2004 06:31:12 -0000	1.23
  @@ -41,6 +41,7 @@
       private String httphost="localhost";
       private int jrmpport=-1;
       private String jrmphost="localhost";
  +    private boolean useXSLTProcessor = true;
   
       public JkMX() {
       }
  @@ -103,6 +104,14 @@
           return jrmphost;
       }
   
  +    public boolean getUseXSLTProcessor() {
  +        return useXSLTProcessor;
  +    }
  +
  +    public void setUseXSLTProcessor(boolean uxsltp) {
  +        useXSLTProcessor = uxsltp;
  +    }        
  +
       /* ==================== Start/stop ==================== */
       ObjectName httpServerName=null;
       ObjectName jrmpServerName=null;
  @@ -124,30 +133,40 @@
                       mserver.setAttribute(httpServerName, new Attribute("Host", httphost));
                   mserver.setAttribute(httpServerName, new Attribute("Port", new Integer(httpport)));
   
  -                ObjectName processorName = registerObject("mx4j.adaptor.http.XSLTProcessor",
  +                if(useXSLTProcessor) {
  +                    ObjectName processorName = registerObject("mx4j.adaptor.http.XSLTProcessor",
                                                             "Http:name=XSLTProcessor");
  -                //mserver.setAttribute(processorName, new Attribute("File", "/opt/41/server/lib/openjmx-tools.jar"));
  -                //mserver.setAttribute(processorName, new Attribute("UseCache", new Boolean(false)));
  -                //mserver.setAttribute(processorName, new Attribute("PathInJar", "/openjmx/adaptor/http/xsl"));
  -                mserver.setAttribute(httpServerName, new Attribute("ProcessorName", processorName));
  -
  -                //server.invoke(serverName, "addAuthorization",
  -                //             new Object[] {"openjmx", "openjmx"},
  -                //             new String[] {"java.lang.String", "java.lang.String"});
  -
  -                // use basic authentication
  -                //server.setAttribute(serverName, new Attribute("AuthenticationMethod",
"basic"));
  -
  -                //  ObjectName sslFactory = new ObjectName("Adaptor:service=SSLServerSocketFactory");
  -                //         server.createMBean("openjmx.adaptor.ssl.SSLAdaptorServerSocketFactory",
sslFactory, null);
  -                //        SSLAdaptorServerSocketFactoryMBean factory =
  -                // (SSLAdaptorServerSocketFactoryMBean)StandardMBeanProxy.create(SSLAdaptorServerSocketFactoryMBean.class,
server, sslFactory);
  -                //             // Customize the values below
  -                //             factory.setKeyStoreName("certs");
  -                //             factory.setKeyStorePassword("openjmx");
  +                    mserver.setAttribute(httpServerName, new Attribute("ProcessorName",
processorName));
  +                }
  +
  +                // starts the server
  +                mserver.invoke(httpServerName, "start", null, null);
  +
  +                log.info( "Started MX4J console on host " + httphost + " at port " + httpport);
  +                
  +                httpAdapterLoaded = true;
  +
  +            } catch( Throwable t ) {
  +                httpServerName=null;
  +                log.error( "Can't load the MX4J http adapter ", t );
  +            }
  +        }
  +
  +        if ((httpport != -1) && (!httpAdapterLoaded) && classExists("mx4j.tools.adaptor.http.HttpAdaptor"))
{
  +            try {
  +                httpServerName = registerObject("mx4j.tools.adaptor.http.HttpAdaptor",
  +                                                "Http:name=HttpAdaptor");
   
  -                //             server.setAttribute(serverName, new Attribute("SocketFactoryName",
sslFactory.toString()));
  +                        
  +                if( httphost!=null )
  +                    mserver.setAttribute(httpServerName, new Attribute("Host", httphost));
  +                mserver.setAttribute(httpServerName, new Attribute("Port", new Integer(httpport)));
   
  +                if(useXSLTProcessor) {
  +                    ObjectName processorName = registerObject("mx4j.tools.adaptor.http.XSLTProcessor",
  +                                                          "Http:name=XSLTProcessor");
  +                    mserver.setAttribute(httpServerName, new Attribute("ProcessorName",
processorName));
  +		}
                   // starts the server
                   mserver.invoke(httpServerName, "start", null, null);
   
  @@ -174,8 +193,6 @@
                   ObjectName adaptor = registerObject("mx4j.adaptor.rmi.jrmp.JRMPAdaptor",
                                                       "Adaptor:protocol=jrmp");
   
  -                //    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"));
   
  @@ -193,11 +210,8 @@
                               jrpmurl},
                           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 + " on host " + jrmphost + " at port "
+ jrmpport);
   
                   jrmpAdapterLoaded = true;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message