cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/security EJBModuleConfiguration.java SecurityRealm.java SecurityService.java WebModuleConfiguration.java

[djencks]

djencks     2003/12/28 12:13:06

  Modified:    modules/core/src/java/org/apache/geronimo/security
                        EJBModuleConfiguration.java SecurityRealm.java
                        SecurityService.java WebModuleConfiguration.java
  Log:
  Introduce some constants for strings
  
  Revision  Changes    Path
  1.4       +3 -1      
incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/EJBModuleConfiguration.java
  
  Index: EJBModuleConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/EJBModuleConfiguration.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EJBModuleConfiguration.java       28 Dec 2003 19:34:05 -0000      1.3
  +++ EJBModuleConfiguration.java       28 Dec 2003 20:13:06 -0000      1.4
  @@ -80,6 +80,8 @@
    */
   public class EJBModuleConfiguration extends AbstractModuleConfiguration {
   
  +    public static final String BASE_OBJECT_NAME = 
"geronimo.security:type=EJBModuleConfiguration";
  +
       public EJBModuleConfiguration(String contextId, EjbJar ejbJar) throws 
GeronimoSecurityException {
           super(contextId);
           configure(ejbJar);
  
  
  
  1.3       +3 -1      
incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/SecurityRealm.java
  
  Index: SecurityRealm.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/SecurityRealm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SecurityRealm.java        28 Dec 2003 19:34:05 -0000      1.2
  +++ SecurityRealm.java        28 Dec 2003 20:13:06 -0000      1.3
  @@ -68,6 +68,8 @@
    */
   public interface SecurityRealm {
   
  +    static final String 
BASE_OBJECT_NAME="geronimo.security:type=SecurityRealm";
  +
       public String getRealmName();
   
       public Set getGroupPrincipals() throws GeronimoSecurityException;
  
  
  
  1.4       +4 -4      
incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/SecurityService.java
  
  Index: SecurityService.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/SecurityService.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SecurityService.java      28 Dec 2003 19:34:05 -0000      1.3
  +++ SecurityService.java      28 Dec 2003 20:13:06 -0000      1.4
  @@ -110,9 +110,9 @@
                       new GeronimoParameterInfo("remove", Boolean.TYPE, "")},
                   GeronimoOperationInfo.ACTION_INFO,
                   "Get security configuration for web module identified by 
contextID"));
  -        mbeanInfo.addEndpoint(new GeronimoMBeanEndpoint("Realms", 
SecurityRealm.class, 
ObjectName.getInstance("geronimo.security:type=SecurityRealm,*")));
  -        mbeanInfo.addEndpoint(new 
GeronimoMBeanEndpoint("EJBModuleConfigurations", EJBModuleConfiguration.class, 
ObjectName.getInstance("geronimo.security:Type=EJBModuleConfiguration,*")));
  -        mbeanInfo.addEndpoint(new 
GeronimoMBeanEndpoint("WebModuleConfigurations", WebModuleConfiguration.class, 
ObjectName.getInstance("geronimo.security:Type=WebModuleConfiguration,*")));
  +        mbeanInfo.addEndpoint(new GeronimoMBeanEndpoint("Realms", 
SecurityRealm.class, ObjectName.getInstance(SecurityRealm.BASE_OBJECT_NAME + 
",*")));
  +        mbeanInfo.addEndpoint(new 
GeronimoMBeanEndpoint("EJBModuleConfigurations", EJBModuleConfiguration.class, 
ObjectName.getInstance(EJBModuleConfiguration.BASE_OBJECT_NAME + ",*")));
  +        mbeanInfo.addEndpoint(new 
GeronimoMBeanEndpoint("WebModuleConfigurations", WebModuleConfiguration.class, 
ObjectName.getInstance(WebModuleConfiguration.BASE_OBJECT_NAME + ",*")));
           return mbeanInfo;
       }
   
  
  
  
  1.4       +3 -1      
incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/WebModuleConfiguration.java
  
  Index: WebModuleConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/WebModuleConfiguration.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WebModuleConfiguration.java       28 Dec 2003 19:34:05 -0000      1.3
  +++ WebModuleConfiguration.java       28 Dec 2003 20:13:06 -0000      1.4
  @@ -89,6 +89,8 @@
    */
   public class WebModuleConfiguration extends AbstractModuleConfiguration {
   
  +    public static final String BASE_OBJECT_NAME = 
"geronimo.security:type=WebModuleConfiguration";
  +
       public WebModuleConfiguration(String contextId, WebApp webApp) throws 
GeronimoSecurityException {
           super(contextId);
           configure(webApp);