continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1548057 - in /continuum/branches/CONTINUUM-2713: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ continuum-webapp/src/main/resources/ c...
Date Thu, 05 Dec 2013 09:58:39 GMT
Author: brett
Date: Thu Dec  5 09:58:38 2013
New Revision: 1548057

URL: http://svn.apache.org/r1548057
Log:
[CONTINUUM-2713] remove DMI from build definition templates

Modified:
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.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/buildDefinitionTemplateSummary.jsp

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java?rev=1548057&r1=1548056&r2=1548057&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java
Thu Dec  5 09:58:38 2013
@@ -38,7 +38,7 @@ public abstract class AbstractBuildDefin
         assertTextPresent( "Available Templates" );
         assertTextPresent( "Available Build Definitions" );
         assertButtonWithIdPresent( "buildDefinitionTemplate_0" );
-        assertButtonWithIdPresent( "buildDefinitionAsTemplate_0" );
+        assertButtonWithIdPresent( "buildDefinitionAsTemplate_input_0" );
     }
 
     protected void goToAddTemplate()
@@ -148,7 +148,7 @@ public abstract class AbstractBuildDefin
     protected void goToAddBuildDefinitionTemplate()
     {
         goToBuildDefinitionTemplatePage();
-        clickSubmitWithLocator( "buildDefinitionAsTemplate_0" );
+        clickSubmitWithLocator( "buildDefinitionAsTemplate_input_0" );
         assertAddEditBuildDefinitionTemplatePage();
     }
 

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=1548057&r1=1548056&r2=1548057&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
Thu Dec  5 09:58:38 2013
@@ -227,11 +227,6 @@ public class BuildDefinitionTemplateActi
     //  BuildDefinition
     // -----------------------------------------------------
 
-    public String inputBuildDefinition()
-    {
-        return INPUT;
-    }
-
     public String editBuildDefinition()
         throws Exception
     {

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=1548057&r1=1548056&r2=1548057&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 Thu Dec
 5 09:58:38 2013
@@ -903,6 +903,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>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=1548057&r1=1548056&r2=1548057&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
Thu Dec  5 09:58:38 2013
@@ -44,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>
@@ -57,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>
@@ -70,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>      
@@ -97,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>
@@ -108,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>
@@ -120,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>           



Mime
View raw message