continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1548073 - in /continuum/branches/CONTINUUM-2713: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ continuum-webapp/src/main/resources/ continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/ continuum-webapp/src/main/webapp...
Date Thu, 05 Dec 2013 10:01:21 GMT
Author: brett
Date: Thu Dec  5 10:01:21 2013
New Revision: 1548073

URL: http://svn.apache.org/r1548073
Log:
[CONTINUUM-2713] remove DMI from queues actions

Modified:
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.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/parallelbuilds.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/QueueTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java?rev=1548073&r1=1548072&r2=1548073&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java
Thu Dec  5 10:01:21 2013
@@ -158,7 +158,7 @@ public class QueueTest
         String location = getSelenium().getLocation();
 
         //check queue page while building
-        getSelenium().open( baseUrl + "/admin/displayQueues!display.action" );
+        getSelenium().open( baseUrl + "/admin/displayQueues.action" );
         assertPage( "Continuum - Build Queue" );
         assertTextPresent( "Current Build" );
         assertTextPresent( "Build Queue" );

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=1548073&r1=1548072&r2=1548073&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 10:01:21 2013
@@ -1027,7 +1027,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>
 

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp?rev=1548073&r1=1548072&r2=1548073&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
Thu Dec  5 10:01:21 2013
@@ -67,7 +67,7 @@
       </c:if>
       
        <div class="functnbar3">
-        <s:form action="addBuildQueue!input.action" method="post">
+        <s:form action="addBuildQueue.action" method="post">
           <s:submit value="%{getText('add')}"/>
         </s:form>
       </div> 

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=1548073&r1=1548072&r2=1548073&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
Thu Dec  5 10:01:21 2013
@@ -130,7 +130,7 @@
           </div> 
         </redback:ifAuthorized> 
         <redback:ifAuthorized permission="continuum-view-queues">
-          <s:url id="queueUrls" action="displayQueues" namespace="/admin" method="display"
includeParams="none"/>
+          <s:url id="queueUrls" action="displayQueues" namespace="/admin" includeParams="none"/>
           <div class="body">
             <s:a href="%{queueUrls}">
               <s:text name="menu.administration.queues"/>



Mime
View raw message