You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2006/09/27 07:51:53 UTC
svn commit: r450328 - in
/maven/continuum/branches/rbac-integration/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ webapp/
Author: jmcconnell
Date: Tue Sep 26 22:51:52 2006
New Revision: 450328
URL: http://svn.apache.org/viewvc?view=rev&rev=450328
Log:
remove the user creation hack from teh configuration screen and action
Removed:
maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/login.jsp
maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/user.jsp
maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/userGroup.jsp
maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/userGroups.jsp
maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/users.jsp
Modified:
maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configurationEdit.jsp
Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?view=diff&rev=450328&r1=450327&r2=450328
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java (original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java Tue Sep 26 22:51:52 2006
@@ -16,18 +16,16 @@
* limitations under the License.
*/
-import java.io.File;
-import java.util.Collections;
-
+import com.opensymphony.xwork.Preparable;
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.model.system.UserGroup;
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;
+import java.io.File;
+import java.util.Collections;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -49,16 +47,6 @@
private boolean guestAccountEnabled;
- private String username;
-
- private String password;
-
- private String passwordTwo;
-
- private String fullName;
-
- private String email;
-
private String workingDirectory;
private String buildOutputDirectory;
@@ -93,17 +81,6 @@
public String execute()
throws ConfigurationStoringException, ContinuumStoreException
{
- //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();
@@ -163,56 +140,6 @@
public void setGuestAccountEnabled( boolean guestAccountEnabled )
{
this.guestAccountEnabled = guestAccountEnabled;
- }
-
- 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()
Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configurationEdit.jsp?view=diff&rev=450328&r1=450327&r2=450328
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configurationEdit.jsp (original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/configurationEdit.jsp Tue Sep 26 22:51:52 2006
@@ -12,16 +12,6 @@
<ww:form action="configuration.action" method="post">
<div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
- <ww:textfield label="Username" name="username"/>
- <ww:textfield label="Full Name" name="fullName"/>
- <ww:textfield label="Email" name="email"/>
- <ww:password label="Password" name="password"/>
- <ww:password label="Password(again)" name="passwordTwo"/>
- </table>
- </div>
-
- <div class="axial">
<table>
<tbody>