You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/09/11 15:03:39 UTC
svn commit: r442208 -
/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
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()