From 4e7c6b76c66dabac47278c8242e0ed21338bf04e Mon Sep 17 00:00:00 2001 From: Antonio Petrelli Date: Tue, 22 Jan 2008 20:26:23 +0000 Subject: [PATCH] WW-2421 Fixed Subversion properties. Removed "velocity-tools" wrong transitive dependencies. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@614309 13f79535-47bb-0310-9956-ffa450edef68 --- .../FormExample-formExamplePrg-validation.xml | 26 +- .../WEB-INF/jetty-pluto-web-default.xml | 768 +++++++++--------- .../WEB-INF/view/formExampleInputPrg.jsp | 16 +- .../formExampleSubmitToSelfWithValidation.jsp | 12 +- .../src/test/java/JettyPlutoLauncher.java | 38 +- .../struts2/portlet/test/BasePortletTest.java | 162 ++-- .../portlet/test/Struts2PortletTest.java | 166 ++-- .../src/main/webapp/orders-edit.jsp | 52 +- .../src/main/webapp/orders-editNew.jsp | 48 +- .../src/main/webapp/orders-index.jsp | 66 +- .../src/main/webapp/orders-show.jsp | 52 +- .../ActionMappingParametersInteceptor.java | 2 +- .../main/resources/template/simple/css.ftl | 2 +- .../rest/ContentTypeHandlerManager.java | 2 +- .../struts2/rest/ContentTypeInterceptor.java | 2 +- .../ControllerClasspathPackageProvider.java | 2 +- .../struts2/rest/DefaultHttpHeaders.java | 2 +- .../org/apache/struts2/rest/HttpHeaders.java | 2 +- .../struts2/rest/RestActionInvocation.java | 2 +- .../apache/struts2/rest/RestActionMapper.java | 2 +- .../struts2/rest/RestActionProxyFactory.java | 2 +- .../struts2/rest/RestWorkflowInterceptor.java | 2 +- .../rest/handler/ContentTypeHandler.java | 2 +- .../struts2/rest/handler/HtmlHandler.java | 2 +- .../struts2/rest/handler/JsonLibHandler.java | 2 +- .../struts2/rest/handler/XStreamHandler.java | 2 +- .../rest/ContentTypeHandlerManagerTest.java | 2 +- .../struts2/rest/DefaultHttpHeadersTest.java | 2 +- .../apache/struts2/rest/handler/Contact.java | 2 +- .../rest/handler/JsonLibHandlerTest.java | 2 +- 30 files changed, 722 insertions(+), 722 deletions(-) diff --git a/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml b/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml index e82c91a94..4effe04b1 100644 --- a/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml +++ b/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml @@ -1,13 +1,13 @@ - - - - - You must enter a first name - - - - - You must enter a last name - - - + + + + + You must enter a first name + + + + + You must enter a last name + + + diff --git a/apps/portlet/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml b/apps/portlet/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml index aa273264f..8cfe5140b 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml +++ b/apps/portlet/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml @@ -1,384 +1,384 @@ - - - - - - - - - - - - - - - - - - - - - - - Default web.xml file. - This file is applied to a Web application before it's own WEB_INF/web.xml file - - - - - - - - - org.mortbay.jetty.webapp.NoTLDJarPattern - start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar - - - - - com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener - - - - - com.bekk.boss.pluto.embedded.util.PortalStartupListener - - - - plutoResourceFilter - com.bekk.boss.pluto.embedded.util.PlutResourcesFilter - - - plutoPortalDriver - com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter - - - - plutoResourceFilter - *.css - - - plutoResourceFilter - *.gif - - - plutoResourceFilter - *.png - - - plutoResourceFilter - *.js - - - plutoPortalDriver - /pluto/index.jsp - - - plutoPortalDriver - /pluto/index.jsp/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - org.mortbay.jetty.servlet.DefaultServlet - - acceptRanges - true - - - dirAllowed - true - - - redirectWelcome - false - - - maxCacheSize - 4000000 - - - maxCachedFileSize - 254000 - - - maxCachedFiles - 1000 - - - gzip - true - - - useFileMappedBuffer - true - - - 0 - - - default / - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - com.bekk.boss.pluto.embedded.util.PortletJspServlet - - logVerbosityLevel - DEBUG - - - fork - false - - - xpoweredBy - false - - - 0 - - - - jsp - *.jsp - *.jspf - *.jspx - *.xsp - *.JSP - *.JSPF - *.JSPX - *.XSP - - - - - - - 30 - - - - - - - - - - - - - index.html - index.htm - index.jsp - - - - - arISO-8859-6 - beISO-8859-5 - bgISO-8859-5 - caISO-8859-1 - csISO-8859-2 - daISO-8859-1 - deISO-8859-1 - elISO-8859-7 - enISO-8859-1 - esISO-8859-1 - etISO-8859-1 - fiISO-8859-1 - frISO-8859-1 - hrISO-8859-2 - huISO-8859-2 - isISO-8859-1 - itISO-8859-1 - iwISO-8859-8 - jaShift_JIS - koEUC-KR - ltISO-8859-2 - lvISO-8859-2 - mkISO-8859-5 - nlISO-8859-1 - noISO-8859-1 - plISO-8859-2 - ptISO-8859-1 - roISO-8859-2 - ruISO-8859-5 - shISO-8859-5 - skISO-8859-2 - slISO-8859-2 - sqISO-8859-2 - srISO-8859-5 - svISO-8859-1 - trISO-8859-9 - ukISO-8859-5 - zhGB2312 - zh_TWBig5 - - - - + + + + + + + + + + + + + + + + + + + + + + + Default web.xml file. + This file is applied to a Web application before it's own WEB_INF/web.xml file + + + + + + + + + org.mortbay.jetty.webapp.NoTLDJarPattern + start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar + + + + + com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener + + + + + com.bekk.boss.pluto.embedded.util.PortalStartupListener + + + + plutoResourceFilter + com.bekk.boss.pluto.embedded.util.PlutResourcesFilter + + + plutoPortalDriver + com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter + + + + plutoResourceFilter + *.css + + + plutoResourceFilter + *.gif + + + plutoResourceFilter + *.png + + + plutoResourceFilter + *.js + + + plutoPortalDriver + /pluto/index.jsp + + + plutoPortalDriver + /pluto/index.jsp/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default + org.mortbay.jetty.servlet.DefaultServlet + + acceptRanges + true + + + dirAllowed + true + + + redirectWelcome + false + + + maxCacheSize + 4000000 + + + maxCachedFileSize + 254000 + + + maxCachedFiles + 1000 + + + gzip + true + + + useFileMappedBuffer + true + + + 0 + + + default / + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jsp + com.bekk.boss.pluto.embedded.util.PortletJspServlet + + logVerbosityLevel + DEBUG + + + fork + false + + + xpoweredBy + false + + + 0 + + + + jsp + *.jsp + *.jspf + *.jspx + *.xsp + *.JSP + *.JSPF + *.JSPX + *.XSP + + + + + + + 30 + + + + + + + + + + + + + index.html + index.htm + index.jsp + + + + + arISO-8859-6 + beISO-8859-5 + bgISO-8859-5 + caISO-8859-1 + csISO-8859-2 + daISO-8859-1 + deISO-8859-1 + elISO-8859-7 + enISO-8859-1 + esISO-8859-1 + etISO-8859-1 + fiISO-8859-1 + frISO-8859-1 + hrISO-8859-2 + huISO-8859-2 + isISO-8859-1 + itISO-8859-1 + iwISO-8859-8 + jaShift_JIS + koEUC-KR + ltISO-8859-2 + lvISO-8859-2 + mkISO-8859-5 + nlISO-8859-1 + noISO-8859-1 + plISO-8859-2 + ptISO-8859-1 + roISO-8859-2 + ruISO-8859-5 + shISO-8859-5 + skISO-8859-2 + slISO-8859-2 + sqISO-8859-2 + srISO-8859-5 + svISO-8859-1 + trISO-8859-9 + ukISO-8859-5 + zhGB2312 + zh_TWBig5 + + + + diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp index aaada2568..bd00bbf51 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleInputPrg.jsp @@ -1,8 +1,8 @@ -<%@ taglib prefix="s" uri="/struts-tags" %> - -

