Author: husted
Date: Sun Sep 17 07:09:09 2006
New Revision: 447068
URL: http://svn.apache.org/viewvc?view=rev&rev=447068
Log:
WW-1349 Various minor updates to prepare for Struts 2.0.0.
Removed:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tutorial.xml
Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/index.xml
struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/apps/portlet/README.txt
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/src.xml
Modified: struts/site/src/site/fml/roadmap.fml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?view=diff&rev=447068&r1=447067&r2=447068
==============================================================================
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Sun Sep 17 07:09:09 2006
@@ -240,6 +240,8 @@
</li><li>
<strong>First-class AJAX support</strong> - The AJAX
theme gives your interactive applications a boost.
</li><li>
+ <strong>Stateful Checkboxes</strong> - Struts 2
checkboxes do not require special handling for false values.
+ </li><li>
<strong>QuickStart</strong> - Many changes can be made
on the fly without restarting a web container.
</li></ul></li>
<li>Easier!
@@ -251,6 +253,10 @@
<strong>Easy-to-customize tags</strong> - Struts 2
tags can be customized by changing an underlying stylesheet. Individual tags
can be customized by editing a FreeMarker template. No need to grok the taglib
API! Both JSP and FreeMarker tags are fully supported.
</li><li>
<strong>Easy cancel handling</strong> - The Struts 2
Cancel button can go directly to a different action.
+ </li><li>
+ <strong>Easy Spring integration</strong> - Struts 2
Actions are Spring-aware. Just add your own Spring beans!
+ </li><li>
+ <strong>Easy Plugins</strong> - Struts 2 extensions
can be added by dropping in a JAR. No manual configuration required!
</li></ul></li>
<li>POJO-ier!
<ul><li>
Modified: struts/site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?view=diff&rev=447068&r1=447067&r2=447068
==============================================================================
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Sun Sep 17 07:09:09 2006
@@ -65,16 +65,16 @@
<ul>
<li>
- An extensible "front controller" that dispatches
requests to
- an "action" handler provided by the application
developer.
+ A "request" handler provided by the application
developer
+ that is mapped to a standard URI.
</li>
<li>
- A location handler that transfers control to another
resource
- that completes the response.
+ A "response" handler that transfers control to
another resource
+ which completes the response.
</li>
<li>
- A tag library that helps developers create
interactive
- form-based applications.
+ A tag library that helps developers create
interactive
+ form-based applications with server pages.
</li>
</ul>
@@ -112,7 +112,7 @@
<p>
- The Apache Sruts Project offers two major versions of the
+ The Apache Struts Project offers two major versions of the
Struts framework.
<a href="http://struts.apache.org/1.x/index.html";>Struts 1</a>
is recognized as
@@ -120,7 +120,7 @@
The 1.x framework is mature, well-documented, and widely
supported.
Struts 1 is the best choice for teams who value proven
- solutions.
+ solutions to common problems.
</p>
<p>
Modified: struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java?view=diff&rev=447068&r1=447067&r2=447068
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java
(original)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/HelloWorld.java Sun
Sep 17 07:09:09 2006
@@ -5,12 +5,15 @@
*/
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.
Modified: struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml?view=diff&rev=447068&r1=447067&r2=447068
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml Sun Sep 17
07:09:09 2006
@@ -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>
Modified: struts/struts2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?view=diff&rev=447068&r1=447067&r2=447068
==============================================================================
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Sun Sep 17 07:09:09 2006
@@ -66,9 +66,6 @@
<include>**/*.xml</include>
</includes>
</resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
</resources>
<plugins>
<plugin>
Modified: struts/struts2/trunk/apps/portlet/README.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/README.txt?view=diff&rev=447068&r1=447067&r2=447068
==============================================================================
--- struts/struts2/trunk/apps/portlet/README.txt (original)
+++ struts/struts2/trunk/apps/portlet/README.txt Sun Sep 17 07:09:09 2006
@@ -6,4 +6,12 @@
* 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.
+
+
----------------------------------------------------------------------------
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?view=diff&rev=447068&r1=447067&r2=447068
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Sun Sep 17 07:09:09
2006
@@ -113,24 +113,8 @@
</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>
- <includes>
- <include>pom.xml</include>
- <include>src/</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../apps/starter</directory>
- <outputDirectory>src/apps/starter</outputDirectory>
<includes>
<include>pom.xml</include>
<include>src/</include>
Modified: struts/struts2/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/src.xml?view=diff&rev=447068&r1=447067&r2=447068
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/src.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/src.xml Sun Sep 17 07:09:09
2006
@@ -93,24 +93,8 @@
</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>
- <includes>
- <include>pom.xml</include>
- <include>src/</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../apps/starter</directory>
- <outputDirectory>src/apps/starter</outputDirectory>
<includes>
<include>pom.xml</include>
<include>src/</include>
