taylor 2004/09/01 14:20:56
Modified: portal/src/java/org/apache/jetspeed/engine/servlet
ServletRequestImpl.java
Log:
re-enabled login by correctly using the authenticated principal from the application
server
we are still putting in an anonymous guest into the RequestContext
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.26 +1 -22
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
Index: ServletRequestImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ServletRequestImpl.java 25 Aug 2004 02:10:07 -0000 1.25
+++ ServletRequestImpl.java 1 Sep 2004 21:20:56 -0000 1.26
@@ -16,7 +16,6 @@
package org.apache.jetspeed.engine.servlet;
import java.io.UnsupportedEncodingException;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -24,7 +23,6 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
import javax.portlet.PortletRequest;
@@ -209,25 +207,6 @@
}
}
return false;
- }
-
- public Principal getUserPrincipal()
- {
- JetspeedRequestContext context = (JetspeedRequestContext)
getAttribute("org.apache.jetspeed.request.RequestContext");
- if (context != null)
- {
- Set principals = context.getSubject().getPrincipals();
- if (principals != null)
- {
- Iterator it = principals.iterator();
- if (it.hasNext())
- {
- return (Principal) it.next();
- }
- }
- }
- return super.getUserPrincipal();
-
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
