Return-Path: 
 <commits-return-7011-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
X-Original-To: apmail-continuum-commits-archive@www.apache.org
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3CBC811208
	for <apmail-continuum-commits-archive@www.apache.org>;
 Tue, 20 May 2014 14:02:45 +0000 (UTC)
Received: (qmail 20564 invoked by uid 500); 20 May 2014 14:02:45 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 20535 invoked by uid 500); 20 May 2014 14:02:45 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 20528 invoked by uid 99); 20 May 2014 14:02:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2014 14:02:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2014 14:02:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B1A26238889B;
	Tue, 20 May 2014 14:02:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1596252 [2/4] - in /continuum/trunk: ./
 continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/
 continuum-jetty/ continuum-jetty/src/main/assembly/ continuum-webapp-test/
 continuum-webapp-test/src/appserver-base/conf/ con...
Date: Tue, 20 May 2014 14:02:06 -0000
To: commits@continuum.apache.org
From: brett@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140520140211.B1A26238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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=1596252&r1=1596251&r2=1596252&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 Tue May 20 14:02:03 2014
@@ -35,7 +35,6 @@ import static org.testng.Assert.assertEq
 public abstract class AbstractContinuumTest
     extends AbstractSeleniumTest
 {
-
     protected static final String SHARED_SECRET = "continuum1234";
 
     protected static final String ANT_PROJECT_TYPE = "ant";
@@ -167,7 +166,7 @@ public abstract class AbstractContinuumT
     // ////////////////////////////////////
     protected void goToProjectGroupsSummaryPage()
     {
-        getSelenium().open( "/continuum/groupSummary.action" );
+        getSelenium().open( baseUrl + "/groupSummary.action" );
         waitPage();
 
         assertProjectGroupsSummaryPage();
@@ -323,11 +322,11 @@ public abstract class AbstractContinuumT
         assertTextPresent( "Update Project Group" );
         assertTextPresent( "Project Group Name" );
         assertTextPresent( "Project Group Id" );
-        assertTextPresent( groupId );
+        assertFieldValue( groupId, "projectGroup.groupId" );
         assertTextPresent( "Description" );
         assertTextPresent( "Homepage Url" );
         assertTextPresent( "Local Repository" );
-        assertElementPresent( "saveProjectGroup_null" );
+        assertElementPresent( "css=input[value='Save']" );
         assertElementPresent( "Cancel" );
     }
 
@@ -561,7 +560,7 @@ public abstract class AbstractContinuumT
         waitPage();
 
         assertTextPresent( "Move to Group" );
-        String xPath = "//preceding::th/label[contains(text(),'" + projectName + "')]//following::select";
+        String xPath = "//preceding::td/label[contains(text(),'" + projectName + "')]//following::select";
         selectValue( xPath, newProjectGroup );
         clickButtonWithValue( "Save" );
         assertProjectGroupSummaryPage( groupName, groupId, groupDescription );
@@ -632,7 +631,12 @@ public abstract class AbstractContinuumT
         assertAddMavenOneProjectPage();
     }
 
