portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r279428 - in /portals/jetspeed-2/trunk/applications/security: project.xml src/java/org/apache/jetspeed/portlets/security/ChangePasswordPortlet.java
Date Wed, 07 Sep 2005 21:30:20 GMT
Author: ate
Date: Wed Sep  7 14:30:10 2005
New Revision: 279428

URL: http://svn.apache.org/viewcvs?rev=279428&view=rev
Log:
Cleanout of a workaround no longer needed since Pluto 1.0.1-rc2

Modified:
    portals/jetspeed-2/trunk/applications/security/project.xml
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/ChangePasswordPortlet.java

Modified: portals/jetspeed-2/trunk/applications/security/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/project.xml?rev=279428&r1=279427&r2=279428&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/security/project.xml Wed Sep  7 14:30:10 2005
@@ -246,10 +246,7 @@
 	      </properties>
 	    </dependency>
 		
-		<!-- needed for hack around PLUTO-83 bug in ChangePasswordPortlet
-	         TODO: should be removed again when rc2 is release -->
-	      
-	    <!-- Pluto Container -->
+	  <!-- Pluto Container needed to be able to compile against jetspeed-api provided extensions
of Pluto -->
 		<dependency>
 		  <id>pluto</id>
 		  <version>${pluto.version}</version>

Modified: portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/ChangePasswordPortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/ChangePasswordPortlet.java?rev=279428&r1=279427&r2=279428&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/ChangePasswordPortlet.java
(original)
+++ portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/ChangePasswordPortlet.java
Wed Sep  7 14:30:10 2005
@@ -30,7 +30,6 @@
 import org.apache.jetspeed.CommonPortletServices;
 import org.apache.jetspeed.PortalReservedParameters;
 import javax.security.auth.Subject;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.InvalidNewPasswordException;
@@ -39,9 +38,7 @@
 import org.apache.jetspeed.security.PasswordCredential;
 import org.apache.jetspeed.security.SecurityException;
 import org.apache.jetspeed.security.UserManager;
-import org.apache.pluto.core.impl.PortletRequestImpl;
-import org.apache.portals.
-bridges.common.GenericServletPortlet;
+import org.apache.portals.bridges.common.GenericServletPortlet;
 
 /**
  * This portlet allows a logged on user to change its password.
@@ -79,11 +76,7 @@
 
         if ( request.getUserPrincipal() != null )
         {
-            // TODO 2004-11-18: Hack around PLUTO-83 bug which fix should be availabe in
1.0.1-rc2 
-            //                  After the fix, the RequestContext should be retrieved from
the RenderRequest
-            //                  and the pluto depedency removed from this project project.xml
-            HttpServletRequest req = (HttpServletRequest)((PortletRequestImpl)request).getRequest();
-            RequestContext requestContext = (RequestContext)req.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+            RequestContext requestContext = (RequestContext)request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
             Integer passwordDaysValid = (Integer)requestContext.getAttribute(PasswordCredential.PASSWORD_CREDENTIAL_DAYS_VALID_REQUEST_ATTR_KEY);
             
             if ( passwordDaysValid != null )



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message