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/05 11:00:20 UTC
svn commit: r1548066 - in
/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main: resources/
webapp/WEB-INF/jsp/admin/ webapp/WEB-INF/jsp/navigations/
Author: brett
Date: Thu Dec 5 10:00:19 2013
New Revision: 1548066
URL: http://svn.apache.org/r1548066
Log:
[CONTINUUM-2713] remove DMI from installations
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/editInstallation.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.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=1548066&r1=1548065&r2=1548066&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:00:19 2013
@@ -856,6 +856,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>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp?rev=1548066&r1=1548065&r2=1548066&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp Thu Dec 5 10:00:19 2013
@@ -32,7 +32,7 @@
<s:text name="installation.section.title"/>
</h3>
- <s:form action="saveInstallation!save" method="post">
+ <s:form action="saveInstallation" method="post">
<s:if test="hasActionErrors()">
<h3>Action Error</h3>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp?rev=1548066&r1=1548065&r2=1548066&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp Thu Dec 5 10:00:19 2013
@@ -48,12 +48,12 @@
<ec:column property="varValue" title="installation.value.label" style="white-space: nowrap" />
<ec:column property="id" title=" " width="1%">
- <a href="editInstallation!edit.action?installation.installationId=<c:out value="${installation.installationId}"/>">
+ <a href="editInstallation.action?installation.installationId=<c:out value="${installation.installationId}"/>">
<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=" " width="1%">
- <a href="deleteInstallation!delete.action?installation.installationId=<c:out value="${installation.installationId}"/>&installation.name=<c:out value="${installation.name}"/>">
+ <a href="deleteInstallation.action?installation.installationId=<c:out value="${installation.installationId}"/>&installation.name=<c:out value="${installation.name}"/>">
<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>
@@ -61,7 +61,7 @@
</ec:table>
</c:if>
<div class="functnbar3">
- <s:form action="installationsTypeChoice!listTypes.action" method="post">
+ <s:form action="installationsTypeChoice.action" method="post">
<s:submit value="%{getText('add')}"/>
</s:form>
</div>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp?rev=1548066&r1=1548065&r2=1548066&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp Thu Dec 5 10:00:19 2013
@@ -31,7 +31,7 @@
<h3>
<s:text name="installationTypeChoice.section.title"/>
</h3>
- <form action="editInstallation!input.action">
+ <form action="editInstallation_input.action">
<div class="axial">
<table>
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=1548066&r1=1548065&r2=1548066&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:00:19 2013
@@ -114,7 +114,7 @@
</div>
</redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-manage-installations">
- <s:url id="configurationUrl" action="installationsList" namespace="/admin" method="list" includeParams="none"/>
+ <s:url id="configurationUrl" action="installationsList" namespace="/admin" includeParams="none"/>
<div class="body">
<s:a href="%{configurationUrl}">
<s:text name="menu.administration.installations"/>