You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2013/12/02 04:40:43 UTC
svn commit: r1546887 - in /continuum/branches/CONTINUUM-2713:
continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/
continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/
continuum-webapp/src/main/resources/ continuu...
Author: brett
Date: Mon Dec 2 03:40:42 2013
New Revision: 1546887
URL: http://svn.apache.org/r1546887
Log:
[CONTINUUM-2713] remove DMI from configuration screen
Added:
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-validation.xml
- copied unchanged from r1546886, continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml
Removed:
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/ConfigurationAction-configuration-validation.xml
Modified:
continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java
continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java
continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java?rev=1546887&r1=1546886&r2=1546887&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java Mon Dec 2 03:40:42 2013
@@ -230,7 +230,7 @@ public class UserRolesManagementTest
// enable distributed build
clickLinkWithText( "Configuration" );
- clickLinkWithLocator( "configuration_distributedBuildEnabled", false );
+ checkField( "distributedBuildEnabled" );
clickButtonWithValue( "Save" );
clickLinkWithText( "Logout" );
@@ -246,7 +246,7 @@ public class UserRolesManagementTest
loginAsAdmin();
// disable distributed build
clickLinkWithText( "Configuration" );
- clickLinkWithLocator( "configuration_distributedBuildEnabled", false );
+ uncheckField( "distributedBuildEnabled" );
clickButtonWithValue( "Save" );
clickLinkWithText( "Logout" );
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java?rev=1546887&r1=1546886&r2=1546887&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java Mon Dec 2 03:40:42 2013
@@ -226,12 +226,12 @@ public abstract class AbstractAdminTest
{
goToConfigurationPage();
setFieldValue( "numberOfAllowedBuildsinParallel", "2" );
- if ( !isChecked( "configuration_distributedBuildEnabled" ) )
+ if ( !isChecked( "distributedBuildEnabled" ) )
{
// must use click here so the JavaScript enabling the shared secret gets triggered
- click( "configuration_distributedBuildEnabled" );
+ click( "distributedBuildEnabled" );
}
- setFieldValue( "configuration_sharedSecretPassword", SHARED_SECRET );
+ setFieldValue( "sharedSecretPassword", SHARED_SECRET );
clickAndWait( "css=input[value='Save']" );
assertTextPresent( "true" );
assertTextPresent( "Distributed Builds" );
@@ -242,9 +242,9 @@ public abstract class AbstractAdminTest
{
goToConfigurationPage();
setFieldValue( "numberOfAllowedBuildsinParallel", "2" );
- if ( isChecked( "configuration_distributedBuildEnabled" ) )
+ if ( isChecked( "distributedBuildEnabled" ) )
{
- uncheckField( "configuration_distributedBuildEnabled" );
+ uncheckField( "distributedBuildEnabled" );
}
submit();
assertTextPresent( "false" );
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=1546887&r1=1546886&r2=1546887&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java Mon Dec 2 03:40:42 2013
@@ -1029,9 +1029,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 ) );
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml?rev=1546887&r1=1546886&r2=1546887&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml Mon Dec 2 03:40:42 2013
@@ -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 -->
@@ -574,7 +573,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,9 +727,13 @@
-->
<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="success">/WEB-INF/jsp/admin/configuration.jsp</result>
<result name="error">/WEB-INF/jsp/admin/configurationEdit.jsp</result>
</action>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp?rev=1546887&r1=1546886&r2=1546887&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp Mon Dec 2 03:40:42 2013
@@ -63,7 +63,7 @@
</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/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?rev=1546887&r1=1546886&r2=1546887&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp Mon Dec 2 03:40:42 2013
@@ -48,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">
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=1546887&r1=1546886&r2=1546887&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Mon Dec 2 03:40:42 2013
@@ -146,7 +146,7 @@
</div>
</redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-manage-configuration">
- <s:url id="configurationUrl" action="configuration" namespace="/admin" method="input" includeParams="none"/>
+ <s:url id="configurationUrl" action="configuration" namespace="/admin" includeParams="none"/>
<div class="body">
<s:a href="%{configurationUrl}">
<s:text name="menu.administration.configuration"/>