Input your name

- - - - - +<%@ taglib prefix="s" uri="/struts-tags" %> + +

Input your name

+ + + + + diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/formExampleSubmitToSelfWithValidation.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleSubmitToSelfWithValidation.jsp index 7bfc109dc..ec7f07662 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/formExampleSubmitToSelfWithValidation.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/formExampleSubmitToSelfWithValidation.jsp @@ -1,6 +1,6 @@ -<%@ taglib prefix="s" uri="/struts-tags" %> - -

Hello

-

-">Back to front page - +<%@ taglib prefix="s" uri="/struts-tags" %> + +

Hello

+

+">Back to front page + diff --git a/apps/portlet/src/test/java/JettyPlutoLauncher.java b/apps/portlet/src/test/java/JettyPlutoLauncher.java index 53cb7af1e..ba5e352db 100644 --- a/apps/portlet/src/test/java/JettyPlutoLauncher.java +++ b/apps/portlet/src/test/java/JettyPlutoLauncher.java @@ -1,19 +1,19 @@ -import org.apache.pluto.core.PortletServlet; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.ServletHolder; -import org.mortbay.jetty.webapp.WebAppContext; - -public class JettyPlutoLauncher { - public static void main(String[] args) throws Exception { - System.setProperty("org.apache.pluto.embedded.portletId", "StrutsPortlet"); - Server server = new Server(8080); - WebAppContext webapp = new WebAppContext("src/main/webapp", "/test"); - webapp.setDefaultsDescriptor("/WEB-INF/jetty-pluto-web-default.xml"); - ServletHolder portletServlet = new ServletHolder(new PortletServlet()); - portletServlet.setInitParameter("portlet-name", "StrutsPortlet"); - portletServlet.setInitOrder(1); - webapp.addServlet(portletServlet, "/PlutoInvoker/StrutsPortlet"); - server.addHandler(webapp); - server.start(); - } -} +import org.apache.pluto.core.PortletServlet; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.ServletHolder; +import org.mortbay.jetty.webapp.WebAppContext; + +public class JettyPlutoLauncher { + public static void main(String[] args) throws Exception { + System.setProperty("org.apache.pluto.embedded.portletId", "StrutsPortlet"); + Server server = new Server(8080); + WebAppContext webapp = new WebAppContext("src/main/webapp", "/test"); + webapp.setDefaultsDescriptor("/WEB-INF/jetty-pluto-web-default.xml"); + ServletHolder portletServlet = new ServletHolder(new PortletServlet()); + portletServlet.setInitParameter("portlet-name", "StrutsPortlet"); + portletServlet.setInitOrder(1); + webapp.addServlet(portletServlet, "/PlutoInvoker/StrutsPortlet"); + server.addHandler(webapp); + server.start(); + } +} diff --git a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java index d367215d1..eceb4c991 100644 --- a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java +++ b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java @@ -1,81 +1,81 @@ -package org.apache.struts2.portlet.test; - -import java.io.File; - -import net.sourceforge.jwebunit.junit.WebTestCase; - -import org.apache.pluto.core.PortletServlet; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.ServletHolder; -import org.mortbay.jetty.webapp.WebAppContext; - -public abstract class BasePortletTest extends WebTestCase { - - protected Server server; - - private String contextPath = "/test"; - - private int port; - - public void setUp() throws Exception { - System.setProperty("org.apache.pluto.embedded.portletId", getPortletName()); - server = new Server(port); - WebAppContext webapp = new WebAppContext("src/main/webapp", contextPath); - webapp.setTempDirectory(new File("target/work")); - webapp.setDefaultsDescriptor("/WEB-INF/jetty-pluto-web-default.xml"); - ServletHolder portletServlet = new ServletHolder(new PortletServlet()); - portletServlet.setInitParameter("portlet-name", getPortletName()); - portletServlet.setInitOrder(1); - webapp.addServlet(portletServlet, "/PlutoInvoker/" + getPortletName()); - server.addHandler(webapp); - server.start(); - // Retrieve the actual port that is used, in case a random, free port is - // picked - int port = server.getConnectors()[0].getLocalPort(); - getTestContext().setBaseUrl("http://localhost:" + port + contextPath); - } - - - public void tearDown() throws Exception { - server.stop(); - } - - public void minimizeWindow() { - clickElementByXPath("//span[@class='minimized']/.."); - } - - public void maximizeWindow() { - clickElementByXPath("//span[@class='minimized']/.."); - } - - public void restoreWindow() { - clickElementByXPath("//span[@class='normal']/.."); - } - - public void switchEdit() { - clickElementByXPath("//span[@class='edit']/.."); - } - - public void switchView() { - clickElementByXPath("//span[@class='view']/.."); - } - - public void switchHelp() { - clickElementByXPath("//span[@class='help']/.."); - } - - public void setContextPath(String contextPath) { - if(!contextPath.startsWith("/")) { - this.contextPath = "/" + contextPath; - } - else { - this.contextPath = contextPath; - } - } - - public void setPort(int port) { - this.port = port; - } - - public abstract String getPortletName(); -} +package org.apache.struts2.portlet.test; + +import java.io.File; + +import net.sourceforge.jwebunit.junit.WebTestCase; + +import org.apache.pluto.core.PortletServlet; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.ServletHolder; +import org.mortbay.jetty.webapp.WebAppContext; + +public abstract class BasePortletTest extends WebTestCase { + + protected Server server; + + private String contextPath = "/test"; + + private int port; + + public void setUp() throws Exception { + System.setProperty("org.apache.pluto.embedded.portletId", getPortletName()); + server = new Server(port); + WebAppContext webapp = new WebAppContext("src/main/webapp", contextPath); + webapp.setTempDirectory(new File("target/work")); + webapp.setDefaultsDescriptor("/WEB-INF/jetty-pluto-web-default.xml"); + ServletHolder portletServlet = new ServletHolder(new PortletServlet()); + portletServlet.setInitParameter("portlet-name", getPortletName()); + portletServlet.setInitOrder(1); + webapp.addServlet(portletServlet, "/PlutoInvoker/" + getPortletName()); + server.addHandler(webapp); + server.start(); + // Retrieve the actual port that is used, in case a random, free port is + // picked + int port = server.getConnectors()[0].getLocalPort(); + getTestContext().setBaseUrl("http://localhost:" + port + contextPath); + } + + + public void tearDown() throws Exception { + server.stop(); + } + + public void minimizeWindow() { + clickElementByXPath("//span[@class='minimized']/.."); + } + + public void maximizeWindow() { + clickElementByXPath("//span[@class='minimized']/.."); + } + + public void restoreWindow() { + clickElementByXPath("//span[@class='normal']/.."); + } + + public void switchEdit() { + clickElementByXPath("//span[@class='edit']/.."); + } + + public void switchView() { + clickElementByXPath("//span[@class='view']/.."); + } + + public void switchHelp() { + clickElementByXPath("//span[@class='help']/.."); + } + + public void setContextPath(String contextPath) { + if(!contextPath.startsWith("/")) { + this.contextPath = "/" + contextPath; + } + else { + this.contextPath = contextPath; + } + } + + public void setPort(int port) { + this.port = port; + } + + public abstract String getPortletName(); +} diff --git a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java index d1e7c8d11..6be30cd97 100644 --- a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java +++ b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java @@ -1,83 +1,83 @@ -package org.apache.struts2.portlet.test; - -public class Struts2PortletTest extends BasePortletTest { - - private final static String PORTLET_NAME = "StrutsPortlet"; - - public void testIndexPage() throws Exception { - beginAt("pluto/index.jsp"); - assertTextPresent("Welcome to the Struts example portlet"); - assertLinkPresentWithExactText("A simple form"); - assertLinkPresentWithExactText("Validation"); - } - - public void testFormExample() throws Exception { - beginAt("pluto/index.jsp"); - clickLinkWithExactText("A simple form"); - assertFormPresent("processFormExample"); - assertTextPresent("Input your name"); - setWorkingForm("processFormExample"); - setTextField("firstName", "Nils-Helge"); - setTextField("lastName", "Garli"); - submit(); - assertTextPresent("Hello Nils-Helge Garli"); - } - - public void testValidationExample() throws Exception { - beginAt("pluto/index.jsp"); - clickLinkWithExactText("Validation"); - assertFormPresent("processValidationExample"); - assertTextPresent("Input your name"); - setWorkingForm("processValidationExample"); - setTextField("firstName", "Nils-Helge"); - submit(); - assertTextFieldEquals("firstName", "Nils-Helge"); - assertTextPresent("You must enter a last name"); - setTextField("lastName", "Garli"); - submit(); - assertTextPresent("Hello Nils-Helge Garli"); - } - - public void testValidationErrorMessagesStickBetweenWindowStateChanges() throws Exception { - beginAt("pluto/index.jsp"); - clickLinkWithExactText("Validation"); - assertFormPresent("processValidationExample"); - assertTextPresent("Input your name"); - setWorkingForm("processValidationExample"); - setTextField("firstName", "Nils-Helge"); - submit(); - assertTextFieldEquals("firstName", "Nils-Helge"); - assertTextPresent("You must enter a last name"); - minimizeWindow(); - assertTextNotPresent("Input your name"); - restoreWindow(); - assertTextPresent("Input your name"); - assertTextPresent("You must enter a last name"); - } - - public void testTokenExample() throws Exception { - beginAt("pluto/index.jsp"); - clickLinkWithText("Token"); - setWorkingForm(0); - setTextField("theValue", "something"); - submit(); - assertTextPresent("ERROR"); - setWorkingForm(1); - setTextField("theValue", "somethingElse"); - submit(); - assertTextPresent("The form was successfully submitted with a valid token"); - } - - public void testSwitchFromViewToEditShouldGoToDefaultEditPage() throws Exception { - beginAt("pluto/index.jsp"); - assertTextPresent("Welcome to the Struts example portlet"); - switchEdit(); - assertTextPresent("Back to view mode"); - } - - @Override - public String getPortletName() { - return PORTLET_NAME; - } - -} +package org.apache.struts2.portlet.test; + +public class Struts2PortletTest extends BasePortletTest { + + private final static String PORTLET_NAME = "StrutsPortlet"; + + public void testIndexPage() throws Exception { + beginAt("pluto/index.jsp"); + assertTextPresent("Welcome to the Struts example portlet"); + assertLinkPresentWithExactText("A simple form"); + assertLinkPresentWithExactText("Validation"); + } + + public void testFormExample() throws Exception { + beginAt("pluto/index.jsp"); + clickLinkWithExactText("A simple form"); + assertFormPresent("processFormExample"); + assertTextPresent("Input your name"); + setWorkingForm("processFormExample"); + setTextField("firstName", "Nils-Helge"); + setTextField("lastName", "Garli"); + submit(); + assertTextPresent("Hello Nils-Helge Garli"); + } + + public void testValidationExample() throws Exception { + beginAt("pluto/index.jsp"); + clickLinkWithExactText("Validation"); + assertFormPresent("processValidationExample"); + assertTextPresent("Input your name"); + setWorkingForm("processValidationExample"); + setTextField("firstName", "Nils-Helge"); + submit(); + assertTextFieldEquals("firstName", "Nils-Helge"); + assertTextPresent("You must enter a last name"); + setTextField("lastName", "Garli"); + submit(); + assertTextPresent("Hello Nils-Helge Garli"); + } + + public void testValidationErrorMessagesStickBetweenWindowStateChanges() throws Exception { + beginAt("pluto/index.jsp"); + clickLinkWithExactText("Validation"); + assertFormPresent("processValidationExample"); + assertTextPresent("Input your name"); + setWorkingForm("processValidationExample"); + setTextField("firstName", "Nils-Helge"); + submit(); + assertTextFieldEquals("firstName", "Nils-Helge"); + assertTextPresent("You must enter a last name"); + minimizeWindow(); + assertTextNotPresent("Input your name"); + restoreWindow(); + assertTextPresent("Input your name"); + assertTextPresent("You must enter a last name"); + } + + public void testTokenExample() throws Exception { + beginAt("pluto/index.jsp"); + clickLinkWithText("Token"); + setWorkingForm(0); + setTextField("theValue", "something"); + submit(); + assertTextPresent("ERROR"); + setWorkingForm(1); + setTextField("theValue", "somethingElse"); + submit(); + assertTextPresent("The form was successfully submitted with a valid token"); + } + + public void testSwitchFromViewToEditShouldGoToDefaultEditPage() throws Exception { + beginAt("pluto/index.jsp"); + assertTextPresent("Welcome to the Struts example portlet"); + switchEdit(); + assertTextPresent("Back to view mode"); + } + + @Override + public String getPortletName() { + return PORTLET_NAME; + } + +} diff --git a/apps/rest-showcase/src/main/webapp/orders-edit.jsp b/apps/rest-showcase/src/main/webapp/orders-edit.jsp index b327adbf1..44a569bc0 100644 --- a/apps/rest-showcase/src/main/webapp/orders-edit.jsp +++ b/apps/rest-showcase/src/main/webapp/orders-edit.jsp @@ -1,27 +1,27 @@ - - -<%@taglib prefix="s" uri="/struts-tags" %> - - - - Order <s:property value="id" /> - - - - - - - - - - -
- -
- - Back to Orders - - + + +<%@taglib prefix="s" uri="/struts-tags" %> + + + + Order <s:property value="id" /> + + + + + + + + + + +
+ +
+ + Back to Orders + + \ No newline at end of file diff --git a/apps/rest-showcase/src/main/webapp/orders-editNew.jsp b/apps/rest-showcase/src/main/webapp/orders-editNew.jsp index a0f4feba1..6145c253f 100644 --- a/apps/rest-showcase/src/main/webapp/orders-editNew.jsp +++ b/apps/rest-showcase/src/main/webapp/orders-editNew.jsp @@ -1,25 +1,25 @@ - - -<%@taglib prefix="s" uri="/struts-tags" %> - - - - New Order - - - - - - - - -
- -
- - Back to Orders - - + + +<%@taglib prefix="s" uri="/struts-tags" %> + + + + New Order + + + + + + + + +
+ +
+ + Back to Orders + + \ No newline at end of file diff --git a/apps/rest-showcase/src/main/webapp/orders-index.jsp b/apps/rest-showcase/src/main/webapp/orders-index.jsp index 4a72729a0..d6f143379 100644 --- a/apps/rest-showcase/src/main/webapp/orders-index.jsp +++ b/apps/rest-showcase/src/main/webapp/orders-index.jsp @@ -1,34 +1,34 @@ - - -<%@taglib prefix="s" uri="/struts-tags" %> - - - - Orders - - - - - - - - - - - - - - - - - - -
IDClientAmountActions
${id}${clientName}${amount}View | - Edit | - Delete
- Create a new order - - + + +<%@taglib prefix="s" uri="/struts-tags" %> + + + + Orders + + + + + + + + + + + + + + + + + + +
IDClientAmountActions
${id}${clientName}${amount}View | + Edit | + Delete
+ Create a new order + + \ No newline at end of file diff --git a/apps/rest-showcase/src/main/webapp/orders-show.jsp b/apps/rest-showcase/src/main/webapp/orders-show.jsp index 721c846a9..226af407d 100644 --- a/apps/rest-showcase/src/main/webapp/orders-show.jsp +++ b/apps/rest-showcase/src/main/webapp/orders-show.jsp @@ -1,27 +1,27 @@ - - - - - Order ${id} - - - - - - - - - - - - - - - -
ID${id}
Client${clientName}
Amount${amount}
- Back to Orders - - + + + + + Order ${id} + + + + + + + + + + + + + + + +
ID${id}
Client${clientName}
Amount${amount}
+ Back to Orders + + \ No newline at end of file diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java index 3b680c1cd..b9f4ff48c 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java @@ -1,5 +1,5 @@ /* - * $Id: ApplicationAware.java 471756 2006-11-06 15:01:43Z husted $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/core/src/main/resources/template/simple/css.ftl b/core/src/main/resources/template/simple/css.ftl index 7069313ff..b0a504711 100644 --- a/core/src/main/resources/template/simple/css.ftl +++ b/core/src/main/resources/template/simple/css.ftl @@ -1,6 +1,6 @@ <#-- /* - * $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java index f4e3ab4ba..9176e0ced 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java index ecdd61204..94f0bba65 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java index 353882f19..7953819a1 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java index 140717a71..18a50fc0f 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java b/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java index 7a4e0a2f8..93f930808 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java index 4df00b7cd..51f8799a0 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java index 96eddd6c0..2481f6bbe 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java index 80ea4a245..acb6b1e73 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java index c92956f48..72407593d 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java index 32b4ec09b..34ae9eeef 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java index 9041395ee..69a1316e5 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java index 789fa4923..63af23b57 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java index 29e12bd23..65aa7ff07 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java index 6ef8baff4..e867c2f5c 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java index a0aaf17ab..97eb4fb5a 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/Contact.java b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/Contact.java index 701798397..b8df55806 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/Contact.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/Contact.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JsonLibHandlerTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JsonLibHandlerTest.java index 99f60c7ce..d6091e91a 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JsonLibHandlerTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JsonLibHandlerTest.java @@ -1,5 +1,5 @@ /* - * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file