svn commit: r742935 - in /servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src: main/java/org/apache/servicemix/jbi/framework/ test/java/org/apache/servicemix/jbi/installation/

[ulhasbhole]

Author: ulhasbhole
Date: Tue Feb 10 10:54:58 2009
New Revision: 742935

URL: http://svn.apache.org/viewvc?rev=742935&view=rev
Log:
[SM-1791] org.apache.servicemix.jbi.framework.InstallerMBeanImpl is missing 
bootstrap.init() call on uninstall phase which is required as per JBI specs.

Modified:
    
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java
    
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java
    
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java

Modified: 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java?rev=742935&r1=742934&r2=742935&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java
 Tue Feb 10 10:54:58 2009
@@ -165,9 +165,9 @@
             result = activateComponent();
             ComponentMBeanImpl lcc = 
container.getComponent(context.getComponentName());
             lcc.persistRunningState();
-            context.setInstall(false);
         } finally {
             cleanUpBootstrap();
+            context.setInstall(false);
         }
         return result;
     }
@@ -240,10 +240,13 @@
         String componentName = context.getComponentName();
         try {
             container.deactivateComponent(componentName);
+            //keep tck happy.
+            bootstrap.init(this.context);
+            bootstrap.getExtensionMBeanName();
             bootstrap.onUninstall();
-            context.setInstall(true);
         } finally {
             cleanUpBootstrap();
+            context.setInstall(true);
             
             // If it was found by a destroyable classloader destroy it
             // XXX Should we be holding the classloader as a member as always 
destroying it?

Modified: 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java?rev=742935&r1=742934&r2=742935&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java
 Tue Feb 10 10:54:58 2009
@@ -268,6 +268,10 @@
 
         // Configure mocks
         reset();
+        bootstrap.init(null);
+        bootstrapMock.setMatcher(MockControl.ALWAYS_MATCHER);
+        bootstrap.getExtensionMBeanName();
+        bootstrapMock.setReturnValue(null);
         bootstrap.onUninstall();
         bootstrap.cleanUp();
         lifecycle.stop();

Modified: 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java?rev=742935&r1=742934&r2=742935&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java
 Tue Feb 10 10:54:58 2009
@@ -435,6 +435,10 @@
 
         // configure bootstrap
         bootstrapMock.reset();
+        bootstrap.init(null);
+        bootstrapMock.setMatcher(MockControl.ALWAYS_MATCHER);
+        bootstrap.getExtensionMBeanName();
+        bootstrapMock.setReturnValue(null);
         bootstrap.onUninstall();
         bootstrap.cleanUp();
         bootstrapMock.replay();