From 522abf29c0182af4ed4d4bb814a2cca285e03caa Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Sun, 17 Sep 2006 14:09:09 +0000
Subject: [PATCH] WW-1349 Various minor updates to prepare for Struts 2.0.0.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@447068 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/example/HelloWorld.java     |  7 +++-
 apps/blank/src/main/webapp/WEB-INF/web.xml    | 17 ++++----
 apps/pom.xml                                  |  3 --
 apps/portlet/README.txt                       |  8 ++++
 .../src/main/resources/struts-tutorial.xml    | 39 -------------------
 assembly/src/main/assembly/all.xml            | 16 --------
 assembly/src/main/assembly/src.xml            | 16 --------
 7 files changed, 21 insertions(+), 85 deletions(-)
 delete mode 100644 apps/showcase/src/main/resources/struts-tutorial.xml

diff --git a/apps/blank/src/main/java/example/HelloWorld.java b/apps/blank/src/main/java/example/HelloWorld.java
index 557e39b0b..68f8e7202 100644
--- a/apps/blank/src/main/java/example/HelloWorld.java
+++ b/apps/blank/src/main/java/example/HelloWorld.java
@@ -5,13 +5,16 @@ package example;
  */
 public class HelloWorld extends ExampleSupport {
 
-    public static final String MESSAGE = "HelloWorld.message";
-
     public String execute() throws Exception {
         setMessage(getText(MESSAGE));
         return SUCCESS;
     }
 
+    /**
+     * Provide default valuie for Message property.
+     */
+    public static final String MESSAGE = "HelloWorld.message";
+
     /**
      * Field for Message property.
      */
diff --git a/apps/blank/src/main/webapp/WEB-INF/web.xml b/apps/blank/src/main/webapp/WEB-INF/web.xml
index 5ce46eb38..595302214 100644
--- a/apps/blank/src/main/webapp/WEB-INF/web.xml
+++ b/apps/blank/src/main/webapp/WEB-INF/web.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
 
-    <display-name>Acme Corp</display-name>
+    <display-name>Struts Blank</display-name>
 
     <filter>
-        <filter-name>action2</filter-name>
+        <filter-name>struts2</filter-name>
         <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 
     <filter-mapping>
-        <filter-name>action2</filter-name>
+        <filter-name>struts2</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
@@ -19,18 +19,17 @@
     </listener>
 
     <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-        <welcome-file>default.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
 
     <!--
         This typically isn't required, as the taglib is included in struts-core.jar.
-        If you really need a taglib configuration within web.xml, copy struts/src/java/META-INF/taglib.tld
-        to the WEB-INF directory as tags.tld.
+        If you really need a taglib configuration within web.xml,
+        copy struts2-core/core/src/main/resources/META-INF/struts-tags.tld
+        to the WEB-INF directory as struts-tags.tld.
      -->
     <!--taglib>
-        <taglib-uri>tags</taglib-uri>
-        <taglib-location>/WEB-INF/tags.tld</taglib-location>
+        <taglib-uri>/s</taglib-uri>
+        <taglib-location>/WEB-INF/struts-tags.tld</taglib-location>
     </taglib-->
 </web-app>
diff --git a/apps/pom.xml b/apps/pom.xml
index b5b432ad8..bd3dd91a2 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -66,9 +66,6 @@
                                 <include>**/*.xml</include>
                              </includes>
                      </resource>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                    </resource>
                 </resources>
                 <plugins>
                     <plugin>
diff --git a/apps/portlet/README.txt b/apps/portlet/README.txt
index a7230a24b..efcb67bbc 100644
--- a/apps/portlet/README.txt
+++ b/apps/portlet/README.txt
@@ -6,4 +6,12 @@ For more on getting started with Struts, see
 
 * http://cwiki.apache.org/WW/home.html
 
+WARNING - Additional configuration required for deployment
+
+Due to difference in portlet contrainer implementations, the porlet
+WAR is not ready-to-run. Extract the porlet WAR, and then copy the
+contents of apps/portlet/src/main/etc/<your_portal_server>/ into the
+WAR's WEB-INF directory.
+
+
 ----------------------------------------------------------------------------
\ No newline at end of file
diff --git a/apps/showcase/src/main/resources/struts-tutorial.xml b/apps/showcase/src/main/resources/struts-tutorial.xml
deleted file mode 100644
index da3e0f77b..000000000
--- a/apps/showcase/src/main/resources/struts-tutorial.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-        "-//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="tutorial-default" extends="struts-default" namespace="/tutorial">
-
-        <action name="Welcome">
-            <result>Welcome.jsp</result>
-        </action>
-
-    </package>
-
-    <package name="tutorial-hello" extends="tutorial-default">
-
-        <action name="HelloWorld" class="org.apache.struts2.showcase.tutorial.HelloWorld">
-            <result>HelloWorld.jsp</result>
-        </action>
-
-    </package>
-
-    <package name="tutorial-actions" extends="tutorial-default">
-
-        <action name="HelloName" class="org.apache.struts2.showcase.tutorial.HelloName">
-            <result>HelloName-success.jsp</result>
-            <result name="error">HelloName-error.html</result>
-        </action>
-
-        <action name="HelloName2" class="org.apache.struts2.showcase.tutorial.HelloName2">
-            <result>HelloName2-success.jsp</result>
-            <result name="error">HelloName-error.html</result>
-        </action>
-
-    </package>
-
-</struts>
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 12206f113..6743833c2 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -112,14 +112,6 @@
         <include>src/</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../apps/shopping-cart</directory>
-      <outputDirectory>src/apps/shopping-cart</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../apps/showcase</directory>
       <outputDirectory>src/apps/showcase</outputDirectory>
@@ -128,14 +120,6 @@
         <include>src/</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../apps/starter</directory>
-      <outputDirectory>src/apps/starter</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../assembly</directory>
       <outputDirectory>src/assembly</outputDirectory>
diff --git a/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml
index 5bd898fee..ab8b23b83 100644
--- a/assembly/src/main/assembly/src.xml
+++ b/assembly/src/main/assembly/src.xml
@@ -92,14 +92,6 @@
           <include>src/</include>
         </includes>
       </fileSet>
-      <fileSet>
-        <directory>../apps/shopping-cart</directory>
-        <outputDirectory>src/apps/shopping-cart</outputDirectory>
-        <includes>
-          <include>pom.xml</include>
-          <include>src/</include>
-        </includes>
-      </fileSet>
       <fileSet>
         <directory>../apps/showcase</directory>
         <outputDirectory>src/apps/showcase</outputDirectory>
@@ -108,14 +100,6 @@
           <include>src/</include>
         </includes>
       </fileSet>
-      <fileSet>
-        <directory>../apps/starter</directory>
-        <outputDirectory>src/apps/starter</outputDirectory>
-        <includes>
-          <include>pom.xml</include>
-          <include>src/</include>
-        </includes>
-      </fileSet>
       <fileSet>
         <directory>../assembly</directory>
         <outputDirectory>src/assembly</outputDirectory>