Author: lukaszlenart
Date: Tue Aug 9 07:20:09 2011
New Revision: 1155236
URL: http://svn.apache.org/viewvc?rev=1155236&view=rev
Log:
Adjusts Showcase application after moving JSONValidationInterceptor into JSON
plugin
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=1155236&r1=1155235&r2=1155236&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Tue Aug 9 07:20:09 2011
@@ -96,6 +96,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-json-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<scope>runtime</scope>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml?rev=1155236&r1=1155235&r2=1155236&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml Tue
Aug 9 07:20:09 2011
@@ -54,7 +54,7 @@
</action>
</package>
- <package name="ajaxNoDecorate" namespace="/nodecorate"
extends="struts-default">
+ <package name="ajaxNoDecorate" namespace="/nodecorate"
extends="json-default">
<!-- example 4 -->
<action name="panel1"
class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction"
method="panel1">
<result
type="freemarker">/ajax/tabbedpanel/nodecorate/panel1.ftl</result>
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml?rev=1155236&r1=1155235&r2=1155236&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml
Tue Aug 9 07:20:09 2011
@@ -3,7 +3,7 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <package name="validation" extends="struts-default"
namespace="/validation">
+ <package name="validation" extends="json-default"
namespace="/validation">
<action name="quizBasic"
class="org.apache.struts2.showcase.validation.QuizAction">
<result name="input">quiz-basic.jsp</result>
<result>quiz-success.jsp</result>
