svn commit: r708777 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security: mbean/SecretManagerAdmin.java mbean/SecretManagerAdminMBean.java secret/SecretManager.java

[indika]

Author: indika
Date: Tue Oct 28 22:04:30 2008
New Revision: 708777

URL: http://svn.apache.org/viewvc?rev=708777&view=rev
Log:
Correct SecretManagerAdminMbean to SecretManagerAdminMBean

Added:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdminMBean.java
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

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=708777&r1=708776&r2=708777&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 22:04:30 2008
@@ -25,7 +25,7 @@
  *
  */
 
-public class SecretManagerAdmin implements SecretManagerAdminMbean {
+public class SecretManagerAdmin implements SecretManagerAdminMBean {
 
     private SecretManager secretManager;
 
@@ -34,7 +34,7 @@
     }
 
     /**
-     * @see SecretManagerAdminMbean
+     * @see SecretManagerAdminMBean
      */
     public void init(String identityStorePass, String identityKeyPass, String 
trustStorePass) {
 

Added: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdminMBean.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdminMBean.java?rev=708777&view=auto
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdminMBean.java
 (added)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/security/mbean/SecretManagerAdminMBean.java
 Tue Oct 28 22:04:30 2008
@@ -0,0 +1,35 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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.synapse.security.mbean;
+
+/**
+ * Admin service for managing SecretManager
+ */
+
+public interface SecretManagerAdminMBean {
+
+    /**
+     * Initialize the SecretManager
+     *
+     * @param identityStorePass Identity keyStore password
+     * @param identityKeyPass   Private key Password
+     * @param trustStorePass    TrustStore password
+     */
+    public void init(String identityStorePass, String identityKeyPass, String 
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=708777&r1=708776&r2=708777&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 22:04:30 2008
@@ -25,7 +25,7 @@
 
     private static Log log = LogFactory.getLog(SecretManager.class);
 
-    private static SecretManager ourInstance = new SecretManager();
+    private final static SecretManager SECRET_MANAGER= new SecretManager();
 
     /* Default configuration file path for secret manager*/
     private final static String DEFAULT_CONF_LOCATION = 
"secret-manager.properties";
@@ -45,10 +45,11 @@
     private boolean initialized = false;
 
     public static SecretManager getInstance() {
-        return ourInstance;
+        return SECRET_MANAGER;
     }
 
     private SecretManager() {
+        registerMBean();
     }
 
     /**
@@ -196,7 +197,7 @@
                 handleException("Error creating a instance from class : " + 
provider);
             }
         }
-        registerMBean();
+        
         initialized = true;
     }