geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r344265 - in /geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core: keystore/KeyStoreGBean.java security/PropertiesLoginModuleManager.java
Date Mon, 14 Nov 2005 23:41:56 GMT
Author: djencks
Date: Mon Nov 14 15:41:53 2005
New Revision: 344265

URL: http://svn.apache.org/viewcvs?rev=344265&view=rev
Log:
add type into gbean info references

Modified:
    geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
    geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java

Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java?rev=344265&r1=344264&r2=344265&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
(original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
Mon Nov 14 15:41:53 2005
@@ -66,6 +66,7 @@
 import org.apache.geronimo.util.jce.X509Principal;
 import org.apache.geronimo.util.jce.X509V1CertificateGenerator;
 import org.apache.geronimo.util.encoders.Base64;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 public class KeyStoreGBean implements GBeanLifecycle {
     public static final String KEY_STORE_OBJ_NAME = "geronimo.security:type=KeyStore";
@@ -94,7 +95,7 @@
     public void doStart() throws WaitingException, Exception {
 
         //Security.addProvider(new BouncyCastleProvider());
-        
+
         this.keystore = KeyStore.getInstance(keyStoreType);
 
         boolean keystoreExistsFlag = true;
@@ -128,43 +129,6 @@
     public void doFail() {
     }
 
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(KeyStoreGBean.class);
-
-        infoFactory.addAttribute("keyStoreType", String.class, true);
-        infoFactory.addAttribute("keyStoreProvider", String.class, true);
-        infoFactory.addAttribute("keyStoreLocation", String.class, true);
-        infoFactory.addAttribute("keyStorePassword", String.class, true);
-
-        infoFactory.addReference("serverInfo", ServerInfo.class);
-
-        infoFactory.addOperation("getKeyEntryInfo",
-                new Class[] { String.class });
-        infoFactory.addOperation("getKeyStoreSize");
-        infoFactory.addOperation("getKeyStoreEntries");
-        infoFactory.addOperation("getCertificateChain",
-                new Class[] { String.class });
-        infoFactory.addOperation("generateCSR", new Class[] { String.class });
-
-        infoFactory.addOperation("generateKeyPair", new Class[] { String.class,
-                String.class, Integer.class, String.class, Integer.class,
-                String.class, String.class, String.class, String.class,
-                String.class, String.class });
-
-        infoFactory.addOperation("importTrustedX509Certificate", new Class[] {
-                String.class, String.class });
-        infoFactory.addOperation("importPKCS7Certificate", new Class[] {
-                String.class, String.class });
-
-        GBEAN_INFO = infoFactory.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
     public void setKeyStoreType(String keyStoreType) {
         this.keyStoreType = keyStoreType;
     }
@@ -503,4 +467,43 @@
 
         saveKeyStore();
     }
+
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(KeyStoreGBean.class);
+
+        infoFactory.addAttribute("keyStoreType", String.class, true);
+        infoFactory.addAttribute("keyStoreProvider", String.class, true);
+        infoFactory.addAttribute("keyStoreLocation", String.class, true);
+        infoFactory.addAttribute("keyStorePassword", String.class, true);
+
+        infoFactory.addReference("serverInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+
+        infoFactory.addOperation("getKeyEntryInfo",
+                new Class[] { String.class });
+        infoFactory.addOperation("getKeyStoreSize");
+        infoFactory.addOperation("getKeyStoreEntries");
+        infoFactory.addOperation("getCertificateChain",
+                new Class[] { String.class });
+        infoFactory.addOperation("generateCSR", new Class[] { String.class });
+
+        infoFactory.addOperation("generateKeyPair", new Class[] { String.class,
+                String.class, Integer.class, String.class, Integer.class,
+                String.class, String.class, String.class, String.class,
+                String.class, String.class });
+
+        infoFactory.addOperation("importTrustedX509Certificate", new Class[] {
+                String.class, String.class });
+        infoFactory.addOperation("importPKCS7Certificate", new Class[] {
+                String.class, String.class });
+
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
 }

Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java?rev=344265&r1=344264&r2=344265&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
(original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
Mon Nov 14 15:41:53 2005
@@ -28,6 +28,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.jaas.LoginModuleGBean;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 public class PropertiesLoginModuleManager {
 
@@ -257,8 +258,8 @@
         infoFactory.addOperation("removeFromGroup", new Class[] { String.class,
                 String.class });
 
-        infoFactory.addReference("ServerInfo", ServerInfo.class);
-        infoFactory.addReference("LoginModule", LoginModuleGBean.class);
+        infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("LoginModule", LoginModuleGBean.class, NameFactory.LOGIN_MODULE);
 
         infoFactory
                 .setConstructor(new String[] { "ServerInfo", "LoginModule" });



Mime
View raw message