geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/remoting/jmx RemoteLoginTest.java
Date Sat, 22 May 2004 15:25:35 GMT
adc         2004/05/22 08:25:35

  Modified:    modules/security/src/java/org/apache/geronimo/security/jaas
                        LoginService.java LoginServiceMBean.java
               modules/security/src/test/org/apache/geronimo/security
                        AbstractTest.java
               modules/security/src/test/org/apache/geronimo/security/jaas
                        ConfigurationEntryTest.java
               modules/security/src/test/org/apache/geronimo/security/remoting/jmx
                        RemoteLoginTest.java
  Log:
  Removed reliance on kernel
  
  Revision  Changes    Path
  1.5       +1 -12     incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/LoginService.java
  
  Index: LoginService.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/LoginService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LoginService.java	25 Feb 2004 09:58:09 -0000	1.4
  +++ LoginService.java	22 May 2004 15:25:35 -0000	1.5
  @@ -57,7 +57,6 @@
   import org.apache.geronimo.gbean.GOperationInfo;
   import org.apache.geronimo.gbean.GReferenceInfo;
   import org.apache.geronimo.gbean.WaitingException;
  -import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.security.ContextManager;
   import org.apache.geronimo.security.GeronimoSecurityException;
  @@ -91,7 +90,6 @@
       private Map loginCache = new Hashtable();
       private long reclaimPeriod;
   
  -    private Kernel kernel;
       private Collection realms = Collections.EMPTY_SET;
       private Collection loginModules = Collections.EMPTY_SET;
       private final static ClassLoader classLoader;
  @@ -126,14 +124,6 @@
           this.reclaimPeriod = reclaimPeriod;
       }
   
  -    public Kernel getKernel() {
  -        return kernel;
  -    }
  -
  -    public void setKernel(Kernel kernel) {
  -        this.kernel = kernel;
  -    }
  -
       public Collection getRealms() throws GeronimoSecurityException {
           return realms;
       }
  @@ -466,7 +456,6 @@
           infoFactory.addOperation(new GOperationInfo("abort", new String[]{LoginModuleId.class.getName()}));
           infoFactory.addOperation(new GOperationInfo("logout", new String[]{LoginModuleId.class.getName()}));
           infoFactory.addOperation(new GOperationInfo("retrieveSubject", new String[]{LoginModuleId.class.getName()}));
  -        infoFactory.addAttribute(new GAttributeInfo("Kernel", true));
           infoFactory.addAttribute(new GAttributeInfo("ReclaimPeriod", true));
           infoFactory.addAttribute(new GAttributeInfo("Algorithm", true));
           infoFactory.addAttribute(new GAttributeInfo("Password", true));
  
  
  
  1.4       +1 -5      incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/LoginServiceMBean.java
  
  Index: LoginServiceMBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jaas/LoginServiceMBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LoginServiceMBean.java	25 Feb 2004 09:58:09 -0000	1.3
  +++ LoginServiceMBean.java	22 May 2004 15:25:35 -0000	1.4
  @@ -33,10 +33,6 @@
    */
   public interface LoginServiceMBean {
   
  -    Kernel getKernel();
  -
  -    void setKernel(Kernel kernel);
  -
       Collection getRealms() throws GeronimoSecurityException;
   
       void setRealms(Collection realms);
  
  
  
  1.5       +1 -2      incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
  
  Index: AbstractTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractTest.java	10 Mar 2004 09:59:27 -0000	1.4
  +++ AbstractTest.java	22 May 2004 15:25:35 -0000	1.5
  @@ -58,7 +58,6 @@
           gbean = new GBeanMBean("org.apache.geronimo.security.jaas.LoginService");
           loginService = new ObjectName("geronimo.security:type=LoginService");
           gbean.setReferencePatterns("Realms", Collections.singleton(new ObjectName("geronimo.security:type=SecurityRealm,*")));
  -        gbean.setAttribute("Kernel", kernel);
           gbean.setAttribute("ReclaimPeriod", new Long(10 * 1000));  // todo check other
tests to see if ok
           gbean.setAttribute("Algorithm", "HmacSHA1");
           gbean.setAttribute("Password", "secret");
  
  
  
  1.3       +1 -2      incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
  
  Index: ConfigurationEntryTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfigurationEntryTest.java	25 Feb 2004 09:58:10 -0000	1.2
  +++ ConfigurationEntryTest.java	22 May 2004 15:25:35 -0000	1.3
  @@ -85,7 +85,6 @@
           gbean = new GBeanMBean("org.apache.geronimo.security.jaas.LoginService");
           loginService = new ObjectName("geronimo.security:type=LoginService");
           gbean.setReferencePatterns("Realms", Collections.singleton(new ObjectName("geronimo.security:type=SecurityRealm,*")));
  -        gbean.setAttribute("Kernel", kernel);
           gbean.setAttribute("ReclaimPeriod", new Long(100));
           gbean.setAttribute("Algorithm", "HmacSHA1");
           gbean.setAttribute("Password", "secret");
  
  
  
  1.6       +1 -2      incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
  
  Index: RemoteLoginTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RemoteLoginTest.java	25 Feb 2004 09:58:11 -0000	1.5
  +++ RemoteLoginTest.java	22 May 2004 15:25:35 -0000	1.6
  @@ -90,7 +90,6 @@
           loginService = new ObjectName("geronimo.security:type=LoginService");
           gbean.setReferencePatterns("Realms", Collections.singleton(new ObjectName("geronimo.security:type=SecurityRealm,*")));
           gbean.setAttribute("ReclaimPeriod", new Long(100));
  -        gbean.setAttribute("Kernel", kernel);
           gbean.setAttribute("Algorithm", "HmacSHA1");
           gbean.setAttribute("Password", "secret");
           kernel.loadGBean(loginService, gbean);
  
  
  

Mime
View raw message