geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/transaction TransactionManagerProxy.java
Date Thu, 22 Jan 2004 07:29:56 GMT
djencks     2004/01/21 23:29:56

  Modified:    modules/core/src/java/org/apache/geronimo/security
                        AbstractModuleConfiguration.java
                        AbstractSecurityRealm.java
                        EJBModuleConfiguration.java SecurityService.java
                        WebModuleConfiguration.java
               modules/core/src/java/org/apache/geronimo/security/bridge
                        AbstractPrincipalMappingUserPasswordRealmBridge.java
                        AbstractRealmBridge.java
                        CallerIdentityUserPasswordRealmBridge.java
                        ConfiguredIdentityUserPasswordRealmBridge.java
                        PropertiesFilePrincipalMappingUserPasswordRealmBridge.java
               modules/core/src/java/org/apache/geronimo/security/providers
                        PropertiesFileSecurityRealm.java
                        SQLSecurityRealm.java
               modules/core/src/java/org/apache/geronimo/transaction
                        TransactionManagerProxy.java
  Log:
  remove geronimombean
  
  Revision  Changes    Path
  1.7       +3 -26     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractModuleConfiguration.java
  
  Index: AbstractModuleConfiguration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractModuleConfiguration.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractModuleConfiguration.java	22 Jan 2004 02:46:27 -0000	1.6
  +++ AbstractModuleConfiguration.java	22 Jan 2004 07:29:56 -0000	1.7
  @@ -57,6 +57,7 @@
   
   import java.util.Collection;
   import java.util.HashSet;
  +
   import javax.security.jacc.PolicyConfiguration;
   import javax.security.jacc.PolicyConfigurationFactory;
   import javax.security.jacc.PolicyContextException;
  @@ -67,23 +68,19 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GOperationInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   
   
   /**
    *
    * @version $Revision$ $Date$
    */
  -public abstract class AbstractModuleConfiguration implements ModuleConfiguration, GeronimoMBeanTarget,
