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

[adc]

adc         2003/12/14 09:21:01

  Modified:    modules/core/src/java/org/apache/geronimo/security
                        SecurityService.java
  Log:
  Moved to OpenEJB Nova
  
  Revision  Changes    Path
  1.2       +1 -27     
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SecurityService.java      18 Nov 2003 05:17:17 -0000      1.1
  +++ SecurityService.java      14 Dec 2003 17:21:01 -0000      1.2
  @@ -60,7 +60,6 @@
   import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
   import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
   import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
   import org.apache.geronimo.core.service.AbstractManagedComponent;
   import org.apache.geronimo.security.util.ConfigurationUtil;
   import org.apache.commons.logging.Log;
  @@ -78,7 +77,6 @@
   import javax.management.MBeanServerNotification;
   import javax.management.InstanceNotFoundException;
   import java.util.Set;
  -import java.util.Hashtable;
   import java.security.AccessController;
   
   
  @@ -92,9 +90,6 @@
   
       private static final ObjectName DEFAULT_NAME = 
JMXUtil.getObjectName("geronimo.security:type=SecurityService");
       private GeronimoMBeanContext context;
  -    private static Hashtable services = new Hashtable();
  -    private static long lastIdUsed = 0;
  -    private static long myId = 0;
   
       private final Log log = LogFactory.getLog(SecurityService.class);
   
  @@ -116,9 +111,6 @@
       public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
           GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
           mbeanInfo.setTargetClass(SecurityService.class.getName());
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ServiceId",
  -                true, false,
  -                "Id of this security service"));
           return mbeanInfo;
       }
   
  @@ -132,15 +124,9 @@
        */
       public void postRegister(Boolean aBoolean) {
           super.postRegister(aBoolean);
  -
  -        synchronized (services) {
  -            myId = ++lastIdUsed;
  -            services.put(new Long(myId), this);
  -        }
       }
   
       public void preDeregister() throws Exception {
  -        services.remove(new Long(myId));
       }
   
       public void postDeregister() {
  @@ -162,8 +148,6 @@
               ConfigurationUtil.registerPolicyContextHandler(new 
PolicyContextHandlerContainerSubject(), true);
               ConfigurationUtil.registerPolicyContextHandler(new 
PolicyContextHandlerSOAPMessage(), true);
               ConfigurationUtil.registerPolicyContextHandler(new 
PolicyContextHandlerHttpServletRequest(), true);
  -            ConfigurationUtil.registerPolicyContextHandler(new 
PolicyContextHandlerEnterpriseBean(), true);
  -            ConfigurationUtil.registerPolicyContextHandler(new 
PolicyContextHandlerEJBArguments(), true);
           } catch (PolicyContextException pce) {
               log.error("Exception in doStart()", pce);
   
  @@ -183,16 +167,6 @@
       }
   
       public void doFail() {
  -    }
  -
  -    /**
  -     *
  -     * @return
  -     * @throws GeronimoSecurityException
  -     * @jmx:managed-operation
  -     */
  -    public String getServiceId() throws GeronimoSecurityException {
  -        return new Long(myId).toString();
       }
   
       /**