svn commit: r742901 - in /servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management: ComponentInstaller.java DefaultNamingStrategy.java InstallationService.java

[ffang]

Author: ffang
Date: Tue Feb 10 09:15:17 2009
New Revision: 742901

URL: http://svn.apache.org/viewvc?rev=742901&view=rev
Log:
[SMX4NMR-17]minor refactor

Modified:
    
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/ComponentInstaller.java
    
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/DefaultNamingStrategy.java
    
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/InstallationService.java

Modified: 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/ComponentInstaller.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/ComponentInstaller.java?rev=742901&r1=742900&r2=742901&view=diff
==============================================================================
--- 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/ComponentInstaller.java
 (original)
+++ 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/ComponentInstaller.java
 Tue Feb 10 09:15:17 2009
@@ -39,6 +39,7 @@
     private InstallationContextImpl context;
     private File jbiArtifact;
     private ObjectName objectName;
+    private ObjectName extensionMBeanName;
     private AdminService adminService;
 
     
@@ -49,6 +50,7 @@
         this.jbiArtifact = jbiArtifact;
         this.adminService = adminService;
         setBundleContext(this.adminService.getBundleContext());
+        extensionMBeanName = 
ic.createCustomComponentMBeanName("Configuration");
     }
 
     /**
@@ -136,8 +138,7 @@
      * @throws javax.jbi.JBIException if the component is not in the LOADED 
state or any error occurs during processing.
      */
     public ObjectName getInstallerConfigurationMBean() throws 
javax.jbi.JBIException {
-       //TODO
-        return null;
+       return this.extensionMBeanName;
     }
     /**
      * @return Returns the objectName.

Modified: 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/DefaultNamingStrategy.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/DefaultNamingStrategy.java?rev=742901&r1=742900&r2=742901&view=diff
==============================================================================
--- 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/DefaultNamingStrategy.java
 (original)
+++ 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/DefaultNamingStrategy.java
 Tue Feb 10 09:15:17 2009
@@ -68,7 +68,7 @@
                                     "Name=AdminCommandsService");
     }
     
-
+ 
     private String sanitize(String in) {
         String result = null;
         if (in != null) {

Modified: 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/InstallationService.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/InstallationService.java?rev=742901&r1=742900&r2=742901&view=diff
==============================================================================
--- 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/InstallationService.java
 (original)
+++ 
servicemix/smx4/nmr/trunk/jbi/management/src/main/java/org/apache/servicemix/jbi/management/InstallationService.java
 Tue Feb 10 09:15:17 2009
@@ -78,7 +78,8 @@
                     if (!installers.containsKey(componentName)) {
                         ComponentInstaller installer = doInstallArchive(desc, 
jarfile);
                         if (installer != null) {
-                            result = installer.getObjectName();
+                               result = 
getNamingStrategy().createCustomComponentMBeanName("LifeCycle", componentName);
+                            installer.setObjectName(result);
                             installers.put(componentName, installer);
                         }
                     } else {
@@ -124,7 +125,7 @@
             if (installer != null) {
                 try {
                     // create an MBean for the installer
-                    ObjectName objectName = 
getNamingStrategy().createCustomComponentMBeanName("Installer", aComponentName);
+                    ObjectName objectName = 
getNamingStrategy().createCustomComponentMBeanName("LifeCycle", aComponentName);
                     installer.setObjectName(objectName);
                     getManagementAgent().register(installer, objectName);
                 } catch (Exception e) {