avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager DefaultManager.java
Date Mon, 25 Mar 2002 08:23:30 GMT
donaldp     02/03/25 00:23:30

  Modified:    .        build.xml
               src/java/org/apache/avalon/phoenix/components/embeddor
                        DefaultEmbeddor.java
               src/java/org/apache/avalon/phoenix/components/manager
                        DefaultManager.java
  Log:
  Integrated baxter code and use suns MBeanServer directly
  
  Revision  Changes    Path
  1.107     +1 -0      jakarta-avalon-phoenix/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- build.xml	21 Mar 2002 08:36:56 -0000	1.106
  +++ build.xml	25 Mar 2002 08:23:29 -0000	1.107
  @@ -285,6 +285,7 @@
   
           <copy file="${build.lib}/phoenix-client.jar" todir="${bin.dist.lib}"/>
           <copy file="${build.lib}/avalon-jmx.jar" todir="${bin.dist.lib}"/>
  +        <copy file="${lib.dir}/excalibur-baxter-1.0a.jar" todir="${bin.dist.lib}"/>
           <copy file="${logkit.jar}" todir="${bin.dist.lib}"/>
           <copy file="${jmxri.jar}" todir="${bin.dist.lib}"/>
           <copy file="${jmxtools.jar}" todir="${bin.dist.lib}"/>
  
  
  
  1.52      +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
  
  Index: DefaultEmbeddor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- DefaultEmbeddor.java	25 Mar 2002 08:16:34 -0000	1.51
  +++ DefaultEmbeddor.java	25 Mar 2002 08:23:30 -0000	1.52
  @@ -541,7 +541,7 @@
           for( int i = 0; i < m_components.length; i++ )
           {
               final EmbeddorEntry entry = m_components[ i ];
  -            shutdownComponent( (Component)entry.getObject(); );
  +            shutdownComponent( (Component)entry.getObject() );
           }
       }
   
  
  
  
  1.14      +2 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/DefaultManager.java
  
  Index: DefaultManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/DefaultManager.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DefaultManager.java	16 Mar 2002 00:11:55 -0000	1.13
  +++ DefaultManager.java	25 Mar 2002 08:23:30 -0000	1.14
  @@ -18,6 +18,7 @@
   import javax.management.ObjectName;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.excalibur.baxter.JavaBeanMBean;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -37,7 +38,6 @@
   import org.apache.avalon.phoenix.interfaces.ManagerException;
   import org.apache.avalon.phoenix.interfaces.PackageRepository;
   import org.apache.jmx.adaptor.RMIAdaptorImpl;
  -import org.apache.jmx.introspector.JavaBeanMBean;
   
   /**
    * This component is responsible for managing phoenix instance.
  @@ -282,7 +282,7 @@
       {
           final String className =
               m_parameters.getParameter( "manager-mBeanServer-class",
  -                                       "org.apache.jmx.MBeanServerImpl" );
  +                                       "com.sun.management.jmx.MBeanServerImpl" );
   
           try
           {
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message