Author: husted
Date: Fri Mar 10 04:54:48 2006
New Revision: 384780
URL: http://svn.apache.org/viewcvs?rev=384780&view=rev
Log:
Action2 Apps
* Replace JSP references with Action references where possible.
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/webwork.properties
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Hello.xml
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Select.xml
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Simple.xml
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork.xml
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp
Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp Fri Mar 10
04:54:48 2006
@@ -15,13 +15,13 @@
<p>To navigate your way through the examples, the following icons will help:
</p>
<table border="0" cellspacing="5" width="85%" >
<tr valign="top">
- <td width="30"><img alt="." src="<ww:url
value="/images/execute.gif"/>"></td>
- <td>Execute the example</td>
- </tr>
- <tr valign="top">
<td width="30"><img alt="." src="<ww:url value="/images/return.gif"/>"
height="24" width="24" /></td>
<td>Return to this screen</td>
</tr>
+ <tr valign="top">
+ <td width="30"><img alt="." src="<ww:url
value="/images/execute.gif"/>"></td>
+ <td>Execute the example</td>
+ </tr>
<tr valign="top">
<td><img alt="" src="<ww:url value="images/code.gif"/>" height="24"
width="24" /></td>
<td>View the source code for the example</td>
@@ -43,7 +43,7 @@
</td>
<td>
- <ww:url id="Hello_src" value="/pages/Hello/index.jsp" />
+ <ww:url id="Hello_src" action="HelloView" />
<ww:a href="%{Hello_src}">
<img src="<ww:url value="/images/code.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
</ww:a>
@@ -68,7 +68,7 @@
</td>
<td>
- <ww:url id="Simple_src" value="/pages/Simple/index.jsp" />
+ <ww:url id="Simple_src" action="SimpleView" />
<ww:a href="%{Simple_src}">
<img src="<ww:url value="/images/code.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
</ww:a>
@@ -103,7 +103,7 @@
</td>
<td>
- <ww:url id="Select_src" value="/pages/Select/index.jsp" />
+ <ww:url id="Select_src" action="SelectView" />
<ww:a href="%{Select_src}">
<img src="<ww:url value="/images/code.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
</ww:a>
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/webwork.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/webwork.properties?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/webwork.properties
(original)
+++
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/webwork.properties
Fri Mar 10 04:54:48 2006
@@ -1,4 +1,4 @@
webwork.objectFactory = spring
webwork.devMode = true
webwork.tag.altSyntax = true
-webwork.action.extension = do
+webwork.action.extension = do,jspa
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Hello.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Hello.xml?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Hello.xml
(original)
+++
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Hello.xml
Fri Mar 10 04:54:48 2006
@@ -4,8 +4,12 @@
<package name="Hello" extends="webwork-default" >
- <action name="Hello" class="com.opensymphony.xwork.ActionSupport">
+ <action name="Hello">
<result>/pages/Hello/Result.jsp</result>
+ </action>
+
+ <action name="HelloView">
+ <result>/pages/Hello/index.jsp</result>
</action>
</package>
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Select.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Select.xml?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Select.xml
(original)
+++
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Select.xml
Fri Mar 10 04:54:48 2006
@@ -9,5 +9,9 @@
<result name="input">/pages/Select/Input.jsp</result>
</action>
+ <action name="SelectView">
+ <result>/pages/Select/index.jsp</result>
+ </action>
+
</package>
</xwork>
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Simple.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Simple.xml?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Simple.xml
(original)
+++
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork-Simple.xml
Fri Mar 10 04:54:48 2006
@@ -9,5 +9,9 @@
<result name="input">/pages/Simple/Input.jsp</result>
</action>
+ <action name="SimpleView">
+ <result>/pages/Simple/index.jsp</result>
+ </action>
+
</package>
</xwork>
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork.xml?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork.xml
(original)
+++
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/WEB-INF/classes/xwork.xml
Fri Mar 10 04:54:48 2006
@@ -4,6 +4,8 @@
<include file="webwork-default.xml"/>
+ <include file="xwork-Home.xml"/>
+
<include file="xwork-Hello.xml"/>
<include file="xwork-Simple.xml"/>
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp
(original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp
Fri Mar 10 04:54:48 2006
@@ -8,27 +8,28 @@
</head>
<body>
-<ww:url id="input_exe" action="Hello" />
+<a href="<ww:url action="Home" />" >
+ <img src="<ww:url value="/images/return.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
+</a>
+<ww:url id="input_exe" action="Hello" />
<ww:a href="%{input_exe}">
<img src="<ww:url value="/images/execute.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
</ww:a>
-<a href="<ww:url value="/Home.jsp" />" >
- <img src="<ww:url value="/images/return.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
-</a>
-
<h1>Source Code for Hello World</h1>
<hr noshade="noshade"/>
<h2>Server Pages</h2>
-<p><a href="<ww:url
value="/View.jsp?src=/pages/Hello/Result.jsp"/>">Result.jsp</a></p>
+<ww:url id="result" value="/View.jsp?src=/pages/Hello/Result.jsp"/>
+<p><a href="<ww:property value="#result"/>">Result.jsp</a></p>
<h2>Actions</h2>
<p>None</p>
<h2>Configuration files</h2>
-<p><a href="<ww:url
value="/View.jsp?src=/WEB-INF/classes/xwork-Hello.xml"/>">xwork-Hello.xml</a></p>
+<ww:url id="config" value="/View.jsp?src=/WEB-INF/classes/xwork-Hello.xml"/>
+<p><a href="<ww:property value="#config"/>">xwork-Hello.xml</a></p>
<h2>Other source files</h2>
<p>None</p>
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp
Fri Mar 10 04:54:48 2006
@@ -4,8 +4,8 @@
<title>Cookbook - Complex Input Form using Select Controls</title>
</head>
<body>
-<a href="Home.jsp"><img src="images/return.gif" height="24" width="24" alt="Go
Home" class="icon" /></a>
-<a href="pages/Select/index.jsp"><img src="images/code.gif" height="24"
width="24" alt="Go Home" class="icon" /></a>
+<a href="<ww:url value="/Home.jsp"/>"><img src="<ww:url
value="/images/return.gif"/>" height="24" width="24" alt="Go Home"
class="icon"/></a>
+<a href="<ww:url value="/pages/Select/index.jsp"/>"><img src="<ww:url
value="/images/code.gif"/>" height="24" width="24" alt="Go Home" class="icon"
/></a>
<h1>Input Result</h1>
<table>
<ww:label label="Name" name="name" />
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp
Fri Mar 10 04:54:48 2006
@@ -8,28 +8,31 @@
</head>
<body>
-<ww:url id="input_exe" action="Select" />
+<a href="<ww:url action="Home" />" >
+ <img src="<ww:url value="/images/return.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
+</a>
+<ww:url id="input_exe" action="Select" />
<ww:a href="%{input_exe}">
<img src="<ww:url value="/images/execute.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
</ww:a>
-<a href="<ww:url value="/Home.jsp" />" >
- <img src="<ww:url value="/images/return.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
-</a>
-
<h1>Source Code for Complex Input Form using Select Controls</h1>
<hr noshade="noshade"/>
<h2>Server Pages</h2>
-<p><a href="<ww:url
value="/View.jsp?src=/pages/Select/Select.jsp"/>">Select.jsp</a></p>
-<p><a href="<ww:url
value="/View.jsp?src=/page/Select/Result.jsp"/>">Result.jsp</a></p>
+<ww:url id="input" value="/View.jsp?src=/pages/Select/Select.jsp"/>
+<ww:url id="result" value="/View.jsp?src=/pages/Select/Result.jsp"/>
+<p><a href="<ww:property value="#input"/>">Select.jsp</a></p>
+<p><a href="<ww:property value="#result"/>">Result.jsp</a></p>
<h2>Actions</h2>
-<p><a href="<ww:url
value="/View.jsp?src=/WEB-INF/src/java/cookbook/Select.java"/>">Select.java</a></p>
+<ww:url id="action"
value="/View.jsp?src=/WEB-INF/src/java/cookbook/Select.java"/>
+<p><a href="<ww:property value="#action"/>">Select.java</a></p>
<h2>Configuration files</h2>
-<p><a href="<ww:url
value="/View.jsp?src=/WEB-INF/classes/xwork-Select.xml"/>">xwork-Select.xml</a></p>
+<ww:url id="config" value="/View.jsp?src=/WEB-INF/classes/xwork-Select.xml"/>
+<p><a href="<ww:property value="#config"/>">xwork-Select.xml</a></p>
<h2>Other source files</h2>
<p>None</p>
Modified:
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp?rev=384780&r1=384779&r2=384780&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp
Fri Mar 10 04:54:48 2006
@@ -3,33 +3,36 @@
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Source Code for Input Form</title>
+<title>Source Code for Simple Input Form using Action Properties</title>
<link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css"
/>" >
</head>
<body>
-<ww:url id="input_exe" action="Simple!input" />
+<a href="<ww:url action="Home" />" >
+ <img src="<ww:url value="/images/return.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
+</a>
+<ww:url id="input_exe" action="Simple!input" />
<ww:a href="%{input_exe}">
<img src="<ww:url value="/images/execute.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
</ww:a>
-<a href="<ww:url value="/Home.jsp" />" >
- <img src="<ww:url value="/images/return.gif"/>" alt="" hspace="4"
border="0" align="top" class="inline" />
-</a>
-
<h1>Source Code for Simple Input Form using Action Properties</h1>
<hr noshade="noshade"/>
<h2>Server Pages</h2>
-<p><a href="<ww:url
value="/View.jsp?src=/pages/Simple/Input.jsp"/>">Input.jsp</a></p>
-<p><a href="<ww:url
value="/View.jsp?src=/pages/Simple/Result.jsp"/>">Result.jsp</a></p>
+<ww:url id="input" value="/View.jsp?src=/pages/Simple/Input.jsp"/>
+<ww:url id="result" value="/View.jsp?src=/pages/Simple/Result.jsp"/>
+<p><a href="<ww:property value="#input"/>">Select.jsp</a></p>
+<p><a href="<ww:property value="#result"/>">Result.jsp</a></p>
<h2>Actions</h2>
-<p><a href="<ww:url
value="/View.jsp?src=/WEB-INF/src/java/cookbook/Simple.java"/>">Input.java</a></p>
+<ww:url id="action"
value="/View.jsp?src=/WEB-INF/src/java/cookbook/Simple.java"/>
+<p><a href="<ww:property value="#action"/>">Simple.java</a></p>
<h2>Configuration files</h2>
-<p><a href="<ww:url
value="/View.jsp?src=/WEB-INF/classes/xwork-Simple.xml"/>">xwork-Input.xml</a></p>
+<ww:url id="config" value="/View.jsp?src=/WEB-INF/classes/xwork-Simple.xml"/>
+<p><a href="<ww:property value="#config"/>">xwork-Simple.xml</a></p>
<h2>Other source files</h2>
<p>None</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
