You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/10/10 20:14:31 UTC
svn commit: r454857 - /struts/struts2/trunk/apps/showcase/src/main/resources/
Author: mrdon
Date: Tue Oct 10 11:14:29 2006
New Revision: 454857
URL: http://svn.apache.org/viewvc?view=rev&rev=454857
Log:
Took out include of struts-default config file
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-actionchaining.xml Tue Oct 10 11:14:29 2006
@@ -5,8 +5,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml" />
-
<package name="actionchaining" extends="struts-default" namespace="/actionchaining">
<action name="actionChain1" class="org.apache.struts2.showcase.actionchaining.ActionChain1">
<result type="chain">actionChain2</result>
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?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-ajax.xml Tue Oct 10 11:14:29 2006
@@ -3,8 +3,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml"/>
-
<package name="ajax" extends="struts-default">
<action name="AjaxTest" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
<result>/ajax/AjaxResult.jsp</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml Tue Oct 10 11:14:29 2006
@@ -4,7 +4,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml" />
<package name="chat" extends="struts-default" namespace="/chat">
<interceptors>
<interceptor name="chatAuthentication"
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-continuations.xml Tue Oct 10 11:14:29 2006
@@ -2,8 +2,6 @@
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml"/>
-
<package name="continuations" extends="struts-default" namespace="/continuations">
<action name="guess" class="org.apache.struts2.showcase.Guess">
<result type="freemarker">guess.ftl</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml Tue Oct 10 11:14:29 2006
@@ -5,8 +5,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml" />
-
<package name="conversion" namespace="/conversion" extends="struts-default">
<!-- Example populating a List inside an Action -->
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-filedownload.xml Tue Oct 10 11:14:29 2006
@@ -5,8 +5,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml" />
-
<package name="filedownload" extends="struts-default" namespace="/filedownload">
<default-action-ref name="download"/>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-fileupload.xml Tue Oct 10 11:14:29 2006
@@ -5,8 +5,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml" />
-
<package name="fileupload" extends="struts-default" namespace="/fileupload">
<default-action-ref name="upload"/>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-freemarker.xml Tue Oct 10 11:14:29 2006
@@ -6,8 +6,6 @@
<struts>
- <include file="struts-default.xml" />
-
<package name="freemarker" namespace="/freemarker" extends="struts-default">
<action name="customFreemarkerManagerDemo">
<result type="freemarker">/freemarker/customFreemarkerManagerUsage.ftl</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-hangman.xml Tue Oct 10 11:14:29 2006
@@ -5,7 +5,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml" />
<package name="hangman" extends="struts-default" namespace="/hangman">
<action name="hangmanMenu">
<result type="freemarker">/hangman/hangmanMenu.ftl</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml Tue Oct 10 11:14:29 2006
@@ -2,8 +2,6 @@
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml"/>
-
<package name="jsf" extends="jsf-default" namespace="/jsf">
<result-types>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-model-driven.xml Tue Oct 10 11:14:29 2006
@@ -5,8 +5,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml" />
-
<package name="modelDriven" extends="struts-default" namespace="/modelDriven">
<!-- Diplay entry page that uses Model-Driven technique -->
<action name="modelDriven" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction" method="input">
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-person.xml Tue Oct 10 11:14:29 2006
@@ -5,8 +5,6 @@
<!-- START SNIPPET: xworkSample -->
<struts>
- <include file="struts-default.xml"/>
-
<package name="person" extends="struts-default" namespace="/person">
<action name="listPeople" class="org.apache.struts2.showcase.person.ListPeople">
<interceptor-ref name="validationWorkflowStack"/>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml Tue Oct 10 11:14:29 2006
@@ -4,8 +4,6 @@
<struts>
- <include file="struts-default.xml" />
-
<!-- ================================== -->
<!-- === Package for ActionTag Demo === -->
<!-- ================================== -->
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml Tue Oct 10 11:14:29 2006
@@ -5,8 +5,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml"/>
-
<package name="ui-tags" extends="struts-default" namespace="/tags/ui">
<action name="example" class="org.apache.struts2.showcase.UITagExample">
<result>example.jsp</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml Tue Oct 10 11:14:29 2006
@@ -2,8 +2,6 @@
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml"/>
-
<package name="token" extends="struts-default" namespace="/token">
<action name="tokenPrepare!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
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?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-validation.xml Tue Oct 10 11:14:29 2006
@@ -3,8 +3,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml" />
-
<package name="validation" extends="struts-default" namespace="/validation">
<action name="quizBasic" class="org.apache.struts2.showcase.validation.QuizAction">
<result name="input">quiz-basic.jsp</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-wait.xml Tue Oct 10 11:14:29 2006
@@ -2,8 +2,6 @@
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
- <include file="struts-default.xml"/>
-
<package name="wait" extends="struts-default" namespace="/wait">
<action name="longProcess1" class="org.apache.struts2.showcase.wait.LongProcessAction">
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?view=diff&rev=454857&r1=454856&r2=454857
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Tue Oct 10 11:14:29 2006
@@ -5,7 +5,6 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<!-- START SNIPPET: xworkSample -->
-
<struts>
<include file="struts-chat.xml" />