-    void assertAddMavenOneProjectPage()
+    protected void assertAddMavenOneProjectPage()
+    {
+        assertAddMavenOneProjectPage( null );
+    }
+
+    protected void assertAddMavenOneProjectPage( String existingProjectGroup )
     {
         assertPage( "Continuum - Add Maven 1 Project" );
         assertTextPresent( "Add Maven 1.x Project" );
@@ -647,7 +651,14 @@ public abstract class AbstractContinuumT
         assertElementPresent( "m1PomFile" );
         assertTextPresent( "Project Group" );
         assertElementPresent( "selectedProjectGroup" );
-        assertOptionPresent( "selectedProjectGroup", new String[]{"Defined by POM", "Default Project Group"} );
+        if ( existingProjectGroup == null )
+        {
+            assertOptionPresent( "selectedProjectGroup", new String[]{"Defined by POM", "Default Project Group"} );
+        }
+        else
+        {
+            assert existingProjectGroup.equals( getFieldValue( "projectGroupName" ) );
+        }
         assertTextPresent( "Build Definition Template" );
         assertElementPresent( "buildDefinitionTemplateId" );
         assertOptionPresent( "buildDefinitionTemplateId",
@@ -1029,9 +1040,9 @@ public abstract class AbstractContinuumT
     {
         if ( getTitle().endsWith( "Continuum - Configuration" ) )
         {
-            String workingDir = getFieldValue( "configuration_workingDirectory" );
-            String buildOutputDir = getFieldValue( "configuration_buildOutputDirectory" );
-            String releaseOutputDir = getFieldValue( "configuration_releaseOutputDirectory" );
+            String workingDir = getFieldValue( "workingDirectory" );
+            String buildOutputDir = getFieldValue( "buildOutputDirectory" );
+            String releaseOutputDir = getFieldValue( "releaseOutputDirectory" );
             String locationDir = "target/data";
             String data = "data";
             setFieldValue( "workingDirectory", workingDir.replaceFirst( data, locationDir ) );
@@ -1059,7 +1070,7 @@ public abstract class AbstractContinuumT
         goToLoginPage();
         getSelenium().type( "loginForm_username", username );
         getSelenium().type( "loginForm_password", password );
-        getSelenium().click( "loginForm__login" );
+        getSelenium().click( "//input[@value='Login']" );
         getSelenium().waitForPageToLoad( maxWaitTimeInMs );
     }
 
@@ -1263,7 +1274,7 @@ public abstract class AbstractContinuumT
         }
     }
 
-    void assertEditBuildEnvironmentPage( String name )
+    protected void assertEditBuildEnvironmentPage( String name )
     {
         assertAddBuildEnvironmentPage();
         assertTextPresent( "Installation Name" );

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=1596252&r1=1596251&r2=1596252&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 Tue May 20 14:02:03 2014
@@ -26,7 +26,7 @@ package org.apache.continuum.web.test.pa
 public abstract class AbstractInstallationTest
     extends AbstractAdminTest
 {
-    void goToInstallationPage()
+    protected void goToInstallationPage()
     {
         clickLinkWithText( "Installations" );
         assertInstallationPage();
@@ -97,7 +97,7 @@ public abstract class AbstractInstallati
         assertTextPresent( "Create a Build Environment with the Installation name" );
     }
 
-    void assertEditInstallationVariablePage()
+    protected void assertEditInstallationVariablePage()
     {
         assertPage( "Continuum - Installation" );
         assertTextPresent( "Continuum - Installation" );

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=1596252&r1=1596251&r2=1596252&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 Tue May 20 14:02:03 2014
@@ -110,16 +110,13 @@ public abstract class AbstractPurgeTest
     protected void goToAddRepositoryPurge()
     {
         goToGeneralPurgePage();
-        assertGeneralPurgePage();
-        clickLinkWithXPath(
-            "//preceding::input[@value='repository' and @type='hidden']//following::input[@type='submit']" );
+        clickLinkWithXPath( "//form[@name='addRepoPurgeConfig']/input[@type='submit']" );
         assertAddRepositoryPurgePage();
     }
 
     protected void goToEditRepositoryPurge( String daysOlder, String retentionCount, String description )
     {
         goToGeneralPurgePage();
-        assertGeneralPurgePage();
         String xPath = "//preceding::td[text()='" + description + "']//following::img[@alt='Edit']";
         clickLinkWithXPath( xPath );
         assertAddRepositoryPurgePage();
@@ -131,7 +128,6 @@ public abstract class AbstractPurgeTest
     protected void goToEditDirectoryPurge( String daysOlder, String retentionCount, String description )
     {
         goToGeneralPurgePage();
-        assertGeneralPurgePage();
         String xPath = "//preceding::td[text()='" + description + "']//following::img[@alt='Edit']";
         clickLinkWithXPath( xPath );
         assertAddEditDirectoryPurgePage();
@@ -160,9 +156,7 @@ public abstract class AbstractPurgeTest
     protected void goToAddDirectoryPurge()
     {
         goToGeneralPurgePage();
-        assertGeneralPurgePage();
-        clickLinkWithXPath(
-            "//preceding::input[@value='directory' and @type='hidden']//following::input[@type='submit']" );
+        clickLinkWithXPath( "//form[@name='addDirPurgeConfig']/input[@type='submit']" );
         assertAddEditDirectoryPurgePage();
     }
 

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java Tue May 20 14:02:03 2014
@@ -249,7 +249,12 @@ public abstract class AbstractSeleniumTe
 
     protected void submit()
     {
-        clickLinkWithXPath( "//input[@type='submit']" );
+        submit( true );
+    }
+
+    protected void submit( boolean wait )
+    {
+        clickLinkWithXPath( "//input[@type='submit']", wait );
     }
 
     protected void assertButtonWithValuePresent( String text )

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=1596252&r1=1596251&r2=1596252&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 Tue May 20 14:02:03 2014
@@ -319,13 +319,20 @@ public abstract class AbstractUserRolesM
         clickButtonWithValue( "Submit" );
     }
 
-
     protected void deleteUser( String userName )
     {
-        //clickLinkWithText( "userlist" );
-        clickLinkWithXPath( "//table[@id='ec_table']/tbody[2]/tr[3]/td[7]/a/img" );
-        assertDeleteUserPage( userName );
-        submit();
-        assertElementNotPresent( userName );
+        deleteUser( userName, true );
+    }
+
+    protected void deleteUser( String userName, boolean failIfMissing )
+    {
+        String xpath = "//tr[.//a[text()='" + userName + "']]/td/a[@title='delete user']";
+        if ( failIfMissing || isElementPresent( "xpath=" + xpath ) )
+        {
+            clickLinkWithXPath( xpath );
+            assertDeleteUserPage( userName );
+            submit();
+            assertElementNotPresent( userName );
+        }
     }
 }

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Tue May 20 14:02:03 2014
@@ -231,7 +231,6 @@
             <contextPath>/</contextPath>
             <jettyEnvXml>${basedir}/src/jetty-env.xml</jettyEnvXml>
           </webAppConfig>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
           <connectors>
             <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
               <port>9090</port>
@@ -314,9 +313,6 @@
                 <copy todir="${project.build.directory}/appserver-base">
                   <fileset dir="src/appserver-base" />
                 </copy>
-                <copy todir="src/main/webapp/template">
-                  <fileset file="src/main/resources/template/default/validation.js" />
-                </copy>
               </tasks>
             </configuration>
           </execution>

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java Tue May 20 14:02:03 2014
@@ -134,19 +134,16 @@ public class BuildAgentAction
 
         if ( buildAgent != null )
         {
-            String escapedBuildAgentUrl = StringEscapeUtils.escapeXml( buildAgent.getUrl() );
-            buildAgent.setUrl( escapedBuildAgentUrl );
-
             for ( BuildAgentConfiguration agent : configuration.getBuildAgents() )
             {
-                if ( agent.getUrl().equals( escapedBuildAgentUrl ) )
+                if ( agent.getUrl().equals( buildAgent.getUrl() ) )
                 {
                     buildAgent = agent;
 
                     try
                     {
                         installations = getContinuum().getDistributedBuildManager().getAvailableInstallations(
-                            escapedBuildAgentUrl );
+                            buildAgent.getUrl() );
                     }
                     catch ( ContinuumException e )
                     {
@@ -439,6 +436,7 @@ public class BuildAgentAction
         }
         else
         {
+            buildAgentGroup = new BuildAgentGroupConfiguration();
             typeGroup = "new";
         }
         return INPUT;

Propchange: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
------------------------------------------------------------------------------
  Merged /continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:r1534881-1596246

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Tue May 20 14:02:03 2014
@@ -227,11 +227,6 @@ public class BuildDefinitionTemplateActi
     //  BuildDefinition
     // -----------------------------------------------------
 
-    public String inputBuildDefinition()
-    {
-        return INPUT;
-    }
-
     public String editBuildDefinition()
         throws Exception
     {

Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.properties?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.properties Tue May 20 14:02:03 2014
@@ -20,10 +20,8 @@
 struts.objectFactory = org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory
 #struts.tag.altSyntax = true
 
-# Theme
-struts.ui.theme = default
-
-struts.serve.static = false
+# TODO: Need to extract updated resources from struts2-core into webapp to enable this
+#struts.serve.static = false
 
 # Locale
 #struts.locale=en_EN

Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.xml?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Tue May 20 14:02:03 2014
@@ -148,7 +148,6 @@
       <result name="continuum-configuration-required" type="redirectAction">
         <param name="actionName">configuration</param>
         <param name="namespace">/admin</param>
-        <param name="method">input</param>
       </result>
 
       <!-- The following security-* result names arrive from the plexus-security package -->
@@ -243,7 +242,7 @@
       <result name="success">/WEB-INF/jsp/groupSummary.jsp</result>
     </action>
 
-    <action name="addMavenTwoProjectInput" class="addMavenTwoProject">
+    <action name="addMavenTwoProjectInput" class="addMavenTwoProject" method="input">
       <result name="input">/WEB-INF/jsp/addMavenTwoProject.jsp</result>
     </action>
 
@@ -263,7 +262,7 @@
       </result>
     </action>
 
-    <action name="addMavenOneProjectInput" class="addMavenOneProject">
+    <action name="addMavenOneProjectInput" class="addMavenOneProject" method="input">
       <result name="input">/WEB-INF/jsp/addMavenOneProject.jsp</result>
     </action>
 
@@ -293,6 +292,17 @@
       </result>
     </action>
 
+    <action name="deleteProject_default" class="deleteProject" method="default">
+      <interceptor-ref name="storeStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+      <result name="delete">/WEB-INF/jsp/deleteProject.jsp</result>
+      <result name="success" type="redirectAction">
+        <param name="actionName">projectGroupSummary</param>
+        <param name="projectGroupId">${projectGroupId}</param>
+      </result>
+    </action>
+
     <action name="deleteProject" class="deleteProject">
       <interceptor-ref name="storeStack">
         <param name="tokenSession.includeMethods">*</param>
@@ -436,6 +446,10 @@
       </result>
     </action>
 
+    <action name="addProjectGroup_input" class="addProjectGroup" method="input">
+      <result name="input">/WEB-INF/jsp/projectGroupAdd.jsp</result>
+    </action>
+
     <action name="addProjectGroup" class="addProjectGroup">
       <result name="input">/WEB-INF/jsp/projectGroupAdd.jsp</result>
       <result name="success" type="redirectAction">groupSummary</result>
@@ -574,7 +588,6 @@
       <result name="releaseOutputDir-required" type="redirectAction">
         <param name="actionName">configuration</param>
         <param name="namespace">/admin</param>
-        <param name="method">input</param>
         <param name="requireReleaseOutput">true</param>
       </result>
     </action>
@@ -729,7 +742,12 @@
   -->
   <package name="admin" extends="default">
 
-    <action name="configuration" class="configuration">
+    <action name="configuration" class="configuration" method="input">
+      <interceptor-ref name="unconfiguredContinuumStack"/>
+      <result name="input">/WEB-INF/jsp/admin/configurationEdit.jsp</result>
+    </action>
+
+    <action name="configuration_save" class="configuration" method="save">
       <interceptor-ref name="unconfiguredContinuumStack"/>
       <result name="input">/WEB-INF/jsp/admin/configurationEdit.jsp</result>
       <result name="success">/WEB-INF/jsp/admin/configuration.jsp</result>
@@ -784,11 +802,11 @@
       <result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>
     </action>
 
-    <action name="addBuildEnv" class="profileAdministration">
+    <action name="addBuildEnv" class="profileAdministration" method="input">
       <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>
     </action>
 
-    <action name="editBuildEnv" class="profileAdministration">
+    <action name="editBuildEnv" class="profileAdministration" method="edit">
       <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>
       <result name="success">/WEB-INF/jsp/admin/editProfile.jsp</result>
     </action>
@@ -800,7 +818,6 @@
       <result name="success" type="redirectAction">
         <param name="actionName">buildEnvList</param>
         <param name="namespace">/admin</param>
-        <param name="method">list</param>
       </result>
     </action>
 
@@ -840,6 +857,10 @@
       <result name="input">/WEB-INF/jsp/admin/editInstallation.jsp</result>
     </action>
 
+    <action name="editInstallation_input" class="installation" method="input">
+      <result name="input">/WEB-INF/jsp/admin/editInstallation.jsp</result>
+    </action>
+
     <action name="saveInstallation" class="installation" method="save">
       <result name="input">/WEB-INF/jsp/admin/editInstallation.jsp</result>
       <result name="success" type="redirectAction">installationsList</result>
@@ -897,6 +918,10 @@
       <result name="input">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
     </action>
 
+    <action name="buildDefinitionAsTemplate_input" class="buildDefinitionTemplates" method="input">
+      <result name="input">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
+    </action>
+
     <action name="buildDefinitionAsTemplate" class="buildDefinitionTemplates" method="saveBuildDefinition">
       <result name="success" type="redirectAction">
         <param name="actionName">buildDefinitionTemplates.action</param>
@@ -1003,7 +1028,7 @@
       <result name="success">/WEB-INF/jsp/admin/parallelbuilds.jsp</result>
     </action>
 
-    <action name="addBuildQueue" class="org.apache.maven.continuum.web.action.admin.BuildQueueAction">
+    <action name="addBuildQueue" class="org.apache.maven.continuum.web.action.admin.BuildQueueAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/editParallelBuilds.jsp</result>
     </action>
 
@@ -1263,8 +1288,11 @@
     <!--
     * notifier actions :: Project
     -->
-    <action name="deleteProjectNotifier" class="deleteProjectNotifier">
+    <action name="deleteProjectNotifier_default" class="deleteProjectNotifier" method="default">
       <result name="delete">/WEB-INF/jsp/notifier/deleteNotifier.jsp</result>
+    </action>
+
+    <action name="deleteProjectNotifier" class="deleteProjectNotifier">
       <result name="success" type="chain">projectView</result>
       <result name="to_group_page" type="chain">projectGroupNotifier</result>
       <interceptor-ref name="configuredContinuumStack">
@@ -1274,6 +1302,10 @@
 
     <action name="addProjectNotifier" class="addProjectNotifier" method="doDefault">
       <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
+    </action>
+
+    <action name="addProjectNotifier_submit" class="addProjectNotifier" method="execute">
+      <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
       <result name="mail_input">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
       <result name="irc_input">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
       <result name="msn_input">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>
@@ -1343,8 +1375,11 @@
     * notifier actions :: Project Group
     -->
 
-    <action name="deleteProjectGroupNotifier" class="deleteGroupNotifier">
+    <action name="deleteProjectGroupNotifier_default" class="deleteGroupNotifier" method="default">
       <result name="delete">/WEB-INF/jsp/notifier/deleteNotifier.jsp</result>
+    </action>
+
+    <action name="deleteProjectGroupNotifier" class="deleteGroupNotifier">
       <result name="success" type="chain">projectGroupNotifier</result>
       <interceptor-ref name="configuredContinuumStack">
         <param name="tokenSession.includeMethods">execute</param>
@@ -1353,6 +1388,10 @@
 
     <action name="addProjectGroupNotifier" class="addGroupNotifier" method="doDefault">
       <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
+    </action>
+
+    <action name="addProjectGroupNotifier_submit" class="addGroupNotifier" method="execute">
+      <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
       <result name="mail_input">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
       <result name="irc_input">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
       <result name="msn_input">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld Tue May 20 14:02:03 2014
@@ -49,90 +49,6 @@
   </tag>
 
   <tag>
-    <name>data</name>
-    <tagclass>org.apache.maven.continuum.web.view.jsp.ui.DataTag</tagclass>
-    <bodycontent>JSP</bodycontent>
-    <info>data tag</info>
-    <attribute>
-      <name>label</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>name</name>
-      <required>false</required>
-      <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>valueLink</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>submitcancel</name>
-    <tagclass>org.apache.maven.continuum.web.view.jsp.ui.SubmitCancelTag</tagclass>
-    <bodycontent>JSP</bodycontent>
-    <info>An HTML Submit-Cancel UI widget</info>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>cssClass</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>cssStyle</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>label</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>labelposition</name>
-      <required>false</required>
-      <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>theme</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>template</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>name</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>align</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-      <name>cancel</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
     <name>ifBuildTypeEnabled</name>
     <tagclass>org.apache.maven.continuum.web.view.jsp.ui.IfBuildTypeEnabledTag</tagclass>
     <bodycontent>JSP</bodycontent>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -29,12 +28,14 @@
         <h3><s:text name="about.section.title"/></h3>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <c1:data label="%{getText('about.version.label')}">
-                <s:param name="after"><s:text name="about.version.number"/></s:param>
-            </c1:data>
-            <c1:data label="%{getText('about.buildnumber.label')}">
-                <s:param name="after"><s:text name="about.buildnumber"/></s:param>
-            </c1:data>
+            <tr class="b">
+              <th><label class="label"><s:text name='about.version.label'/>:</label></th>
+              <td><s:text name="about.version.number"/></td>
+            </tr>
+            <tr class="b">
+              <th><label class="label"><s:text name='about.buildnumber.label'/>:</label></th>
+              <td><s:text name="about.buildnumber"/></td>
+            </tr>
           </table>
         </div>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
 
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <s:i18n name="localization.Continuum">
 <html>
     <head>
@@ -43,8 +42,8 @@
                         </c:if>
                         <table>
                           <tbody>
-                            <s:textfield label="%{getText('add.m1.project.m1PomUrl.label')}" name="m1PomUrl">
-                                <s:param name="desc">
+                            <s:textfield label="%{getText('add.m1.project.m1PomUrl.label')}" name="m1PomUrl" size="100">
+                                <s:param name="after">
                                 <table cellspacing="0" cellpadding="0">
                                   <tbody>
                                     <tr>
@@ -67,14 +66,14 @@
                             <s:label>
                               <s:param name="after"><strong><s:text name="or"/></strong></s:param>
                             </s:label>
-                            <s:file label="%{getText('add.m1.project.m1PomFile.label')}" name="m1PomFile">
-                                <s:param name="desc"><p><s:text name="add.m1.project.m1PomFile.message"/></p></s:param>
+                            <s:file label="%{getText('add.m1.project.m1PomFile.label')}" name="m1PomFile" size="100">
+                                <s:param name="after"><p><s:text name="add.m1.project.m1PomFile.message"/></p></s:param>
                             </s:file>
                             <c:choose>
                             <c:when test="${disableGroupSelection == true}">
                               <s:hidden name="selectedProjectGroup"/>
                               <s:hidden name="disableGroupSelection"/>
-                              <s:textfield label="%{getText('add.m1.project.projectGroup')}" name="projectGroupName" disabled="true"/>
+                              <s:textfield label="%{getText('add.m1.project.projectGroup')}" name="projectGroupName" disabled="true" size="100"/>
                             </c:when>
                             <c:otherwise>
                               <s:select label="%{getText('add.m1.project.projectGroup')}" name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
@@ -86,7 +85,8 @@
                           </tbody>
                         </table>
                         <div class="functnbar3">
-                          <c1:submitcancel value="%{getText('add')}" cancel="%{getText('cancel')}"/>
+                          <s:submit value="%{getText('add')}" theme="simple"/>
+                          <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
                         </div>
                   </s:form>
                 </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
 
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <s:i18n name="localization.Continuum">
 <html>
     <head>
@@ -43,8 +42,8 @@
                         </c:if>
                         <table>
                           <tbody>
-                            <s:textfield label="%{getText('add.m2.project.m2PomUrl.label')}" requiredLabel="true" name="m2PomUrl">
-	                            <s:param name="desc">
+                            <s:textfield label="%{getText('add.m2.project.m2PomUrl.label')}" requiredLabel="true" name="m2PomUrl" size="100">
+	                            <s:param name="after">
 		                            <table cellspacing="0" cellpadding="0">
 		                              <tbody>
 		                                <tr>
@@ -67,14 +66,14 @@
                             <s:label>
                               <s:param name="after"><strong><s:text name="or"/></strong></s:param>
                             </s:label>
-                            <s:file label="%{getText('add.m2.project.m2PomFile.label')}" name="m2PomFile">
-                                <s:param name="desc"><p><s:text name="add.m2.project.m2PomFile.message"/></p></s:param>
+                            <s:file label="%{getText('add.m2.project.m2PomFile.label')}" name="m2PomFile" size="100">
+                                <s:param name="after"><p><s:text name="add.m2.project.m2PomFile.message"/></p></s:param>
                             </s:file>
                             <c:choose>
                             <c:when test="${disableGroupSelection == true}">
                               <s:hidden name="selectedProjectGroup"/>
                               <s:hidden name="disableGroupSelection"/>
-                              <s:textfield label="%{getText('add.m2.project.projectGroup')}" name="projectGroupName" disabled="true"/>
+                              <s:textfield label="%{getText('add.m2.project.projectGroup')}" name="projectGroupName" disabled="true" size="100"/>
                             </c:when>
                             <c:otherwise>
                               <s:select label="%{getText('add.m2.project.projectGroup')}" name="selectedProjectGroup"
@@ -83,7 +82,7 @@
                             </c:choose>
                             
                             <s:label>
-                              <s:param name="desc">
+                              <s:param name="after">
                                 <table cellspacing="0" cellpadding="0">
 	                              <tbody>
 	                                <tr>
@@ -109,7 +108,8 @@
                           </tbody>
                         </table>
                         <div class="functnbar3">
-                          <c1:submitcancel value="%{getText('add')}" cancel="%{getText('cancel')}"/>
+                          <s:submit value="%{getText('add')}" theme="simple"/>
+                          <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
                         </div>
                     </s:form>
                 </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <s:i18n name="localization.Continuum">
 <html>
@@ -54,33 +53,33 @@
                         </c:if>
                         <table>
                           <tbody>
-                            <s:textfield label="%{getText('projectName.label')}" name="projectName" requiredLabel="true">
-                                <s:param name="desc"><p><s:text name="projectName.message"/></p></s:param>
+                            <s:textfield label="%{getText('projectName.label')}" name="projectName" requiredLabel="true" size="100">
+                                <s:param name="after"><p><s:text name="projectName.message"/></p></s:param>
                             </s:textfield>
-                            <s:textfield label="%{getText('projectDescription.label')}" name="projectDescription">
-                                <s:param name="desc"><p><s:text name="projectDescription.message"/></p></s:param>
+                            <s:textfield label="%{getText('projectDescription.label')}" name="projectDescription" size="100">
+                                <s:param name="after"><p><s:text name="projectDescription.message"/></p></s:param>
                             </s:textfield>
-                            <s:textfield label="%{getText('projectVersion.label')}" name="projectVersion" requiredLabel="true">
-                                <s:param name="desc"><p><s:text name="projectVersion.message"/></p></s:param>
+                            <s:textfield label="%{getText('projectVersion.label')}" name="projectVersion" requiredLabel="true" size="100">
+                                <s:param name="after"><p><s:text name="projectVersion.message"/></p></s:param>
                             </s:textfield>
-                            <s:textfield label="%{getText('projectScmUrl.label')}" name="projectScmUrl" requiredLabel="true">
-                                <s:param name="desc"><p><s:text name="projectScmUrl.message"/></p></s:param>
+                            <s:textfield label="%{getText('projectScmUrl.label')}" name="projectScmUrl" requiredLabel="true" size="100">
+                                <s:param name="after"><p><s:text name="projectScmUrl.message"/></p></s:param>
                             </s:textfield>
-                            <s:textfield label="%{getText('projectScmUsername.label')}" name="projectScmUsername">
-                                <s:param name="desc"><p><s:text name="projectScmUsername.message"/></p></s:param>
+                            <s:textfield label="%{getText('projectScmUsername.label')}" name="projectScmUsername" size="100">
+                                <s:param name="after"><p><s:text name="projectScmUsername.message"/></p></s:param>
                             </s:textfield>
-                            <s:password label="%{getText('projectScmPassword.label')}" name="projectScmPassword">
-                                <s:param name="desc"><p><s:text name="projectScmPassword.message"/></p></s:param>
+                            <s:password label="%{getText('projectScmPassword.label')}" name="projectScmPassword" size="100">
+                                <s:param name="after"><p><s:text name="projectScmPassword.message"/></p></s:param>
                             </s:password>
-                            <s:textfield label="%{getText('projectScmTag.label')}" name="projectScmTag">
-                                <s:param name="desc"><p><s:text name="projectScmTag.message"/></p></s:param>
+                            <s:textfield label="%{getText('projectScmTag.label')}" name="projectScmTag" size="100">
+                                <s:param name="after"><p><s:text name="projectScmTag.message"/></p></s:param>
                             </s:textfield>
                             <s:checkbox label="%{getText('projectScmUseCache.label')}" name="projectScmUseCache"/>
                             <c:choose>
                             <c:when test="${disableGroupSelection == true}">
                               <s:hidden name="selectedProjectGroup"/>
                               <s:hidden name="disableGroupSelection"/>
-                              <s:textfield label="%{getText('projectGroup.name.label')}" name="projectGroupName" disabled="true"/>
+                              <s:textfield label="%{getText('projectGroup.name.label')}" name="projectGroupName" disabled="true" size="100"/>
                             </c:when>
                             <c:otherwise>
                               <s:select label="%{getText('projectGroup.name.label')}" name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
@@ -101,7 +100,8 @@
                         </table>
                         <input type="hidden" name="projectType" value="<s:property value="projectType"/>">
                         <div class="functnbar3">
-                          <c1:submitcancel value="%{getText('add')}" cancel="%{getText('cancel')}"/>
+                          <s:submit value="%{getText('add')}" theme="simple"/>
+                          <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
                         </div>
                     </s:form>
                 </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
 
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
 <s:i18n name="localization.Continuum">
 <head>
@@ -100,7 +99,7 @@
 </c:if>
 
 <s:actionmessage/>
-<s:form action="saveFooter!saveFooter.action" method="post" namespace="/admin">
+<s:form action="saveFooter.action" method="post" namespace="/admin">
   <s:token/>
   <div id="axial" class="h3">
     <h3><s:text name="appearance.footerContent"/></h3>
@@ -111,7 +110,8 @@
         </tbody>
       </table>
       <div class="functnbar3">
-        <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+        <s:submit value="%{getText('save')}" theme="simple"/>
+        <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
       </div>      
     </div>
   </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
 
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 
 <html>
@@ -45,7 +44,7 @@
         <ec:row>
           <ec:column property="name" title="buildDefinition.template.name"/>
           <ec:column property="editAction" title="&nbsp;" width="1%">
-            <s:url id="editUrl" action="editBuildDefinitionTemplate" method="edit" namespace="/">
+            <s:url id="editUrl" action="editBuildDefinitionTemplate" namespace="/">
               <s:param name="buildDefinitionTemplate.id"><c:out value="${pageScope.template.id}"/></s:param>
             </s:url>
             <s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"></s:a>
@@ -58,7 +57,7 @@
             </c:when>
             <c:otherwise>
               <s:token/>
-              <s:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete" namespace="/">
+              <s:url id="deleteUrl" action="deleteDefinitionTemplate" namespace="/">
                 <s:param name="buildDefinitionTemplate.id"><c:out value="${pageScope.template.id}"/></s:param>
                 <s:param name="buildDefinitionTemplate.name"><c:out value="${pageScope.template.name}"/></s:param>
                 <s:param name="struts.token.name">token</s:param>
@@ -71,7 +70,7 @@
         </ec:row>  
       </ec:table> 
       <div class="functnbar3">
-        <s:form action="buildDefinitionTemplate!input.action" method="post">
+        <s:form action="buildDefinitionTemplate.action" method="post">
           <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
       </div>      
@@ -98,7 +97,7 @@
           <ec:column property="description" title="buildDefinition.template.buildDefinition.description"/>
           <ec:column property="type" title="buildDefinition.template.buildDefinition.type"/>
           <ec:column property="editAction" title="&nbsp;" width="1%">
-            <s:url id="editUrl" action="editBuildDefinitionAsTemplate" method="editBuildDefinition" namespace="/">
+            <s:url id="editUrl" action="editBuildDefinitionAsTemplate" namespace="/">
               <s:param name="buildDefinition.id"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
             </s:url>
             <s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"></s:a>
@@ -109,7 +108,7 @@
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
             </c:when>
             <c:otherwise>
-              <s:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" method="deleteBuildDefinition" namespace="/">
+              <s:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" namespace="/">
                 <s:param name="buildDefinition.id"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
                 <s:param name="buildDefinition.description"><c:out value="${pageScope.buildDefinitionSummary.description}"/></s:param>
               </s:url>
@@ -121,7 +120,7 @@
       </ec:table>      
       
       <div class="functnbar3">
-        <s:form action="buildDefinitionAsTemplate!inputBuildDefinition.action" method="post">
+        <s:form action="buildDefinitionAsTemplate_input.action" method="post">
           <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
       </div>           

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
 
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
@@ -56,7 +55,7 @@
                 <ec:column property="task.buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" width="19%"/>
                 <ec:column property="cancelAction" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
-                    <s:url id="cancelUrl" action="cancelCurrentBuildTask" method="cancelCurrent" namespace="/">
+                    <s:url id="cancelUrl" action="cancelCurrentBuildTask" namespace="/">
                       <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
                     </s:url>
                     <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
@@ -74,7 +73,7 @@
         </div>
       
       
-      <s:form id="removeBuildForm" action="removeBuildQueueEntries!removeBuildEntries.action" method="post">
+      <s:form id="removeBuildForm" action="removeBuildQueueEntries.action" method="post">
         <div id="h3">
           <h3>
             <s:text name="buildQueue.section.title"/>
@@ -105,7 +104,7 @@
                 <ec:column property="task.buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" width="19%"/>
                 <ec:column property="cancelAction" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
-                    <s:url id="cancelUrl" action="removeBuildQueueEntry" method="remove" namespace="/">
+                    <s:url id="cancelUrl" action="removeBuildQueueEntry" namespace="/">
                       <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
                       <s:param name="buildDefinitionId"><c:out value="${queue.task.buildDefinitionId}"/></s:param>
                       <s:param name="trigger"><c:out value="${queue.task.buildTrigger.trigger}"/></s:param>
@@ -166,7 +165,7 @@
                 </ec:column>
                 <ec:column property="cancelAction" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
-                    <s:url id="cancelUrl" action="cancelCurrentQueueTask" method="cancelCurrentCheckout" namespace="/">
+                    <s:url id="cancelUrl" action="cancelCurrentQueueTask" namespace="/">
                       <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
                     </s:url>
                     <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
@@ -184,7 +183,7 @@
         </div>
       
         
-      <s:form id="removeCheckoutForm" action="removeCheckoutQueueEntries!removeCheckoutEntries.action" method="post">
+      <s:form id="removeCheckoutForm" action="removeCheckoutQueueEntries.action" method="post">
         <div id="h3">
           <h3>
             <s:text name="checkoutQueue.section.title"/>
@@ -214,7 +213,7 @@
                 </ec:column>
                 <ec:column property="cancelAction" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
-                    <s:url id="cancelUrl" action="removeCheckoutQueueEntry" method="removeCheckout" namespace="/">
+                    <s:url id="cancelUrl" action="removeCheckoutQueueEntry" namespace="/">
                       <s:param name="projectId"><c:out value="${queue.task.projectId}"/></s:param>
                     </s:url>
                     <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
@@ -309,7 +308,7 @@
                 <ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
-                    <s:url id="cancelUrl" action="removePrepareBuildEntry" method="removePrepareBuildEntry" namespace="/">
+                    <s:url id="cancelUrl" action="removePrepareBuildEntry" namespace="/">
                       <s:param name="projectGroupId"><c:out value="${pageScope.prepareBuildQueue.projectGroupId}"/></s:param>
                       <s:param name="scmRootId"><c:out value="${pageScope.prepareBuildQueue.scmRootId}"/></s:param>
                     </s:url>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
 <s:i18n name="localization.Continuum">
   <head>
@@ -34,17 +33,37 @@
 
     <div class="axial">
       <table border="1" cellspacing="2" cellpadding="3" width="100%">
-        <c1:data label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"/>
-        <c1:data label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"/>
-        <c1:data label="%{getText('configuration.releaseOutputDirectory.label')}" name="releaseOutputDirectory"/>
-        <c1:data label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
-                 name="deploymentRepositoryDirectory"/>
-        <c1:data label="%{getText('configuration.baseUrl.label')}" name="baseUrl"/>
-        <c1:data label="%{getText('configuration.allowed.build.parallel')}" name="numberOfAllowedBuildsinParallel"/>
-        <c1:data label="%{getText('configuration.distributedBuildEnabled.label')}" name="distributedBuildEnabled"/>
+        <tr class="b">
+          <th><label class="label"><s:text name='configuration.workingDirectory.label'/>:</label></th>
+          <td><s:property value="workingDirectory"/></td>
+        </tr>
+        <tr class="b">
+          <th><label class="label"><s:text name='configuration.buildOutputDirectory.label'/>:</label></th>
+          <td><s:property value="buildOutputDirectory"/></td>
+        </tr>
+        <tr class="b">
+          <th><label class="label"><s:text name='configuration.releaseOutputDirectory.label'/>:</label></th>
+          <td><s:property value="releaseOutputDirectory"/></td>
+        </tr>
+        <tr class="b">
+          <th><label class="label"><s:text name='configuration.deploymentRepositoryDirectory.label'/>:</label></th>
+          <td><s:property value="deploymentRepositoryDirectory"/></td>
+        </tr>
+        <tr class="b">
+          <th><label class="label"><s:text name='configuration.baseUrl.label'/>:</label></th>
+          <td><s:property value="baseUrl"/></td>
+        </tr>
+        <tr class="b">
+          <th><label class="label"><s:text name='configuration.allowed.build.parallel'/>:</label></th>
+          <td><s:property value="numberOfAllowedBuildsinParallel"/></td>
+        </tr>
+        <tr class="b">
+          <th><label class="label"><s:text name='configuration.distributedBuildEnabled.label'/>:</label></th>
+          <td><s:property value="distributedBuildEnabled"/></td>
+        </tr>
       </table>
       <div class="functnbar3">
-        <s:form action="configuration!input.action" method="post">
+        <s:form action="configuration.action" method="post">
           <s:submit value="%{getText('edit')}"/>
         </s:form>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <html>
 <s:i18n name="localization.Continuum">
@@ -49,7 +48,7 @@
       <s:text name="configuration.section.title"/>
     </h3>
 
-    <s:form name="editConfiguration" action="configuration!save" method="post">
+    <s:form name="editConfiguration" action="configuration_save" method="post">
 
       <c:if test="${!empty actionErrors}">
         <div class="errormessage">
@@ -65,41 +64,41 @@
           <tbody>
 
             <s:textfield label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"
-                          requiredLabel="true">
-              <s:param name="desc"><p>
+                          requiredLabel="true" size="100">
+              <s:param name="after"><p>
                 <s:text name="configuration.workingDirectory.message"/>
               </p></s:param>
             </s:textfield>
 
             <s:textfield label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"
-                          requiredLabel="true">
-              <s:param name="desc"><p>
+                          requiredLabel="true" size="100">
+              <s:param name="after"><p>
                 <s:text name="configuration.buildOutputDirectory.message"/>
               </p></s:param>
             </s:textfield>
 
             <s:textfield label="%{getText('configuration.releaseOutputDirectory.label')}" name="releaseOutputDirectory"
-            			  requiredLabel="%{requireReleaseOutput}">
-              <s:param name="desc"><p>
+            			  requiredLabel="%{requireReleaseOutput}" size="100">
+              <s:param name="after"><p>
                 <s:text name="configuration.releaseOutputDirectory.message"/>
               </s:param>
             </s:textfield>
 
             <s:textfield label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
-                          name="deploymentRepositoryDirectory">
-              <s:param name="desc"><p>
+                          name="deploymentRepositoryDirectory" size="100">
+              <s:param name="after"><p>
                 <s:text name="configuration.deploymentRepositoryDirectory.message"/>
               </p></s:param>
             </s:textfield>
 
-            <s:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl" requiredLabel="true">
-              <s:param name="desc"><p>
+            <s:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl" requiredLabel="true" size="100">
+              <s:param name="after"><p>
                 <s:text name="configuration.baseUrl.message"/>
               </p></s:param>
             </s:textfield>
 
             <s:textfield label="%{getText('configuration.allowed.build.parallel')}" name="numberOfAllowedBuildsinParallel" size="10">
-              <s:param name="desc"><p>
+              <s:param name="after"><p>
                 <s:text name="configuration.allowed.build.paralle.message"/>
               </p></s:param>
             </s:textfield>
@@ -110,8 +109,8 @@
 
             <s:checkbox label="%{getText('configuration.distributedBuildEnabled.label')}" name="distributedBuildEnabled" onclick="setSecretPassword();"/>
 
-            <s:password label="%{getText('configuration.sharedSecretPassword.label')}" name="sharedSecretPassword" disabled="%{!distributedBuildEnabled}" showPassword="true">
-              <s:param name="desc">
+            <s:password label="%{getText('configuration.sharedSecretPassword.label')}" name="sharedSecretPassword" disabled="%{!distributedBuildEnabled}" showPassword="true" size="100">
+              <s:param name="after">
                 <p>
                   <s:text name="configuration.sharedSecretPassword.message"/>
                 </p>
@@ -122,7 +121,8 @@
           </tbody>
         </table>
         <div class="functnbar3">
-          <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+          <s:submit value="%{getText('save')}" theme="simple"/>
+          <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
         </div>
 
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 
 <html>
   <s:i18n name="localization.Continuum">
@@ -39,11 +38,12 @@
           </p>
         </div>
         <div class="functnbar3">
-          <s:form action="deleteBuildAgent!delete.action" method="post">
+          <s:form action="deleteBuildAgent.action" method="post">
             <s:token/>
             <input type="hidden" name="buildAgent.url" value="${buildAgent.url}" />
             <s:hidden name="confirmed" value="true"/>
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </s:form>
         </div>
       </div>

Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
------------------------------------------------------------------------------
  Merged /continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp:r1534881-1596246

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 
 <html>
   <s:i18n name="localization.Continuum">
@@ -39,11 +38,12 @@
           </p>
         </div>
         <div class="functnbar3">
-          <s:form action="deleteBuildAgentGroup!deleteGroup.action" method="post">
+          <s:form action="deleteBuildAgentGroup.action" method="post">
             <s:token/>
             <input type="hidden" name="buildAgentGroup.name" value="${buildAgentGroup.name}" />
             <s:hidden name="confirmed" value="true"/>
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </s:form>
         </div>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -41,7 +40,8 @@
           <s:form action="deleteBuildDefinitionAsTemplate" method="post">
             <s:hidden name="buildDefinition.id"/>
             <s:hidden name="confirmed" value="true"/>
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </s:form>
         </div>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -42,7 +41,8 @@
             <s:token/>
             <s:hidden name="buildDefinitionTemplate.id"/>
             <s:hidden name="confirmed" value="true"/>
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </s:form>
         </div>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -38,10 +37,11 @@
           </p>
         </div>
         <div class="functnbar3">
-          <s:form action="deleteBuildEnv!delete.action" method="post">
+          <s:form action="deleteBuildEnv.action" method="post">
             <s:token/>
             <input type="hidden" name="profile.id" value="${profile.id}" />
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </s:form>
         </div>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -42,7 +41,8 @@
             <s:token/>
             <s:hidden name="buildQueue.id"/>
             <s:hidden name="confirmed" value="true"/>
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </s:form>
         </div>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteDistributedPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteDistributedPurgeConfiguration.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteDistributedPurgeConfiguration.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteDistributedPurgeConfiguration.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <html>
   <s:i18n name="localization.Continuum">
@@ -46,7 +45,8 @@
           </div>
 
           <div class="functnbar3">
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </div>
         </s:form>
         </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -41,7 +40,8 @@
           <s:form action="deleteInstallation" method="post">
             <input type="hidden" name="installation.installationId" value="${installation.installationId}" />
             <s:hidden name="confirmed" value="true"/>
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </s:form>
         </div>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <html>
   <s:i18n name="localization.Continuum">
@@ -46,7 +45,8 @@
           </div>
 
           <div class="functnbar3">
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </div>
         </s:form>
         </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
   --%>
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <html>
   <s:i18n name="localization.Continuum">
@@ -46,7 +45,8 @@
           </div>
 
           <div class="functnbar3">
-            <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+            <s:submit value="%{getText('delete')}" theme="simple"/>
+            <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
           </div>
         </s:form>
         </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/distributedPurgeConfigurationsList.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Tue May 20 14:02:03 2014
@@ -34,9 +34,9 @@
   </p>
 
   <s:actionmessage/>
-  <s:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
-    <s:textfield name="companyPom.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
-    <s:textfield name="companyPom.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
+  <s:form method="post" action="saveAppearance" namespace="/admin" validate="true">
+    <s:textfield name="companyPom.groupId" label="%{getText('appearance.companyPom.groupId')}" size="100"/>
+    <s:textfield name="companyPom.artifactId" label="%{getText('appearance.companyPom.artifactId')}" size="100"/>
     <s:submit value="%{getText('save')}"/>
   </s:form>
 </body>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
   
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -44,18 +43,19 @@
               <s:hidden name="type"/>
               <c:choose>
                 <c:when test="${type=='new'}">
-                  <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url" requiredLabel="true"/>
+                  <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url" requiredLabel="true" size="100"/>
                 </c:when>
                 <c:otherwise>
                   <s:hidden name="buildAgent.url"/>
-                  <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url" requiredLabel="true" disabled="true"/>
+                  <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url" requiredLabel="true" disabled="true" size="100"/>
                 </c:otherwise>
               </c:choose>
-              <s:textfield label="%{getText('buildAgent.description.label')}" name="buildAgent.description"/>
+              <s:textfield label="%{getText('buildAgent.description.label')}" name="buildAgent.description" size="100"/>
               <s:checkbox label="%{getText('buildAgent.enabled.label')}" name="buildAgent.enabled" value="buildAgent.enabled" fieldValue="true"/>
             </table>
             <div class="functnbar3">
-              <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+              <s:submit value="%{getText('save')}" theme="simple"/>
+              <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
             </div>
           </s:form>
         </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
   
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -44,11 +43,11 @@
               <s:hidden name="typeGroup"/>
               <c:choose>
                 <c:when test="${typeGroup=='new'}">
-                  <s:textfield label="%{getText('buildAgentGroup.name.label')}" name="buildAgentGroup.name" requiredLabel="true"/>
+                  <s:textfield label="%{getText('buildAgentGroup.name.label')}" name="buildAgentGroup.name" requiredLabel="true" size="100"/>
                 </c:when>
                 <c:otherwise>
                   <s:hidden name="buildAgentGroup.name"/>
-                  <s:textfield label="%{getText('buildAgentGroup.name.label')}" name="buildAgentGroup.name" requiredLabel="true" disabled="true"/>
+                  <s:textfield label="%{getText('buildAgentGroup.name.label')}" name="buildAgentGroup.name" requiredLabel="true" disabled="true" size="100"/>
                 </c:otherwise>
               </c:choose>
             </table>
@@ -90,7 +89,8 @@
             </c:choose>                           
 
             <div class="functnbar3">
-              <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+              <s:submit value="%{getText('save')}" theme="simple"/>
+              <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
             </div>
           </s:form>
         </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -46,25 +45,25 @@
                 <table>
                   <tbody>
                     <s:if test="buildDefinition.type == 'ant'">
-                      <s:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildDefinition.buildFile"  requiredLabel="true"/>
+                      <s:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildDefinition.buildFile"  requiredLabel="true" size="100"/>
                     </s:if>
                     <s:elseif test="buildDefinition.type == 'shell'">
-                      <s:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildDefinition.buildFile" requiredLabel="true"/>
+                      <s:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildDefinition.buildFile" requiredLabel="true" size="100"/>
                     </s:elseif>
                     <s:else>
-                      <s:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildDefinition.buildFile" requiredLabel="true"/>
+                      <s:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildDefinition.buildFile" requiredLabel="true" size="100"/>
                     </s:else>
     
                     <s:if test="buildDefinition.type == 'ant'">
-                      <s:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="buildDefinition.goals"/>
+                      <s:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="buildDefinition.goals" size="100"/>
                     </s:if>
                     <s:elseif test="buildDefinition.type == 'shell'">
                     </s:elseif>
                     <s:else>
-                      <s:textfield label="%{getText('buildDefinition.goals.maven.label')}" name="buildDefinition.goals" requiredLabel="true"/>
+                      <s:textfield label="%{getText('buildDefinition.goals.maven.label')}" name="buildDefinition.goals" requiredLabel="true" size="100"/>
                     </s:else>
     
-                    <s:textfield label="%{getText('buildDefinition.arguments.label')}" name="buildDefinition.arguments"/>
+                    <s:textfield label="%{getText('buildDefinition.arguments.label')}" name="buildDefinition.arguments" size="100"/>
                     <s:checkbox label="%{getText('buildDefinition.buildFresh.label')}" name="buildDefinition.buildFresh"/>
                     <s:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}" name="buildDefinition.alwaysBuild" />
                     <s:checkbox label="%{getText('buildDefinition.defaultForProject.label')}" name="buildDefinition.defaultForProject" />
@@ -82,11 +81,12 @@
                     <s:if test="buildDefinition.type != 'ant' || buildDefinition.type != 'shell'">
                         <s:select label="%{getText('buildDefinition.updatePolicy.label')}" name="buildDefinition.updatePolicy" list="buildDefinitionUpdatePolicies"/>
                     </s:if>
-                    <s:textfield label="%{getText('buildDefinition.description.label')}" name="buildDefinition.description" requiredLabel="true"/>
+                    <s:textfield label="%{getText('buildDefinition.description.label')}" name="buildDefinition.description" requiredLabel="true" size="100"/>
                   </tbody>
                 </table>
                 <div class="functnbar3">
-                  <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+                  <s:submit value="%{getText('save')}" theme="simple"/>
+                  <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
                 </div>
 
                 <s:hidden name="buildDefinition.id"/>