avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: avalon/merlin/facilities/jmx/mx4j/src/java/org/apache/avalon/merlin/jmx/mx4j MX4JComponentRegistrationManager.java MX4JComponentRegistrationManager.xconfig MX4JComponentManager.java MX4JComponentManager.xconfig
Date Sat, 03 Apr 2004 15:51:35 GMT
niclas      2004/04/03 07:51:35

  Modified:    merlin/facilities/jmx project.xml
               merlin/facilities/jmx/api/src/java/org/apache/avalon/merlin/jmx
                        ComponentRegistrationException.java
                        ComponentRegistrationManager.java
               merlin/facilities/jmx/conf block.xml
               merlin/facilities/jmx/handler project.xml
               merlin/facilities/jmx/handler/src/java/org/apache/avalon/merlin/jmx/handler
                        JmxManagementHandler.java
               merlin/facilities/jmx/mx4j/conf block.xml
  Added:       merlin/facilities/jmx LICENSE.txt maven.xml
               merlin/facilities/jmx/handler maven.xml
               merlin/facilities/jmx/mx4j maven.xml
               merlin/facilities/jmx/mx4j/src/java/org/apache/avalon/merlin/jmx/mx4j
                        MX4JComponentRegistrationManager.java
                        MX4JComponentRegistrationManager.xconfig
  Removed:     merlin/facilities/jmx/mx4j/src/java/org/apache/avalon/merlin/jmx/mx4j
                        MX4JComponentManager.java
                        MX4JComponentManager.xconfig
  Log:
  More updates to get this operational.
  
  Revision  Changes    Path
  1.2       +1 -1      avalon/merlin/facilities/jmx/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/jmx/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	3 Apr 2004 10:26:20 -0000	1.1
  +++ project.xml	3 Apr 2004 15:51:35 -0000	1.2
  @@ -5,7 +5,7 @@
     <groupId>avalon-merlin-jmx</groupId>
     <id>jmx-master</id>
     <name>JMX Facility Master POM</name>
  -  <currentVersion>0.1-SNAPSHOT</currentVersion>
  +  <currentVersion>1.0</currentVersion>
   
     <inceptionYear>2004</inceptionYear>
     <repository>
  
  
  
  1.1                  avalon/merlin/facilities/jmx/LICENSE.txt
  
  Index: LICENSE.txt
  ===================================================================
  
                                   Apache License
                             Version 2.0, January 2004
                          http://www.apache.org/licenses/
  
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
  
     1. Definitions.
  
        "License" shall mean the terms and conditions for use, reproduction,
        and distribution as defined by Sections 1 through 9 of this document.
  
        "Licensor" shall mean the copyright owner or entity authorized by
        the copyright owner that is granting the License.
  
        "Legal Entity" shall mean the union of the acting entity and all
        other entities that control, are controlled by, or are under common
        control with that entity. For the purposes of this definition,
        "control" means (i) the power, direct or indirect, to cause the
        direction or management of such entity, whether by contract or
        otherwise, or (ii) ownership of fifty percent (50%) or more of the
        outstanding shares, or (iii) beneficial ownership of such entity.
  
        "You" (or "Your") shall mean an individual or Legal Entity
        exercising permissions granted by this License.
  
        "Source" form shall mean the preferred form for making modifications,
        including but not limited to software source code, documentation
        source, and configuration files.
  
        "Object" form shall mean any form resulting from mechanical
        transformation or translation of a Source form, including but
        not limited to compiled object code, generated documentation,
        and conversions to other media types.
  
        "Work" shall mean the work of authorship, whether in Source or
        Object form, made available under the License, as indicated by a
        copyright notice that is included in or attached to the work
        (an example is provided in the Appendix below).
  
        "Derivative Works" shall mean any work, whether in Source or Object
        form, that is based on (or derived from) the Work and for which the
        editorial revisions, annotations, elaborations, or other modifications
        represent, as a whole, an original work of authorship. For the purposes
        of this License, Derivative Works shall not include works that remain
        separable from, or merely link (or bind by name) to the interfaces of,
        the Work and Derivative Works thereof.
  
        "Contribution" shall mean any work of authorship, including
        the original version of the Work and any modifications or additions
        to that Work or Derivative Works thereof, that is intentionally
        submitted to Licensor for inclusion in the Work by the copyright owner
        or by an individual or Legal Entity authorized to submit on behalf of
        the copyright owner. For the purposes of this definition, "submitted"
        means any form of electronic, verbal, or written communication sent
        to the Licensor or its representatives, including but not limited to
        communication on electronic mailing lists, source code control systems,
        and issue tracking systems that are managed by, or on behalf of, the
        Licensor for the purpose of discussing and improving the Work, but
        excluding communication that is conspicuously marked or otherwise
        designated in writing by the copyright owner as "Not a Contribution."
  
        "Contributor" shall mean Licensor and any individual or Legal Entity
        on behalf of whom a Contribution has been received by Licensor and
        subsequently incorporated within the Work.
  
     2. Grant of Copyright License. Subject to the terms and conditions of
        this License, each Contributor hereby grants to You a perpetual,
        worldwide, non-exclusive, no-charge, royalty-free, irrevocable
        copyright license to reproduce, prepare Derivative Works of,
        publicly display, publicly perform, sublicense, and distribute the
        Work and such Derivative Works in Source or Object form.
  
     3. Grant of Patent License. Subject to the terms and conditions of
        this License, each Contributor hereby grants to You a perpetual,
        worldwide, non-exclusive, no-charge, royalty-free, irrevocable
        (except as stated in this section) patent license to make, have made,
        use, offer to sell, sell, import, and otherwise transfer the Work,
        where such license applies only to those patent claims licensable
        by such Contributor that are necessarily infringed by their
        Contribution(s) alone or by combination of their Contribution(s)
        with the Work to which such Contribution(s) was submitted. If You
        institute patent litigation against any entity (including a
        cross-claim or counterclaim in a lawsuit) alleging that the Work
        or a Contribution incorporated within the Work constitutes direct
        or contributory patent infringement, then any patent licenses
        granted to You under this License for that Work shall terminate
        as of the date such litigation is filed.
  
     4. Redistribution. You may reproduce and distribute copies of the
        Work or Derivative Works thereof in any medium, with or without
        modifications, and in Source or Object form, provided that You
        meet the following conditions:
  
        (a) You must give any other recipients of the Work or
            Derivative Works a copy of this License; and
  
        (b) You must cause any modified files to carry prominent notices
            stating that You changed the files; and
  
        (c) You must retain, in the Source form of any Derivative Works
            that You distribute, all copyright, patent, trademark, and
            attribution notices from the Source form of the Work,
            excluding those notices that do not pertain to any part of
            the Derivative Works; and
  
        (d) If the Work includes a "NOTICE" text file as part of its
            distribution, then any Derivative Works that You distribute must
            include a readable copy of the attribution notices contained
            within such NOTICE file, excluding those notices that do not
            pertain to any part of the Derivative Works, in at least one
            of the following places: within a NOTICE text file distributed
            as part of the Derivative Works; within the Source form or
            documentation, if provided along with the Derivative Works; or,
            within a display generated by the Derivative Works, if and
            wherever such third-party notices normally appear. The contents
            of the NOTICE file are for informational purposes only and
            do not modify the License. You may add Your own attribution
            notices within Derivative Works that You distribute, alongside
            or as an addendum to the NOTICE text from the Work, provided
            that such additional attribution notices cannot be construed
            as modifying the License.
  
        You may add Your own copyright statement to Your modifications and
        may provide additional or different license terms and conditions
        for use, reproduction, or distribution of Your modifications, or
        for any such Derivative Works as a whole, provided Your use,
        reproduction, and distribution of the Work otherwise complies with
        the conditions stated in this License.
  
     5. Submission of Contributions. Unless You explicitly state otherwise,
        any Contribution intentionally submitted for inclusion in the Work
        by You to the Licensor shall be under the terms and conditions of
        this License, without any additional terms or conditions.
        Notwithstanding the above, nothing herein shall supersede or modify
        the terms of any separate license agreement you may have executed
        with Licensor regarding such Contributions.
  
     6. Trademarks. This License does not grant permission to use the trade
        names, trademarks, service marks, or product names of the Licensor,
        except as required for reasonable and customary use in describing the
        origin of the Work and reproducing the content of the NOTICE file.
  
     7. Disclaimer of Warranty. Unless required by applicable law or
        agreed to in writing, Licensor provides the Work (and each
        Contributor provides its Contributions) on an "AS IS" BASIS,
        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
        implied, including, without limitation, any warranties or conditions
        of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
        PARTICULAR PURPOSE. You are solely responsible for determining the
        appropriateness of using or redistributing the Work and assume any
        risks associated with Your exercise of permissions under this License.
  
     8. Limitation of Liability. In no event and under no legal theory,
        whether in tort (including negligence), contract, or otherwise,
        unless required by applicable law (such as deliberate and grossly
        negligent acts) or agreed to in writing, shall any Contributor be
        liable to You for damages, including any direct, indirect, special,
        incidental, or consequential damages of any character arising as a
        result of this License or out of the use or inability to use the
        Work (including but not limited to damages for loss of goodwill,
        work stoppage, computer failure or malfunction, or any and all
        other commercial damages or losses), even if such Contributor
        has been advised of the possibility of such damages.
  
     9. Accepting Warranty or Additional Liability. While redistributing
        the Work or Derivative Works thereof, You may choose to offer,
        and charge a fee for, acceptance of support, warranty, indemnity,
        or other liability obligations and/or rights consistent with this
        License. However, in accepting such obligations, You may act only
        on Your own behalf and on Your sole responsibility, not on behalf
        of any other Contributor, and only if You agree to indemnify,
        defend, and hold each Contributor harmless for any liability
        incurred by, or claims asserted against, such Contributor by reason
        of your accepting any such warranty or additional liability.
  
  
  
  1.1                  avalon/merlin/facilities/jmx/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="multiproject:install">
  
  </project>
  
  
  
  1.2       +6 -6      avalon/merlin/facilities/jmx/api/src/java/org/apache/avalon/merlin/jmx/ComponentRegistrationException.java
  
  Index: ComponentRegistrationException.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/jmx/api/src/java/org/apache/avalon/merlin/jmx/ComponentRegistrationException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComponentRegistrationException.java	3 Apr 2004 10:26:20 -0000	1.1
  +++ ComponentRegistrationException.java	3 Apr 2004 15:51:35 -0000	1.2
  @@ -27,9 +27,9 @@
   public class ComponentRegistrationException extends CascadingException
   {
       /**
  -     * Constructs a new ComponentManagerException with the specified message.
  +     * Constructs a new ComponentRegistrationException with the specified message.
        *
  -     * @param message a description of the cause of this ComponentManagerException
  +     * @param message a description of the cause of this ComponentRegistrationException
        */
       public ComponentRegistrationException( String message )
       {
  @@ -37,10 +37,10 @@
       }
   
       /**
  -     * Constructs a new ComponentManagerException with the specified message and cause.
  +     * Constructs a new ComponentRegistrationException with the specified message and cause.
        *
  -     * @param message a description of the cause of this ComponentManagerException
  -     * @param cause the cause of this ComponentManagerException
  +     * @param message a description of the cause of this ComponentRegistrationException
  +     * @param cause the cause of this ComponentRegistrationException
        */
       public ComponentRegistrationException( String message, Throwable cause )
       {
  
  
  
  1.2       +5 -5      avalon/merlin/facilities/jmx/api/src/java/org/apache/avalon/merlin/jmx/ComponentRegistrationManager.java
  
  Index: ComponentRegistrationManager.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/jmx/api/src/java/org/apache/avalon/merlin/jmx/ComponentRegistrationManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComponentRegistrationManager.java	3 Apr 2004 10:26:20 -0000	1.1
  +++ ComponentRegistrationManager.java	3 Apr 2004 15:51:35 -0000	1.2
  @@ -26,18 +26,18 @@
   public interface ComponentRegistrationManager
   {
       /**
  -     * Adds a component for management with this ComponentManager.
  +     * Adds a component for management with this ComponentRegistrationManager.
        *
        * @param componentModel the ComponentModel of the component to manage
  -     * @throws ComponentManagerException the the component cannot be managed
  +     * @throws ComponentRegistrationException the the component cannot be managed
        */
       void register( ComponentModel componentModel ) throws ComponentRegistrationException;
   
       /**
  -     * Removes a component from this ComponentManager.
  +     * Removes a component from this ComponentRegistrationManager.
        *
        * @param componentModel the ComponentModel of the component to remove
  -     * @throws ComponentManagerException if the component does not exist or an error occurs
unregistering it.
  +     * @throws ComponentRegistrationException if the component does not exist or an error
occurs unregistering it.
        */
       void unregister( ComponentModel componentModel ) throws ComponentRegistrationException;
   
  
  
  
  1.2       +13 -13    avalon/merlin/facilities/jmx/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/jmx/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	3 Apr 2004 10:26:20 -0000	1.1
  +++ block.xml	3 Apr 2004 15:51:35 -0000	1.2
  @@ -1,20 +1,20 @@
   
   <container name="jmx-facility">
     <classloader>
  -     <classpath>
  -       <repository>
  -         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -         <resource id="avalon-composition:avalon-composition-api" version="2.0-SNAPSHOT"/>
  -         <resource id="jmx-facility:componentmanager-api" version="0.1-SNAPSHOT"/>
  -         <resource id="jmx-facility:jmx-facility-impl" version="0.1-SNAPSHOT"/>
  -         <resource id="jmx-facility:jmx-facility-test" version="0.1-SNAPSHOT"/>
  -       </repository>
  -     </classpath>
  -   </classloader>
  +    <classpath>
  +      <repository>
  +        <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  +        <resource id="avalon-composition:avalon-composition-api" version="2.0-SNAPSHOT"/>
  +        <resource id="avalon-merlin-jmx:merlin-jmx-management-api" version="1.0"/>
  +        <resource id="avalon-merlin-jmx:merlin-jmx-management-handler" version="1.0"/>
  +        <resource id="avalon-merlin-jmx:merlin-jmx-test" version="1.0"/>
  +      </repository>
  +    </classpath>
  +  </classloader>
   
  -   <include name="ComponentManager" id="jmx-facility:componentmanager-impl" version="0.1-SNAPSHOT"/>
  +  <include name="ComponentRegistrationManager" id="avalon-merlin-jmx:merlin-jmx-management-handler"
version="1.0"/>
   
  -   <component name="ComponentManagementCompositionListener" class="org.apache.avalon.merlin.jmx.impl.ComponentManagementCompositionListener"/>
  +  <component name="JmxManagementHandler" class="org.apache.avalon.merlin.jmx.handler.JmxManagementHandler"/>
   
  -   <component name="JMXTestComponent" class="org.apache.avalon.playground.jmxtest.JMXTestComponent"/>
  +  <component name="JMXTestComponent" class="org.apache.avalon.playground.jmxtest.JMXTestComponent"/>
   </container>
  
  
  
  1.2       +1 -1      avalon/merlin/facilities/jmx/handler/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/jmx/handler/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	3 Apr 2004 10:26:20 -0000	1.1
  +++ project.xml	3 Apr 2004 15:51:35 -0000	1.2
  @@ -3,7 +3,7 @@
   <project>
   
     <extend>${basedir}/../project.xml</extend>
  -  <id>merlin-jmx-component</id>
  +  <id>merlin-jmx-handler</id>
     <name>JMX Facility Handler</name>
     <package>org.apache.avalon.merlin.jmx.handler</package>
     <shortDescription>JMX Facility Handler Implementation</shortDescription>
  
  
  
  1.1                  avalon/merlin/facilities/jmx/handler/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:install">
  
    <preGoal name="java:compile">
      <attainGoal name="avalon:meta"/>
    </preGoal>
  
  </project>
  
  
  
  1.2       +3 -3      avalon/merlin/facilities/jmx/handler/src/java/org/apache/avalon/merlin/jmx/handler/JmxManagementHandler.java
  
  Index: JmxManagementHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/jmx/handler/src/java/org/apache/avalon/merlin/jmx/handler/JmxManagementHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JmxManagementHandler.java	3 Apr 2004 10:26:20 -0000	1.1
  +++ JmxManagementHandler.java	3 Apr 2004 15:51:35 -0000	1.2
  @@ -39,7 +39,7 @@
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    * @version $Revision$
    *
  - * @avalon.component name="JmxManagementComponent" version="0.1" lifestyle="singleton"
  + * @avalon.component name="JmxManagementHandler" version="0.1" lifestyle="singleton"
    */
   
   public class JmxManagementHandler extends AbstractLogEnabled 
  @@ -68,7 +68,7 @@
        * @param serviceManager the ServiceManager from which to retrieve service dependencies
        * @throws ServiceException if a required service is not available
        *
  -     * @avalon.dependency key="ComponentRegistrationManager" type="org.apache.avalon.merlin.jmx.ComponentRegistrationManager.ComponentRegistrationManager"
optional="false"
  +     * @avalon.dependency key="ComponentRegistrationManager" type="org.apache.avalon.merlin.jmx.ComponentRegistrationManager"
optional="false"
        */
       public void service( ServiceManager serviceManager ) throws ServiceException
       {
  
  
  
  1.1                  avalon/merlin/facilities/jmx/mx4j/maven.xml
  
  Index: maven.xml
  ===================================================================
  <project default="jar:install">
  
    <preGoal name="java:compile">
      <attainGoal name="avalon:meta"/>
    </preGoal>
  
  </project>
  
  
  
  1.2       +8 -6      avalon/merlin/facilities/jmx/mx4j/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/jmx/mx4j/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	3 Apr 2004 10:26:20 -0000	1.1
  +++ block.xml	3 Apr 2004 15:51:35 -0000	1.2
  @@ -1,10 +1,12 @@
   
   <container name="jmx">
  +
     <services>
  -    <service type="org.apache.avalon.merlin.jmx.componentmanager.ComponentRegistrationManager">
  -      <source>MX4JComponentManager</source>
  +    <service type="org.apache.avalon.merlin.jmx.ComponentRegistrationManager">
  +      <source>MX4JComponentRegistrationManager</source>
       </service>
     </services>
  +  
     <classloader>
        <classpath>
          <repository>
  @@ -12,15 +14,15 @@
            <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
            <resource id="avalon-composition:avalon-composition-api" version="2.0-SNAPSHOT"/>
            <resource id="excalibur-i18n:excalibur-i18n" version="1.1"/>
  -         <resource id="jmx-facility:componentmanager-api" version="0.1-SNAPSHOT"/>
  -         <resource id="jmx-facility:componentmanager-spi" version="0.1-SNAPSHOT"/>
  -         <resource id="jmx-facility:jmx-util" version="0.1-SNAPSHOT"/>
  +         <resource id="avalon-merlin-jmx:merlin-jmx-management-api" version="1.0"/>
  +         <resource id="avalon-merlin-jmx:merlin-jmx-management-spi" version="1.0"/>
  +         <resource id="avalon-merlin-jmx:merlin-jmx-util" version="1.0"/>
            <resource id="mx4j:mx4j-jmx" version="1.1.1"/>
            <resource id="mx4j:mx4j-tools" version="1.1.1"/>
          </repository>
        </classpath>
      </classloader>
   
  -   <component name="MX4JComponentManager" class="org.apache.avalon.merlin.jmx.componentmanager.impl.MX4JComponentManager"
activation="startup"/>
  +   <component name="MX4JComponentRegistrationManager" class="org.apache.avalon.merlin.jmx.mx4j.MX4JComponentRegistrationManager"
activation="startup"/>
   
   </container>
  
  
  
  1.1                  avalon/merlin/facilities/jmx/mx4j/src/java/org/apache/avalon/merlin/jmx/mx4j/MX4JComponentRegistrationManager.java
  
  Index: MX4JComponentRegistrationManager.java
  ===================================================================
  /*
   * Copyright 2004 Apache Software Foundation
   * Licensed  under the  Apache License,  Version 2.0  (the "License");
   * you may not use  this file  except in  compliance with the License.
   * You may obtain a copy of the License at
   *
   *   http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed  under the  License is distributed on an "AS IS" BASIS,
   * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
   * implied.
   *
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  package org.apache.avalon.merlin.jmx.mx4j;
  
  import java.io.File;
  import javax.management.Attribute;
  import javax.management.AttributeNotFoundException;
  import javax.management.InstanceNotFoundException;
  import javax.management.InvalidAttributeValueException;
  import javax.management.MBeanException;
  import javax.management.MBeanServer;
  import javax.management.MBeanServerFactory;
  import javax.management.ObjectName;
  import javax.management.ReflectionException;
  
  import org.apache.avalon.framework.configuration.Configurable;
  import org.apache.avalon.framework.configuration.Configuration;
  import org.apache.avalon.framework.configuration.ConfigurationException;
  import org.apache.avalon.framework.context.Context;
  import org.apache.avalon.framework.context.ContextException;
  import org.apache.avalon.framework.context.Contextualizable;
  import org.apache.avalon.merlin.jmx.spi.AbstractJMXComponentRegistrationManager;
  
  import org.apache.avalon.util.i18n.ResourceManager;
  import org.apache.avalon.util.i18n.Resources;
  
  import mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
  import mx4j.log.Log;
  import mx4j.util.StandardMBeanProxy;
  
  /**
   * A component manager using the MX4J implementation of JMX.
   *
   * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
   * @version $Revision: 1.1 $
   *
   * @avalon.component name="MX4JComponentRegistrationManager" version="0.1" lifestyle="singleton"
   * @avalon.service type="org.apache.avalon.merlin.jmx.ComponentRegistrationManager"
   */
  
  public class MX4JComponentRegistrationManager extends AbstractJMXComponentRegistrationManager

      implements Contextualizable, Configurable
  {
      private static final Resources REZ = ResourceManager.getPackageResources( MX4JComponentRegistrationManager.class
);
      private static final String DEFAULT_NAMING_FACTORY =
          "com.sun.jndi.rmi.registry.RegistryContextFactory";
      private static final String DEFAULT_HTTPADAPTER_HOST = "localhost";
      private static final int DEFAULT_HTTPADAPTER_PORT = Integer.getInteger( "merlin.adapter.http",
          8082 ).intValue();
  
      private String m_host;
      private int m_port;
      private boolean m_rmi;
      private File m_homeDir;
      private String m_stylesheetDir;
      private String m_namingFactory;
      private String m_password;
      private String m_username;
  
      /**
       * @avalon.entry key="urn:avalon:home" type="java.io.File"
       */
      public void contextualize( Context context ) throws ContextException
      {
          m_homeDir = ( File ) context.get( "urn:avalon:home" );
      }
  
      public void configure( final Configuration configuration ) throws ConfigurationException
      {
          m_host = configuration.getChild( "manager-adaptor-host" ).getValue(
              DEFAULT_HTTPADAPTER_HOST );
  
          m_port = configuration.getChild( "manager-adaptor-port" ).getValueAsInteger(
              DEFAULT_HTTPADAPTER_PORT );
  
          //This is for backwards compatability with old-style
          //RI JMX implementation
          m_port = configuration.getChild( "port" ).getValueAsInteger( m_port );
  
          getLogger().debug( "MX4J HTTP listener port: " + m_port );
  
          m_rmi = configuration.getChild( "enable-rmi-adaptor" ).getValueAsBoolean( false
);
  
          m_namingFactory = configuration.getChild( "rmi-naming-factory" ).getValue(
              DEFAULT_NAMING_FACTORY );
  
          final String stylesheets = configuration.getChild( "stylesheets-dir" ).getValue(
null );
          if ( null != stylesheets )
          {
              m_stylesheetDir = new File( m_homeDir, stylesheets ).getAbsolutePath();
          }
  
          /*
           * <user>
           *  <name>user</name>
           *  <password>passwd</password>
           * </user>
           */
          final Configuration userConfig = configuration.getChild( "user" );
          m_username = userConfig.getChild( "name" ).getValue( null );
          m_password = userConfig.getChild( "password" ).getValue( null );
      }
  
      public void initialize() throws Exception
      {
          super.initialize();
  
          final MBeanServer mBeanServer = getMBeanServer();
  
          startHttpAdaptor( mBeanServer );
  
          if ( m_rmi )
          {
              startRMIAdaptor( mBeanServer );
          }
      }
  
      public void dispose()
      {
          final MBeanServer mBeanServer = getMBeanServer();
  
          stopHttpAdaptor( mBeanServer );
  
          if ( m_rmi )
          {
              stopRMIAdaptor( mBeanServer );
          }
  
          super.dispose();
      }
  
      private void startHttpAdaptor( final MBeanServer mBeanServer ) throws Exception
      {
          final ObjectName adaptorName = new ObjectName( "Http:name=HttpAdaptor" );
          mBeanServer.createMBean( "mx4j.adaptor.http.HttpAdaptor", adaptorName, null );
          mBeanServer.setAttribute( adaptorName, new Attribute( "Host", m_host ) );
          mBeanServer.setAttribute( adaptorName, new Attribute( "Port", new Integer( m_port
) ) );
  
          if ( null != m_username )
          {
              configureAuthentication( mBeanServer, adaptorName );
          }
  
          configureProcessor( mBeanServer, adaptorName );
  
          // starts the server
          mBeanServer.invoke( adaptorName, "start", null, null );
      }
  
      private void configureProcessor( final MBeanServer mBeanServer, final ObjectName adaptorName
) throws
          Exception
      {
          final ObjectName processorName = new ObjectName( "Http:name=XSLTProcessor" );
          mBeanServer.createMBean( "mx4j.adaptor.http.XSLTProcessor", processorName, null
);
          mBeanServer.setAttribute( adaptorName, new Attribute( "ProcessorName", processorName
) );
  
          if ( null != m_stylesheetDir )
          {
              final Attribute stylesheetDir = new Attribute( "File", m_stylesheetDir );
              mBeanServer.setAttribute( processorName, stylesheetDir );
          }
  
          final Attribute useCache = new Attribute( "UseCache", Boolean.FALSE );
          mBeanServer.setAttribute( processorName, useCache );
      }
  
      private void configureAuthentication( final MBeanServer mBeanServer,
                                            final ObjectName adaptorName ) throws
          InstanceNotFoundException, MBeanException, ReflectionException, AttributeNotFoundException,
          InvalidAttributeValueException
      {
          // add user names
          mBeanServer.invoke( adaptorName, "addAuthorization", new Object[]
                              {m_username, m_password}
                              , new String[]
                              {"java.lang.String", "java.lang.String"} );
  
          // use basic authentication
          mBeanServer.setAttribute( adaptorName, new Attribute( "AuthenticationMethod", "basic"
) );
      }
  
      private void startRMIAdaptor( final MBeanServer server ) throws Exception
      {
          // Create and start the naming service
          final ObjectName naming = new ObjectName( "Naming:type=rmiregistry" );
          server.createMBean( "mx4j.tools.naming.NamingService", naming, null );
          server.invoke( naming, "start", null, null );
  
          // Create the JRMP adaptor
          final ObjectName adaptor = new ObjectName( "Adaptor:protocol=JRMP" );
          server.createMBean( "mx4j.adaptor.rmi.jrmp.JRMPAdaptor", adaptor, null );
          JRMPAdaptorMBean mbean = ( JRMPAdaptorMBean ) StandardMBeanProxy.create( JRMPAdaptorMBean.class,
              server, adaptor );
          // Set the JNDI name with which will be registered
          mbean.setJNDIName( "jrmp" );
          mbean.putJNDIProperty( javax.naming.Context.INITIAL_CONTEXT_FACTORY, m_namingFactory
);
          // Register the JRMP adaptor in JNDI and start it
          mbean.start();
      }
  
      private void stopHttpAdaptor( final MBeanServer server )
      {
          stopJMXMBean( server, "Http:name=HttpAdaptor" );
      }
  
      private void stopRMIAdaptor( final MBeanServer server )
      {
          // stop the JRMP adaptor
          stopJMXMBean( server, "Adaptor:protocol=JRMP" );
          // stop the naming service
          stopJMXMBean( server, "Naming:type=rmiregistry" );
      }
  
      protected MBeanServer createMBeanServer() throws Exception
      {
          MX4JLoggerAdapter.setLogger( getLogger() );
          Log.redirectTo( new MX4JLoggerAdapter() );
          return MBeanServerFactory.createMBeanServer( "Merlin" );
      }
  
      private void stopJMXMBean( final MBeanServer mBeanServer, final String name )
      {
          try
          {
              final ObjectName objectName = new ObjectName( name );
              mBeanServer.invoke( objectName, "stop", null, null );
          }
          catch ( final Exception e )
          {
              final String message = REZ.getString( "jmxmanager.error.jmxmbean.dispose", name
);
              getLogger().error( message, e );
          }
      }
  }
  
  
  
  1.1                  avalon/merlin/facilities/jmx/mx4j/src/java/org/apache/avalon/merlin/jmx/mx4j/MX4JComponentRegistrationManager.xconfig
  
  Index: MX4JComponentRegistrationManager.xconfig
  ===================================================================
  <configuration>
    <!--
      By default the Mx4J Http Adaptor will bind a webserver to all
      network interfaces. If you wish to restrict it to only one
      interface (say localhost) then uncomment and edit the next line.
    -->
    <!--
    <manager-adaptor-host>localhost</manager-adaptor-host>
    -->
  
    <!--
      This specifies the IP port which the Http Adaptor will bind on.
    -->
    <manager-adaptor-port>8083</manager-adaptor-port>
    <!--
    <enable-rmi-adaptor>true</enable-rmi-adaptor>
    <rmi-naming-factory>com.sun.jndi.rmi.registry.RegistryContextFactory</rmi-naming-factory>
    <stylesheets-dir>conf/xsl</stylesheets-dir>
    -->
  
    <!--
      If you want the HTTPAdaptor to require authentication then you need to specify
      a username and password in the next xml block.
    -->
    <!--
    <user>
      <name>user</name>
      <password>password</password>
    </user>
    -->
  </configuration>
  
  
  

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


Mime
View raw message