continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1548062 - in /continuum/branches/CONTINUUM-2713/continuum-webapp/src/main: resources/ webapp/WEB-INF/jsp/admin/ webapp/WEB-INF/jsp/components/ webapp/WEB-INF/jsp/navigations/
Date Thu, 05 Dec 2013 09:59:27 GMT
Author: brett
Date: Thu Dec  5 09:59:27 2013
New Revision: 1548062

URL: http://svn.apache.org/r1548062
Log:
[CONTINUUM-2713] remove DMI from build environments

Modified:
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/resources/struts.xml
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp

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=1548062&r1=1548061&r2=1548062&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:59:27 2013
@@ -790,11 +790,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>
@@ -806,7 +806,6 @@
       <result name="success" type="redirectAction">
         <param name="actionName">buildEnvList</param>
         <param name="namespace">/admin</param>
-        <param name="method">list</param>
       </result>
     </action>
 

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp?rev=1548062&r1=1548061&r2=1548062&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
Thu Dec  5 09:59:27 2013
@@ -37,7 +37,7 @@
           </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}" />
             <s:submit value="%{getText('delete')}" theme="simple"/>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=1548062&r1=1548061&r2=1548062&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
Thu Dec  5 09:59:27 2013
@@ -46,7 +46,7 @@
       <table>
         <tr>
           <td>
-          <s:form action="saveBuildEnv!save" method="post">
+          <s:form action="saveBuildEnv" method="post">
 
             <div class="axial">
               <!--  if other fields are added ProfileAction#save must be changed  -->

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=1548062&r1=1548061&r2=1548062&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
Thu Dec  5 09:59:27 2013
@@ -71,12 +71,12 @@
           <ec:column property="buildAgentGroup" title="profilesList.buildAgentGroup.label"
style="white-space: nowrap" />
         </c1:ifBuildTypeEnabled>                
         <ec:column property="id" title="&nbsp;" width="1%">
-          <a href="editBuildEnv!edit.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
+          <a href="editBuildEnv.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
             <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text
name='edit'/>" title="<s:text name='edit'/>" border="0" />
           </a>                    
         </ec:column>
         <ec:column property="id" title="&nbsp;" width="1%">
-          <a href="confirmDeleteBuildEnv!confirmDelete.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
+          <a href="confirmDeleteBuildEnv.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
             <img src="<s:url value='/images/delete.gif' includeParams="none"/>"
alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
           </a>                    
         </ec:column>
@@ -84,7 +84,7 @@
     </ec:table>
     </c:if>
     <div class="functnbar3">
-      <s:form action="addBuildEnv!input.action" method="post">
+      <s:form action="addBuildEnv.action" method="post">
         <s:submit value="%{getText('add')}"/>
       </s:form>
     </div>    

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=1548062&r1=1548061&r2=1548062&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Thu Dec  5 09:59:27 2013
@@ -50,7 +50,7 @@
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="profileName" title="projectView.buildDefinition.profile">
-        <s:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
+        <s:url id="profileUrl" action="editBuildEnv.action" namespace="/" includeParams="none">
           <s:param name="profile.id"><c:out value="${pageScope.buildDefinitionSummary.profileId}"/></s:param>
         </s:url>
         <s:a href="%{profileUrl}"><c:out value="${pageScope.buildDefinitionSummary.profileName}"/></s:a>
@@ -162,7 +162,7 @@
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="profileName" title="projectView.buildDefinition.profile">
-        <s:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
+        <s:url id="profileUrl" action="editBuildEnv.action" namespace="/" includeParams="none">
           <s:param name="profile.id"><c:out value="${pageScope.buildDefinitionSummary.profileId}"/></s:param>
         </s:url>
         <s:a href="%{profileUrl}"><c:out value="${pageScope.buildDefinitionSummary.profileName}"/></s:a>

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=1548062&r1=1548061&r2=1548062&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 09:59:27 2013
@@ -122,7 +122,7 @@
           </div>
         </redback:ifAuthorized>
         <redback:ifAuthorized permission="continuum-manage-profiles">
-          <s:url id="configurationUrl" action="buildEnvList" namespace="/admin" method="list"
includeParams="none"/>
+          <s:url id="configurationUrl" action="buildEnvList" namespace="/admin" includeParams="none"/>
           <div class="body">
             <s:a href="%{configurationUrl}">
               <s:text name="menu.administration.profile"/>



Mime
View raw message