diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index cec84f6b9..5d170e913 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -37,7 +37,8 @@ javax.servlet - servlet-api + javax.servlet-api + 3.1.0 provided diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 07f016677..ad9ebdb9d 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -37,8 +37,8 @@ javax.servlet - servlet-api - 2.4 + javax.servlet-api + 3.1.0 provided diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index a5a7adc69..12ddb68e2 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -49,7 +49,7 @@ org.apache.pluto maven-pluto-plugin - 1.1.3 + 1.1.7 generate-resources @@ -68,7 +68,7 @@ src/main/webapp/WEB-INF/jetty-pluto-web-default.xml - org.apache.pluto.embedded.portletId + org.apache.pluto.embedded.portletIds StrutsPortlet @@ -172,7 +172,7 @@ com.bekk.boss maven-jetty-pluto-embedded - 1.0 + 1.0.1 test diff --git a/apps/portlet/src/main/resources/pluto-portal-driver-services-config.xml b/apps/portlet/src/main/resources/pluto-portal-driver-services-config.xml new file mode 100644 index 000000000..6803d03da --- /dev/null +++ b/apps/portlet/src/main/resources/pluto-portal-driver-services-config.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml b/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml index 6bd3e54ba..5df7f3523 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml +++ b/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml @@ -1,16 +1,20 @@ - + + - + + class="org.apache.struts2.portlet.example.spring.SpringAction" scope="prototype"> diff --git a/apps/portlet/src/test/java/JettyPlutoLauncher.java b/apps/portlet/src/test/java/JettyPlutoLauncher.java index ba5e352db..ef24a407e 100644 --- a/apps/portlet/src/test/java/JettyPlutoLauncher.java +++ b/apps/portlet/src/test/java/JettyPlutoLauncher.java @@ -5,10 +5,10 @@ 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"); + System.setProperty("org.apache.pluto.embedded.portletIds", "StrutsPortlet"); + Server server = new Server(8080); + WebAppContext webapp = new WebAppContext(System.getProperty("user.dir") + "/apps/portlet/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); 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 eceb4c991..13f172f1d 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,14 +1,13 @@ 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; +import java.io.File; + public abstract class BasePortletTest extends WebTestCase { protected Server server; @@ -18,8 +17,9 @@ public abstract class BasePortletTest extends WebTestCase { private int port; public void setUp() throws Exception { - System.setProperty("org.apache.pluto.embedded.portletId", getPortletName()); + System.setProperty("org.apache.pluto.embedded.portletIds", 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"); diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index e1c9b77d5..7173275e0 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -177,6 +177,15 @@ 3.0.0 + + + javax.servlet + javax.servlet-api + 3.1.0 + test + + diff --git a/core/pom.xml b/core/pom.xml index 34a1c55a1..be09a0bff 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -311,11 +311,6 @@ 3.1.0 test - - org.springframework - spring-web - test - diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 89ace699e..077b861a0 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -82,6 +82,15 @@ jasper provided + + + + javax.servlet + javax.servlet-api + 3.1.0 + test + diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index dda577d91..a6a19d831 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -74,6 +74,15 @@ test + + + javax.servlet + javax.servlet-api + 3.1.0 + test + + UTF-8 diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index f060a2600..fc3d83df7 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -97,6 +97,15 @@ test + + + javax.servlet + javax.servlet-api + 3.1.0 + test + + UTF-8 diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 32caa7763..798c14329 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -74,6 +74,15 @@ portlet-api test + + + + javax.servlet + javax.servlet-api + 3.1.0 + test + UTF-8 diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index fb889840f..da5a8cac4 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -115,6 +115,15 @@ cglib test + + + + javax.servlet + javax.servlet-api + 3.1.0 + test + UTF-8 diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index a1510849f..2ad36e742 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -77,6 +77,15 @@ true + + + javax.servlet + javax.servlet-api + 3.1.0 + test + + 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 f46a20376..57e9d6754 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 @@ -28,10 +28,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import java.text.SimpleDateFormat; import java.util.Date; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_CREATED; -import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static javax.servlet.http.HttpServletResponse.*; public class DefaultHttpHeadersTest extends TestCase { private MockHttpServletResponse mockResponse; @@ -61,9 +58,9 @@ public class DefaultHttpHeadersTest extends TestCase { headers.apply(mockRequest, mockResponse, new Object()); assertEquals(SC_CREATED, mockResponse.getStatus()); - assertEquals("http://localhost:80/foo/bar/44.xhtml", mockResponse.getHeader("Location")); + assertEquals("http://localhost/foo/bar/44.xhtml", mockResponse.getHeader("Location")); assertEquals("asdf", mockResponse.getHeader("ETag")); - assertEquals(now.getTime(), mockResponse.getHeader("Last-Modified")); + assertEquals(String.valueOf(now.getTime()), mockResponse.getHeader("Last-Modified")); } @@ -73,7 +70,7 @@ public class DefaultHttpHeadersTest extends TestCase { mockRequest.setRequestURI("/foo/bar"); headers.apply(mockRequest, mockResponse, new Object()); - assertEquals("http://localhost:80/foo/bar/44", mockResponse.getHeader("Location")); + assertEquals("http://localhost/foo/bar/44", mockResponse.getHeader("Location")); assertEquals(SC_CREATED, mockResponse.getStatus()); } diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 289f7c8ee..8f6302f3c 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -137,6 +137,15 @@ test + + + javax.servlet + javax.servlet-api + 3.1.0 + test + + diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 8b76997d8..a45a17f74 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -55,6 +55,15 @@ provided + + + javax.servlet + javax.servlet-api + 3.1.0 + test + + UTF-8 diff --git a/pom.xml b/pom.xml index 1437061c8..bafd12b48 100644 --- a/pom.xml +++ b/pom.xml @@ -597,7 +597,7 @@ junit junit - 4.8.2 + 4.12 cglib