You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/09/30 16:58:01 UTC
svn commit: r580733 - in /geronimo/sandbox/gshell/trunk/gshell-remote: gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/auth/ gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/handler/ gshell-remote-...

Author: jdillon
Date: Sun Sep 30 07:58:00 2007
New Revision: 580733

URL: http://svn.apache.org/viewvc?rev=580733&view=rev
Log:
Wee bit more tidy

Modified:
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/auth/ClientPrincipal.java
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/handler/ClientSessionContext.java
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.java

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/auth/ClientPrincipal.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/auth/ClientPrincipal.java?rev=580733&r1=580732&r2=580733&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/auth/ClientPrincipal.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/auth/ClientPrincipal.java Sun Sep 30 07:58:00 2007
@@ -32,7 +32,7 @@
         return name;
     }
 
-    public Object getIdentity() {
+    public Object getIdentityToken() {
         return identity;
     }
 

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/handler/ClientSessionContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/handler/ClientSessionContext.java?rev=580733&r1=580732&r2=580733&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/handler/ClientSessionContext.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-client/src/main/java/org/apache/geronimo/gshell/remote/client/handler/ClientSessionContext.java Sun Sep 30 07:58:00 2007
@@ -23,6 +23,7 @@
 
 import javax.security.auth.Subject;
 
+import org.apache.geronimo.gshell.remote.client.auth.ClientPrincipal;
 import org.apache.geronimo.gshell.whisper.session.SessionAttributeBinder;
 
 /**
@@ -39,4 +40,16 @@
 
     /** The subject which the remote client has been authenticated as. */
     public Subject subject;
+
+    public ClientPrincipal getClientPrincipal() {
+        return subject.getPrincipals(ClientPrincipal.class).iterator().next();
+    }
+
+    public Object getIdentityToken() {
+        return getClientPrincipal().getIdentityToken();
+    }
+
+    public String getUsername() {
+        return getClientPrincipal().getName();
+    }
 }

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.java?rev=580733&r1=580732&r2=580733&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-server/src/main/java/org/apache/geronimo/gshell/remote/server/handler/ServerSessionContext.java Sun Sep 30 07:58:00 2007
@@ -44,6 +44,10 @@
 
     public Identity identity;
 
+    public Object getIdentityToken() {
+        return identity.getToken();
+    }
+
     public Subject getSubject() {
         return identity.getSubject();
     }