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/06 04:03:27 UTC
svn commit: r440567 - in
/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ConfigurationAction.java
webapp/configuration.jsp
Author: carlos
Date: Tue Sep 5 19:03:27 2006
New Revision: 440567
URL: http://svn.apache.org/viewvc?view=rev&rev=440567
Log:
Remove configuration of guest user through continuum interface, must be done through maven-user
Modified:
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configuration.jsp
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=440567&r1=440566&r2=440567
==============================================================================
--- 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 Tue Sep 5 19:03:27 2006
@@ -17,12 +17,10 @@
*/
import java.io.File;
-import java.util.Collections;
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;
@@ -47,8 +45,6 @@
*/
private ContinuumStore store;
- private boolean guestAccountEnabled;
-
private String username;
private String password;
@@ -75,8 +71,6 @@
{
ConfigurationService configuration = getContinuum().getConfiguration();
- guestAccountEnabled = configuration.isGuestAccountEnabled();
-
workingDirectory = configuration.getWorkingDirectory().getAbsolutePath();
buildOutputDirectory = configuration.getBuildOutputDirectory().getAbsolutePath();
@@ -107,21 +101,6 @@
ConfigurationService configuration = getContinuum().getConfiguration();
- if ( guestAccountEnabled )
- {
- configuration.setGuestAccountEnabled( guestAccountEnabled );
- }
- else
- {
- configuration.setGuestAccountEnabled( false );
-
- UserGroup guestGroup = store.getUserGroup( ContinuumSecurity.GUEST_GROUP_NAME );
-
- guestGroup.setPermissions( Collections.EMPTY_LIST );
-
- store.updateUserGroup( guestGroup );
- }
-
configuration.setWorkingDirectory( new File( workingDirectory ) );
configuration.setWorkingDirectory( new File( workingDirectory ) );
@@ -153,16 +132,6 @@
throws Exception
{
return INPUT;
- }
-
- public boolean isGuestAccountEnabled()
- {
- return guestAccountEnabled;
- }
-
- public void setGuestAccountEnabled( boolean guestAccountEnabled )
- {
- this.guestAccountEnabled = guestAccountEnabled;
}
public String getUsername()
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configuration.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configuration.jsp?view=diff&rev=440567&r1=440566&r2=440567
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configuration.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configuration.jsp Tue Sep 5 19:03:27 2006
@@ -11,16 +11,6 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('configuration.guest.label')}">
- <ww:param name="after">
- <ww:text name="configuration.guest.value">
- <ww:param>
- <ww:if test="guestAccountEnabled"><ww:text name="enabled"/></ww:if>
- <ww:else><ww:text name="disabled"/></ww:else>
- </ww:param>
- </ww:text>
- </ww:param>
- </c1:data>
<c1:data label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"/>
<c1:data label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"/>
<c1:data label="%{getText('configuration.baseUrl.label')}" name="baseUrl"/>