continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r415390 - in /maven/continuum/trunk/continuum-webapp: ./ src/main/java/org/apache/maven/continuum/web/action/ src/main/java/org/apache/maven/continuum/web/rememberme/ src/main/resources/
Date Mon, 19 Jun 2006 19:24:22 GMT
Author: evenisse
Date: Mon Jun 19 12:24:21 2006
New Revision: 415390

URL: http://svn.apache.org/viewvc?rev=415390&view=rev
Log:
Remove osuser and rememberme because they won't be used

Removed:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/rememberme/DefaultRememberMeServices.java
Modified:
    maven/continuum/trunk/continuum-webapp/pom.xml
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-request.xml

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/pom.xml?rev=415390&r1=415389&r2=415390&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Mon Jun 19 12:24:21 2006
@@ -41,15 +41,6 @@
       <version>1.0-alpha-2-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-security-osuser</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-remember-me</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java?rev=415390&r1=415389&r2=415390&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
Mon Jun 19 12:24:21 2006
@@ -16,10 +16,6 @@
  * limitations under the License.
  */
 
-import org.codehaus.plexus.rememberme.RememberMeServices;
-import org.codehaus.plexus.security.Authentication;
-import org.codehaus.plexus.security.Authenticator;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,10 +31,6 @@
 public class LoginAction
     extends ActionSupport
 {
-    private Authenticator authenticator;
-
-    private RememberMeServices rememberMeServices;
-
     private String username = "";
 
     private String password = "";
@@ -51,43 +43,7 @@
     public String execute()
         throws Exception
     {
-        try
-        {
-            Map params = new HashMap();
-
-            params.put( "username", username );
-
-            params.put( "password", password );
-
-            params.put( "request", ServletActionContext.getRequest() );
-
-            Authentication auth = authenticator.authenticate( params );
-
-            if ( rememberMe )
-            {
-                rememberMeServices.loginSuccess( ServletActionContext.getRequest(), ServletActionContext.getResponse(),
-                                                 auth );
-            }
-
-            HttpSession session = ServletActionContext.getRequest().getSession( true );
-
-            session.setAttribute( "authentication", auth );
-
-            return SUCCESS;
-        }
-        catch ( Exception e )
-        {
-            addActionError( "Login failed. " + e.getMessage() );
-
-            e.printStackTrace();
-
-            if ( rememberMe )
-            {
-                rememberMeServices.loginFail( ServletActionContext.getRequest(), ServletActionContext.getResponse()
);
-            }
-
-            return INPUT;
-        }
+        return INPUT;
     }
 
     /**

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-request.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-request.xml?rev=415390&r1=415389&r2=415390&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-request.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-request.xml Mon Jun 19
12:24:21 2006
@@ -27,15 +27,6 @@
       <role>com.opensymphony.xwork.Action</role>
       <role-hint>loginAction</role-hint>
       <implementation>org.apache.maven.continuum.web.action.LoginAction</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.rememberme.RememberMeServices</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.security.Authenticator</role>
-          <role-hint>osuser</role-hint>
-        </requirement>
-      </requirements>
     </component>
     <component>
       <role>com.opensymphony.xwork.Action</role>



Mime
View raw message