Return-Path: 
 <commits-return-9374-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
X-Original-To: apmail-struts-commits-archive@minotaur.apache.org
Delivered-To: apmail-struts-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7056774D5
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Tue,  9 Aug 2011 07:20:49 +0000 (UTC)
Received: (qmail 60496 invoked by uid 500); 9 Aug 2011 07:20:48 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 60079 invoked by uid 500); 9 Aug 2011 07:20:37 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 60072 invoked by uid 99); 9 Aug 2011 07:20:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2011 07:20:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2011 07:20:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id EE6A1238889B
	for <commits@struts.apache.org>; Tue,  9 Aug 2011 07:20:09 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1155236 - in /struts/struts2/trunk/apps/showcase:
 pom.xml
 src/main/resources/struts-ajax.xml src/main/resources/struts-validation.xml
Date: Tue, 09 Aug 2011 07:20:09 -0000
To: commits@struts.apache.org
From: lukaszlenart@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110809072009.EE6A1238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>