From 8d209daa762ecbe394b986ea38a4e3fddc94c276 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 31 May 2013 06:30:45 +0000
Subject: [PATCH] WW-4085 Adds default-action-ref to configuration of example
 apps

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1488108 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/example.xml            | 37 ++++++++++---------
 .../src/main/resources/struts.xml             | 29 +++++++++++----
 .../src/main/resources/struts.xml             | 28 ++++++++------
 3 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
index 77753819d..442f5eee3 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
+        "http://struts.apache.org/dtds/struts-2.3.dtd">
 <!-- 
   - This file is included by the struts.xml file as an example
   - of how to break up the configuration file into multiple files.
 -->
 <struts>
-  <package name="example" namespace="/example" extends="struts-default">
-    <action name="HelloWorld" class="${package}.example.HelloWorld">
-      <result>/example/HelloWorld.jsp</result>
-    </action>
+    <package name="example" namespace="/example" extends="struts-default">
 
-    <action name="Login_*" method="{1}" class="${package}.example.Login">
-      <result name="input">/example/Login.jsp</result>
-      <result type="redirectAction">Menu</result>
-    </action>
+        <default-action-ref name="HelloWorld" />
 
-    <action name="*" class="${package}.example.ExampleSupport">
-      <result>/example/{1}.jsp</result>
-    </action>
-    
-    <!-- Add additional "example" package actions here. -->
-    
-  </package>
+        <action name="HelloWorld" class="${package}.example.HelloWorld">
+            <result>/example/HelloWorld.jsp</result>
+        </action>
+
+        <action name="Login_*" method="{1}" class="${package}.example.Login">
+            <result name="input">/example/Login.jsp</result>
+            <result type="redirectAction">Menu</result>
+        </action>
+
+        <action name="*" class="${package}.example.ExampleSupport">
+            <result>/example/{1}.jsp</result>
+        </action>
+
+        <!-- Add additional "example" package actions here. -->
+
+    </package>
 </struts>
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
index 20bea68d6..5e9703845 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -1,12 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
+        "http://struts.apache.org/dtds/struts-2.3.dtd">
 <struts>
-  <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
-  <constant name="struts.devMode" value="true"/>
-  
-  <include file="example.xml"/>
-  
-  <!-- Add addition packages and configuration here. -->
+    <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
+    <constant name="struts.devMode" value="true"/>
+
+    <include file="example.xml"/>
+
+    <package name="default" namespace="/" extends="struts-default">
+
+        <default-action-ref name="index"/>
+
+        <action name="index">
+            <result type="redirectAction">
+                <param name="actionName">HelloWorld</param>
+                <param name="namespace">/example</param>
+            </result>
+        </action>
+
+    </package>
+
+    <!-- Add addition packages and configuration here. -->
 </struts>
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
index 45dc73bf8..8bcbdb172 100644
--- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
+++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
+        "http://struts.apache.org/dtds/struts-2.3.dtd">
 
 <struts>
 
     <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
 
-	<package name="myPackage" extends="struts-default">
-		<action name="index" class="${package}.IndexAction">
-			<result>/jsp/index.jsp</result>
-		</action>
-		<action name="helloWorld" class="helloWorldAction"> 
-			<result name="input">/jsp/index.jsp</result>
-			<result>/jsp/helloWorld.jsp</result>
-		</action>
-	</package>
+    <package name="myPackage" extends="struts-default">
+
+        <default-action-ref name="index" />
+
+        <action name="index" class="${package}.IndexAction">
+            <result>/jsp/index.jsp</result>
+        </action>
+
+        <action name="helloWorld" class="helloWorldAction">
+            <result name="input">/jsp/index.jsp</result>
+            <result>/jsp/helloWorld.jsp</result>
+        </action>
+
+    </package>
+
 </struts>