You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2013/08/05 16:57:13 UTC

svn commit: r1510519 - in /karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr: ScrServiceMBean.java internal/ScrServiceMBeanImpl.java

Author: iocanel
Date: Mon Aug  5 14:57:13 2013
New Revision: 1510519

URL: http://svn.apache.org/r1510519
Log:
[KARAF-2431] Depracate mispelled deactivate method in ScrServiceMBean. Add method with fixed deactivate name in ScrServiceMBean.

Modified:
    karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/ScrServiceMBean.java
    karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/internal/ScrServiceMBeanImpl.java

Modified: karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/ScrServiceMBean.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/ScrServiceMBean.java?rev=1510519&r1=1510518&r2=1510519&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/ScrServiceMBean.java (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/ScrServiceMBean.java Mon Aug  5 14:57:13 2013
@@ -62,5 +62,14 @@ public interface ScrServiceMBean {
      * @param componentName the components name
      * @throws Exception
      */
+    @Deprecated
     void deactiveateComponent(String componentName) throws Exception;
+
+    /**
+     * Disables a component that is not in an ACTIVE state.
+     *
+     * @param componentName the components name
+     * @throws Exception
+     */
+    void deactivateComponent(String componentName) throws Exception;
 }

Modified: karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/internal/ScrServiceMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/internal/ScrServiceMBeanImpl.java?rev=1510519&r1=1510518&r2=1510519&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/internal/ScrServiceMBeanImpl.java (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/scr/src/main/java/org/apache/karaf/management/mbeans/scr/internal/ScrServiceMBeanImpl.java Mon Aug  5 14:57:13 2013
@@ -172,6 +172,16 @@ public class ScrServiceMBeanImpl extends
      * @throws Exception
      */
     public void deactiveateComponent(String componentName) throws Exception {
+        deactivateComponent(componentName);
+    }
+
+    /*
+     * @see org.apache.karaf.management.mbeans.scr.ScrServiceMBean#deactiveateComponent(java.lang.String)
+     *
+     * @param componentName
+     * @throws Exception
+    */
+    public void deactivateComponent(String componentName) throws Exception {
         final Component component = findComponent(componentName);
         if (component != null)
             component.disable();