diff --git a/action/pom.xml b/action/pom.xml
index 2a30a6299..1777d80e1 100644
--- a/action/pom.xml
+++ b/action/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
action
jar
Struts Action Framework 2.0
diff --git a/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java b/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
index 09de57e43..2c32b5c79 100644
--- a/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
+++ b/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
@@ -18,7 +18,9 @@
package org.apache.struts.action2;
import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
import com.opensymphony.xwork.XWorkTestCase;
+import com.opensymphony.xwork.util.LocalizedTextUtil;
/**
* Base test case for unit testing WebWork.
@@ -27,7 +29,9 @@ public abstract class StrutsTestCase extends XWorkTestCase {
protected void setUp() throws Exception {
super.setUp();
+ DispatcherUtils.setInstance(null);
Configuration.reset();
+ LocalizedTextUtil.clearDefaultResourceBundles();
}
protected void tearDown() throws Exception {
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
index 5ad6a6386..0066cd49c 100644
--- a/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
+++ b/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
@@ -20,6 +20,7 @@ package org.apache.struts.action2.dispatcher;
import java.util.Locale;
import org.springframework.mock.web.MockServletContext;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.util.LocalizedTextUtil;
@@ -29,7 +30,7 @@ import junit.framework.TestCase;
* Test case for DispatcherUtils.
*
*/
-public class DispatcherUtilsTest extends TestCase {
+public class DispatcherUtilsTest extends StrutsTestCase {
public void testDefaultResurceBundlePropertyLoaded() throws Exception {
Locale.setDefault(Locale.US); // force to US locale as we also have _de and _da properties
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
index beac4224a..f87139a76 100644
--- a/action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
+++ b/action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
@@ -20,6 +20,7 @@ package org.apache.struts.action2.dispatcher;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.XWorkTestCase;
@@ -34,7 +35,7 @@ import java.util.Map;
* HttpHeaderResultTest
*
*/
-public class HttpHeaderResultTest extends XWorkTestCase {
+public class HttpHeaderResultTest extends StrutsTestCase {
ActionInvocation invocation;
HttpHeaderResult result;
diff --git a/action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java b/action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
index 2c3b80dd2..cc0bcf51c 100644
--- a/action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
+++ b/action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
@@ -19,6 +19,7 @@ package org.apache.struts.action2.interceptor;
import org.apache.struts.action2.ServletActionContext;
import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.StrutsTestCase;
import org.apache.struts.action2.util.TokenHelper;
import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
import org.apache.struts.action2.views.jsp.StrutsMockHttpSession;
@@ -40,7 +41,7 @@ import java.util.Map;
* TokenInterceptorTest
*
*/
-public class TokenInterceptorTest extends TestCase {
+public class TokenInterceptorTest extends StrutsTestCase {
ActionContext oldContext;
HttpSession httpSession;
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java b/action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
index b7c0c0b05..ce7332ea6 100644
--- a/action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
+++ b/action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse;
import org.easymock.MockControl;
import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsTestCase;
import junit.framework.TestCase;
@@ -33,7 +34,7 @@ import junit.framework.TestCase;
* Test for the {@link PreparatorServletTest}
*
*/
-public class PreparatorServletTest extends TestCase {
+public class PreparatorServletTest extends StrutsTestCase {
/**
* Test that the service method stores the request, response and servlet context
diff --git a/action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java b/action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
index 1414ed3b6..c24e11a37 100644
--- a/action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
+++ b/action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
@@ -29,6 +29,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockRequestDispatcher;
import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.StrutsTestCase;
import org.apache.struts.action2.util.ListEntry;
import org.apache.struts.action2.util.StrutsUtil;
import com.opensymphony.xwork.util.OgnlValueStack;
@@ -39,7 +40,7 @@ import junit.framework.TestCase;
* Test case for StrutsUtil.
*
*/
-public class StrutsUtilTest extends TestCase {
+public class StrutsUtilTest extends StrutsTestCase {
protected OgnlValueStack stack = null;
protected InternalMockHttpServletRequest request = null;
diff --git a/action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java b/action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
index c5cc7dcb9..13150c64c 100644
--- a/action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
+++ b/action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
@@ -18,6 +18,7 @@
package org.apache.struts.action2.spring;
import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.StrutsTestCase;
import org.apache.struts.action2.config.Configuration;
import junit.framework.TestCase;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
@@ -32,7 +33,7 @@ import javax.servlet.ServletContext;
* Unit test for {@link StrutsSpringObjectFactory}.
*
*/
-public class StrutsSpringObjectFactoryTest extends TestCase {
+public class StrutsSpringObjectFactoryTest extends StrutsTestCase {
public void testNoSpringContext() throws Exception {
// to cover situations where there will be logged an error
diff --git a/action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
index 8a4b98107..1cc4fa27a 100644
--- a/action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
+++ b/action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
@@ -20,6 +20,7 @@ package org.apache.struts.action2.views.jsp;
import com.mockobjects.servlet.MockJspWriter;
import com.mockobjects.servlet.MockPageContext;
import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsTestCase;
import org.apache.struts.action2.components.If;
import com.opensymphony.xwork.util.OgnlValueStack;
import junit.framework.TestCase;
@@ -30,7 +31,7 @@ import javax.servlet.jsp.tagext.TagSupport;
/**
*/
-public class ElseTagTest extends TestCase {
+public class ElseTagTest extends StrutsTestCase {
ElseTag elseTag;
MockPageContext pageContext;
diff --git a/action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java b/action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
index c16eb0a7a..a5d7cf1f5 100644
--- a/action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
+++ b/action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
@@ -18,6 +18,7 @@
package org.apache.struts.action2.views.xslt;
import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.StrutsTestCase;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.mock.MockActionInvocation;
@@ -36,7 +37,7 @@ import java.util.ArrayList;
* Unit test for {@link XSLTResult}.
*
*/
-public class XSLTResultTest extends TestCase {
+public class XSLTResultTest extends StrutsTestCase {
private XSLTResult result;
private MockHttpServletResponse response;
diff --git a/pom.xml b/pom.xml
index cacd951b9..ac4d98c1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
org.apache.maven.plugins
maven-idea-plugin
- 1.4
+ 1.5
target,test-output,.clover
true
@@ -151,8 +151,8 @@
maven-compiler-plugin
- 1.4
- 1.4
+ 1.5
+ 1.5
@@ -173,4 +173,112 @@
scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
+
+
+
+ org.apache.struts.action2
+ action
+ ${project.version}
+
+
+ org.apache.struts.action2
+ ${project.version}
+ action-jasperreports
+
+
+ org.apache.struts.action2
+ ${project.version}
+ action-jfreechart
+
+
+ org.apache.struts.action2
+ ${project.version}
+ action-pell-file-upload
+
+
+
+ log4j
+ log4j
+ 1.2.9
+
+
+
+ org.springframework
+ spring-beans
+ 1.2.6
+
+
+
+ org.springframework
+ spring-core
+ 1.2.6
+
+
+
+ org.springframework
+ spring-context
+ 1.2.6
+
+
+
+ org.springframework
+ spring-web
+ 1.2.6
+
+
+
+ jasperreports
+ jasperreports
+ 1.1.0
+
+
+
+ jasperreports
+ jasperreports
+ 1.1.0
+
+
+
+ javax.servlet
+ servlet-api
+ 2.4
+
+
+
+ jfree
+ jfreechart
+ 1.0.0
+
+
+
+ mockobjects
+ mockobjects-core
+ 0.09
+
+
+
+ opensymphony
+ pell-multipart
+ 2.1.5
+
+
+
+ portlet-api
+ portlet-api
+ 1.0
+
+
+
+ commons-lang
+ commons-lang
+ 2.0
+
+
+
+ cewolf
+ cewolf
+ 1.0
+
+
+
diff --git a/thirdparty/jasperreports/pom.xml b/thirdparty/jasperreports/pom.xml
index 40b126cde..30b8992b7 100644
--- a/thirdparty/jasperreports/pom.xml
+++ b/thirdparty/jasperreports/pom.xml
@@ -8,93 +8,18 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
action-jasperreports
jar
JasperReports
-
- scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
- scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
- http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
-
-
-
-
- 1.4
-
-
-
-
-
-
-
-
- opensymphony
- opensymphony
- legacy
-
- true
- always
- ignore
-
-
- false
-
- http://maven.opensymphony.com
-
-
-
-
-
- org.apache.maven.plugins
- maven-idea-plugin
-
- 1.4
- target,test-output,.clover
- true
-
-
- xwork
- file://$xwork$/src/java
-
-
- xwork-tiger
- file://$xwork$/tiger/src/java
-
-
-
-
-
- maven-compiler-plugin
-
- 1.4
- 1.4
-
-
-
- maven-surefire-plugin
-
-
- **/*Test.java
-
-
- **/TestBean.java
-
-
-
-
-
jasperreports
jasperreports
- 1.1.0
javax.servlet
servlet-api
- 2.4
provided
diff --git a/thirdparty/jfreechart/pom.xml b/thirdparty/jfreechart/pom.xml
index 93c7f4a41..92e0c801e 100644
--- a/thirdparty/jfreechart/pom.xml
+++ b/thirdparty/jfreechart/pom.xml
@@ -8,87 +8,13 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
action-jfreechart
jar
JFree Chart
-
- scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
- scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
- http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
-
-
-
-
- 1.4
-
-
-
-
-
-
-
-
- opensymphony
- opensymphony
- legacy
-
- true
- always
- ignore
-
-
- false
-
- http://maven.opensymphony.com
-
-
-
-
-
- org.apache.maven.plugins
- maven-idea-plugin
-
- 1.4
- target,test-output,.clover
- true
-
-
- xwork
- file://$xwork$/src/java
-
-
- xwork-tiger
- file://$xwork$/tiger/src/java
-
-
-
-
-
- maven-compiler-plugin
-
- 1.4
- 1.4
-
-
-
- maven-surefire-plugin
-
-
- **/*Test.java
-
-
- **/TestBean.java
-
-
-
-
-
jfree
jfreechart
- 1.0.0
true
@@ -101,7 +27,6 @@
javax.servlet
servlet-api
- 2.4
provided
diff --git a/thirdparty/pell-file-upload/pom.xml b/thirdparty/pell-file-upload/pom.xml
index 14ae15f65..40c00fe21 100644
--- a/thirdparty/pell-file-upload/pom.xml
+++ b/thirdparty/pell-file-upload/pom.xml
@@ -8,95 +8,19 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
action-pell-file-upload
jar
Pell File Upload
-
- scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
- scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
- http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
-
-
-
-
- 1.4
-
-
-
-
-
-
-
-
- opensymphony
- opensymphony
- legacy
-
- true
- always
- ignore
-
-
- false
-
- http://maven.opensymphony.com
-
-
-
-
-
- org.apache.maven.plugins
- maven-idea-plugin
-
- 1.4
- target,test-output,.clover
- true
-
-
- xwork
- file://$xwork$/src/java
-
-
- xwork-tiger
- file://$xwork$/tiger/src/java
-
-
-
-
-
- maven-compiler-plugin
-
- 1.4
- 1.4
-
-
-
- maven-surefire-plugin
-
-
- **/*Test.java
-
-
- **/TestBean.java
-
-
-
-
-
opensymphony
pell-multipart
-
- 2.1.5
true
javax.servlet
servlet-api
- 2.4
provided
diff --git a/thirdparty/pom.xml b/thirdparty/pom.xml
index f80889658..1415b4b75 100644
--- a/thirdparty/pom.xml
+++ b/thirdparty/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
thirdparty
pom
Third Party Modules
@@ -21,7 +20,6 @@
org.apache.struts.action2
action
- 2.0-SNAPSHOT
diff --git a/uber/pom.xml b/uber/pom.xml
index 792d5f2c3..d25e70823 100644
--- a/uber/pom.xml
+++ b/uber/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
action-all
pom
Uber Jar
@@ -38,24 +37,20 @@
org.apache.struts.action2
action
- 2.0-SNAPSHOT
- provided
+ test
org.apache.struts.action2
- 2.0-SNAPSHOT
action-jasperreports
test
org.apache.struts.action2
- 2.0-SNAPSHOT
action-jfreechart
test
org.apache.struts.action2
- 2.0-SNAPSHOT
action-pell-file-upload
test
diff --git a/webapps/blank/pom.xml b/webapps/blank/pom.xml
index 18d3bc610..4f29ef570 100644
--- a/webapps/blank/pom.xml
+++ b/webapps/blank/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
webapp-blank
war
Blank Webapp
diff --git a/webapps/pom.xml b/webapps/pom.xml
index 264492f7f..bef780c0c 100644
--- a/webapps/pom.xml
+++ b/webapps/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
webapps
pom
Webapps
@@ -23,13 +22,11 @@
org.apache.struts.action2
action
- 2.0-SNAPSHOT
javax.servlet
servlet-api
- 2.4
provided
diff --git a/webapps/portlet/pom.xml b/webapps/portlet/pom.xml
index a7bcfb767..8d13a9f1d 100644
--- a/webapps/portlet/pom.xml
+++ b/webapps/portlet/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
webapp-portlet
war
Portet Webapp
@@ -16,14 +15,12 @@
portlet-api
portlet-api
- 1.0
provided
commons-lang
commons-lang
- 2.0
diff --git a/webapps/shopping-cart/pom.xml b/webapps/shopping-cart/pom.xml
index a1c0c88b7..a23d3ae68 100644
--- a/webapps/shopping-cart/pom.xml
+++ b/webapps/shopping-cart/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
webapp-shopping-cart
war
Shopping Cart Webapp
diff --git a/webapps/showcase/pom.xml b/webapps/showcase/pom.xml
index 805e6f32a..38028d3af 100644
--- a/webapps/showcase/pom.xml
+++ b/webapps/showcase/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
webapp-showcase
war
Showcase Webapp
@@ -16,37 +15,31 @@
log4j
log4j
- 1.2.9
org.springframework
spring-beans
- 1.2.6
org.springframework
spring-core
- 1.2.6
org.springframework
spring-context
- 1.2.6
org.springframework
spring-web
- 1.2.6
jasperreports
jasperreports
- 1.1.0
diff --git a/webapps/starter/pom.xml b/webapps/starter/pom.xml
index b86c943c1..a355c2ba9 100644
--- a/webapps/starter/pom.xml
+++ b/webapps/starter/pom.xml
@@ -8,7 +8,6 @@
2.0-SNAPSHOT
org.apache.struts.action2
- 2.0-SNAPSHOT
webapp-starter
war
Starter Webapp