Author: indika
Date: Tue Oct 28 03:09:23 2008
New Revision: 708502

URL: http://svn.apache.org/viewvc?rev=708502&view=rev
Log:
add mbean registration for secret manager
remove test scope from common lang

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
    synapse/trunk/java/pom.xml

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java?rev=708502&r1=708501&r2=708502&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdmin.java
 Tue Oct 28 03:09:23 2008
@@ -27,9 +27,14 @@
 
 public class SecretManagerAdmin implements SecretManagerAdminMbean {
 
+    private SecretManager secretManager;
+
+    public SecretManagerAdmin(SecretManager secretManager) {
+        this.secretManager = secretManager;
+    }
+
     public void init(String identityStorePass, String identityKeyPass, String 
trustStorePass) {
 
-        SecretManager secretManager = SecretManager.getInstance();
         secretManager.init(identityStorePass, identityKeyPass, trustStorePass);
     }
 }

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java?rev=708502&r1=708501&r2=708502&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/secret/SecretManager.java
 Tue Oct 28 03:09:23 2008
@@ -196,7 +196,7 @@
                 handleException("Error creating a instance from class : " + 
provider);
             }
         }
-//        registerMBean();
+        registerMBean();
         initialized = true;
     }
 
@@ -230,8 +230,8 @@
         throw new SynapseException(msg);
     }
 
-    private static void registerMBean() {
+    private void registerMBean() {
         MBeanRegistrar mBeanRegistrar = MBeanRegistrar.getInstance();
-        mBeanRegistrar.registerMBean(new SecretManagerAdmin(), 
"SecurityAdminServices", "SecretManagerAdmin");
+        mBeanRegistrar.registerMBean(new SecretManagerAdmin(this), 
"SecurityAdminServices", "SecretManagerAdmin");
     }
 }

Modified: synapse/trunk/java/pom.xml
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=708502&r1=708501&r2=708502&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Tue Oct 28 03:09:23 2008
@@ -1055,7 +1055,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <version>${commons-lang.version}</version>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>


Reply via email to