GBean {
  +public abstract class AbstractModuleConfiguration implements ModuleConfiguration, GBean
{
   
       private static final GBeanInfo GBEAN_INFO;
   
       public static final String BASE_OBJECT_NAME = "geronimo.security:type=ModuleConfiguration";
   
       private String contextId;
  -    private GeronimoMBeanContext context;
       private PolicyConfigurationFactory factory;
       private PolicyConfiguration policyConfiguration;
       private boolean configured = false;
  @@ -120,19 +117,6 @@
   
       }
   
  -    public boolean canStart() {
  -        return true;
  -    }
  -
  -    public boolean canStop() {
  -        return true;
  -    }
  -
  -    public void setMBeanContext(GeronimoMBeanContext context) {
  -        this.context = context;
  -    }
  -
  -
       /**
        * This method returns this object's policy context identifier.
        * @return this module's policy context identifier.
  @@ -312,13 +296,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
  -        //don't set target class: do this in concrete subclasses.
  -        mbeanInfo.addOperationsDeclaredIn(ModuleConfiguration.class);
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.7       +2 -10     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractSecurityRealm.java
  
  Index: AbstractSecurityRealm.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/AbstractSecurityRealm.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractSecurityRealm.java	22 Jan 2004 02:46:27 -0000	1.6
  +++ AbstractSecurityRealm.java	22 Jan 2004 07:29:56 -0000	1.7
  @@ -71,7 +71,7 @@
    *
    * @version $Revision$ $Date$
    */
  -public abstract class AbstractSecurityRealm  implements SecurityRealm, GeronimoMBeanTarget,
GBean {
  +public abstract class AbstractSecurityRealm  implements SecurityRealm, GBean {
   
       private static final GBeanInfo GBEAN_INFO;
   
  @@ -102,15 +102,7 @@
       public void setGBeanContext(GBeanContext context) {
       }
   
  -    public boolean canStart() {
  -        return true;
  -    }
  -
       public void doStart() {
  -    }
  -
  -    public boolean canStop() {
  -        return true;
       }
   
       public void doStop() {
  
  
  
  1.9       +3 -9      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EJBModuleConfiguration.java	20 Jan 2004 01:36:59 -0000	1.8
  +++ EJBModuleConfiguration.java	22 Jan 2004 07:29:56 -0000	1.9
  @@ -69,12 +69,11 @@
   import org.apache.geronimo.deployment.model.geronimo.j2ee.RoleMappings;
   import org.apache.geronimo.deployment.model.geronimo.j2ee.Security;
   import org.apache.geronimo.deployment.model.j2ee.SecurityRole;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.security.util.ConfigurationUtil;
  +import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
  -import org.apache.geronimo.gbean.GAttributeInfo;
  +import org.apache.geronimo.security.util.ConfigurationUtil;
   
   
   /**
  @@ -169,9 +168,4 @@
           return GBEAN_INFO;
       }
   
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo mbeanInfo = AbstractModuleConfiguration.getGeronimoMBeanInfo();
  -        mbeanInfo.setTargetClass(EJBModuleConfiguration.class);
  -        return mbeanInfo;
  -    }
   }
  
  
  
  1.9       +5 -33     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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SecurityService.java	20 Jan 2004 01:36:59 -0000	1.8
  +++ SecurityService.java	22 Jan 2004 07:29:56 -0000	1.9
  @@ -60,24 +60,18 @@
   import java.util.Collections;
   import java.util.Iterator;
   
  -import javax.management.ObjectName;
   import javax.security.auth.login.Configuration;
   import javax.security.jacc.PolicyContextException;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanEndpoint;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
  -import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
  -import org.apache.geronimo.security.util.ConfigurationUtil;
  +import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.GOperationInfo;
  -import org.apache.geronimo.gbean.GAttributeInfo;
  -import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.GConstructorInfo;
  +import org.apache.geronimo.gbean.GEndpointInfo;
  +import org.apache.geronimo.gbean.GOperationInfo;
  +import org.apache.geronimo.security.util.ConfigurationUtil;
   
   
   /**
  @@ -232,28 +226,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
  -        mbeanInfo.setTargetClass(SecurityService.class.getName());
  -
  -        mbeanInfo.addOperationInfo(new GeronimoOperationInfo("getModuleConfiguration",
  -                new GeronimoParameterInfo[] {
  -                    new GeronimoParameterInfo("contextID", String.class, ""),
  -                    new GeronimoParameterInfo("remove", Boolean.TYPE, "")},
  -                GeronimoOperationInfo.ACTION_INFO,
  -                "Get security configuration for module identified by contextID"));
  -
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("PolicyConfigurationFactory",
  -                                                             true, true,
  -                                                             "The PolicyConfigurationFactory
to use",
  -                                                             (Object)"org.apache.geronimo.security.GeronimoPolicyConfigurationFactory"));
  -
  -        mbeanInfo.addEndpoint(new GeronimoMBeanEndpoint("Realms", SecurityRealm.class,
ObjectName.getInstance(SecurityRealm.BASE_OBJECT_NAME + ",*")));
  -        mbeanInfo.addEndpoint(new GeronimoMBeanEndpoint("ModuleConfigurations", ModuleConfiguration.class,
ObjectName.getInstance(AbstractModuleConfiguration.BASE_OBJECT_NAME + ",*")));
  -
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.9       +1 -7      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WebModuleConfiguration.java	20 Jan 2004 01:36:59 -0000	1.8
  +++ WebModuleConfiguration.java	22 Jan 2004 07:29:56 -0000	1.9
  @@ -72,7 +72,6 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.security.util.ConfigurationUtil;
   
   
  @@ -171,9 +170,4 @@
           return GBEAN_INFO;
       }
   
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo mbeanInfo = AbstractModuleConfiguration.getGeronimoMBeanInfo();
  -        mbeanInfo.setTargetClass(WebModuleConfiguration.class);
  -        return mbeanInfo;
  -    }
   }
  
  
  
  1.3       +4 -17     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/AbstractPrincipalMappingUserPasswordRealmBridge.java
  
  Index: AbstractPrincipalMappingUserPasswordRealmBridge.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/AbstractPrincipalMappingUserPasswordRealmBridge.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractPrincipalMappingUserPasswordRealmBridge.java	20 Jan 2004 06:12:45 -0000	1.2
  +++ AbstractPrincipalMappingUserPasswordRealmBridge.java	22 Jan 2004 07:29:56 -0000	1.3
  @@ -58,9 +58,9 @@
   
   import java.io.IOException;
   import java.security.Principal;
  +import java.util.HashMap;
   import java.util.Map;
   import java.util.Set;
  -import java.util.HashMap;
   
   import javax.security.auth.Subject;
   import javax.security.auth.callback.Callback;
  @@ -69,11 +69,9 @@
   import javax.security.auth.callback.PasswordCallback;
   import javax.security.auth.callback.UnsupportedCallbackException;
   
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GAttributeInfo;
  +import org.apache.geronimo.gbean.GBeanInfo;
  +import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
   
   /**
  @@ -216,17 +214,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() {
  -        GeronimoMBeanInfo mbeanInfo = AbstractRealmBridge.getGeronimoMBeanInfo();
  -        //set target class in concrete subclass
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("PrincipalSourceType", true,
true, "Class of principal to use as source for target principal map key"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("PrincipalTargetCallbackName",
true, true, "Pronpt of NameCallback used to query for target principal"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UserNameSourceType", true,
true, "Class of principal to use as source for target user name map key"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UserNameTargetCallbackName",
true, true, "Pronpt of NameCallback used to query for target user name"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("PasswordSourceType", true,
true, "Class of principal to use as source for target password map key"));
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.3       +3 -19     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/AbstractRealmBridge.java
  
  Index: AbstractRealmBridge.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/AbstractRealmBridge.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractRealmBridge.java	20 Jan 2004 06:12:45 -0000	1.2
  +++ AbstractRealmBridge.java	22 Jan 2004 07:29:56 -0000	1.3
  @@ -57,19 +57,14 @@
   package org.apache.geronimo.security.bridge;
   
   import javax.security.auth.Subject;
  +import javax.security.auth.callback.CallbackHandler;
   import javax.security.auth.login.LoginContext;
   import javax.security.auth.login.LoginException;
  -import javax.security.auth.callback.CallbackHandler;
   
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
  -import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
  +import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GConstructorInfo;
  -import org.apache.geronimo.security.providers.PropertiesFileSecurityRealm;
   
   /**
    *
  @@ -117,17 +112,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() {
  -        GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
  -        //set target class in concrete subclass
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("TargetRealm", true, true,
"Name of realm to log in to"));
  -        mbeanInfo.addOperationInfo(new GeronimoOperationInfo("getSubject",
  -                new GeronimoParameterInfo[]{new GeronimoParameterInfo("sourceSubject",
Subject.class, "Subject to be translated")},
  -                GeronimoOperationInfo.ACTION,
  -                "Log into the target realm using information gleaned from the supplied
Subject"));
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.3       +1 -8      incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordRealmBridge.java
  
  Index: CallerIdentityUserPasswordRealmBridge.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordRealmBridge.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CallerIdentityUserPasswordRealmBridge.java	20 Jan 2004 06:12:45 -0000	1.2
  +++ CallerIdentityUserPasswordRealmBridge.java	22 Jan 2004 07:29:56 -0000	1.3
  @@ -68,7 +68,6 @@
   
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.security.providers.GeronimoPasswordCredential;
   
   /**
  @@ -120,12 +119,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() {
  -        GeronimoMBeanInfo mbeanInfo = AbstractRealmBridge.getGeronimoMBeanInfo();
  -        mbeanInfo.setTargetClass(CallerIdentityUserPasswordRealmBridge.class);
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.3       +1 -11     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordRealmBridge.java
  
  Index: ConfiguredIdentityUserPasswordRealmBridge.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordRealmBridge.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfiguredIdentityUserPasswordRealmBridge.java	20 Jan 2004 06:12:45 -0000	1.2
  +++ ConfiguredIdentityUserPasswordRealmBridge.java	22 Jan 2004 07:29:56 -0000	1.3
  @@ -69,8 +69,6 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   
   /**
    * ConfiguredIdentityRealmBridge supplies a constant mapping between realms:
  @@ -142,14 +140,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() {
  -        GeronimoMBeanInfo mbeanInfo = AbstractRealmBridge.getGeronimoMBeanInfo();
  -        mbeanInfo.setTargetClass(ConfiguredIdentityUserPasswordRealmBridge.class);
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ConfiguredUser", true, true,
"Name of user to log in as"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ConfiguredPassword", true,
true, "Password of user to log in as"));
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.3       +5 -15     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/PropertiesFilePrincipalMappingUserPasswordRealmBridge.java
  
  Index: PropertiesFilePrincipalMappingUserPasswordRealmBridge.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/bridge/PropertiesFilePrincipalMappingUserPasswordRealmBridge.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropertiesFilePrincipalMappingUserPasswordRealmBridge.java	20 Jan 2004 06:12:45 -0000
1.2
  +++ PropertiesFilePrincipalMappingUserPasswordRealmBridge.java	22 Jan 2004 07:29:56 -0000
1.3
  @@ -56,19 +56,16 @@
   
   package org.apache.geronimo.security.bridge;
   
  +import java.io.IOException;
   import java.net.URL;
  -import java.util.Properties;
  -import java.util.Map;
   import java.util.Iterator;
  +import java.util.Map;
  +import java.util.Properties;
   import java.util.StringTokenizer;
  -import java.io.IOException;
   
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.security.bridge.AbstractPrincipalMappingUserPasswordRealmBridge;
  +import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GConstructorInfo;
   
   /**
  @@ -147,13 +144,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() {
  -        GeronimoMBeanInfo mbeanInfo = AbstractPrincipalMappingUserPasswordRealmBridge.getGeronimoMBeanInfo();
  -        mbeanInfo.setTargetClass(PropertiesFilePrincipalMappingUserPasswordRealmBridge.class);
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("PropertyFileURL", true, true,
"URL to read the mapping from in sourcePrincipal=targetPrincipal:targetUserName:targetPassword
format0"));
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.7       +4 -20     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/PropertiesFileSecurityRealm.java
  
  Index: PropertiesFileSecurityRealm.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/PropertiesFileSecurityRealm.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PropertiesFileSecurityRealm.java	20 Jan 2004 01:36:59 -0000	1.6
  +++ PropertiesFileSecurityRealm.java	22 Jan 2004 07:29:56 -0000	1.7
  @@ -55,8 +55,6 @@
    */
   package org.apache.geronimo.security.providers;
   
  -import java.io.File;
  -import java.io.FileInputStream;
   import java.io.IOException;
   import java.net.URI;
   import java.util.Collections;
  @@ -68,14 +66,12 @@
   
   import javax.security.auth.login.AppConfigurationEntry;
   
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.security.AbstractSecurityRealm;
  -import org.apache.geronimo.security.GeronimoSecurityException;
  +import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GConstructorInfo;
  +import org.apache.geronimo.security.AbstractSecurityRealm;
  +import org.apache.geronimo.security.GeronimoSecurityException;
   import org.apache.regexp.RE;
   
   
  @@ -225,18 +221,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
  -
  -        mbeanInfo.setTargetClass(PropertiesFileSecurityRealm.class.getName());
  -
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("RealmName", true, true, "The
name of this security realm"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UsersURI", true, true, "The
location of the users property file"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("GroupsURI", true, true, "The
location of the groups property file"));
  -
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.8       +1 -18     incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/SQLSecurityRealm.java
  
  Index: SQLSecurityRealm.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/security/providers/SQLSecurityRealm.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SQLSecurityRealm.java	20 Jan 2004 06:12:45 -0000	1.7
  +++ SQLSecurityRealm.java	22 Jan 2004 07:29:56 -0000	1.8
  @@ -73,8 +73,6 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.security.AbstractSecurityRealm;
   import org.apache.geronimo.security.GeronimoSecurityException;
   import org.apache.regexp.RE;
  @@ -328,21 +326,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
  -
  -        mbeanInfo.setTargetClass(PropertiesFileSecurityRealm.class.getName());
  -
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("RealmName", true, true, "The
name of this security realm"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ConnectionURL", true, true,
"The URL of the data source"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("User", true, true, "The user
name to use when logging in to the data source"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Password", true, true, "The
password to use when logging in to the data source"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UserSelect", true, true,
"The SQL statement to used to obtain the list of users"));
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("GroupSelect", true, true,
"The SQL statement to used to obtain the list of groups"));
  -
  -        return mbeanInfo;
       }
   
   }
  
  
  
  1.5       +1 -14     incubator-geronimo/modules/core/src/java/org/apache/geronimo/transaction/TransactionManagerProxy.java
  
  Index: TransactionManagerProxy.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/transaction/TransactionManagerProxy.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TransactionManagerProxy.java	19 Jan 2004 06:29:08 -0000	1.4
  +++ TransactionManagerProxy.java	22 Jan 2004 07:29:56 -0000	1.5
  @@ -71,7 +71,6 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GOperationInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
   
   /**
  @@ -222,18 +221,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    /**
  -     * Provides the GeronimoMBean description for this class
  -     * @return
  -     */
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo rc = new GeronimoMBeanInfo();
  -        rc.setTargetClass(TransactionManagerProxy.class);
  -        rc.addOperationsDeclaredIn(TransactionManager.class);
  -        rc.addOperationsDeclaredIn(XATerminator.class);
  -        return rc;
       }
   
   }
  
  
  

Mime
View raw message