Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.3.17'

Browse Source
This commit is contained in:
Lukasz Lenart
2014-04-06 16:00:55 +02:00
parent a77f28d4d4 e1f97c8b07
commit 6d55d01522
404 changed files with 3544 additions and 1618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -9,6 +9,9 @@
.project
.settings/
# OSX
.DS_Store
# Scripts
*.sh
apps/blank/README.txt
+7 -1
View File
@@ -7,4 +7,10 @@ For more on getting started with Struts, see
* http://cwiki.apache.org/WW/home.html
----------------------------------------------------------------------------
I18N:
=====
Please note that this project was created with the assumption that it will be run
in an environment where the default locale is set to English. This means that
the default messages defined in package.properties are in English. If the default
locale for your server is different, then rename package.properties to package_en.properties
and create a new package.properties with proper values for your default locale.
apps/blank/pom.xml
+2 -2
View File
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.16.1</version>
<version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-blank</artifactId>
<packaging>war</packaging>
<name>Blank Webapp</name>
<name>Struts 2 Blank Webapp</name>
<dependencies>
apps/blank/src/main/webapp/WEB-INF/web.xml
+5
View File
@@ -31,4 +31,9 @@
</auth-constraint>
</security-constraint>
<security-role>
<description>Don't assign users to this role</description>
<role-name>no-users</role-name>
</security-role>
</web-app>
apps/jboss-blank/README.txt
+7 -1
View File
@@ -7,4 +7,10 @@ For more on getting started with Struts, see
* http://cwiki.apache.org/WW/home.html
----------------------------------------------------------------------------
I18N:
=====
Please note that this project was created with the assumption that it will be run
in an environment where the default locale is set to English. This means that
the default messages defined in package.properties are in English. If the default
locale for your server is different, then rename package.properties to package_en.properties
and create a new package.properties with proper values for your default locale.
apps/jboss-blank/pom.xml
+2 -2
View File
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.16.1</version>
<version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-jboss-blank</artifactId>
<packaging>war</packaging>
<name>JBoss Blank Webapp</name>
<name>Struts 2 JBoss Blank Webapp</name>
<dependencies>
apps/jboss-blank/src/main/resources/example.xml
+3 -3
View File
@@ -8,16 +8,16 @@
<package name="example" namespace="/example" extends="struts-default">
<action name="HelloWorld" class="example.HelloWorld">
<result>/example/HelloWorld.jsp</result>
<result>/WEB-INF/jsp/example/HelloWorld.jsp</result>
</action>
<action name="Login_*" method="{1}" class="example.Login">
<result name="input">/example/Login.jsp</result>
<result name="input">/WEB-INF/jsp/example/Login.jsp</result>
<result type="redirectAction">Menu</result>
</action>
<action name="*" class="example.ExampleSupport">
<result>/example/{1}.jsp</result>
<result>/WEB-INF/jsp/example/{1}.jsp</result>
</action>
<!-- Add actions here -->
apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp → apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
+28 -28
View File
@@ -1,28 +1,28 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title><s:text name="HelloWorld.message"/></title>
</head>
<body>
<h2><s:property value="message"/></h2>
<h3>Languages</h3>
<ul>
<li>
<s:url id="url" action="HelloWorld">
<s:param name="request_locale">en</s:param>
</s:url>
<s:a href="%{url}">English</s:a>
</li>
<li>
<s:url id="url" action="HelloWorld">
<s:param name="request_locale">es</s:param>
</s:url>
<s:a href="%{url}">Espanol</s:a>
</li>
</ul>
</body>
</html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title><s:text name="HelloWorld.message"/></title>
</head>
<body>
<h2><s:property value="message"/></h2>
<h3>Languages</h3>
<ul>
<li>
<s:url id="url" action="HelloWorld">
<s:param name="request_locale">en</s:param>
</s:url>
<s:a href="%{url}">English</s:a>
</li>
<li>
<s:url id="url" action="HelloWorld">
<s:param name="request_locale">es</s:param>
</s:url>
<s:a href="%{url}">Espanol</s:a>
</li>
</ul>
</body>
</html>
apps/jboss-blank/src/main/webapp/example/Login.jsp → apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
+15 -15
View File
@@ -1,15 +1,15 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Sign On</title>
</head>
<body>
<s:form action="Login">
<s:textfield key="username"/>
<s:password key="password" />
<s:submit/>
</s:form>
</body>
</html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Sign On</title>
</head>
<body>
<s:form action="Login">
<s:textfield key="username"/>
<s:password key="password" />
<s:submit/>
</s:form>
</body>
</html>
apps/jboss-blank/src/main/webapp/example/Menu.jsp → apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
+2 -2
View File
@@ -1,3 +1,3 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<s:include value="Missing.jsp"/>
apps/jboss-blank/src/main/webapp/example/Missing.jsp → apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
+11 -11
View File
@@ -1,11 +1,11 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head><title>Missing Feature</title></head>
<body>
<p>
<s:text name="Missing.message"/>
</p>
</body>
</html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head><title>Missing Feature</title></head>
<body>
<p>
<s:text name="Missing.message"/>
</p>
</body>
</html>
apps/jboss-blank/src/main/webapp/example/Register.jsp → apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
+2 -2
View File
@@ -1,3 +1,3 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<s:include value="Missing.jsp"/>
apps/jboss-blank/src/main/webapp/example/Welcome.jsp → apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
+18 -18
View File
@@ -1,18 +1,18 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Welcome</title>
<link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
type="text/css"/>
</head>
<body>
<h3>Commands</h3>
<ul>
<li><a href="<s:url action="Login_input"/>">Sign On</a></li>
<li><a href="<s:url action="Register"/>">Register</a></li>
</ul>
</body>
</html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Welcome</title>
<link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
type="text/css"/>
</head>
<body>
<h3>Commands</h3>
<ul>
<li><a href="<s:url action="Login_input"/>">Sign On</a></li>
<li><a href="<s:url action="Register"/>">Register</a></li>
</ul>
</body>
</html>
apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
+17
View File
@@ -17,4 +17,21 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
<!-- Restricts access to pure JSP files - access available only via Struts action -->
<security-constraint>
<display-name>No direct JSP access</display-name>
<web-resource-collection>
<web-resource-name>No-JSP</web-resource-name>
<url-pattern>*.jsp</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>no-users</role-name>
</auth-constraint>
</security-constraint>
<security-role>
<description>Don't assign users to this role</description>
<role-name>no-users</role-name>
</security-role>
</web-app>
apps/mailreader/README.txt
+7 -2
View File
@@ -14,5 +14,10 @@ For more about the MailReader applicaton genneraly, visit Struts University.
* http://www.StrutsUniversity.org/
----------------------------------------------------------------------------
I18N:
=====
Please note that this project was created with the assumption that it will be run
in an environment where the default locale is set to English. This means that
the default messages defined in package.properties are in English. If the default
locale for your server is different, then rename package.properties to package_en.properties
and create a new package.properties with proper values for your default locale.
apps/mailreader/pom.xml
+2 -2
View File
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.16.1</version>
<version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-mailreader</artifactId>
<packaging>war</packaging>
<name>Mail Reader Webapp</name>
<name>Struts 2 Mail Reader Webapp</name>
<dependencies>
apps/mailreader/src/main/java/mailreader-support.xml
+5 -5
View File
@@ -12,7 +12,7 @@
</action>
<action name="Welcome" class="mailreader2.Welcome">
<result>/Welcome.jsp</result>
<result>/WEB-INF/jsp/Welcome.jsp</result>
<interceptor-ref name="guest"/>
</action>
@@ -21,7 +21,7 @@
</action>
<action name="Login_*" method="{1}" class="mailreader2.Login">
<result name="input">/Login.jsp</result>
<result name="input">/WEB-INF/jsp/Login.jsp</result>
<result name="cancel" type="redirectAction">Welcome</result>
<result type="redirectAction">MainMenu</result>
<result name="expired" type="chain">ChangePassword</result>
@@ -32,7 +32,7 @@
</action>
<action name="Registration_*" method="{1}" class="mailreader2.Registration">
<result name="input">/Registration.jsp</result>
<result name="input">/WEB-INF/jsp/Registration.jsp</result>
<result type="redirectAction">MainMenu</result>
<interceptor-ref name="guest"/>
</action>
@@ -41,7 +41,7 @@
<package name="subscription" namespace="/" extends="mailreader-support">
<global-results>
<result name="input">/Subscription.jsp</result>
<result name="input">/WEB-INF/jsp/Subscription.jsp</result>
<result type="redirectAction">Registration_input</result>
</global-results>
@@ -56,7 +56,7 @@
<package name="wildcard" namespace="/" extends="mailreader-support">
<action name="*" class="mailreader2.MailreaderSupport">
<result>/{1}.jsp</result>
<result>/WEB-INF/jsp/{1}.jsp</result>
</action>
</package>
apps/mailreader/src/main/webapp/ChangePassword.jsp → apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp
View File
apps/mailreader/src/main/webapp/Error.jsp → apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp
View File
apps/mailreader/src/main/webapp/Footer.jsp → apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp
View File
apps/mailreader/src/main/webapp/Login.jsp → apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp
View File
apps/mailreader/src/main/webapp/MainMenu.jsp → apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp
View File
apps/mailreader/src/main/webapp/Registration.jsp → apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp
View File
apps/mailreader/src/main/webapp/Subscription.jsp → apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp
View File
apps/mailreader/src/main/webapp/Welcome.jsp → apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp
View File
apps/mailreader/src/main/webapp/WEB-INF/web.xml
+17
View File
@@ -27,4 +27,21 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
<!-- Restricts access to pure JSP files - access available only via Struts action -->
<security-constraint>
<display-name>No direct JSP access</display-name>
<web-resource-collection>
<web-resource-name>No-JSP</web-resource-name>
<url-pattern>*.jsp</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>no-users</role-name>
</auth-constraint>
</security-constraint>
<security-role>
<description>Don't assign users to this role</description>
<role-name>no-users</role-name>
</security-role>
</web-app>
apps/pom.xml
+1 -2
View File
@@ -26,9 +26,8 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>2.3.16.1</version>
<version>2.3.18-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
<name>Struts 2 Webapps</name>
apps/portlet/README.txt
+7 -2
View File
@@ -13,5 +13,10 @@ WAR is not ready-to-run. Extract the portlet WAR, and then copy the
contents of apps/portlet/src/main/etc/<your_portal_server>/ into the
WAR's WEB-INF directory.
----------------------------------------------------------------------------
I18N:
=====
Please note that this project was created with the assumption that it will be run
in an environment where the default locale is set to English. This means that
the default messages defined in package.properties are in English. If the default
locale for your server is different, then rename package.properties to package_en.properties
and create a new package.properties with proper values for your default locale.
apps/portlet/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.16.1</version>
<version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet</artifactId>
apps/rest-showcase/README.txt
+15
View File
@@ -0,0 +1,15 @@
README.txt - Rest Showcase Webapp
Rest Showcase is a simple example of REST app build with the REST plugin.
For more on getting started with Struts, see
* http://cwiki.apache.org/WW/home.html
I18N:
=====
Please note that this project was created with the assumption that it will be run
in an environment where the default locale is set to English. This means that
the default messages defined in package.properties are in English. If the default
locale for your server is different, then rename package.properties to package_en.properties
and create a new package.properties with proper values for your default locale.
apps/rest-showcase/pom.xml
+2 -2
View File
@@ -26,12 +26,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.16.1</version>
<version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
<version>2.3.16.1</version>
<version>2.3.18-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
apps/rest-showcase/src/main/webapp/WEB-INF/web.xml
+17
View File
@@ -26,4 +26,21 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<!-- Restricts access to pure JSP files - access available only via Struts action -->
<security-constraint>
<display-name>No direct JSP access</display-name>
<web-resource-collection>
<web-resource-name>No-JSP</web-resource-name>
<url-pattern>*.jsp</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>no-users</role-name>
</auth-constraint>
</security-constraint>
<security-role>
<description>Don't assign users to this role</description>
<role-name>no-users</role-name>
</security-role>
</web-app>
apps/showcase/README.txt
+7 -1
View File
@@ -7,4 +7,10 @@ For more on getting started with Struts, see
* http://cwiki.apache.org/WW/home.html
----------------------------------------------------------------------------
I18N:
=====
Please note that this project was created with the assumption that it will be run
in an environment where the default locale is set to English. This means that
the default messages defined in package.properties are in English. If the default
locale for your server is different, then rename package.properties to package_en.properties
and create a new package.properties with proper values for your default locale.
apps/showcase/pom.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>2.3.16.1</version>
<version>2.3.18-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
apps/showcase/src/main/resources/struts-actionchaining.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<result type="chain">actionChain3</result>
</action>
<action name="actionChain3" class="org.apache.struts2.showcase.actionchaining.ActionChain3">
<result>/actionchaining/actionChainingResult.jsp</result>
<result>/WEB-INF/actionchaining/actionChainingResult.jsp</result>
</action>
</package>
</struts>
apps/showcase/src/main/resources/struts-ajax.xml
+48 -21
View File
@@ -6,27 +6,27 @@
<struts>
<package name="ajax" extends="struts-default">
<action name="AjaxTest" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
<result>/ajax/AjaxResult.jsp</result>
<result>/WEB-INF/ajax/AjaxResult.jsp</result>
</action>
<action name="AjaxRemoteLink" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
<result>/ajax/AjaxResult2.js</result>
<result>/WEB-INF/ajax/AjaxResult2.js</result>
</action>
<action name="AjaxRemoteForm" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
<result>/ajax/AjaxResult3.jsp</result>
<result>/WEB-INF/ajax/AjaxResult3.jsp</result>
</action>
<action name="Test1">
<result>/ajax/remoteforms/test2.jsp</result>
<result>/WEB-INF/ajax/remoteforms/test2.jsp</result>
</action>
<action name="Test2">
<result>/ajax/remoteforms/test3.jsp</result>
<result>/WEB-INF/ajax/remoteforms/test3.jsp</result>
</action>
<action name="Test3">
<result>/ajax/testjs.jsp</result>
<result>/WEB-INF/ajax/testjs.jsp</result>
</action>
<action name="JSONList">
@@ -34,54 +34,81 @@
</action>
<action name="tree">
<result>/ajax/tree/tree.jsp</result>
<result>/WEB-INF/ajax/tree/tree.jsp</result>
</action>
<action name="getCategory" class="org.apache.struts2.showcase.ajax.tree.GetCategory">
<result>/ajax/tree/getCategory.jsp</result>
<result>/WEB-INF/ajax/tree/getCategory.jsp</result>
</action>
<action name="toggle" class="org.apache.struts2.showcase.ajax.tree.Toggle">
<result>/ajax/tree/toggle.jsp</result>
<result>/WEB-INF/ajax/tree/toggle.jsp</result>
</action>
<action name="example4">
<result type="freemarker">/ajax/tabbedpanel/example4.ftl</result>
<result type="freemarker">/WEB-INF/ajax/tabbedpanel/example4.ftl</result>
</action>
<action name="example5" class="org.apache.struts2.showcase.ajax.Example5Action">
<result name="input">/ajax/tabbedpanel/example5.jsp</result>
<result>/ajax/tabbedpanel/example5Ok.jsp</result>
<result name="input">/WEB-INF/ajax/tabbedpanel/example5.jsp</result>
<result>/WEB-INF/ajax/tabbedpanel/example5Ok.jsp</result>
</action>
</package>
<package name="ajax-examples" namespace="/ajax" extends="struts-default">
<action name="bind">
<result>/WEB-INF/ajax/bind/index.jsp</result>
</action>
<action name="autocompleter">
<result>/WEB-INF/ajax/autocompleter/index.jsp</result>
</action>
<action name="remotebutton">
<result>/WEB-INF/ajax/remotebutton/index.jsp</result>
</action>
<action name="remotediv">
<result>/WEB-INF/ajax/remotediv/index.jsp</result>
</action>
<action name="remotelink">
<result>/WEB-INF/ajax/remotelink/index.jsp</result>
</action>
<action name="tabbedpanel">
<result>/WEB-INF/ajax/tabbedpanel/index.jsp</result>
</action>
<action name="remoteforms">
<result>/WEB-INF/ajax/remoteforms/index.jsp</result>
</action>
<action name="widgets">
<result>/WEB-INF/ajax/widgets/index.jsp</result>
</action>
</package>
<package name="ajaxNoDecorate" namespace="/nodecorate" extends="json-default">
<!-- example 4 -->
<action name="panel1" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel1">
<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel1.ftl</result>
<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel1.ftl</result>
</action>
<action name="panel2">
<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel2.ftl</result>
<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel2.ftl</result>
</action>
<action name="panel3">
<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel3.ftl</result>
<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel3.ftl</result>
</action>
<action name="panel2Submit" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel2">
<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel2Submit.ftl</result>
<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel2Submit.ftl</result>
</action>
<action name="panel3Submit" class="org.apache.struts2.showcase.ajax.Example4ShowPanelAction" method="panel3">
<result type="freemarker">/ajax/tabbedpanel/nodecorate/panel3Submit.ftl</result>
<result type="freemarker">/WEB-INF/ajax/tabbedpanel/nodecorate/panel3Submit.ftl</result>
</action>
<action name="AutocompleterExample" class="org.apache.struts2.showcase.ajax.AutocompleterExampleAction">
<result type="freemarker">/ajax/options.ftl</result>
<result type="freemarker">/WEB-INF/ajax/options.ftl</result>
</action>
<action name="quizAjax" class="org.apache.struts2.showcase.validation.QuizAction">
<interceptor-ref name="jsonValidationWorkflowStack"/>
<result name="input">/validation/quiz-ajax.jsp</result>
<result>/validation/quiz-success.jsp</result>
<result name="input">/WEB-INF/validation/quiz-ajax.jsp</result>
<result>/WEB-INF/validation/quiz-success.jsp</result>
</action>
<action name="getNodes" class="org.apache.struts2.showcase.ShowAjaxDynamicTreeAction">
<result type="freemarker">/tags/ui/treeExampleAjaxDynamic.ftl</result>
<result type="freemarker">/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl</result>
</action>
</package>
</struts>
apps/showcase/src/main/resources/struts-chat.xml
+14 -14
View File
@@ -33,18 +33,18 @@
</interceptors>
<global-results>
<result name="login" type="freemarker">/chat/chatLogin.ftl</result>
<result name="login" type="freemarker">/WEB-INF/chat/chatLogin.ftl</result>
</global-results>
<action name="main">
<interceptor-ref name="chatAuthentication" />
<result type="freemarker">/chat/roomSelection.ftl</result>
<result type="freemarker">/WEB-INF/chat/roomSelection.ftl</result>
</action>
<action name="login" class="chatLoginAction">
<interceptor-ref name="defaultStack" />
<result type="redirect">/chat/showRooms.action</result>
<result name="input" type="freemarker">/chat/chatLogin.ftl</result>
<result name="input" type="freemarker">/WEB-INF/chat/chatLogin.ftl</result>
</action>
<action name="logout" class="chatLogoutAction">
@@ -54,12 +54,12 @@
<action name="showRooms">
<interceptor-ref name="chatAuthenticationStack" />
<result type="freemarker">/chat/roomSelection.ftl</result>
<result type="freemarker">/WEB-INF/chat/roomSelection.ftl</result>
</action>
<action name="enterRoom" class="enterRoomAction">
<interceptor-ref name="chatAuthenticationStack" />
<result type="freemarker">/chat/showRoom.ftl</result>
<result type="freemarker">/WEB-INF/chat/showRoom.ftl</result>
</action>
<action name="exitRoom" class="exitRoomAction">
@@ -100,35 +100,35 @@
<action name="usersAvailable" class="usersAvailableAction">
<interceptor-ref name="chatAuthenticationStack" />
<result type="freemarker">/chat/usersAvailable.ftl</result>
<result type="freemarker">/WEB-INF/chat/usersAvailable.ftl</result>
</action>
<action name="roomsAvailable" class="roomsAvailableAction">
<interceptor-ref name="chatAuthenticationStack" />
<result type="freemarker">/chat/roomsAvailable.ftl</result>
<result type="freemarker">/WEB-INF/chat/roomsAvailable.ftl</result>
</action>
<action name="createRoom" class="crudRoomAction" method="create">
<interceptor-ref name="chatAuthenticationStack" />
<result type="freemarker">/chat/createRoom.ftl</result>
<result name="input" type="freemarker">/chat/createRoom.ftl</result>
<result type="freemarker">/WEB-INF/chat/createRoom.ftl</result>
<result name="input" type="freemarker">/WEB-INF/chat/createRoom.ftl</result>
</action>
<action name="messagesAvailableInRoom" class="messagesAvailableInRoomAction">
<interceptor-ref name="chatAuthenticationStack" />
<result type="freemarker">/chat/messagesAvailableInRoom.ftl</result>
<result name="input" type="freemarker">/chat/messagesAvailableInRoom.ftl</result>
<result type="freemarker">/WEB-INF/chat/messagesAvailableInRoom.ftl</result>
<result name="input" type="freemarker">/WEB-INF/chat/messagesAvailableInRoom.ftl</result>
</action>
<action name="sendMessageToRoom" class="sendMessageToRoomAction">
<interceptor-ref name="chatAuthenticationStack" />
<result type="freemarker">/chat/sendMessageToRoomResult.ftl</result>
<result name="input" type="freemarker">/chat/sendMessageToRoomResult.ftl</result>
<result type="freemarker">/WEB-INF/chat/sendMessageToRoomResult.ftl</result>
<result name="input" type="freemarker">/WEB-INF/chat/sendMessageToRoomResult.ftl</result>
</action>
<action name="usersAvailableInRoom" class="usersAvailableInRoomAction">
<interceptor-ref name="chatAuthenticationStack" />
<result type="freemarker">/chat/usersAvailableInRoom.ftl</result>
<result type="freemarker">/WEB-INF/chat/usersAvailableInRoom.ftl</result>
</action>
</package>
</struts>
apps/showcase/src/main/resources/struts-conversion.xml
+24 -20
View File
@@ -6,68 +6,72 @@
<struts>
<package name="conversion" namespace="/conversion" extends="struts-default">
<action name="index">
<result>/WEB-INF/conversion/index.jsp</result>
</action>
<!-- Example populating a List inside an Action -->
<action name="enterPersonsInfo" method="input"
class="org.apache.struts2.showcase.conversion.PersonAction">
<result>enterPersonInfo.jsp</result>
<result>/WEB-INF/conversion/enterPersonInfo.jsp</result>
</action>
<action name="submitPersonInfo" method="submit"
class="org.apache.struts2.showcase.conversion.PersonAction">
<result>showPersonInfo.jsp</result>
<result name="input">enterPersonInfo.jsp</result>
<result>/WEB-INF/conversion/showPersonInfo.jsp</result>
<result name="input">/WEB-INF/conversion/enterPersonInfo.jsp</result>
</action>
<action name="showPersonJspCode">
<result type="plainText">/conversion/enterPersonInfo.jsp</result>
<result type="plainText">/WEB-INF/conversion/enterPersonInfo.jsp</result>
</action>
<action name="showPersonActionJavaCode">
<result type="plainText">/conversion/PersonAction.java.txt</result>
<result type="plainText">/WEB-INF/conversion/PersonAction.java.txt</result>
</action>
<action name="showPersonJavaCode">
<result type="plainText">/conversion/Person.java.txt</result>
<result type="plainText">/WEB-INF/conversion/Person.java.txt</result>
</action>
<!-- Example populating a Set inside an Action -->
<action name="enterAddressesInfo" class="org.apache.struts2.showcase.conversion.AddressAction" method="input">
<result>enterAddressInfo.jsp</result>
<result>/WEB-INF/conversion/enterAddressInfo.jsp</result>
</action>
<action name="submitAddressesInfo" class="org.apache.struts2.showcase.conversion.AddressAction" method="submit">
<result>showAddressInfo.jsp</result>
<result name="input">enterAddressInfo.jsp</result>
<result>/WEB-INF/conversion/showAddressInfo.jsp</result>
<result name="input">/WEB-INF/conversion/enterAddressInfo.jsp</result>
</action>
<action name="showAddressJspCode">
<result type="plainText">/conversion/enterAddressInfo.jsp</result>
<result type="plainText">/WEB-INF/conversion/enterAddressInfo.jsp</result>
</action>
<action name="showAddressActionJavaCode">
<result type="plainText">/conversion/AddressAction.java.txt</result>
<result type="plainText">/WEB-INF/conversion/AddressAction.java.txt</result>
</action>
<action name="showAddressJavaCode">
<result type="plainText">/conversion/Address.java.txt</result>
<result type="plainText">/WEB-INF/conversion/Address.java.txt</result>
</action>
<!-- Example populating a List with Tiger 5 Enum -->
<action name="enterOperationEnumInfo" class="org.apache.struts2.showcase.conversion.OperationsEnumAction" method="input">
<result>enterOperations.jsp</result>
<result>/WEB-INF/conversion/enterOperations.jsp</result>
</action>
<action name="submitOperationEnumInfo" class="org.apache.struts2.showcase.conversion.OperationsEnumAction" method="submit">
<result>showOperations.jsp</result>
<result name="input">enterOperations.jsp</result>
<result>/WEB-INF/conversion/showOperations.jsp</result>
<result name="input">/WEB-INF/conversion/enterOperations.jsp</result>
</action>
<action name="showEnumJspCode">
<result type="plainText">/conversion/enterOperations.jsp</result>
<result type="plainText">/WEB-INF/conversion/enterOperations.jsp</result>
</action>
<action name="showOperationsEnumJavaCode">
<result type="plainText">/conversion/OperationsEnum.java.txt</result>
<result type="plainText">/WEB-INF/conversion/OperationsEnum.java.txt</result>
</action>
<action name="showOperationEnumActionJavaCode">
<result type="plainText">/conversion/OperationsEnumAction.java.txt</result>
<result type="plainText">/WEB-INF/conversion/OperationsEnumAction.java.txt</result>
</action>
<action name="showEnumTypeConverterJavaCode">
<result type="plainText">/conversion/EnumTypeConverter.java.txt</result>
<result type="plainText">/WEB-INF/conversion/EnumTypeConverter.java.txt</result>
</action>
<action name="showOperationsEnumActionConversionProperties">
<result type="plainText">/conversion/OperationsEnumActionConversion.txt</result>
<result type="plainText">/WEB-INF/conversion/OperationsEnumActionConversion.txt</result>
</action>
</package>
apps/showcase/src/main/resources/struts-filedownload.xml
+4
View File
@@ -8,6 +8,10 @@
<default-action-ref name="download"/>
<action name="index">
<result>/WEB-INF/filedownload/index.jsp</result>
</action>
<action name="download" class="org.apache.struts2.showcase.filedownload.FileDownloadAction">
<param name="inputPath">/images/struts.gif</param>
<result name="success" type="stream">
apps/showcase/src/main/resources/struts-fileupload.xml
+7 -7
View File
@@ -7,29 +7,29 @@
<package name="fileupload" extends="struts-default" namespace="/fileupload">
<action name="upload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="input">
<result>upload.jsp</result>
<result>/WEB-INF/fileupload/upload.jsp</result>
</action>
<action name="doUpload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="upload">
<result name="input">upload.jsp</result>
<result>upload-success.jsp</result>
<result name="input">/WEB-INF/fileupload/upload.jsp</result>
<result>/WEB-INF/fileupload/upload-success.jsp</result>
</action>
<action name="multipleUploadUsingList">
<result>multipleUploadUsingList.jsp</result>
<result>/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
</action>
<action name="doMultipleUploadUsingList" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingListAction" method="upload">
<result>multiple-success.jsp</result>
<result>/WEB-INF/fileupload/multiple-success.jsp</result>
</action>
<action name="multipleUploadUsingArray">
<result>multipleUploadUsingArray.jsp</result>
<result>/WEB-INF/fileupload/multipleUploadUsingArray.jsp</result>
</action>
<action name="doMultipleUploadUsingArray" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingArrayAction" method="upload">
<result>multiple-success.jsp</result>
<result>/WEB-INF/fileupload/multiple-success.jsp</result>
</action>
apps/showcase/src/main/resources/struts-freemarker.xml
+2 -2
View File
@@ -6,11 +6,11 @@
<struts>
<package name="freemarker" namespace="/freemarker" extends="struts-default">
<action name="customFreemarkerManagerDemo">
<result type="freemarker">/freemarker/customFreemarkerManagerUsage.ftl</result>
<result type="freemarker">/WEB-INF/freemarker/customFreemarkerManagerUsage.ftl</result>
</action>
<action name="standardTags" class="org.apache.struts2.showcase.freemarker.StandardTagsAction">
<result type="freemarker">/freemarker/standardTags.ftl</result>
<result type="freemarker">/WEB-INF/freemarker/standardTags.ftl</result>
</action>
</package>
</struts>
apps/showcase/src/main/resources/struts-hangman.xml
+9 -9
View File
@@ -6,19 +6,19 @@
<struts>
<package name="hangman" extends="struts-default" namespace="/hangman">
<action name="hangmanAjax" class="startHangmanAction">
<result type="freemarker">/hangman/hangmanAjax.ftl</result>
<result type="freemarker">/WEB-INF/hangman/hangmanAjax.ftl</result>
</action>
<action name="hangmanNonAjax" class="startHangmanAction">
<result type="freemarker">/hangman/hangmanNonAjax.ftl</result>
<result type="freemarker">/WEB-INF/hangman/hangmanNonAjax.ftl</result>
</action>
<action name="test">
<result type="freemarker">/hangman/test.ftl</result>
</action>
<action name="guessCharacter" class="guessCharacterAction">
<result type="freemarker">/hangman/blank.ftl</result>
<result type="freemarker">/WEB-INF/hangman/blank.ftl</result>
</action>
<action name="guessCharacterNonAjax" class="guessCharacterAction">
<result type="freemarker">/hangman/hangmanNonAjax.ftl</result>
<result type="freemarker">/WEB-INF/hangman/hangmanNonAjax.ftl</result>
</action>
</package>
@@ -26,19 +26,19 @@
<package name="hangman-ajax" extends="struts-default" namespace="/hangman/ajax">
<action name="blank">
<result type="freemarker">/hangman/blank.ftl</result>
<result type="freemarker">/WEB-INF/hangman/blank.ftl</result>
</action>
<action name="updateVocabCharacters" class="getUpdatedHangmanAction">
<result type="freemarker">/hangman/updateVocabCharacters.ftl</result>
<result type="freemarker">/WEB-INF/hangman/updateVocabCharacters.ftl</result>
</action>
<action name="updateCharacterAvailable" class="getUpdatedHangmanAction">
<result type="freemarker">/hangman/updateCharacterAvailable.ftl</result>
<result type="freemarker">/WEB-INF/hangman/updateCharacterAvailable.ftl</result>
</action>
<action name="updateScaffold" class="getUpdatedHangmanAction">
<result type="freemarker">/hangman/updateScaffold.ftl</result>
<result type="freemarker">/WEB-INF/hangman/updateScaffold.ftl</result>
</action>
<action name="updateGuessLeft" class="getUpdatedHangmanAction">
<result type="freemarker">/hangman/updateGuessLeft.ftl</result>
<result type="freemarker">/WEB-INF/hangman/updateGuessLeft.ftl</result>
</action>
</package>
</struts>
apps/showcase/src/main/resources/struts-integration.xml
+3 -3
View File
@@ -32,15 +32,15 @@
<!-- Display entry page that uses Model-Driven technique -->
<action name="editGangster" class="org.apache.struts2.s1.Struts1Action">
<param name="className">org.apache.struts2.showcase.integration.EditGangsterAction</param>
<result>modelDriven.jsp</result>
<result>/WEB-INF/integration/modelDriven.jsp</result>
</action>
<!-- Display the result page whose content is populated using the Model-Driven technique -->
<action name="saveGangster" class="org.apache.struts2.s1.Struts1Action">
<param name="className">org.apache.struts2.showcase.integration.SaveGangsterAction</param>
<param name="validate">true</param>
<result name="input">modelDriven.jsp</result>
<result>modelDrivenResult.jsp</result>
<result name="input">/WEB-INF/integration/modelDriven.jsp</result>
<result>/WEB-INF/integration/modelDrivenResult.jsp</result>
</action>
</package>
apps/showcase/src/main/resources/struts-interactive.xml
+6 -1
View File
@@ -4,12 +4,17 @@
"http://struts.apache.org/dtds/struts-2.3.dtd">
<struts>
<package name="interactive" namespace="/interactive" extends="struts-default">
<action name="index">
<result>/WEB-INF/interactive/index.jsp</result>
</action>
</package>
<package name="ognl" namespace="/nodecorate" extends="struts-default">
<action name="jspEval" class="org.apache.struts2.showcase.action.JSPEvalAction">
<interceptor-ref name="params"/>
<interceptor-ref name="debugging"/>
<interceptor-ref name="annotationWorkflow" />
<result>/interactive/demo.jsp</result>
<result>/WEB-INF/interactive/demo.jsp</result>
</action>
<action name="example" class="org.apache.struts2.showcase.action.ExampleAction" />
</package>
apps/showcase/src/main/resources/struts-jsf.xml
+4
View File
@@ -20,6 +20,10 @@
<default-interceptor-ref name="jsfFullStack"/>
<action name="index">
<result>/WEB-INF/jsf/index.jsp</result>
</action>
</package>
<package name="jsf.employee" extends="jsf" namespace="/jsf/employee">
apps/showcase/src/main/resources/struts-model-driven.xml
+2 -2
View File
@@ -7,12 +7,12 @@
<package name="modelDriven" extends="struts-default" namespace="/modelDriven">
<!-- Diplay entry page that uses Model-Driven technique -->
<action name="modelDriven" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction" method="input">
<result>modelDriven.jsp</result>
<result>/WEB-INF/modelDriven/modelDriven.jsp</result>
</action>
<!-- Display the result page whose content is populated using the Model-Driven technique -->
<action name="modelDrivenResult" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction">
<result>modelDrivenResult.jsp</result>
<result>/WEB-INF/modelDriven/modelDrivenResult.jsp</result>
</action>
</package>
</struts>
apps/showcase/src/main/resources/struts-tags-non-ui.xml
+30 -27
View File
@@ -11,19 +11,19 @@
<package name="actionTag" extends="struts-default" namespace="/tags/non-ui/actionTag">
<action name="showActionTagDemo" class="org.apache.struts2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
<result>/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
</action>
<action name="includePage" class="org.apache.struts2.showcase.tag.nonui.actiontag.ActionTagDemo" method="doInclude">
<result>/tags/non-ui/actionTag/includedPage.jsp</result>
<result>/WEB-INF/tags/non-ui/actionTag/includedPage.jsp</result>
</action>
<action name="includePage2">
<result>/tags/non-ui/actionTag/includedPage2.jsp</result>
<result>/WEB-INF/tags/non-ui/actionTag/includedPage2.jsp</result>
</action>
<action name="includePage3">
<result>/tags/non-ui/actionTag/includedPage3.jsp</result>
<result>/WEB-INF/tags/non-ui/actionTag/includedPage3.jsp</result>
</action>
<action name="lookAtSource">
<result type="plainText">/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
<result type="plainText">/WEB-INF/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
</action>
</package>
@@ -33,11 +33,11 @@
<package name="iteratorGeneratorTag" extends="struts-default" namespace="/tags/non-ui/iteratorGeneratorTag">
<action name="showGeneratorTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
<result>/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
</action>
<action name="submitGeneratorTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="submit">
<result name="input">/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
<result>/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
<result name="input">/WEB-INF/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
</action>
</package>
@@ -47,11 +47,11 @@
<!-- ========================================== -->
<package name="appendIteratorTag" extends="struts-default" namespace="/tags/non-ui/appendIteratorTag">
<action name="showAppendTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="input">
<result>/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
</action>
<action name="submitAppendTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="submit">
<result name="input">/tag/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
<result>/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
<result name="input">/WEB-INF/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
</action>
</package>
@@ -61,11 +61,11 @@
<!-- ========================================= -->
<package name="mergeIteratorTag" extends="struts-default" namespace="/tags/non-ui/mergeIteratorTag">
<action name="showMergeTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="input">
<result>/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
</action>
<action name="submitMergeTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="submit">
<result name="input">/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
<result>/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
<result name="input">/WEB-INF/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
</action>
</package>
@@ -74,11 +74,11 @@
<!-- =========================================== -->
<package name="subsetIteratorTag" extends="struts-default" namespace="/tags/non-ui/subsetIteratorTag">
<action name="showSubsetTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="input">
<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
</action>
<action name="submitSubsetTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="submit">
<result name="input">/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
<result name="input">/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
<result>/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
</action>
</package>
@@ -87,28 +87,28 @@
<!-- ========================================= -->
<package name="actionPrefix" extends="struts-default" namespace="/tags/non-ui/actionPrefix">
<action name="actionPrefixExampleUsingFreemarker">
<result type="freemarker">/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
</action>
<action name="submit" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction">
<result type="freemarker">/tags/non-ui/actionPrefix/normalSubmit.ftl</result>
<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl</result>
</action>
<action name="submit" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction" method="alternateMethod">
<result name="methodPrefixResult" type="freemarker">/tags/non-ui/actionPrefix/methodPrefix.ftl</result>
<result name="methodPrefixResult" type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl</result>
</action>
<action name="actionPrefix" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction">
<result type="freemarker">/tags/non-ui/actionPrefix/actionPrefix.ftl</result>
<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl</result>
</action>
<action name="redirectPrefix">
<result type="freemarker">/tags/non-ui/actionPrefix/redirectPrefix.ftl</result>
<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/redirectPrefix.ftl</result>
</action>
<action name="redirectActionPrefix">
<result type="freemarker">/tags/non-ui/actionPrefix/redirectActionPrefix.ftl</result>
<result type="freemarker">/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl</result>
</action>
<action name="redirectActionPrefixAction">
<result type="redirect">redirectActionPrefix</result>
</action>
<action name="viewSource">
<result type="plainText">/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
<result type="plainText">/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
</action>
</package>
@@ -117,10 +117,10 @@
<!-- ========================================== -->
<package name="ifTagPackage" extends="struts-default" namespace="/tags/non-ui/ifTag">
<action name="testIfTagJsp">
<result>/tags/non-ui/ifTag/testIf.jsp</result>
<result>/WEB-INF/tags/non-ui/ifTag/testIf.jsp</result>
</action>
<action name="testIfTagFreemarker">
<result type="freemarker">/tags/non-ui/ifTag/testIf.ftl</result>
<result type="freemarker">/WEB-INF/tags/non-ui/ifTag/testIf.ftl</result>
</action>
</package>
@@ -128,8 +128,11 @@
<!-- === Package for Debug Tag === -->
<!-- ========================================== -->
<package name="debugTagPackage" extends="struts-default" namespace="/tags/non-ui">
<action name="date">
<result>/WEB-INF/tags/non-ui/date.jsp</result>
</action>
<action name="debugTagDemo">
<result>/tags/non-ui/debug.jsp</result>
<result>/WEB-INF/tags/non-ui/debug.jsp</result>
</action>
</package>
</struts>
apps/showcase/src/main/resources/struts-tags-ui.xml
+37 -21
View File
@@ -6,57 +6,73 @@
<struts>
<package name="ui-tags" extends="struts-default" namespace="/tags/ui">
<action name="example" class="org.apache.struts2.showcase.UITagExample">
<result>example.jsp</result>
<result name="input">example.jsp</result>
<result>/WEB-INF/tags/ui/example.jsp</result>
<result name="input">/WEB-INF/tags/ui/example.jsp</result>
</action>
<action name="exampleSubmit" class="org.apache.struts2.showcase.UITagExample" method="doSubmit">
<result>exampleSubmited.jsp</result>
<result name="input">example.jsp</result>
<result>/WEB-INF/tags/ui/exampleSubmited.jsp</result>
<result name="input">/WEB-INF/tags/ui/example.jsp</result>
</action>
<action name="exampleVelocity" class="org.apache.struts2.showcase.UITagExample">
<result type="velocity">example.vm</result>
<result name="input" type="velocity">example.vm</result>
<result type="velocity">/WEB-INF/tags/ui/example.vm</result>
<result name="input" type="velocity">/WEB-INF/tags/ui/example.vm</result>
</action>
<action name="exampleSubmitVelocity" class="org.apache.struts2.showcase.UITagExample" method="doSubmit">
<result type="velocity">exampleSubmited.vm</result>
<result name="input" type="velocity">example.vm</result>
<result type="velocity">/WEB-INF/tags/ui/exampleSubmited.vm</result>
<result name="input" type="velocity">/WEB-INF/tags/ui/example.vm</result>
</action>
<action name="lotsOfOptiontransferselect" class="org.apache.struts2.showcase.LotsOfOptiontransferselectAction" method="input">
<result>lotsOfOptiontransferselect.jsp</result>
<result>/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp</result>
</action>
<action name="lotsOfOptiontransferselectSubmit" class="org.apache.struts2.showcase.LotsOfOptiontransferselectAction" method="submit">
<result name="input">lotsOfOptiontransferselect.jsp</result>
<result>lotsOfOptiontransferselectSubmit.jsp</result>
<result name="input">/WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp</result>
<result>/WEB-INF/tags/ui/lotsOfOptiontransferselectSubmit.jsp</result>
</action>
<action name="moreSelects" class="org.apache.struts2.showcase.MoreSelectsAction" method="input">
<result>moreSelects.jsp</result>
<result>/WEB-INF/tags/ui/moreSelects.jsp</result>
</action>
<action name="moreSelectsSubmit" class="org.apache.struts2.showcase.MoreSelectsAction" method="submit">
<result name="input">moreSelects.jsp</result>
<result>moreSelectsSubmit.jsp</result>
<result name="input">/WEB-INF/tags/ui/moreSelects.jsp</result>
<result>/WEB-INF/tags/ui/moreSelectsSubmit.jsp</result>
</action>
<!-- START SNIPPET: treeExampleDynamicXWorkXml -->
<action name="showDynamicTreeAction" class="org.apache.struts2.showcase.ShowDynamicTreeAction">
<result>/tags/ui/treeExampleDynamic.jsp</result>
<result>/WEB-INF/tags/ui/treeExampleDynamic.jsp</result>
</action>
<!-- END SNIPPET: treeExampleDynamicXWorkXml -->
<action name="treeExampleStatic">
<result>/WEB-INF/tags/ui/treeExampleStatic.jsp</result>
</action>
<action name="showDynamicAjaxTreeAction">
<result>/tags/ui/treeExampleAjaxDynamic.jsp</result>
<result>/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp</result>
</action>
<action name="componentTagExample">
<result>/WEB-INF/tags/ui/componentTagExample.jsp</result>
</action>
<action name="showComponentTagExampleCode">
<result type="plainText">/tags/ui/componentTagExample.jsp</result>
<result type="plainText">/WEB-INF/tags/ui/componentTagExample.jsp</result>
</action>
<action name="actionTagExample">
<result>/tags/ui/actionTagExampleCalled.jsp</result>
<result name="input">/tags/ui/actionTagExampleCalling.jsp</result>
<result>/WEB-INF/tags/ui/actionTagExampleCalled.jsp</result>
<result name="input">/WEB-INF/tags/ui/actionTagExampleCalling.jsp</result>
</action>
<action name="datepicker">
<result>/WEB-INF/tags/ui/datepicker/index.jsp</result>
</action>
<action name="timepicker">
<result>/WEB-INF/tags/ui/timepicker/index.jsp</result>
</action>
</package>
@@ -65,10 +81,10 @@
<package name="ui-tags-ajax" namespace="/tags/ui/ajax" extends="struts-default">
<!-- Actions dealing with Tree Example -->
<action name="staticTreeSelectAction">
<result>/tags/ui/staticTreeSelect.jsp</result>
<result>/WEB-INF/tags/ui/staticTreeSelect.jsp</result>
</action>
<action name="dynamicTreeSelectAction" class="org.apache.struts2.showcase.DynamicTreeSelectAction">
<result>/tags/ui/dynamicTreeSelect.jsp</result>
<result>/WEB-INF/tags/ui/dynamicTreeSelect.jsp</result>
</action>
</package>
apps/showcase/src/main/resources/struts-tiles.xml
+1 -1
View File
@@ -21,7 +21,7 @@
</action>
<action name="sanity">
<result type="redirect">/tiles/layout.jsp</result>
<result type="redirect">/WEB-INF/tiles/layout.jsp</result>
<result type="redirect" name="success">/tiles/layout.jsp</result>
</action>
</package>
apps/showcase/src/main/resources/struts-token.xml
+12 -12
View File
@@ -7,56 +7,56 @@
<action name="tokenPrepare!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
<interceptor-ref name="defaultStack"/>
<result name="input">example1.jsp</result>
<result name="input">/WEB-INF/token/example1.jsp</result>
</action>
<action name="transfer" class="org.apache.struts2.showcase.token.TokenAction">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="token"/>
<result name="invalid.token">doublePost.jsp</result>
<result name="success">transferDone.jsp</result>
<result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
<result name="success">/WEB-INF/token/transferDone.jsp</result>
</action>
<action name="tokenPrepare2!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
<interceptor-ref name="defaultStack"/>
<result name="input">example2.jsp</result>
<result name="input">/WEB-INF/token/example2.jsp</result>
</action>
<action name="transfer2" class="org.apache.struts2.showcase.token.TokenAction">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="token"/>
<result name="invalid.token">doublePost.jsp</result>
<result name="success" type="redirect">transferDone.jsp</result>
<result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
<result name="success" type="redirect">/WEB-INF/token/transferDone.jsp</result>
</action>
<action name="tokenPrepare3!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
<interceptor-ref name="defaultStack"/>
<result name="input">example3.jsp</result>
<result name="input">/WEB-INF/token/example3.jsp</result>
</action>
<action name="transfer3" class="org.apache.struts2.showcase.token.TokenAction">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="tokenSession"/>
<result name="invalid.token">doublePost.jsp</result>
<result name="success" type="redirect">transferDone.jsp</result>
<result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
<result name="success" type="redirect">/WEB-INF/token/transferDone.jsp</result>
</action>
<action name="tokenPrepare4!*" class="org.apache.struts2.showcase.token.TokenAction" method="{1}">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="createSession"/> <!-- we must have a session when using freemarker and the @s.token tag -->
<result name="input" type="freemarker">example4.ftl</result>
<result name="input" type="freemarker">/WEB-INF/token/example4.ftl</result>
</action>
<action name="transfer4" class="org.apache.struts2.showcase.token.TokenAction">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="token"/>
<result name="invalid.token">doublePost.jsp</result>
<result name="success">transferDone.jsp</result>
<result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
<result name="success">/WEB-INF/token/transferDone.jsp</result>
</action>
</package>
apps/showcase/src/main/resources/struts-validation.xml
+22 -15
View File
@@ -5,6 +5,10 @@
<struts>
<package name="validation" extends="json-default" namespace="/validation">
<action name="index">
<result>/WEB-INF/validation/index.jsp</result>
</action>
<action name="quizBasic" class="org.apache.struts2.showcase.validation.QuizAction">
<result name="input">quiz-basic.jsp</result>
<result>quiz-success.jsp</result>
@@ -40,12 +44,12 @@
<!-- ======================== -->
<action name="showFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="input">
<result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result>
<result name="input" type="dispatcher">/WEB-INF/validation/fieldValidatorsExample.jsp</result>
</action>
<action name="submitFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="submit">
<result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result>
<result type="dispatcher">/validation/successFieldValidatorsExample.jsp</result>
<result name="input" type="dispatcher">/WEB-INF/validation/fieldValidatorsExample.jsp</result>
<result type="dispatcher">/WEB-INF/validation/successFieldValidatorsExample.jsp</result>
</action>
@@ -55,12 +59,12 @@
<!-- ============================ -->
<action name="showNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="input">
<result name="input">/validation/nonFieldValidatorsExample.jsp</result>
<result name="input">/WEB-INF/validation/nonFieldValidatorsExample.jsp</result>
</action>
<action name="submitNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="submit">
<result name="input">/validation/nonFieldValidatorsExample.jsp</result>
<result>/validation/successNonFieldValidatorsExample.jsp</result>
<result name="input">/WEB-INF/validation/nonFieldValidatorsExample.jsp</result>
<result>/WEB-INF/validation/successNonFieldValidatorsExample.jsp</result>
</action>
@@ -70,12 +74,12 @@
<!-- ========================== -->
<action name="showVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="input">
<result name="input">/validation/visitorValidatorsExample.jsp</result>
<result name="input">/WEB-INF/validation/visitorValidatorsExample.jsp</result>
</action>
<action name="submitVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="submit">
<result name="input">/validation/visitorValidatorsExample.jsp</result>
<result>/validation/successVisitorValidatorsExample.jsp</result>
<result name="input">/WEB-INF/validation/visitorValidatorsExample.jsp</result>
<result>/WEB-INF/validation/successVisitorValidatorsExample.jsp</result>
</action>
@@ -85,12 +89,12 @@
<!-- ========================== -->
<action name="clientSideValidationExample" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="input">
<result name="input">/validation/clientSideValidationExample.jsp</result>
<result name="input">/WEB-INF/validation/clientSideValidationExample.jsp</result>
</action>
<action name="submitClientSideValidationExample" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="submit">
<result name="input">/validation/clientSideValidationExample.jsp</result>
<result>/validation/successClientSideValidationExample.jsp</result>
<result name="input">/WEB-INF/validation/clientSideValidationExample.jsp</result>
<result>/WEB-INF/validation/successClientSideValidationExample.jsp</result>
</action>
<!-- =========================================== -->
@@ -109,16 +113,19 @@
<interceptor-ref name="store">
<param name="operationMode">RETRIEVE</param>
</interceptor-ref>
<result>/validation/storeErrorsAcrossRequestExample.jsp</result>
<result>/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp</result>
</action>
<action name="storeErrorsAcrossRequestExample">
<result>/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp</result>
</action>
<action name="applicationOk" class="org.apache.struts2.showcase.validation.SubmitApplication" method="applicationOk">
<interceptor-ref name="store">
<param name="operationMode">RETRIEVE</param>
</interceptor-ref>
<result>/validation/storeErrorsAcrossRequestOk.jsp</result>
<result>/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp</result>
</action>
<action name="cancelApplication" class="org.apache.struts2.showcase.validation.SubmitApplication" method="cancelApplication">
<result>/validation/storeErrorsAcrossRequestCancel.jsp</result>
<result>/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp</result>
</action>
</package>
apps/showcase/src/main/resources/struts-wait.xml
+18 -6
View File
@@ -6,11 +6,23 @@
<struts>
<package name="wait" extends="struts-default" namespace="/wait">
<action name="example1">
<result>/WEB-INF/wait/example1.jsp</result>
</action>
<action name="example2">
<result>/WEB-INF/wait/example2.jsp</result>
</action>
<action name="example3">
<result>/WEB-INF/wait/example3.jsp</result>
</action>
<action name="longProcess1" class="org.apache.struts2.showcase.wait.LongProcessAction">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="execAndWait"/>
<result name="wait">wait.jsp</result>
<result name="success">complete.jsp</result>
<result name="wait">/WEB-INF/wait/wait.jsp</result>
<result name="success">/WEB-INF/wait/complete.jsp</result>
</action>
<action name="longProcess2" class="org.apache.struts2.showcase.wait.LongProcessAction">
@@ -18,8 +30,8 @@
<interceptor-ref name="execAndWait">
<param name="delay">2000</param>
</interceptor-ref>
<result name="wait">wait.jsp</result>
<result name="success">complete.jsp</result>
<result name="wait">/WEB-INF/wait/wait.jsp</result>
<result name="success">/WEB-INF/wait/complete.jsp</result>
</action>
<action name="longProcess3" class="org.apache.struts2.showcase.wait.LongProcessAction">
@@ -28,8 +40,8 @@
<param name="delay">3000</param>
<param name="delaySleepInterval">1000</param>
</interceptor-ref>
<result name="wait">wait.jsp</result>
<result name="success">complete.jsp</result>
<result name="wait">/WEB-INF/wait/wait.jsp</result>
<result name="success">/WEB-INF/wait/complete.jsp</result>
</action>
</package>
apps/showcase/src/main/resources/struts.xml
+13 -12
View File
@@ -9,13 +9,14 @@
<!-- Some or all of these can be flipped to true for debugging -->
<constant name="struts.i18n.reload" value="false" />
<constant name="struts.enable.DynamicMethodInvocation" value="true" />
<constant name="struts.devMode" value="false" />
<constant name="struts.configuration.xml.reload" value="false" />
<constant name="struts.custom.i18n.resources" value="globalMessages" />
<constant name="struts.action.extension" value="action,," />
<constant name="struts.convention.package.locators.basePackage" value="org.apache.struts2.showcase.person" />
<constant name="struts.convention.result.path" value="/" />
<constant name="struts.convention.result.path" value="/WEB-INF" />
<!-- Necessary for Showcase because default includes org.apache.struts2.* -->
<constant name="struts.convention.exclude.packages" value="org.apache.struts.*,org.springframework.web.struts.*,org.springframework.web.struts2.*,org.hibernate.*"/>
@@ -75,15 +76,15 @@
<default-action-ref name="showcase" />
<action name="showcase">
<result>showcase.jsp</result>
<result>/WEB-INF/showcase.jsp</result>
</action>
<action name="viewSource" class="org.apache.struts2.showcase.source.ViewSourceAction">
<result>viewSource.jsp</result>
<result>/WEB-INF/viewSource.jsp</result>
</action>
<action name="date" class="org.apache.struts2.showcase.DateAction" method="browse">
<result name="success">/date.jsp</result>
<result name="success">/WEB-INF/date.jsp</result>
</action>
</package>
@@ -92,20 +93,20 @@
<default-interceptor-ref name="crudStack"/>
<action name="list" class="org.apache.struts2.showcase.action.SkillAction" method="list">
<result>/empmanager/listSkills.jsp</result>
<result>/WEB-INF/empmanager/listSkills.jsp</result>
<interceptor-ref name="basicStack"/>
</action>
<action name="edit" class="org.apache.struts2.showcase.action.SkillAction">
<result>/empmanager/editSkill.jsp</result>
<result>/WEB-INF/empmanager/editSkill.jsp</result>
<interceptor-ref name="params" />
<interceptor-ref name="basicStack"/>
</action>
<action name="save" class="org.apache.struts2.showcase.action.SkillAction" method="save">
<result name="input">/empmanager/editSkill.jsp</result>
<result name="input">/WEB-INF/empmanager/editSkill.jsp</result>
<result type="redirect">list.action</result>
</action>
<action name="delete" class="org.apache.struts2.showcase.action.SkillAction" method="delete">
<result name="error">/empmanager/editSkill.jsp</result>
<result name="error">/WEB-INF/empmanager/editSkill.jsp</result>
<result type="redirect">list.action</result>
</action>
</package>
@@ -114,20 +115,20 @@
<default-interceptor-ref name="crudStack"/>
<action name="list" class="org.apache.struts2.showcase.action.EmployeeAction" method="list">
<result>/empmanager/listEmployees.jsp</result>
<result>/WEB-INF/empmanager/listEmployees.jsp</result>
<interceptor-ref name="basicStack"/>
</action>
<action name="edit-*" class="org.apache.struts2.showcase.action.EmployeeAction">
<param name="empId">{1}</param>
<result>/empmanager/editEmployee.jsp</result>
<result>/WEB-INF/empmanager/editEmployee.jsp</result>
<interceptor-ref name="crudStack"><param name="validation.excludeMethods">execute</param></interceptor-ref>
</action>
<action name="save" class="org.apache.struts2.showcase.action.EmployeeAction" method="save">
<result name="input">/empmanager/editEmployee.jsp</result>
<result name="input">/WEB-INF/empmanager/editEmployee.jsp</result>
<result type="redirect">list.action</result>
</action>
<action name="delete" class="org.apache.struts2.showcase.action.EmployeeAction" method="delete">
<result name="error">/empmanager/editEmployee.jsp</result>
<result name="error">/WEB-INF/empmanager/editEmployee.jsp</result>
<result type="redirect">list.action</result>
</action>
</package>
apps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp → apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp
View File
apps/showcase/src/main/webapp/ajax/AjaxResult.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp
View File
apps/showcase/src/main/webapp/ajax/AjaxResult2.js → apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js
View File
apps/showcase/src/main/webapp/ajax/AjaxResult3.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp
View File
apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp
+18 -10
View File
@@ -6,7 +6,7 @@
<title>Ajax Examples</title>
<!--// START SNIPPET: common-include-->
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
<!--// END SNIPPET: common-include-->
</head>
@@ -49,7 +49,8 @@
Using a JSON list returned from an action (href="/JSONList.action"), without autoComplete (autoComplete="false"), use indicator, search substring (searchType="substring")
<br/>
<sx:autocompleter
<sx:autocompleter
id="auto1"
indicator="indicator1"
href="%{jsonList}"
cssStyle="width: 200px;"
@@ -77,7 +78,8 @@ Reload on type (loadOnTextChange="true"), after 3 characters (loadMinimumCount="
Using a JSON list returned from an action (href="/JSONList.action"), with autoComplete (autoComplete="true")
<br/>
<sx:autocompleter
<sx:autocompleter
id="auto3"
name="auto3"
href="%{#jsonList}"
cssStyle="width: 200px;"
@@ -87,13 +89,14 @@ Using a JSON list returned from an action (href="/JSONList.action"), with autoCo
Using a local list (list="%{'apple','banana','grape','pear'}")
<br/>
<sx:autocompleter list="{'apple','banana','grape','pear'}" cssStyle="width: 150px;"/>
<sx:autocompleter id="auto-list" list="{'apple','banana','grape','pear'}" cssStyle="width: 150px;"/>
<br/><br/>
Force valid options (forceValidOption="true")
<br/>
<sx:autocompleter
<sx:autocompleter
id="auto4"
name="auto4"
href="%{#jsonList}"
cssStyle="width: 200px;"
@@ -105,8 +108,9 @@ Force valid options (forceValidOption="true")
Make dropdown's height to 180px (dropdownHeight="180")
<br/>
<sx:autocompleter
id="auto5"
name="auto5"
href="%{#jsonList}"
href="%{#jsonList}"
cssStyle="width: 200px;"
dropdownHeight="180"/>
@@ -116,8 +120,9 @@ Make dropdown's height to 180px (dropdownHeight="180")
Disabled combobox (disabled="true")
<br/>
<sx:autocompleter
id="auto6"
name="auto6"
href="%{#jsonList}"
href="%{#jsonList}"
cssStyle="width: 200px;"
disabled="true"/>
@@ -133,8 +138,9 @@ Link two autocompleter elements. When the selected value in 'Autocompleter 1' ch
<p>
Autocompleter 1
<sx:autocompleter
name="select"
list="{'fruits','colors'}"
id="auto7"
name="select"
list="{'fruits','colors'}"
value="colors"
valueNotifyTopics="/Changed"
forceValidOption="true"/>
@@ -142,6 +148,7 @@ Link two autocompleter elements. When the selected value in 'Autocompleter 1' ch
</form>
Autocompleter 2
<sx:autocompleter
id="auto8"
name="auto8"
href="%{#autoex}"
autoComplete="false"
@@ -154,8 +161,9 @@ Autocompleter 2
Publish before/after/value notify topics
<br/>
<sx:autocompleter
id="auto9"
name="auto9"
href="%{#jsonList}"
href="%{#jsonList}"
listenTopics="/reload"
beforeNotifyTopics="/before"
afterNotifyTopics="/after"
apps/showcase/src/main/webapp/ajax/bind/index.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Bind Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<script type="text/javascript">
apps/showcase/src/main/webapp/ajax/commonInclude.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/commonInclude.jsp
+1 -1
View File
@@ -1,5 +1,5 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<!--// START SNIPPET: common-include-->
<sx:head cache="true"/>
<sx:head cache="false"/>
<!--// END SNIPPET: common-include-->
apps/showcase/src/main/webapp/ajax/footer.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp
+1 -1
View File
@@ -2,7 +2,7 @@
<hr/>
<s:url var="backToAjaxExamples" value="../index.jsp" />
<s:url var="backToAjaxExamples" value="/ajax/index.html" />
<s:a href="%{backToAjaxExamples}">Back To AJAX Examples</s:a>&nbsp;
apps/showcase/src/main/webapp/ajax/options.ftl → apps/showcase/src/main/webapp/WEB-INF/ajax/options.ftl
View File
apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsplude.jsp"/>
</head>
<script type="text/javascript">
apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<s:url var="ajaxTest" value="/AjaxTest.action" />
apps/showcase/src/main/webapp/ajax/remotediv/example10.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<script type="text/javascript">
apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/remotediv/example5.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/remotediv/example6.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/remotediv/example9.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/remotediv/index.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp
+1 -1
View File
@@ -2,7 +2,7 @@
<html>
<head>
<title>AJAX-based remote DIV tag</title>
<%@ include file="/ajax/commonInclude.jsp" %>
<%@ include file="/WEB-INF/ajax/commonInclude.jsp" %>
</head>
<body>
apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remoteforms/index.jsp
View File
apps/showcase/src/main/webapp/ajax/remotelink/index.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Examples</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<script type="text/javascript">
apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp
+1 -1
View File
@@ -6,7 +6,7 @@
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<s:url var="ajaxTest" value="/AjaxTest.action" />
apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp
+1 -1
View File
@@ -6,7 +6,7 @@
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp
+1 -1
View File
@@ -6,7 +6,7 @@
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<s:url var="ajaxTest" value="/AjaxTest.action" />
apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example4.jsp
+1 -1
View File
@@ -6,7 +6,7 @@
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<script>
apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5.jsp
+1 -1
View File
@@ -6,7 +6,7 @@
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/ajax/tabbedpanel/example5Ok.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5Ok.jsp
View File
apps/showcase/src/main/webapp/ajax/tabbedpanel/example6.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example6.jsp
+1 -1
View File
@@ -6,7 +6,7 @@
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<script>
apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/index.jsp
+1 -1
View File
@@ -2,7 +2,7 @@
<html>
<head>
<title>Tabbed Panes</title>
<%@ include file="/ajax/commonInclude.jsp" %>
<%@ include file="/WEB-INF/ajax/commonInclude.jsp" %>
</head>
<body>
apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel1.ftl → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel1.ftl
View File
apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel2.ftl
View File
apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2Submit.ftl → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel2Submit.ftl
View File
apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3.ftl → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel3.ftl
View File
apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3Submit.ftl → apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel3Submit.ftl
View File
apps/showcase/src/main/webapp/ajax/testjs.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/testjs.jsp
View File
apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tree/getCategory.jsp
View File
apps/showcase/src/main/webapp/ajax/tree/partialChunkHeader.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tree/partialChunkHeader.jsp
View File
apps/showcase/src/main/webapp/ajax/tree/toggle.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tree/toggle.jsp
View File
apps/showcase/src/main/webapp/ajax/tree/tree.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/tree/tree.jsp
View File
apps/showcase/src/main/webapp/ajax/widgets/index.jsp → apps/showcase/src/main/webapp/WEB-INF/ajax/widgets/index.jsp
+1 -1
View File
@@ -5,7 +5,7 @@
<html>
<head>
<title>Ajax Widgets</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
<jsp:include page="/WEB-INF/ajax/commonInclude.jsp"/>
</head>
<body>
apps/showcase/src/main/webapp/chat/chatLogin.ftl → apps/showcase/src/main/webapp/WEB-INF/chat/chatLogin.ftl
View File
apps/showcase/src/main/webapp/chat/createRoom.ftl → apps/showcase/src/main/webapp/WEB-INF/chat/createRoom.ftl
View File
apps/showcase/src/main/webapp/chat/index.jsp → apps/showcase/src/main/webapp/WEB-INF/chat/index.jsp
View File
apps/showcase/src/main/webapp/chat/messagesAvailableInRoom.ftl → apps/showcase/src/main/webapp/WEB-INF/chat/messagesAvailableInRoom.ftl
View File
apps/showcase/src/main/webapp/chat/roomSelection.ftl → apps/showcase/src/main/webapp/WEB-INF/chat/roomSelection.ftl
View File

Some files were not shown because too many files have changed in this diff Show More