Author: mrdon
Date: Sun Jun 11 17:31:36 2006
New Revision: 413555
URL: http://svn.apache.org/viewvc?rev=413555&view=rev
Log:
Added a wildcard example to showcase, fixed showcase config with new
resources layout, added display of struts classes in debug mode, minor
formatting
Modified:
struts/action2/trunk/apps/showcase/quickstart.xml
struts/action2/trunk/apps/showcase/src/main/resources/xwork.xml
struts/action2/trunk/apps/showcase/src/main/webapp/empmanager/listEmployees.jsp
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
Modified: struts/action2/trunk/apps/showcase/quickstart.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/quickstart.xml?rev=413555&r1=413554&r2=413555&view=diff
==============================================================================
--- struts/action2/trunk/apps/showcase/quickstart.xml (original)
+++ struts/action2/trunk/apps/showcase/quickstart.xml Sun Jun 11 17:31:36 2006
@@ -44,7 +44,6 @@
The classDirs directories can be a jar or a directory of classes
-->
<classDirs>
- <dir>src/main/webapp/WEB-INF/classes</dir>
<dir>src/main/resources</dir>
<dir>../../core/target/classes</dir>
</classDirs>
Modified: struts/action2/trunk/apps/showcase/src/main/resources/xwork.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/resources/xwork.xml?rev=413555&r1=413554&r2=413555&view=diff
==============================================================================
--- struts/action2/trunk/apps/showcase/src/main/resources/xwork.xml (original)
+++ struts/action2/trunk/apps/showcase/src/main/resources/xwork.xml Sun Jun 11
17:31:36 2006
@@ -44,6 +44,7 @@
<interceptors>
<interceptor-stack name="crudStack">
<interceptor-ref name="params" />
+ <interceptor-ref name="static-params" />
<interceptor-ref name="defaultStack" />
</interceptor-stack>
</interceptors>
@@ -89,17 +90,18 @@
<result>/empmanager/listEmployees.jsp</result>
<interceptor-ref name="basicStack"/>
</action>
- <action name="edit"
class="org.apache.struts.action2.showcase.action.EmployeeAction">
+ <action name="edit-*"
class="org.apache.struts.action2.showcase.action.EmployeeAction">
+ <param name="empId">{1}</param>
<result>/empmanager/editEmployee.jsp</result>
<interceptor-ref name="crudStack"><param
name="validation.excludeMethods">execute</param></interceptor-ref>
</action>
<action name="save"
class="org.apache.struts.action2.showcase.action.EmployeeAction" method="save">
<result name="input">/empmanager/editEmployee.jsp</result>
- <result
type="redirect">edit.action?empId=${currentEmployee.empId}</result>
+ <result
type="redirect">edit-${currentEmployee.empId}.action</result>
</action>
<action name="delete"
class="org.apache.struts.action2.showcase.action.EmployeeAction"
method="delete">
<result name="error">/empmanager/editEmployee.jsp</result>
- <result
type="redirect">edit.action?empId=${currentEmployee.empId}</result>
+ <result
type="redirect">edit-${currentEmployee.empId}.action</result>
</action>
</package>
Modified:
struts/action2/trunk/apps/showcase/src/main/webapp/empmanager/listEmployees.jsp
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/webapp/empmanager/listEmployees.jsp?rev=413555&r1=413554&r2=413555&view=diff
==============================================================================
---
struts/action2/trunk/apps/showcase/src/main/webapp/empmanager/listEmployees.jsp
(original)
+++
struts/action2/trunk/apps/showcase/src/main/webapp/empmanager/listEmployees.jsp
Sun Jun 11 17:31:36 2006
@@ -14,13 +14,13 @@
</tr>
<saf:iterator value="availableItems">
<tr>
- <td><a href="<saf:url action="edit"><saf:param name="empId"
value="empId"/></saf:url>"><saf:property value="empId"/></a></td>
+ <td><a href="<saf:url action="edit-%{empId}" />"><saf:property
value="empId"/></a></td>
<td><saf:property value="firstName"/></td>
<td><saf:property value="lastName"/></td>
</tr>
</saf:iterator>
</table>
-<p><a href="<saf:url action="edit" includeParams="none"/>">Create new
Employee</a></p>
+<p><a href="<saf:url action="edit-" includeParams="none"/>">Create new
Employee</a></p>
<p><a href="<saf:url action="showcase" namespace="/"
includeParams="none"/>">Back to Showcase Startpage</a></p>
</body>
</html>
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java?rev=413555&r1=413554&r2=413555&view=diff
==============================================================================
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
(original)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
Sun Jun 11 17:31:36 2006
@@ -259,7 +259,7 @@
sendError(request, response, context,
HttpServletResponse.SC_NOT_FOUND, e);
} catch (Exception e) {
LOG.error("Could not execute action", e);
- sendError(request, response, context,
HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
+ sendError(request, response, context,
HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
}
}
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java?rev=413555&r1=413554&r2=413555&view=diff
==============================================================================
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
(original)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
Sun Jun 11 17:31:36 2006
@@ -301,12 +301,7 @@
serializeIt(Array.get(bean, i), "arrayitem", writer, stack);
}
} else {
- if (clsName != null && clsName.startsWith("org.apache.struts")) {
- // ignore
- } else if (clsName != null
- && clsName.startsWith("com.opensymphony.xwork")) {
- // ignore
- } else if (clsName.startsWith("java.lang")) {
+ if (clsName.startsWith("java.lang")) {
writer.setValue(bean.toString());
} else {
// Not java.lang, so we can call ourselves with this object's
