svn commit: r580193 - /geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java

[db...@apache.org]

Author: dblevins
Date: Thu Sep 27 18:50:24 2007
New Revision: 580193

URL: http://svn.apache.org/viewvc?rev=580193&view=rev
Log:
Updated the SecurityService implementation for the revised SecurityService
It's now method compatible with 3.0-beta-1 as well as trunk which has two extra methods

Modified:
    geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java

Modified: geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java?rev=580193&r1=580192&r2=580193&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoSecurityService.java Thu Sep 27 18:50:24 2007
@@ -55,10 +55,10 @@
         return ContextManager.getSubjectId(subject);
     }
 
-//    public void logout(Object securityIdentity) {
-//        Subject subject = ContextManager.getRegisteredSubject((SubjectId) securityIdentity);
-//        ContextManager.unregisterSubject(subject);
-//    }
+    public void logout(Object securityIdentity) {
+        Subject subject = ContextManager.getRegisteredSubject((SubjectId) securityIdentity);
+        ContextManager.unregisterSubject(subject);
+    }
 
     public void associate(Object securityIdentity) throws LoginException {
         if (securityIdentity == null) {
@@ -72,9 +72,10 @@
         ContextManager.setCallers(subject, subject);
     }
 
-    public void unassociate(Object securityIdentity) {
+    public Object disassociate() {
         // this is only called before the thread is put back in the pool so it should be ok
         ContextManager.popCallers(null);
+        return null;
     }
 
     public boolean isCallerAuthorized(Method method, InterfaceType typee) {