continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1372260 [23/30] - in /continuum/trunk: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/ continuum-api/src/main/java/org/a...
Date Mon, 13 Aug 2012 04:29:28 GMT
Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java Mon Aug 13 04:29:09 2012
@@ -3,7 +3,7 @@ package org.apache.continuum.web.test;
 import org.apache.continuum.web.test.parent.AbstractUserRolesManagementTest;
 import org.testng.annotations.Test;
 
-@Test( groups = { "userroles" }, sequential = true )
+@Test( groups = {"userroles"}, sequential = true )
 public class UserRolesManagementTest
     extends AbstractUserRolesManagementTest
 {
@@ -16,13 +16,13 @@ public class UserRolesManagementTest
         deleteUser( username );
         clickLinkWithText( "Logout" );
     }
-    
+
     /*
      * GUEST USER ROLE
      * Guest Role could only view the About Page. Project Groups should not be shown when clicking
      * Show Project Group link.
     */
-    @Test( dependsOnMethods = { "testBasicAddDeleteUser" } )
+    @Test( dependsOnMethods = {"testBasicAddDeleteUser"} )
     public void testAddUserWithGuestRole()
     {
         username = getProperty( "GUEST_USERNAME" );
@@ -41,7 +41,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testAddUserWithGuestRole" } )
+    @Test( dependsOnMethods = {"testAddUserWithGuestRole"} )
     public void testGuestUserRoleFunction()
     {
         username = getProperty( "GUEST_USERNAME" );
@@ -60,7 +60,7 @@ public class UserRolesManagementTest
      * Registered User Role could only view the About Page. Project Groups should not be shown when clicking
      * Show Project Group link.
     */
-    @Test( dependsOnMethods = { "testBasicAddDeleteUser" , "testGuestUserRoleFunction" } )
+    @Test( dependsOnMethods = {"testBasicAddDeleteUser", "testGuestUserRoleFunction"} )
     public void testAddUserWithRegisteredUserRole()
     {
         username = getProperty( "REGISTERED_USERNAME" );
@@ -80,7 +80,7 @@ public class UserRolesManagementTest
         // assertTextPresent("You are already logged in.");
     }
 
-    @Test( dependsOnMethods = { "testAddUserWithRegisteredUserRole" } )
+    @Test( dependsOnMethods = {"testAddUserWithRegisteredUserRole"} )
     public void testRegisteredRoleFunction()
     {
         username = getProperty( "REGISTERED_USERNAME" );
@@ -101,7 +101,7 @@ public class UserRolesManagementTest
      * when system admin user is logged in since the user that is used 
      * to test the other functionalities is a system admin user.
      */
-    @Test( dependsOnMethods = { "testBasicAddDeleteUser" , "testRegisteredRoleFunction" } )
+    @Test( dependsOnMethods = {"testBasicAddDeleteUser", "testRegisteredRoleFunction"} )
     public void testAddUserWithSystemAdminRole()
     {
         username = getProperty( "SYSAD_USERNAME" );
@@ -121,17 +121,17 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testAddUserWithSystemAdminRole" } )
+    @Test( dependsOnMethods = {"testAddUserWithSystemAdminRole"} )
     public void testSystemAdminRoleFunction()
     {
-	    username = getProperty( "SYSAD_USERNAME" );
+        username = getProperty( "SYSAD_USERNAME" );
         fullname = getProperty( "SYSAD_FULLNAME" );
         login( username, getUserRoleNewPassword() );
         assertLeftNavMenuWithRole( fullname );
         clickLinkWithText( "Show Project Groups" );
         assertTextNotPresent( "Project Groups list is empty." );
         assertLinkPresent( "Default Project Group" );
-	
+
         clickLinkWithText( "Logout" );
     }
 
@@ -141,7 +141,7 @@ public class UserRolesManagementTest
      * but can assign a User to a project.
      *
      */
-    @Test( dependsOnMethods = { "testBasicAddDeleteUser" , "testSystemAdminRoleFunction" } )
+    @Test( dependsOnMethods = {"testBasicAddDeleteUser", "testSystemAdminRoleFunction"} )
     public void testAddUserWithUserAdminRole()
     {
         username = getProperty( "USERADMIN_USERNAME" );
@@ -150,7 +150,7 @@ public class UserRolesManagementTest
         createUser( username, fullname, getUserEmail(), getUserRolePassword() );
         assertCreatedUserInfo( username );
         checkUserRoleWithValue( fullname );
-		clickButtonWithValue( "Submit" );
+        clickButtonWithValue( "Submit" );
 
         clickLinkWithText( "Logout" );
 
@@ -160,8 +160,8 @@ public class UserRolesManagementTest
 
         clickLinkWithText( "Logout" );
     }
-    
-    @Test( dependsOnMethods = { "testAddUserWithUserAdminRole" } )
+
+    @Test( dependsOnMethods = {"testAddUserWithUserAdminRole"} )
     public void testUserAdminFunction()
     {
         username = getProperty( "USERADMIN_USERNAME" );
@@ -173,14 +173,14 @@ public class UserRolesManagementTest
         // add user
         clickLinkWithText( "Users" );
         clickButtonWithValue( "Create New User" );
-	    assertCreateUserPage();
-	    setFieldValue( "user.username", "guest0" );
+        assertCreateUserPage();
+        setFieldValue( "user.username", "guest0" );
         setFieldValue( "user.fullName", "guest0" );
         setFieldValue( "user.email", "guest0@guest0.com" );
         setFieldValue( "user.password", "pass" );
         setFieldValue( "user.confirmPassword", "pass" );
         submit();
-        assertUserRolesPage( );
+        assertUserRolesPage();
         clickButtonWithValue( "Submit" );
         selectValue( "name=ec_rd", "50" );
         waitPage();
@@ -198,7 +198,7 @@ public class UserRolesManagementTest
      *    projects, can build/release projects
      * - Cannot add users, --- --- ---
      */
-    @Test( dependsOnMethods = { "testBasicAddDeleteUser" , "testUserAdminFunction" } )
+    @Test( dependsOnMethods = {"testBasicAddDeleteUser", "testUserAdminFunction"} )
     public void testAddUserWithContinuumGroupProjectAdminRole()
     {
         username = getProperty( "GROUPPROJECTADMIN_USERNAME" );
@@ -220,7 +220,7 @@ public class UserRolesManagementTest
         changePassword( getUserRolePassword(), getUserRoleNewPassword() );
         assertTextPresent( "Password successfully changed" );
 
-	    assertProjectAdministratorAccess();
+        assertProjectAdministratorAccess();
 
         clickLinkWithText( "Logout" );
 
@@ -238,8 +238,9 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testAddUserWithContinuumGroupProjectAdminRole" } )
-    public void testContinuumGroupProjectAdmin_AddProjectGroup() throws Exception
+    @Test( dependsOnMethods = {"testAddUserWithContinuumGroupProjectAdminRole"} )
+    public void testContinuumGroupProjectAdmin_AddProjectGroup()
+        throws Exception
     {
         username = getProperty( "GROUPPROJECTADMIN_USERNAME" );
         fullname = getProperty( "GROUPPROJECTADMIN_FULLNAME" );
@@ -255,11 +256,12 @@ public class UserRolesManagementTest
         submit();
     }
 
-    @Test( dependsOnMethods = { "testContinuumGroupProjectAdmin_AddProjectGroup" } )
-    public void testContinuumGroupProjectAdmin_AddProjectToProjectGroup() throws Exception
+    @Test( dependsOnMethods = {"testContinuumGroupProjectAdmin_AddProjectGroup"} )
+    public void testContinuumGroupProjectAdmin_AddProjectToProjectGroup()
+        throws Exception
     {
         clickLinkWithText( "Test Group" );
-        clickButtonWithValue( "Add" );	
+        clickButtonWithValue( "Add" );
         assertAddMavenTwoProjectPage();
         setFieldValue( "m2PomUrl", getProperty( "M2_POM_URL" ) );
         clickButtonWithValue( "Add" );
@@ -267,14 +269,15 @@ public class UserRolesManagementTest
         assertTextPresent( "ContinuumBuildQueueTestData" );
         waitForProjectCheckout();
     }
-    
-    @Test( dependsOnMethods = { "testContinuumGroupProjectAdmin_AddProjectToProjectGroup" } )
-    public void testContinuumGroupProjectAdmin_BuildProject() throws Exception
+
+    @Test( dependsOnMethods = {"testContinuumGroupProjectAdmin_AddProjectToProjectGroup"} )
+    public void testContinuumGroupProjectAdmin_BuildProject()
+        throws Exception
     {
         buildProjectGroup( "Test Group", "Test Group", "testing project group", "ContinuumBuildQueueTestData", true );
     }
 
-    @Test( dependsOnMethods = { "testContinuumGroupProjectAdmin_BuildProject" } )
+    @Test( dependsOnMethods = {"testContinuumGroupProjectAdmin_BuildProject"} )
     public void testContinuumGroupProjectAdmin_AssignUserToAGroup()
     {
         clickLinkWithText( "Users" );
@@ -333,7 +336,7 @@ public class UserRolesManagementTest
     }
     */
 
-    @Test( dependsOnMethods = { "testContinuumGroupProjectAdmin_AssignUserToAGroup" } )
+    @Test( dependsOnMethods = {"testContinuumGroupProjectAdmin_AssignUserToAGroup"} )
     public void testUserWithContinuumGroupProjectDeveloperRole()
     {
         username = getProperty( "GROUPPROJECTDEVELOPER_USERNAME" );
@@ -355,7 +358,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumGroupProjectDeveloperRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumGroupProjectDeveloperRole"} )
     public void testUserWithContinuumGroupProjectUserRole()
     {
         username = getProperty( "GROUPPROJECTUSER_USERNAME" );
@@ -377,7 +380,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumGroupProjectUserRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumGroupProjectUserRole"} )
     public void testUserWithContinuumManageBuildEnvironmentRole()
     {
         username = getProperty( "MANAGEBUILDENVIRONMENT_USERNAME" );
@@ -391,7 +394,7 @@ public class UserRolesManagementTest
 
         login( username, getUserRolePassword() );
         changePassword( getUserRolePassword(), getUserRoleNewPassword() );
-        assertTextPresent( "Password successfully changed" );	
+        assertTextPresent( "Password successfully changed" );
         clickLinkWithText( "Logout" );
 
         login( username, getUserRoleNewPassword() );
@@ -399,7 +402,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumManageBuildEnvironmentRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumManageBuildEnvironmentRole"} )
     public void testUserWithContinuumManageBuildTemplatesRole()
     {
         username = getProperty( "MANAGEBUILDTEMPLATES_USERNAME" );
@@ -421,7 +424,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumManageBuildTemplatesRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumManageBuildTemplatesRole"} )
     public void testUserWithContinuumManageInstallationsRole()
     {
         username = getProperty( "MANAGEINSTALLATIONS_USERNAME" );
@@ -443,7 +446,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumManageInstallationsRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumManageInstallationsRole"} )
     public void testUserWithContinuumManageLocalRepoRole()
     {
         username = getProperty( "MANAGELOCALREPOS_USERNAME" );
@@ -465,7 +468,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumManageLocalRepoRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumManageLocalRepoRole"} )
     public void testUserWithContinuumManagePurgingRole()
     {
         username = getProperty( "MANAGEPURGING_USERNAME" );
@@ -487,7 +490,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumManagePurgingRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumManagePurgingRole"} )
     public void testUserWithContinuumManageQueuesRole()
     {
         username = getProperty( "MANAGEQUEUES_USERNAME" );
@@ -496,7 +499,7 @@ public class UserRolesManagementTest
         createUser( username, fullname, getUserEmail(), getUserRolePassword() );
         assertCreatedUserInfo( username );
         checkUserRoleWithValue( fullname );
-	    clickButtonWithValue( "Submit" );
+        clickButtonWithValue( "Submit" );
         clickLinkWithText( "Logout" );
 
         login( username, getUserRolePassword() );
@@ -509,7 +512,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumManageQueuesRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumManageQueuesRole"} )
     public void testUserWithContinuumManageSchedulingRole()
     {
         username = getProperty( "MANAGESCHEDULING_USERNAME" );
@@ -531,7 +534,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithContinuumManageSchedulingRole" } )
+    @Test( dependsOnMethods = {"testUserWithContinuumManageSchedulingRole"} )
     public void testUserWithProjectAdminDefaultProjectGroup()
     {
         username = getProperty( "PROJECTADMINISTRATOR_DEFAULTPROJECTGROUP_USERNAME" );
@@ -553,7 +556,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithProjectAdminDefaultProjectGroup" } )
+    @Test( dependsOnMethods = {"testUserWithProjectAdminDefaultProjectGroup"} )
     public void testUserWithProjectDevDefaultProjectGroup()
     {
         username = getProperty( "PROJECTDEVELOPER_DEFAULTPROJECTGROUP_USERNAME" );
@@ -575,7 +578,7 @@ public class UserRolesManagementTest
         clickLinkWithText( "Logout" );
     }
 
-    @Test( dependsOnMethods = { "testUserWithProjectDevDefaultProjectGroup" } )
+    @Test( dependsOnMethods = {"testUserWithProjectDevDefaultProjectGroup"} )
     public void testUserWithProjectUserDefaultProjectGroup()
     {
         username = getProperty( "PROJECTUSER_DEFAULTPROJECTGROUP_USERNAME" );

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java Mon Aug 13 04:29:09 2012
@@ -38,7 +38,7 @@ public abstract class AbstractBuildAgent
         if ( failIfMissing || isElementPresent( deleteButton ) )
         {
             clickLinkWithXPath( deleteButton );
-            assertPage("Continuum - Delete Build Agent");
+            assertPage( "Continuum - Delete Build Agent" );
             assertTextPresent( "Delete Build Agent" );
             assertTextPresent( "Are you sure you want to delete build agent " + agentName + " ?" );
             assertButtonWithValuePresent( "Delete" );
@@ -52,11 +52,11 @@ public abstract class AbstractBuildAgent
                                   boolean pingOk )
     {
         setFieldValue( "saveBuildAgent_buildAgent_url", agentURL );
-        setFieldValue("saveBuildAgent_buildAgent_description", description );
+        setFieldValue( "saveBuildAgent_buildAgent_description", description );
 
         if ( enabled )
         {
-            checkField("saveBuildAgent_buildAgent_enabled");
+            checkField( "saveBuildAgent_buildAgent_enabled" );
         }
 
         submit();
@@ -90,7 +90,7 @@ public abstract class AbstractBuildAgent
         assertAddEditBuildAgentPage( false );
         assertFieldValue( name, "saveBuildAgent_buildAgent_url" );
         assertFieldValue( description, "saveBuildAgent_buildAgent_description" );
-	}
+    }
 
     protected void addEditBuildAgent( String agentName, String newDesc )
     {
@@ -104,7 +104,7 @@ public abstract class AbstractBuildAgent
     protected void enableDisableBuildAgent( String agentName, boolean enable )
     {
         assertFieldValue( agentName, "saveBuildAgent_buildAgent_url" );
-        
+
         if ( enable )
         {
             checkField( "saveBuildAgent_buildAgent_enabled" );
@@ -121,9 +121,8 @@ public abstract class AbstractBuildAgent
     protected void goToAddBuildAgentGroup()
     {
         goToBuildAgentPage();
-        clickAndWait("editBuildAgentGroup_0"); //add button
-        String[] options =
-            new String[] { "--- Available Build Agents ---" };
+        clickAndWait( "editBuildAgentGroup_0" ); //add button
+        String[] options = new String[]{"--- Available Build Agents ---"};
         assertAddEditBuildAgentGroupPage( options, null );
     }
 
@@ -190,8 +189,9 @@ public abstract class AbstractBuildAgent
     protected void removeBuildAgentGroup( String name )
     {
         goToBuildAgentPage();
-        clickLinkWithXPath( "(//a[contains(@href,'deleteBuildAgentGroup.action') and contains(@href, '" + name + "')])//img" );
-        assertPage("Continuum - Delete Build Agent Group");
+        clickLinkWithXPath(
+            "(//a[contains(@href,'deleteBuildAgentGroup.action') and contains(@href, '" + name + "')])//img" );
+        assertPage( "Continuum - Delete Build Agent Group" );
         assertTextPresent( "Delete Build Agent" );
         assertTextPresent( "Are you sure you want to delete build agent group " + name + " ?" );
         assertButtonWithValuePresent( "Delete" );

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java Mon Aug 13 04:29:09 2012
@@ -45,10 +45,8 @@ public abstract class AbstractBuildDefin
     {
         goToBuildDefinitionTemplatePage();
         clickSubmitWithLocator( "buildDefinitionTemplate_0" );
-        String[] options =
-            new String[] { "--- Available Build Definitions ---", "Default Ant Build Definition",
-                "Default Maven 1 Build Definition", "Default Maven Build Definition",
-                "Default Shell Build Definition" };
+        String[] options = new String[]{"--- Available Build Definitions ---", "Default Ant Build Definition",
+            "Default Maven 1 Build Definition", "Default Maven Build Definition", "Default Shell Build Definition"};
         assertAddEditTemplatePage( options, null );
     }
 
@@ -114,8 +112,8 @@ public abstract class AbstractBuildDefin
     protected void removeTemplate( String name )
     {
         goToBuildDefinitionTemplatePage();
-        clickLinkWithXPath( "(//a[contains(@href,'deleteDefinitionTemplate') and contains(@href, '" + name
-            + "')])//img" );
+        clickLinkWithXPath(
+            "(//a[contains(@href,'deleteDefinitionTemplate') and contains(@href, '" + name + "')])//img" );
         assertPage( "Continuum - Delete Build Definition Template" );
         assertTextPresent( "Delete Build Definition Template" );
         assertTextPresent( "Are you sure you want to delete build definition template \"" + name + "\"?" );

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java Mon Aug 13 04:29:09 2012
@@ -44,8 +44,8 @@ public abstract class AbstractBuildQueue
 
     protected void removeBuildQueue( String queueName )
     {
-        clickLinkWithXPath( "(//a[contains(@href,'deleteBuildQueue.action') and contains(@href, '" + queueName
-            + "')])//img" );
+        clickLinkWithXPath(
+            "(//a[contains(@href,'deleteBuildQueue.action') and contains(@href, '" + queueName + "')])//img" );
         assertTextPresent( "Delete Parallel Build Queue" );
         assertTextPresent( "Are you sure you want to delete the build queue \"" + queueName + "\"?" );
         assertButtonWithValuePresent( "Delete" );
@@ -64,31 +64,31 @@ public abstract class AbstractBuildQueue
         assertButtonWithValuePresent( "Cancel" );
     }
 
-	protected void addBuildQueue( String name, boolean success )
-	{
-	    goToBuildQueuePage();
-	    assertBuildQueuePage();
-	    submit();
-	    assertAddBuildQueuePage();
-	    setFieldValue( "name", name );
-	    submit();
-	    if ( success )
-	    {
-	        assertBuildQueuePage();
-	        assertTextPresent( name );
-	    }
-	    else
-	    {
-	        assertAddBuildQueuePage();
-	    }
-	}
-	    
-	protected void buildProjectForQueuePageTest( String projectGroupName, String groupId, String description )
+    protected void addBuildQueue( String name, boolean success )
+    {
+        goToBuildQueuePage();
+        assertBuildQueuePage();
+        submit();
+        assertAddBuildQueuePage();
+        setFieldValue( "name", name );
+        submit();
+        if ( success )
+        {
+            assertBuildQueuePage();
+            assertTextPresent( name );
+        }
+        else
+        {
+            assertAddBuildQueuePage();
+        }
+    }
+
+    protected void buildProjectForQueuePageTest( String projectGroupName, String groupId, String description )
     {
         showProjectGroup( projectGroupName, groupId, description );
         clickButtonWithValue( "Build all projects" );
         waitForElementPresent( "//img[@alt='Building']" );
-     }
-	    
-	    
+    }
+
+
 }

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java Mon Aug 13 04:29:09 2012
@@ -337,7 +337,7 @@ public abstract class AbstractContinuumT
 
         // wait for project to finish building
         waitForProjectBuild();
-        
+
         // wait for the success status of project
         if ( success )
         {
@@ -353,7 +353,7 @@ public abstract class AbstractContinuumT
                 waitForElementPresent( "//a/img[@alt='Failed']" );
             }
         }
-        
+
         // wait for the projectName link
         if ( !isLinkPresent( projectName ) )
         {
@@ -404,8 +404,9 @@ public abstract class AbstractContinuumT
 
     protected void assertDeleteBuildDefinitionPage( String description, String goals )
     {
-        assertTextPresent( "Are you sure you want to delete the build definition with description \"" + description
-            + "\", goals \"" + goals + "\" and id" );
+        assertTextPresent(
+            "Are you sure you want to delete the build definition with description \"" + description + "\", goals \"" +
+                goals + "\" and id" );
         isButtonWithValuePresent( "Cancel" );
         isButtonWithValuePresent( "Delete" );
     }
@@ -527,10 +528,10 @@ public abstract class AbstractContinuumT
                                               String projectName, String newProjectGroup )
     {
         showProjectGroup( groupName, groupId, groupDescription );
-        
+
         // wait for project not being used
         waitForProjectBuild();
-        
+
         String id = getFieldValue( "name=projectGroupId" );
         String url = baseUrl + "/editProjectGroup.action?projectGroupId=" + id;
         getSelenium().open( url );
@@ -623,11 +624,12 @@ public abstract class AbstractContinuumT
         assertElementPresent( "m1PomFile" );
         assertTextPresent( "Project Group" );
         assertElementPresent( "selectedProjectGroup" );
-        assertOptionPresent( "selectedProjectGroup", new String[] { "Defined by POM", "Default Project Group" } );
+        assertOptionPresent( "selectedProjectGroup", new String[]{"Defined by POM", "Default Project Group"} );
         assertTextPresent( "Build Definition Template" );
         assertElementPresent( "buildDefinitionTemplateId" );
-        assertOptionPresent( "buildDefinitionTemplateId", new String[] { "Default", "Default Ant Template",
-            "Default Maven 1 Template", "Default Maven Template", "Default Shell Template" } );
+        assertOptionPresent( "buildDefinitionTemplateId",
+                             new String[]{"Default", "Default Ant Template", "Default Maven 1 Template",
+                                 "Default Maven Template", "Default Shell Template"} );
         assertButtonWithValuePresent( "Add" );
         assertButtonWithValuePresent( "Cancel" );
     }
@@ -696,11 +698,12 @@ public abstract class AbstractContinuumT
         assertElementPresent( "projectScmUseCache" );
         assertTextPresent( "Project Group" );
         assertElementPresent( "selectedProjectGroup" );
-        assertOptionPresent( "selectedProjectGroup", new String[] { "Default Project Group" } );
+        assertOptionPresent( "selectedProjectGroup", new String[]{"Default Project Group"} );
         assertTextPresent( "Build Definition Template" );
         assertElementPresent( "buildDefinitionTemplateId" );
-        assertOptionPresent( "buildDefinitionTemplateId", new String[] { "Default", "Default Ant Template",
-            "Default Maven 1 Template", "Default Maven Template", "Default Shell Template" } );
+        assertOptionPresent( "buildDefinitionTemplateId",
+                             new String[]{"Default", "Default Ant Template", "Default Maven 1 Template",
+                                 "Default Maven Template", "Default Shell Template"} );
         assertButtonWithValuePresent( "Add" );
         assertButtonWithValuePresent( "Cancel" );
     }
@@ -743,7 +746,7 @@ public abstract class AbstractContinuumT
             int maxIt = 20;
 
             // there's a problem with ie using waitForCondition
-            while( getTitle().equals( "" ) && currentIt <= maxIt )
+            while ( getTitle().equals( "" ) && currentIt <= maxIt )
             {
                 waitPage();
                 currentIt++;
@@ -751,7 +754,8 @@ public abstract class AbstractContinuumT
         }
         else
         {
-            String condition = "selenium.browserbot.getCurrentWindow().document.title.replace(/^\\s*/, \"\").replace(/\\s*$/, \"\") != '' && selenium.browserbot.getCurrentWindow().document.getElementById('footer') != null";
+            String condition =
+                "selenium.browserbot.getCurrentWindow().document.title.replace(/^\\s*/, \"\").replace(/\\s*$/, \"\") != '' && selenium.browserbot.getCurrentWindow().document.getElementById('footer') != null";
             waitForCondition( condition );
         }
 
@@ -807,32 +811,33 @@ public abstract class AbstractContinuumT
         // wait for project to finish checking out
         waitForElementPresent( "//img[@alt='Checking Out']", false );
     }
-    
+
     void waitForProjectUpdate()
     {
         if ( isElementPresent( "//img[@alt='Checking Out']" ) )
         {
             waitForProjectCheckout();
         }
-        
+
         // wait for project to finish updating
         waitForElementPresent( "//img[@alt='Updating']", false );
     }
-    
+
     void waitForProjectBuild()
     {
         if ( isElementPresent( "//img[@alt='Checking Out']" ) || isElementPresent( "//img[@alt='Updating']" ) )
         {
             waitForProjectUpdate();
         }
-        
+
         // wait for project to finish building
         waitForElementPresent( "//img[@alt='Building']", false );
     }
 
     void assignContinuumResourceRoleToUser( String groupName )
     {
-        clickLinkWithXPath( "//input[@name='addDSelectedRoles' and @value='" + "Project Developer" + " - " + groupName + "']", false );
+        clickLinkWithXPath(
+            "//input[@name='addDSelectedRoles' and @value='" + "Project Developer" + " - " + groupName + "']", false );
     }
 
     protected void removeDefaultBuildDefinitionFromTemplate( String type )
@@ -848,8 +853,8 @@ public abstract class AbstractContinuumT
 
         if ( "maven2".equals( type ) )
         {
-            getSelenium().addSelection(
-                "saveBuildDefinitionTemplate_buildDefinitionIds", "label=" + "Default Maven Build Definition" );
+            getSelenium().addSelection( "saveBuildDefinitionTemplate_buildDefinitionIds",
+                                        "label=" + "Default Maven Build Definition" );
         }
 
         clickLinkWithXPath( "//input[@value='->']", false );
@@ -895,7 +900,7 @@ public abstract class AbstractContinuumT
         assertTextPresent( "Default Maven Build Definition" );
         assertTextPresent( "Default Shell Build Definition" );
     }
-    
+
     // ////////////////////////////////////
     // Distributed Builds
     // ////////////////////////////////////
@@ -933,15 +938,15 @@ public abstract class AbstractContinuumT
 
     protected void goToBuildAgentPage()
     {
-        clickAndWait("link=Build Agents");
-        assertPage("Continuum - Build Agents");
+        clickAndWait( "link=Build Agents" );
+        assertPage( "Continuum - Build Agents" );
     }
 
     void assertBuildAgentPage()
     {
-        assertPage("Continuum - Build Agents");
-        assertTextPresent("Build Agents");
-        assertTextPresent("Build Agent Groups");
+        assertPage( "Continuum - Build Agents" );
+        assertTextPresent( "Build Agents" );
+        assertTextPresent( "Build Agent Groups" );
         assertButtonWithValuePresent( "Add" );
     }
 
@@ -975,7 +980,7 @@ public abstract class AbstractContinuumT
         assertTextNotPresent( "No Results Found" );
         assertTextNotPresent( "Export to CSV" );
     }
-    
+
     protected void assertProjectBuildReportWithResult()
     {
         assertTextPresent( "Results" );
@@ -1010,7 +1015,7 @@ public abstract class AbstractContinuumT
     }
 
     @BeforeSuite( alwaysRun = true )
-    @Parameters( { "baseUrl", "browser", "seleniumHost", "seleniumPort" } )
+    @Parameters( {"baseUrl", "browser", "seleniumHost", "seleniumPort"} )
     public void initializeContinuum( @Optional( "http://localhost:9595/continuum" ) String baseUrl,
                                      @Optional( "*firefox" ) String browser,
                                      @Optional( "localhost" ) String seleniumHost,

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractInstallationTest.java Mon Aug 13 04:29:09 2012
@@ -64,7 +64,7 @@ public abstract class AbstractInstallati
         assertPage( "Continuum - Installation Type Choice" );
         assertTextPresent( "Installation Type Choice" );
         assertTextPresent( "Installation Type" );
-        assertOptionPresent( "installationType", new String[] { "Tool", "Environment Variable" } );
+        assertOptionPresent( "installationType", new String[]{"Tool", "Environment Variable"} );
         assertButtonWithValuePresent( "Add" );
         assertButtonWithValuePresent( "Cancel" );
     }
@@ -83,7 +83,7 @@ public abstract class AbstractInstallati
         assertTextPresent( "Name" );
         assertElementPresent( "installation.name" );
         assertTextPresent( "Type" );
-        assertOptionPresent( "installation.type", new String[] { "JDK", "Maven", "Maven 1", "ANT" } );
+        assertOptionPresent( "installation.type", new String[]{"JDK", "Maven", "Maven 1", "ANT"} );
         assertTextPresent( "Value/Path" );
         assertElementPresent( "installation.varValue" );
         assertButtonWithValuePresent( "Save" );

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java Mon Aug 13 04:29:09 2012
@@ -43,8 +43,8 @@ public abstract class AbstractPurgeTest
     protected void removeRepositoryPurge( String purgeDescription )
     {
         goToGeneralPurgePage();
-        clickLinkWithXPath( "(//a[contains(@href,'removePurgeConfig.action') and contains(@href, '" + purgeDescription
-            + "')])//img" );
+        clickLinkWithXPath(
+            "(//a[contains(@href,'removePurgeConfig.action') and contains(@href, '" + purgeDescription + "')])//img" );
         assertTextPresent( "Delete Purge Configuration" );
         assertTextPresent( "Are you sure you want to delete Purge Configuration \"" + purgeDescription + "\"?" );
         assertButtonWithValuePresent( "Delete" );
@@ -56,8 +56,8 @@ public abstract class AbstractPurgeTest
     protected void removeDirectoryPurge( String purgeDescription )
     {
         goToGeneralPurgePage();
-        clickLinkWithXPath( "(//a[contains(@href,'removePurgeConfig.action') and contains(@href, '" + purgeDescription
-            + "')])//img" );
+        clickLinkWithXPath(
+            "(//a[contains(@href,'removePurgeConfig.action') and contains(@href, '" + purgeDescription + "')])//img" );
         assertTextPresent( "Delete Purge Configuration" );
         assertTextPresent( "Are you sure you want to delete Purge Configuration \"" + purgeDescription + "\"?" );
         assertButtonWithValuePresent( "Delete" );
@@ -111,7 +111,8 @@ public abstract class AbstractPurgeTest
     {
         goToGeneralPurgePage();
         assertGeneralPurgePage();
-        clickLinkWithXPath( "//preceding::input[@value='repository' and @type='hidden']//following::input[@type='submit']" );
+        clickLinkWithXPath(
+            "//preceding::input[@value='repository' and @type='hidden']//following::input[@type='submit']" );
         assertAddRepositoryPurgePage();
     }
 
@@ -160,7 +161,8 @@ public abstract class AbstractPurgeTest
     {
         goToGeneralPurgePage();
         assertGeneralPurgePage();
-        clickLinkWithXPath( "//preceding::input[@value='directory' and @type='hidden']//following::input[@type='submit']" );
+        clickLinkWithXPath(
+            "//preceding::input[@value='directory' and @type='hidden']//following::input[@type='submit']" );
         assertAddEditDirectoryPurgePage();
     }
 

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.java Mon Aug 13 04:29:09 2012
@@ -96,38 +96,38 @@ public abstract class AbstractScheduleTe
                                     String dayMonth, String month, String dayWeek, String year, String maxTime,
                                     String period, boolean buildQueue, boolean success )
     {
-	if ( buildQueue ) 
-	{
-	        setFieldValue( "name", name );
-		setFieldValue( "description", description );
-		setFieldValue( "second", second );
-		setFieldValue( "minute", minute );
-		setFieldValue( "hour", hour );
-		setFieldValue( "dayOfMonth", dayMonth );
-		setFieldValue( "month", month );
-		setFieldValue( "dayOfWeek", dayWeek );
-		setFieldValue( "year", year );
-		setFieldValue( "maxJobExecutionTime", maxTime );
-		setFieldValue( "delay", period );
-		getSelenium().addSelection("saveSchedule_availableBuildQueuesIds", "label=DEFAULT_BUILD_QUEUE");
-		getSelenium().click("//input[@value='->']");
-		submit();
-	}
-	else
-	{
-		setFieldValue( "name", name );
-		setFieldValue( "description", description );
-		setFieldValue( "second", second );
-		setFieldValue( "minute", minute );
-		setFieldValue( "hour", hour );
-		setFieldValue( "dayOfMonth", dayMonth );
-		setFieldValue( "month", month );
-		setFieldValue( "dayOfWeek", dayWeek );
-		setFieldValue( "year", year );
-		setFieldValue( "maxJobExecutionTime", maxTime );
-		setFieldValue( "delay", period );
-		submit();
-	}
+        if ( buildQueue )
+        {
+            setFieldValue( "name", name );
+            setFieldValue( "description", description );
+            setFieldValue( "second", second );
+            setFieldValue( "minute", minute );
+            setFieldValue( "hour", hour );
+            setFieldValue( "dayOfMonth", dayMonth );
+            setFieldValue( "month", month );
+            setFieldValue( "dayOfWeek", dayWeek );
+            setFieldValue( "year", year );
+            setFieldValue( "maxJobExecutionTime", maxTime );
+            setFieldValue( "delay", period );
+            getSelenium().addSelection( "saveSchedule_availableBuildQueuesIds", "label=DEFAULT_BUILD_QUEUE" );
+            getSelenium().click( "//input[@value='->']" );
+            submit();
+        }
+        else
+        {
+            setFieldValue( "name", name );
+            setFieldValue( "description", description );
+            setFieldValue( "second", second );
+            setFieldValue( "minute", minute );
+            setFieldValue( "hour", hour );
+            setFieldValue( "dayOfMonth", dayMonth );
+            setFieldValue( "month", month );
+            setFieldValue( "dayOfWeek", dayWeek );
+            setFieldValue( "year", year );
+            setFieldValue( "maxJobExecutionTime", maxTime );
+            setFieldValue( "delay", period );
+            submit();
+        }
 
         if ( success )
         {

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java Mon Aug 13 04:29:09 2012
@@ -3,55 +3,59 @@ package org.apache.continuum.web.test.pa
 public abstract class AbstractUserRolesManagementTest
     extends AbstractAdminTest
 {
-	protected String username;
-	protected String fullname;
+    protected String username;
 
-	protected String getUserEmail()
-	{
+    protected String fullname;
+
+    protected String getUserEmail()
+    {
         return getProperty( "USERROLE_EMAIL" );
-	}
+    }
 
-	protected String getUserRolePassword()
-	{
+    protected String getUserRolePassword()
+    {
         return getProperty( "USERROLE_PASSWORD" );
-	}
+    }
 
-	protected String getUserRoleNewPassword()
-	{
+    protected String getUserRoleNewPassword()
+    {
         return getProperty( "NEW_USERROLE_PASSWORD" );
-	}
+    }
 
     ////////////////////////////
-	// Assertions
-	////////////////////////////
+    // Assertions
+    ////////////////////////////
     protected void assertCreateUserPage()
-	{
-		assertPage( "[Admin] User Create" );
-		assertTextPresent( "[Admin] User Create" );
-		assertTextPresent( "Username*:" );
-		assertElementPresent( "user.username" );
-		assertTextPresent( "Full Name*:");
-		assertElementPresent( "user.fullName" );
-		assertTextPresent( "Email Address*:" );
-		assertElementPresent( "user.email" );
-		assertTextPresent( "Password*:" );
-		assertElementPresent( "user.password" );
-		assertTextPresent( "Confirm Password*:" );
-		assertElementPresent( "user.confirmPassword" );
-		assertButtonWithValuePresent( "Create User" );
-	}
-
-	protected void assertUserRolesPage()
-	{
-		assertPage( "[Admin] User Edit" );
-		assertTextPresent( "[Admin] User Roles" );
-		String userRoles = "Username,Full Name,Email,Guest,Registered User,System Administrator,User Administrator,Continuum Group Project Administrator,Continuum Group Project Developer,Continuum Group Project User,Continuum Manage Build Environments,Continuum Manage Build Templates,Continuum Manage Installations,Continuum Manage Local Repositories,Continuum Manage Purging,Continuum Manage Queues,Continuum Manage Scheduling,Project Administrator,Project Developer,Project User,Default Project Group";
-		String[] arrayUserRoles = userRoles.split( "," );
-			for ( String userroles : arrayUserRoles )
-				assertTextPresent( userroles );
-	}
+    {
+        assertPage( "[Admin] User Create" );
+        assertTextPresent( "[Admin] User Create" );
+        assertTextPresent( "Username*:" );
+        assertElementPresent( "user.username" );
+        assertTextPresent( "Full Name*:" );
+        assertElementPresent( "user.fullName" );
+        assertTextPresent( "Email Address*:" );
+        assertElementPresent( "user.email" );
+        assertTextPresent( "Password*:" );
+        assertElementPresent( "user.password" );
+        assertTextPresent( "Confirm Password*:" );
+        assertElementPresent( "user.confirmPassword" );
+        assertButtonWithValuePresent( "Create User" );
+    }
 
-	   protected void assertCreatedUserInfo( String username )
+    protected void assertUserRolesPage()
+    {
+        assertPage( "[Admin] User Edit" );
+        assertTextPresent( "[Admin] User Roles" );
+        String userRoles =
+            "Username,Full Name,Email,Guest,Registered User,System Administrator,User Administrator,Continuum Group Project Administrator,Continuum Group Project Developer,Continuum Group Project User,Continuum Manage Build Environments,Continuum Manage Build Templates,Continuum Manage Installations,Continuum Manage Local Repositories,Continuum Manage Purging,Continuum Manage Queues,Continuum Manage Scheduling,Project Administrator,Project Developer,Project User,Default Project Group";
+        String[] arrayUserRoles = userRoles.split( "," );
+        for ( String userroles : arrayUserRoles )
+        {
+            assertTextPresent( userroles );
+        }
+    }
+
+    protected void assertCreatedUserInfo( String username )
     {
         selectValue( "name=ec_rd", "50" );
         waitPage();
@@ -59,140 +63,176 @@ public abstract class AbstractUserRolesM
         clickLinkWithText( "Edit Roles" );
     }
 
-	void assertUserRoleCheckBoxPresent( String value )
+    void assertUserRoleCheckBoxPresent( String value )
     {
-    	getSelenium().isElementPresent( "xpath=//input[@id='addRolesToUser_addNDSelectedRoles' and @name='addNDSelectedRoles' and @value='"+ value + "']" );
+        getSelenium().isElementPresent(
+            "xpath=//input[@id='addRolesToUser_addNDSelectedRoles' and @name='addNDSelectedRoles' and @value='" +
+                value + "']" );
     }
 
     void assertResourceRolesCheckBoxPresent( String value )
     {
-    	getSelenium().isElementPresent( "xpath=//input[@name='addDSelectedRoles' and @value='" + value + "']" );
+        getSelenium().isElementPresent( "xpath=//input[@name='addDSelectedRoles' and @value='" + value + "']" );
     }
 
     protected void checkUserRoleWithValue( String value )
     {
-    	assertUserRoleCheckBoxPresent( value );
-    	getSelenium().click( "xpath=//input[@id='addRolesToUser_addNDSelectedRoles' and @name='addNDSelectedRoles' and @value='"+ value + "']" );
+        assertUserRoleCheckBoxPresent( value );
+        getSelenium().click(
+            "xpath=//input[@id='addRolesToUser_addNDSelectedRoles' and @name='addNDSelectedRoles' and @value='" +
+                value + "']" );
     }
 
     protected void checkResourceRoleWithValue( String value )
     {
-    	assertResourceRolesCheckBoxPresent( value );
-    	getSelenium().click( "xpath=//input[@name='addDSelectedRoles' and @value='" + value + "']" );
+        assertResourceRolesCheckBoxPresent( value );
+        getSelenium().click( "xpath=//input[@name='addDSelectedRoles' and @value='" + value + "']" );
     }
 
-	protected void assertLeftNavMenuWithRole( String role )
-	{
-		if( "System Administrator".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Maven Project,Maven 1.x Project,Ant Project,Shell Project,Local Repositories,Purge Configurations,Schedules,Installations,Build Environments,Queues,Build Definition Templates,Configuration,Appearance,Users,Roles,Build Queue";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "User Administrator".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Users,Roles";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Group Project Administrator".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Maven Project,Maven 1.x Project,Ant Project,Shell Project,Schedules,Queues,Users,Roles";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Group Project Developer".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Queues";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Group Project User".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Queues";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Manage Build Environments".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Build Environments";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Manage Build Templates".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Build Definition Templates";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Manage Installations".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Installations";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Manage Local Repositories".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Local Repositories";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Manage Purging".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Purge Configurations";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Manage Queues".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Queues";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Continuum Manage Scheduling".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Schedules";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Project Administrator - Default Project Group".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Queues,Users,Roles";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else if( "Project Developer - Default Project Group".equals( role ) ||
+    protected void assertLeftNavMenuWithRole( String role )
+    {
+        if ( "System Administrator".equals( role ) )
+        {
+            String navMenu =
+                "About,Show Project Groups,Maven Project,Maven 1.x Project,Ant Project,Shell Project,Local Repositories,Purge Configurations,Schedules,Installations,Build Environments,Queues,Build Definition Templates,Configuration,Appearance,Users,Roles,Build Queue";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "User Administrator".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Users,Roles";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Group Project Administrator".equals( role ) )
+        {
+            String navMenu =
+                "About,Show Project Groups,Maven Project,Maven 1.x Project,Ant Project,Shell Project,Schedules,Queues,Users,Roles";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Group Project Developer".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Queues";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Group Project User".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Queues";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Manage Build Environments".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Build Environments";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Manage Build Templates".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Build Definition Templates";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Manage Installations".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Installations";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Manage Local Repositories".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Local Repositories";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Manage Purging".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Purge Configurations";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Manage Queues".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Queues";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Continuum Manage Scheduling".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Schedules";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Project Administrator - Default Project Group".equals( role ) )
+        {
+            String navMenu = "About,Show Project Groups,Queues,Users,Roles";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else if ( "Project Developer - Default Project Group".equals( role ) ||
             "Project User - Default Project Group".equals( role ) )
-    	{
-    		String navMenu = "About,Show Project Groups,Queues";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    	}
-    	else
-    	{
-    		String navMenu = "About,Show Project Groups";
-    		String[] arrayNavMenu = navMenu.split( "," );
-    		for( String navmenu : arrayNavMenu )
-    			assertLinkPresent( navmenu );
-    		assertTextPresent( "Project Groups" );
-    		//assertTextPresent( "Project Groups list is empty." );
-    	}
+        {
+            String navMenu = "About,Show Project Groups,Queues";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+        }
+        else
+        {
+            String navMenu = "About,Show Project Groups";
+            String[] arrayNavMenu = navMenu.split( "," );
+            for ( String navmenu : arrayNavMenu )
+            {
+                assertLinkPresent( navmenu );
+            }
+            assertTextPresent( "Project Groups" );
+            //assertTextPresent( "Project Groups list is empty." );
+        }
 
-	}
+    }
 
     void assertDeleteUserPage( String username )
     {
@@ -203,7 +243,7 @@ public abstract class AbstractUserRolesM
         assertButtonWithValuePresent( "Delete User" );
     }
 
-	protected void assertProjectAdministratorAccess()
+    protected void assertProjectAdministratorAccess()
     {
         assertLinkPresent( "About" );
         assertLinkPresent( "Show Project Groups" );
@@ -226,29 +266,29 @@ public abstract class AbstractUserRolesM
         assertLinkNotPresent( "Build Agent" );
     }
 
-	/////////////////////////////////////////
-	// User Roles Management
-	/////////////////////////////////////////
+    /////////////////////////////////////////
+    // User Roles Management
+    /////////////////////////////////////////
     protected void changePassword( String oldPassword, String newPassword )
-	{
-		assertPage( "Change Password" );
-		setFieldValue( "existingPassword", oldPassword );
-		setFieldValue( "newPassword", newPassword );
-		setFieldValue( "newPasswordConfirm", newPassword );
-		clickButtonWithValue( "Change Password" );
-	}
-
-	protected void createUser( String userName, String fullName, String email, String password )
-	{
-		createUser( userName, fullName, email, password, password );
-	}
-
-	private void createUser( String userName, String fullName, String emailAd, String password, String confirmPassword )
-	{
-		loginAsAdmin();
-		clickLinkWithText( "Users" );
-		clickButtonWithValue( "Create New User" );
-		assertCreateUserPage();
+    {
+        assertPage( "Change Password" );
+        setFieldValue( "existingPassword", oldPassword );
+        setFieldValue( "newPassword", newPassword );
+        setFieldValue( "newPasswordConfirm", newPassword );
+        clickButtonWithValue( "Change Password" );
+    }
+
+    protected void createUser( String userName, String fullName, String email, String password )
+    {
+        createUser( userName, fullName, email, password, password );
+    }
+
+    private void createUser( String userName, String fullName, String emailAd, String password, String confirmPassword )
+    {
+        loginAsAdmin();
+        clickLinkWithText( "Users" );
+        clickButtonWithValue( "Create New User" );
+        assertCreateUserPage();
         setFieldValue( "user.username", userName );
         setFieldValue( "user.fullName", fullName );
         setFieldValue( "user.email", emailAd );
@@ -256,14 +296,14 @@ public abstract class AbstractUserRolesM
         setFieldValue( "user.confirmPassword", confirmPassword );
         submit();
 
-        assertUserRolesPage( );
+        assertUserRolesPage();
         clickButtonWithValue( "Submit" );
-	}
+    }
 
 
     protected void deleteUser( String userName )
     {
-	    //clickLinkWithText( "userlist" );
+        //clickLinkWithText( "userlist" );
         clickLinkWithXPath( "//table[@id='ec_table']/tbody[2]/tr[3]/td[7]/a/img" );
         assertDeleteUserPage( userName );
         submit();

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>continuum</artifactId>
     <groupId>org.apache.continuum</groupId>
@@ -27,7 +28,7 @@ under the License.
   <artifactId>continuum-webapp</artifactId>
   <name>Continuum :: Web APP</name>
   <packaging>war</packaging>
-  <build> 
+  <build>
     <resources>
       <resource>
         <filtering>true</filtering>
@@ -52,12 +53,12 @@ under the License.
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>        
+        <artifactId>maven-clean-plugin</artifactId>
         <configuration>
           <filesets>
             <fileset>
               <directory>${basedir}/data</directory>
-            </fileset>            
+            </fileset>
           </filesets>
         </configuration>
       </plugin>
@@ -68,8 +69,9 @@ under the License.
           <!-- Some versions of maven-war-plugin (snapshots) have this incorrectly defaulted to true.
                Specifically setting this to false to avoid accidental jar file creation. -->
           <archiveClasses>false</archiveClasses>
-          <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**</dependentWarExcludes>
-        </configuration>       
+          <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**
+          </dependentWarExcludes>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
@@ -83,7 +85,7 @@ under the License.
             <roleDefault>
               <role>com.opensymphony.xwork2.validator.Validator</role>
               <instantiation-strategy>per-lookup</instantiation-strategy>
-            </roleDefault>            
+            </roleDefault>
           </roleDefaults>
         </configuration>
         <executions>
@@ -124,7 +126,7 @@ under the License.
               <goal>xpp3-reader</goal>
               <goal>xpp3-writer</goal>
             </goals>
-          </execution>    
+          </execution>
         </executions>
         <configuration>
           <useJava5>true</useJava5>
@@ -154,7 +156,7 @@ under the License.
           -->
         </configuration>
       </plugin>
-      
+
       <!-- hack for jetty:run, continuum web config files are checked in /WEB-INF/ dir -->
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -167,11 +169,11 @@ under the License.
             <phase>compile</phase>
             <configuration>
               <tasks>
-                <mkdir dir="${basedir}/target/continuum/WEB-INF/" />
+                <mkdir dir="${basedir}/target/continuum/WEB-INF/"/>
                 <copy todir="${basedir}/target/continuum/WEB-INF/">
-                  <fileset dir="${basedir}/target" includes="classes/" excludes="**/struts.xml" />         
+                  <fileset dir="${basedir}/target" includes="classes/" excludes="**/struts.xml"/>
                 </copy>
-              </tasks>              
+              </tasks>
             </configuration>
           </execution>
         </executions>
@@ -182,21 +184,21 @@ under the License.
           <execution>
             <id>unpack-redback-war</id>
             <goals>
-             <goal>unpack</goal>
+              <goal>unpack</goal>
             </goals>
             <phase>compile</phase>
             <configuration>
-               <artifactItems>
-                 <artifactItem>
-                   <groupId>org.codehaus.redback</groupId>
-                   <artifactId>redback-struts2-content</artifactId>
-                   <version>${redback.version}</version>
-                   <type>war</type>
-                   <overWrite>false</overWrite>
-                   <outputDirectory>${project.build.directory}/redback</outputDirectory>
-                   <excludes>**/struts-security.xml</excludes>
-                 </artifactItem>
-               </artifactItems>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.codehaus.redback</groupId>
+                  <artifactId>redback-struts2-content</artifactId>
+                  <version>${redback.version}</version>
+                  <type>war</type>
+                  <overWrite>false</overWrite>
+                  <outputDirectory>${project.build.directory}/redback</outputDirectory>
+                  <excludes>**/struts-security.xml</excludes>
+                </artifactItem>
+              </artifactItems>
             </configuration>
           </execution>
         </executions>
@@ -206,13 +208,13 @@ under the License.
         <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
           <webAppConfig>
-	        <contextPath>/</contextPath>	          
-	        <baseResource implementation="org.mortbay.resource.ResourceCollection">
-	          <resourcesAsCSV>src/main/webapp,target/continuum,target/redback</resourcesAsCSV>
-	        </baseResource>   
+            <contextPath>/</contextPath>
+            <baseResource implementation="org.mortbay.resource.ResourceCollection">
+              <resourcesAsCSV>src/main/webapp,target/continuum,target/redback</resourcesAsCSV>
+            </baseResource>
           </webAppConfig>
           <scanIntervalSeconds>10</scanIntervalSeconds>
-          <jettyEnvXml>${basedir}/src/jetty-env.xml</jettyEnvXml>          
+          <jettyEnvXml>${basedir}/src/jetty-env.xml</jettyEnvXml>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
               <port>9090</port>
@@ -227,12 +229,12 @@ under the License.
             <systemProperty>
               <name>appserver.home</name>
               <value>${project.build.directory}/appserver-home</value>
-            </systemProperty>            
+            </systemProperty>
             <systemProperty>
               <name>derby.system.home</name>
               <value>${project.build.directory}/appserver-base/logs</value>
             </systemProperty>
-          </systemProperties>          
+          </systemProperties>
         </configuration>
         <dependencies>
           <dependency>
@@ -253,7 +255,7 @@ under the License.
             <appserver.base>${project.build.directory}/appserver-base</appserver.base>
             <appserver.home>${project.build.directory}/appserver-home</appserver.home>
             <derby.system.home>${project.build.directory}/appserver-base/logs</derby.system.home>
-          </systemProperties>          
+          </systemProperties>
         </configuration>
         <dependencies>
           <dependency>
@@ -266,7 +268,7 @@ under the License.
             <artifactId>mail</artifactId>
             <version>1.4</version>
           </dependency>
-        </dependencies>        
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -291,10 +293,10 @@ under the License.
             <configuration>
               <tasks>
                 <copy todir="${project.build.directory}/appserver-base">
-                  <fileset dir="src/appserver-base" />
+                  <fileset dir="src/appserver-base"/>
                 </copy>
                 <copy todir="src/main/webapp/template">
-                  <fileset file="src/main/resources/template/default/validation.js" />
+                  <fileset file="src/main/resources/template/default/validation.js"/>
                 </copy>
               </tasks>
             </configuration>
@@ -472,7 +474,7 @@ under the License.
           <artifactId>plexus-container-default</artifactId>
         </exclusion>
       </exclusions>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-notifier-irc</artifactId>
@@ -518,7 +520,7 @@ under the License.
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-distributed-master-server</artifactId>
       <scope>runtime</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
@@ -578,7 +580,7 @@ under the License.
       <groupId>org.codehaus.redback</groupId>
       <artifactId>redback-struts2-content</artifactId>
       <type>war</type>
-      <scope>runtime</scope> 
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.redback</groupId>
@@ -629,7 +631,7 @@ under the License.
           <artifactId>commons-logging</artifactId>
         </exclusion>
       </exclusions>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
@@ -647,7 +649,7 @@ under the License.
           <artifactId>xml-apis</artifactId>
         </exclusion>
       </exclusions>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
@@ -655,7 +657,7 @@ under the License.
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
@@ -709,7 +711,7 @@ under the License.
             </configuration>
           </plugin>
         </plugins>
-      </build>      
+      </build>
     </profile>
     <profile>
       <id>mysql</id>
@@ -748,8 +750,10 @@ under the License.
                 </goals>
                 <configuration>
                   <tasks>
-                    <copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml" todir="${basedir}/src/main/webapp/WEB-INF/classes" />
-					          <copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml" todir="${project.build.directory}/classes" />
+                    <copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml"
+                          todir="${basedir}/src/main/webapp/WEB-INF/classes"/>
+                    <copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml"
+                          todir="${project.build.directory}/classes"/>
                   </tasks>
                 </configuration>
               </execution>
@@ -776,8 +780,8 @@ under the License.
             </configuration>
           </plugin>
         </plugins>
-      </build>      
-    </profile>  
+      </build>
+    </profile>
     <profile>
       <!-- local dev settings use a file which is ignore in svn -->
       <id>local-tomcat-env</id>
@@ -796,7 +800,7 @@ under the License.
             </configuration>
           </plugin>
         </plugins>
-      </build>      
-    </profile>    
+      </build>
+    </profile>
   </profiles>
 </project>

Modified: continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml (original)
+++ continuum/trunk/continuum-webapp/src/appserver-base/conf/shared.xml Mon Aug 13 04:29:09 2012
@@ -1 +1 @@
-<configuration />
+<configuration/>

Modified: continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml Mon Aug 13 04:29:09 2012
@@ -23,70 +23,68 @@
 <Configure class="org.mortbay.jetty.webapp.WebAppContext">
 
 
-
-
-<New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>mail/Session</Arg>
-  <Arg>
-    <New class="org.mortbay.naming.factories.MailSessionReference">
-      <Set name="user"></Set>
-      <Set name="password"></Set>
-      <Set name="properties">
-        <New class="java.util.Properties">
-          <Put name="mail.smtp.host">localhost</Put>
-          <Put name="mail.from">continuum@localhost</Put>
-          <Put name="mail.senderName">Continuum</Put>
-          <Put name="mail.debug">true</Put>
-        </New>
-      </Set>
-    </New>
-  </Arg>
-</New>
-
-<New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/continuum</Arg>
-  <Arg>
-    <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">continuum</Set>
-      <Set name="user">root</Set>
-      <Set name="password"></Set>
-    </New>
-  </Arg>
-</New>
-<New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/continuum_shutdown</Arg>
-  <Arg>
-    <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">continuum</Set>
-      <Set name="user">root</Set>
-      <Set name="password"></Set>  
-    </New>
-  </Arg>
-</New>
-<New id="users" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/users</Arg>
-  <Arg>
-    <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">users</Set>
-      <Set name="user">root</Set>
-      <Set name="password"></Set>
-    </New>
-  </Arg>
-</New>
-<New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/users_shutdown</Arg>
-  <Arg>
-    <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
-      <Set name="serverName">localhost</Set>
-      <Set name="databaseName">users</Set>
-      <Set name="user">root</Set>
-      <Set name="password"></Set>  
-    </New>
-  </Arg>
-</New>
+  <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>mail/Session</Arg>
+    <Arg>
+      <New class="org.mortbay.naming.factories.MailSessionReference">
+        <Set name="user"></Set>
+        <Set name="password"></Set>
+        <Set name="properties">
+          <New class="java.util.Properties">
+            <Put name="mail.smtp.host">localhost</Put>
+            <Put name="mail.from">continuum@localhost</Put>
+            <Put name="mail.senderName">Continuum</Put>
+            <Put name="mail.debug">true</Put>
+          </New>
+        </Set>
+      </New>
+    </Arg>
+  </New>
+
+  <New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/continuum</Arg>
+    <Arg>
+      <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
+        <Set name="serverName">localhost</Set>
+        <Set name="databaseName">continuum</Set>
+        <Set name="user">root</Set>
+        <Set name="password"></Set>
+      </New>
+    </Arg>
+  </New>
+  <New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/continuum_shutdown</Arg>
+    <Arg>
+      <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
+        <Set name="serverName">localhost</Set>
+        <Set name="databaseName">continuum</Set>
+        <Set name="user">root</Set>
+        <Set name="password"></Set>
+      </New>
+    </Arg>
+  </New>
+  <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/users</Arg>
+    <Arg>
+      <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
+        <Set name="serverName">localhost</Set>
+        <Set name="databaseName">users</Set>
+        <Set name="user">root</Set>
+        <Set name="password"></Set>
+      </New>
+    </Arg>
+  </New>
+  <New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/users_shutdown</Arg>
+    <Arg>
+      <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
+        <Set name="serverName">localhost</Set>
+        <Set name="databaseName">users</Set>
+        <Set name="user">root</Set>
+        <Set name="password"></Set>
+      </New>
+    </Arg>
+  </New>
 
 </Configure>
 

Modified: continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml Mon Aug 13 04:29:09 2012
@@ -23,49 +23,55 @@
 <Configure class="org.mortbay.jetty.webapp.WebAppContext">
 
 
-
-
-<New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>mail/Session</Arg>
-  <Arg>
-    <New class="org.mortbay.naming.factories.MailSessionReference">
-      <Set name="user"></Set>
-      <Set name="password"></Set>
-      <Set name="properties">
-        <New class="java.util.Properties">
-          <Put name="mail.smtp.host">localhost</Put>
-          <Put name="mail.from">continuum@localhost</Put>
-          <Put name="mail.senderName">Continuum</Put>
-          <Put name="mail.debug">true</Put>
-        </New>
-      </Set>
-    </New>
-  </Arg>
-</New>
-
-<New id="continuumDataSource" class="org.postgresql.ds.PGPoolingDataSource">
-  <Set name="serverName">localhost</Set>
-  <Set name="databaseName">continuum</Set>
-  <Set name="user">postgres</Set>
-  <Set name="password">sparky</Set>
-</New>
-
-<New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/continuum</Arg>
-  <Arg><Ref id="continuumDataSource"/></Arg>
-</New>
-<New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/continuum_shutdown</Arg>
-  <Arg><Ref id="continuumDataSource"/></Arg>
-</New>
-<New id="users" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/users</Arg>
-  <Arg><Ref id="continuumDataSource"/></Arg>
-</New>
-<New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/users_shutdown</Arg>
-  <Arg><Ref id="continuumDataSource"/></Arg>
-</New>
+  <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>mail/Session</Arg>
+    <Arg>
+      <New class="org.mortbay.naming.factories.MailSessionReference">
+        <Set name="user"></Set>
+        <Set name="password"></Set>
+        <Set name="properties">
+          <New class="java.util.Properties">
+            <Put name="mail.smtp.host">localhost</Put>
+            <Put name="mail.from">continuum@localhost</Put>
+            <Put name="mail.senderName">Continuum</Put>
+            <Put name="mail.debug">true</Put>
+          </New>
+        </Set>
+      </New>
+    </Arg>
+  </New>
+
+  <New id="continuumDataSource" class="org.postgresql.ds.PGPoolingDataSource">
+    <Set name="serverName">localhost</Set>
+    <Set name="databaseName">continuum</Set>
+    <Set name="user">postgres</Set>
+    <Set name="password">sparky</Set>
+  </New>
+
+  <New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/continuum</Arg>
+    <Arg>
+      <Ref id="continuumDataSource"/>
+    </Arg>
+  </New>
+  <New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/continuum_shutdown</Arg>
+    <Arg>
+      <Ref id="continuumDataSource"/>
+    </Arg>
+  </New>
+  <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/users</Arg>
+    <Arg>
+      <Ref id="continuumDataSource"/>
+    </Arg>
+  </New>
+  <New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/users_shutdown</Arg>
+    <Arg>
+      <Ref id="continuumDataSource"/>
+    </Arg>
+  </New>
 
 </Configure>
 

Modified: continuum/trunk/continuum-webapp/src/jetty-env.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/jetty-env.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env.xml Mon Aug 13 04:29:09 2012
@@ -22,64 +22,64 @@
 
 <Configure class="org.mortbay.jetty.webapp.WebAppContext">
 
-<New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>mail/Session</Arg>
-  <Arg>
-    <New class="org.mortbay.naming.factories.MailSessionReference">
-      <Set name="user"></Set>
-      <Set name="password"></Set>
-      <Set name="properties">
-        <New class="java.util.Properties">
-          <Put name="mail.smtp.host">localhost</Put>
-          <Put name="mail.from">continuum@localhost</Put>
-          <Put name="mail.senderName">Continuum</Put>
-          <Put name="mail.debug">true</Put>
-        </New>
-      </Set>
-    </New>
-  </Arg>
-</New>
+  <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>mail/Session</Arg>
+    <Arg>
+      <New class="org.mortbay.naming.factories.MailSessionReference">
+        <Set name="user"></Set>
+        <Set name="password"></Set>
+        <Set name="properties">
+          <New class="java.util.Properties">
+            <Put name="mail.smtp.host">localhost</Put>
+            <Put name="mail.from">continuum@localhost</Put>
+            <Put name="mail.senderName">Continuum</Put>
+            <Put name="mail.debug">true</Put>
+          </New>
+        </Set>
+      </New>
+    </Arg>
+  </New>
 
-<New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/continuum</Arg>
-  <Arg>
-    <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <Set name="DatabaseName">../continuum_database</Set>
-      <Set name="user">sa</Set>
-      <Set name="createDatabase">create</Set>
-    </New>
-  </Arg>
-</New>
-<New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/continuum_shutdown</Arg>
-  <Arg>
-    <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <Set name="DatabaseName">../continuum_database</Set>
-      <Set name="user">sa</Set>
-      <Set name="shutdownDatabase">shutdown</Set>
-    </New>
-  </Arg>
-</New>
-<New id="users" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/users</Arg>
-  <Arg>
-    <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <Set name="DatabaseName">../users_database</Set>
-      <Set name="user">sa</Set>
-      <Set name="createDatabase">create</Set>
-    </New>
-  </Arg>
-</New>
-<New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
-  <Arg>jdbc/users_shutdown</Arg>
-  <Arg>
-    <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-      <Set name="DatabaseName">../users_database</Set>
-      <Set name="user">sa</Set>
-      <Set name="shutdownDatabase">shutdown</Set>
-    </New>
-  </Arg>
-</New>
+  <New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/continuum</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="DatabaseName">../continuum_database</Set>
+        <Set name="user">sa</Set>
+        <Set name="createDatabase">create</Set>
+      </New>
+    </Arg>
+  </New>
+  <New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/continuum_shutdown</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="DatabaseName">../continuum_database</Set>
+        <Set name="user">sa</Set>
+        <Set name="shutdownDatabase">shutdown</Set>
+      </New>
+    </Arg>
+  </New>
+  <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/users</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="DatabaseName">../users_database</Set>
+        <Set name="user">sa</Set>
+        <Set name="createDatabase">create</Set>
+      </New>
+    </Arg>
+  </New>
+  <New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
+    <Arg>jdbc/users_shutdown</Arg>
+    <Arg>
+      <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+        <Set name="DatabaseName">../users_database</Set>
+        <Set name="user">sa</Set>
+        <Set name="shutdownDatabase">shutdown</Set>
+      </New>
+    </Arg>
+  </New>
 
 </Configure>
 

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/AbstractReleaseAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/AbstractReleaseAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/AbstractReleaseAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/AbstractReleaseAction.java Mon Aug 13 04:29:09 2012
@@ -55,8 +55,8 @@ public class AbstractReleaseAction
         if ( defaultBuildagent != null && defaultBuildagent.length() > 0 )
         {
             // get buildagent to be used from the buildagent group for distributed builds setup
-            BuildAgentGroupConfiguration group =
-                getContinuum().getConfiguration().getBuildAgentGroup( profile.getBuildAgentGroup() );
+            BuildAgentGroupConfiguration group = getContinuum().getConfiguration().getBuildAgentGroup(
+                profile.getBuildAgentGroup() );
 
             if ( group != null )
             {

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java Mon Aug 13 04:29:09 2012
@@ -1,9 +1,5 @@
 package org.apache.continuum.web.action;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.continuum.release.distributed.DistributedReleaseUtil;
 import org.apache.continuum.release.distributed.manager.DistributedReleaseManager;
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
@@ -14,6 +10,10 @@ import org.codehaus.redback.integration.
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
 import org.codehaus.redback.integration.interceptor.SecureActionException;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="distributedRelease"
  */



Mime
View raw message