geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r591925 - /geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
Date Mon, 05 Nov 2007 09:11:10 GMT
Author: vamsic007
Date: Mon Nov  5 01:11:09 2007
New Revision: 591925

URL: http://svn.apache.org/viewvc?rev=591925&view=rev
Log:
Fix error from a previous merge.

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

Modified: geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java?rev=591925&r1=591924&r2=591925&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
Mon Nov  5 01:11:09 2007
@@ -38,9 +38,6 @@
 import org.apache.geronimo.security.SubjectId;
 
 /**
-<<<<<<< .working
- * @version $Rev$ $Date$
-=======
  * OpenejbRemoteLoginModule uses the openejb protocol to communicate with the server to be
used for ejbs and try to
  * login on that server. If login succeeds an identity token is added to the private credentials
of the Subject
  * that can be used on further calls to identify the client.  Note this should only be used
on secure networks or
@@ -51,7 +48,6 @@
  * or throw LoginException to indicate failure.
  *
  * @version $Rev$ $Date$
->>>>>>> .merge-right.r565912
  */
 public class OpenejbRemoteLoginModule implements LoginModule {
     private static final String SECURITY_REALM_KEY = "org.apache.geronimo.openejb.OpenejbRemoteLoginModule.RemoteSecurityRealm";



Mime
View raw message