You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2008/12/04 01:24:18 UTC
svn commit: r723167 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/continuum/web/action/ScmResultAction.java
resources/struts.xml webapp/WEB-INF/jsp/scmResult.jsp
Author: ctan
Date: Wed Dec 3 16:24:18 2008
New Revision: 723167
URL: http://svn.apache.org/viewvc?rev=723167&view=rev
Log:
[CONTINUUM-1962] migrate scm result to struts2
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java
continuum/trunk/continuum-webapp/src/main/resources/struts.xml
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java?rev=723167&r1=723166&r2=723167&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java Wed Dec 3 16:24:18 2008
@@ -11,7 +11,7 @@
/**
* @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="scmResult"
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="scmResult"
*/
public class ScmResultAction
extends ContinuumActionSupport
Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.xml?rev=723167&r1=723166&r2=723167&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Wed Dec 3 16:24:18 2008
@@ -407,6 +407,10 @@
</result>
</action>
+ <action name="scmResult" class="scmResult">
+ <result name="success">/WEB-INF/jsp/scmResult.jsp</result>
+ </action>
+
<!--
* schedule actions
-->
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp?rev=723167&r1=723166&r2=723167&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp Wed Dec 3 16:24:18 2008
@@ -34,21 +34,15 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('scmResult.projectGroupName')}">
- <ww:param name="after" value="projectGroupName"/>
- </c1:data>
- <c1:data label="%{getText('scmResult.scmRootAddress')}">
- <ww:param name="after" value="projectScmRoot.scmRootAddress"/>
- </c1:data>
- <c1:data label="%{getText('scmResult.state')}">
- <ww:param name="after" value="state"/>
- </c1:data>
+ <c1:data label="%{getText('scmResult.projectGroupName')}" name="projectGroupName"/>
+ <c1:data label="%{getText('scmResult.scmRootAddress')}" name="projectScmRoot.scmRootAddress"/>
+ <c1:data label="%{getText('scmResult.state')}" name="state"/>
</table>
</div>
- <h4><ww:text name="scmResult.scmError"/></h4>
+ <h4><s:text name="scmResult.scmError"/></h4>
<div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
- <pre><ww:property value="projectScmRoot.error"/></pre>
+ <pre><s:property value="projectScmRoot.error"/></pre>
</div>
</div>
</body>