cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanUtils.java

2004-10-06 Thread remm 
remm2004/10/06 09:10:57

  Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java MBeanUtils.java
  Log:
  - Remove MX4J code.
  
  Revision  ChangesPath
  1.20  +1 -51 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
  
  Index: ServerLifecycleListener.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ServerLifecycleListener.java  16 Aug 2004 09:31:08 -  1.19
  +++ ServerLifecycleListener.java  6 Oct 2004 16:10:57 -   1.20
  @@ -84,46 +84,6 @@
   }
   
   
  -/**
  - * MX4J adaptor name.
  - */
  -protected String adaptor = null;
  -
  -public String getAdaptor() {
  -return (this.adaptor);
  -}
  -
  -public void setAdaptor(String adaptor) {
  -this.adaptor = adaptor;
  -}
  -
  -/**
  - * MX4J jrmp/iiop listen host
  - */ 
  -protected String adaptorHost = null;
  -
  -public String getAdaptorHost() {
  -return (this.adaptorHost);
  -}
  -
  -public void setAdaptorHost(String adaptorHost) {
  -this.adaptorHost = adaptorHost;
  -}
  -
  -/**
  - * MX4J jrmp/iiop listen port
  - */ 
  -protected int adaptorPort = -1;
  -
  -public int getAdaptorPort() {
  -return (this.adaptorPort);
  -}
  -
  -public void setAdaptorPort(int adaptorPort) {
  -this.adaptorPort = adaptorPort;
  -}
  -
  -
   // -- ContainerListener Methods
   
   
  @@ -165,17 +125,7 @@
   if (Lifecycle.START_EVENT.equals(event.getType())) {
   
   if (lifecycle instanceof Server) {
  -
   createMBeans();
  -
  -if (adaptor != null) {
  -try {
  -MBeanUtils.createRMIAdaptor(adaptor, adaptorHost, 
adaptorPort);
  -} catch (Exception e) {
  -log.error(createAdaptor: Exception, e);
  -}
  -}
  -
   }
   
   // We are embedded.
  
  
  
  1.33  +2 -117
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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- MBeanUtils.java   29 Aug 2004 16:46:11 -  1.32
  +++ MBeanUtils.java   6 Oct 2004 16:10:57 -   1.33
  @@ -17,10 +17,8 @@
   package org.apache.catalina.mbeans;
   
   
  -import java.lang.reflect.Method;
   import java.util.Hashtable;
   
  -import javax.management.Attribute;
   import javax.management.MBeanException;
   import javax.management.MBeanServer;
   import javax.management.MalformedObjectNameException;
  @@ -1518,15 +1516,13 @@
   registry.loadDescriptors(org.apache.catalina, cl);
   registry.loadDescriptors(org.apache.catalina.deploy, cl);
   registry.loadDescriptors(org.apache.catalina.loader, cl);
  -registry.loadDescriptors(org.apache.catalina.logger, cl);
   registry.loadDescriptors(org.apache.catalina.realm, cl);
   registry.loadDescriptors(org.apache.catalina.session, cl);
   registry.loadDescriptors(org.apache.catalina.startup, cl);
   registry.loadDescriptors(org.apache.catalina.users, cl);
   registry.loadDescriptors(org.apache.catalina.cluster, cl);
  -
  +registry.loadDescriptors(org.apache.catalina.connector, cl);
   registry.loadDescriptors(org.apache.catalina.valves,  cl);
  -registry.loadDescriptors(org.apache.coyote.tomcat5, cl);
   }
   return (registry);
   
  @@ -1542,8 +1538,6 @@
   
   if (mserver == null) {
   try {
  -//Trace.parseTraceProperties();
  -//mserver = MBeanServerFactory.createMBeanServer();
   mserver = Registry.getRegistry(null, null).getMBeanServer();
   } catch (Throwable t) {
   t.printStackTrace(System.out);
  @@ -1551,115 +1545,6 @@
   }
   }
   return (mserver);
  -
  -}
  -
  -
  -/**
  - * Create a RMI adapter [MX4J specific].
  - */
  -public static void createRMIAdaptor(String adaptorType, String host, int port)
  -throws Exception {
  -
  -String namingProviderObjectName = null;
  -String namingProviderClassName = null;
  -String

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanUtils.java

2004-07-13 Thread remm 
remm2004/07/13 02:38:21

  Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java MBeanUtils.java
  Log:
  - Remove useless loadDescriptors method (modeler will load from the current package 
automagically).
  
  Revision  ChangesPath
  1.18  +1 -22 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
  
  Index: ServerLifecycleListener.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ServerLifecycleListener.java  25 Jun 2004 23:56:25 -  1.17
  +++ ServerLifecycleListener.java  13 Jul 2004 09:38:21 -  1.18
  @@ -19,7 +19,6 @@
   
   import java.beans.PropertyChangeEvent;
   import java.beans.PropertyChangeListener;
  -import java.util.StringTokenizer;
   import javax.management.MBeanException;
   
   import org.apache.catalina.Container;
  @@ -168,9 +167,6 @@
   
   if (lifecycle instanceof Server) {
   
  -// Loading additional MBean descriptors
  -loadMBeanDescriptors();
  -
   createMBeans();
   
   if (adaptor != null) {
  @@ -188,7 +184,6 @@
   try {
   MBeanFactory factory = new MBeanFactory();
   createMBeans(factory);
  -loadMBeanDescriptors();
   createMBeans((Service)lifecycle);
   } catch( Exception ex ) {
   log.error(Create mbean factory);
  @@ -319,22 +314,6 @@
   
   
   // -- Protected Methods
  -
  -
  -/**
  - * Load additional MBean descriptor resources.
  - */
  -protected void loadMBeanDescriptors() {
  -
  -if (descriptors != null) {
  -StringTokenizer tokenizer = new StringTokenizer(descriptors, ;);
  -while (tokenizer.hasMoreTokens()) {
  -String resource = tokenizer.nextToken();
  -MBeanUtils.loadMBeanDescriptors(resource);
  -}
  -}
  -
  -}
   
   
   /**
  
  
  
  1.28  +1 -25 
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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- MBeanUtils.java   27 Jun 2004 23:56:23 -  1.27
  +++ MBeanUtils.java   13 Jul 2004 09:38:21 -  1.28
  @@ -17,9 +17,7 @@
   package org.apache.catalina.mbeans;
   
   
  -import java.io.InputStream;
   import java.lang.reflect.Method;
  -import java.net.URL;
   import java.net.URLEncoder;
   import java.util.Hashtable;
   
  @@ -1540,28 +1538,6 @@
   registry.loadDescriptors(org.apache.coyote.tomcat5, cl);
   }
   return (registry);
  -
  -}
  -
  -
  -/**
  - * Load an MBean descriptor resource.
  - */
  -public synchronized static void loadMBeanDescriptors(String resource) {
  -
  -try {
  -URL url = ServerLifecycleListener.class.getResource(resource);
  -if (url != null) {
  -InputStream stream = url.openStream();
  -Registry.loadRegistry(stream);
  -stream.close();
  -} else {
  -// XXX: i18n
  -System.out.println(MBean descriptors not found: + resource);
  -}
  -} catch (Throwable t) {
  -t.printStackTrace(System.out);
  -}
   
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java MBeanUtils.java

2003-09-25 Thread hgomez 
hgomez  2003/09/25 05:49:01

  Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java MBeanUtils.java
  Log:
  Make RMI/IIOP port configurable
  
  Revision  ChangesPath
  1.11  +39 -13
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
  
  Index: ServerLifecycleListener.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ServerLifecycleListener.java  19 Mar 2003 07:30:07 -  1.10
  +++ ServerLifecycleListener.java  25 Sep 2003 12:49:01 -  1.11
  @@ -152,15 +152,41 @@
   /**
* MX4J adaptor name.
*/
  -protected String adaptor = null;
  + protected String adaptor = null;
   
  -public String getAdaptor() {
  -return (this.adaptor);
  -}
  -
  -public void setAdaptor(String adaptor) {
  -this.adaptor = adaptor;
  -}
  + public String getAdaptor() {
  + return (this.adaptor);
  + }
  +
  + public void setAdaptor(String adaptor) {
  + this.adaptor = adaptor;
  + }
  +
  + /**
  +  * MX4J jrmp/iiop listen host
  +  */ 
  + protected String adaptorHost = null;
  +
  + public String getAdaptorHost() {
  + return (this.adaptorHost);
  + }
  +
  + public void setAdaptorHost(String adaptorHost) {
  + this.adaptorHost = adaptorHost;
  + }
  +
  + /**
  +  * MX4J jrmp/iiop listen port
  +  */ 
  + protected int adaptorPort = -1;
  +
  + public int getAdaptorPort() {
  + return (this.adaptorPort);
  + }
  +
  + public void setAdaptorPort(int adaptorPort) {
  + this.adaptorPort = adaptorPort;
  + }
   
   
   // -- ContainerListener Methods
  @@ -212,7 +238,7 @@
   
   if (adaptor != null) {
   try {
  -MBeanUtils.createRMIAdaptor(adaptor);
  +MBeanUtils.createRMIAdaptor(adaptor, adaptorHost, 
adaptorPort);
   } catch (Exception e) {
   log.error(createAdaptor: Exception, e);
   }
  
  
  
  1.22  +19 -7 
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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- MBeanUtils.java   2 Sep 2003 21:22:02 -   1.21
  +++ MBeanUtils.java   25 Sep 2003 12:49:01 -  1.22
  @@ -1711,7 +1711,7 @@
   /**
* Create a RMI adapter [MX4J specific].
*/
  -public static void createRMIAdaptor(String adaptorType)
  +public static void createRMIAdaptor(String adaptorType, String host, int port)
   throws Exception {
   
   String namingProviderObjectName = null;
  @@ -1724,6 +1724,9 @@
   String contextFactory = null;
   String providerUrl = null;
   
  + if ((host == null) || (host.trim().length() == 0))
  + host = localhost;
  +
   if (adaptorType.equals(jrmp)) {
   namingProviderObjectName = Naming:type=rmiregistry;
   namingProviderClassName = mx4j.tools.naming.NamingService;
  @@ -1732,7 +1735,12 @@
   adaptorMbeanClassName = mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
   contextFactory = 
   com.sun.jndi.rmi.registry.RegistryContextFactory;
  -providerUrl = rmi://localhost:1099;
  +
  + if (port == -1)
  + port = 1099;
  + 
  +providerUrl = rmi:// + host + : + Integer.toString(port);
  +
   } else if (adaptorType.equals(iiop)) {
   namingProviderObjectName = Naming:type=tnameserv;
   namingProviderClassName = mx4j.tools.naming.CosNamingService;
  @@ -1741,7 +1749,11 @@
   adaptorClassName = mx4j.adaptor.rmi.iiop.IIOPAdaptor;
   adaptorMbeanClassName = mx4j.adaptor.rmi.iiop.IIOPAdaptorMBean;
   contextFactory = com.sun.jndi.cosnaming.CNCtxFactory;
  -providerUrl = iiop://localhost:900;
  +
  + if (port == -1)
  + port = 900;
  + 
  +providerUrl = iiop:// + host + : + Integer.toString(port);
   } else {
   throw new