Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 91568 invoked from network); 11 Sep 2006 13:04:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Sep 2006 13:04:01 -0000 Received: (qmail 18647 invoked by uid 500); 11 Sep 2006 13:04:01 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 18614 invoked by uid 500); 11 Sep 2006 13:04:00 -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 18603 invoked by uid 99); 11 Sep 2006 13:04:00 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Sep 2006 06:04:00 -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, 11 Sep 2006 06:04:00 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C805A1A981A; Mon, 11 Sep 2006 06:03:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r442208 - /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Date: Mon, 11 Sep 2006 13:03:39 -0000 To: continuum-commits@maven.apache.org From: carlos@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060911130339.C805A1A981A@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: carlos Date: Mon Sep 11 06:03:38 2006 New Revision: 442208 URL: http://svn.apache.org/viewvc?view=rev&rev=442208 Log: [CONTINUUM-853] Remove creation of admin user during configuration Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?view=diff&rev=442208&r1=442207&r2=442208 ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Mon Sep 11 06:03:38 2006 @@ -20,9 +20,6 @@ import org.apache.maven.continuum.configuration.ConfigurationService; import org.apache.maven.continuum.configuration.ConfigurationStoringException; -import org.apache.maven.continuum.model.system.ContinuumUser; -import org.apache.maven.continuum.security.ContinuumSecurity; -import org.apache.maven.continuum.store.ContinuumStore; import org.apache.maven.continuum.store.ContinuumStoreException; import com.opensymphony.xwork.Preparable; @@ -40,21 +37,6 @@ implements Preparable { - /** - * @plexus.requirement - */ - private ContinuumStore store; - - private String username; - - private String password; - - private String passwordTwo; - - private String fullName; - - private String email; - private String workingDirectory; private String buildOutputDirectory; @@ -89,16 +71,6 @@ { //todo switch this to validation - ContinuumUser adminUser = new ContinuumUser(); - - adminUser.setUsername( username ); - adminUser.setPassword( password ); - adminUser.setEmail( email ); - adminUser.setFullName( fullName ); - adminUser.setGroup( store.getUserGroup( ContinuumSecurity.ADMIN_GROUP_NAME ) ); - - store.addUser( adminUser ); - ConfigurationService configuration = getContinuum().getConfiguration(); configuration.setWorkingDirectory( new File( workingDirectory ) ); @@ -114,9 +86,6 @@ configuration.setCompanyName( companyName ); configuration.setInitialized( true ); - configuration.store(); - - configuration.setInitialized( true ); configuration.store(); return SUCCESS; @@ -132,56 +101,6 @@ throws Exception { return INPUT; - } - - public String getUsername() - { - return username; - } - - public void setUsername( String username ) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword( String password ) - { - this.password = password; - } - - public String getPasswordTwo() - { - return passwordTwo; - } - - public void setPasswordTwo( String passwordTwo ) - { - this.passwordTwo = passwordTwo; - } - - public String getFullName() - { - return fullName; - } - - public void setFullName( String fullName ) - { - this.fullName = fullName; - } - - public String getEmail() - { - return email; - } - - public void setEmail( String email ) - { - this.email = email; } public String getWorkingDirectory()