From continuum-commits-return-1719-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Mon Jun 19 19:24:47 2006 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 28523 invoked from network); 19 Jun 2006 19:24:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jun 2006 19:24:46 -0000 Received: (qmail 32515 invoked by uid 500); 19 Jun 2006 19:24:45 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 32488 invoked by uid 500); 19 Jun 2006 19:24:45 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 32465 invoked by uid 99); 19 Jun 2006 19:24:44 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2006 12:24:44 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2006 12:24:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7FF8F1A983A; Mon, 19 Jun 2006 12:24:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060619192423.7FF8F1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ 1.0-alpha-2-SNAPSHOT - org.codehaus.plexus - plexus-security-osuser - - - org.codehaus.plexus - plexus-remember-me - 1.0-alpha-1-SNAPSHOT - - javax.servlet servlet-api 2.4 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 @@ com.opensymphony.xwork.Action loginAction org.apache.maven.continuum.web.action.LoginAction - - - org.codehaus.plexus.rememberme.RememberMeServices - - - org.codehaus.plexus.security.Authenticator - osuser - - com.opensymphony.xwork.Action