[struts] replace tomcat 7.x apis with jboss apis
gil
gil at fedoraproject.org
Fri Jun 29 10:33:30 UTC 2012
commit dfb104a8241847bd2cd33569227ed3aa5c8b7e9b
Author: gil <puntogil at libero.it>
Date: Fri Jun 29 10:35:30 2012 +0200
replace tomcat 7.x apis with jboss apis
struts-1.3.10-jboss.patch | 823 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 823 insertions(+), 0 deletions(-)
---
diff --git a/struts-1.3.10-jboss.patch b/struts-1.3.10-jboss.patch
new file mode 100644
index 0000000..833aa6c
--- /dev/null
+++ b/struts-1.3.10-jboss.patch
@@ -0,0 +1,823 @@
+diff -Nru struts-1.3.10/src/core/pom.xml struts-1.3.10-gil/src/core/pom.xml
+--- struts-1.3.10/src/core/pom.xml 2008-11-28 23:43:44.000000000 +0100
++++ struts-1.3.10-gil/src/core/pom.xml 2012-06-29 10:07:26.629640047 +0200
+@@ -156,16 +156,28 @@
+ </exclusions>
+ </dependency>
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.3</version>
++ <groupId>org.jboss.spec.javax.servlet</groupId>
++ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
++ <version>1.0.1.Final</version>
++ <scope>provided</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
++ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
++ <version>1.0.1.Final</version>
++ <scope>provided</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.jboss.spec.javax.el</groupId>
++ <artifactId>jboss-el-api_2.2_spec</artifactId>
++ <version>1.0.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+- <optional>true</optional>
++ <!--optional>true</optional-->
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java
+--- struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java 2008-06-05 00:14:08.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java 2012-06-29 10:02:17.917644023 +0200
+@@ -20,16 +20,28 @@
+ */
+ package org.apache.struts.mock;
+
++import javax.servlet.AsyncContext;
++import javax.servlet.DispatcherType;
+ import javax.servlet.RequestDispatcher;
++import javax.servlet.ServletContext;
++import javax.servlet.ServletException;
+ import javax.servlet.ServletInputStream;
++import javax.servlet.ServletRequest;
++import javax.servlet.ServletResponse;
+ import javax.servlet.http.Cookie;
+ import javax.servlet.http.HttpServletRequest;
++import javax.servlet.http.HttpServletResponse;
+ import javax.servlet.http.HttpSession;
++import javax.servlet.http.Part;
+
+ import java.io.BufferedReader;
++import java.io.IOException;
++
++import java.lang.IllegalStateException;
+
+ import java.security.Principal;
+
++import java.util.Collection;
+ import java.util.Enumeration;
+ import java.util.HashMap;
+ import java.util.Locale;
+@@ -425,4 +437,85 @@
+ public void setCharacterEncoding(String name) {
+ throw new UnsupportedOperationException();
+ }
++
++ public int getLocalPort() {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getLocalAddr() {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getLocalName() {
++ throw new UnsupportedOperationException();
++ }
++
++ public int getRemotePort() {
++ throw new UnsupportedOperationException();
++ }
++
++ public String getRemoteName() {
++ throw new UnsupportedOperationException();
++ }
++
++ public Part getPart(String name) throws IOException, IllegalStateException, ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public Collection<Part> getParts() throws IOException, IllegalStateException, ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void logout() throws ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void login(String username, String password) throws ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public DispatcherType getDispatcherType() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public AsyncContext getAsyncContext() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public boolean isAsyncSupported() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public boolean isAsyncStarted() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public AsyncContext startAsync() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public ServletContext getServletContext() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
+ }
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java
+--- struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java 2008-06-05 00:14:16.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java 2012-06-29 10:02:17.918644023 +0200
+@@ -20,6 +20,7 @@
+ */
+ package org.apache.struts.mock;
+
++import javax.servlet.ServletException;
+ import javax.servlet.ServletOutputStream;
+ import javax.servlet.http.Cookie;
+ import javax.servlet.http.HttpServletResponse;
+@@ -27,6 +28,7 @@
+ import java.io.IOException;
+ import java.io.PrintWriter;
+
++import java.util.Collection;
+ import java.util.Locale;
+
+ /**
+@@ -169,7 +171,40 @@
+ throw new UnsupportedOperationException();
+ }
+
++ public String getContentType() {
++ throw new UnsupportedOperationException();
++ }
++
+ public void setLocale(Locale locale) {
+ throw new UnsupportedOperationException();
+ }
++
++ public void setCharacterEncoding(String enc) {
++ throw new UnsupportedOperationException();
++ }
++
++ public Collection<String> getHeaderNames() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public String getHeader(String name) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public Collection<String> getHeaders(String name) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void logout() throws ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public int getStatus() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
+ }
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockPageContext.java struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/MockPageContext.java
+--- struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockPageContext.java 2008-06-05 00:14:08.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/MockPageContext.java 2012-06-29 10:02:17.918644023 +0200
+@@ -20,6 +20,7 @@
+ */
+ package org.apache.struts.mock;
+
++import javax.el.ELContext;
+ import javax.servlet.Servlet;
+ import javax.servlet.ServletConfig;
+ import javax.servlet.ServletContext;
+@@ -29,6 +30,8 @@
+ import javax.servlet.http.HttpSession;
+ import javax.servlet.jsp.JspWriter;
+ import javax.servlet.jsp.PageContext;
++import javax.servlet.jsp.el.VariableResolver;
++import javax.servlet.jsp.el.ExpressionEvaluator;
+ import javax.servlet.jsp.tagext.BodyContent;
+
+ import java.io.IOException;
+@@ -533,6 +536,22 @@
+ throw new UnsupportedOperationException();
+ }
+
++ public void include(String relativeUrlPath, boolean flush) {
++ throw new UnsupportedOperationException();
++ }
++
++ public VariableResolver getVariableResolver() {
++ throw new UnsupportedOperationException();
++ }
++
++ public ELContext getELContext() {
++ throw new UnsupportedOperationException();
++ }
++
++ public ExpressionEvaluator getExpressionEvaluator() {
++ throw new UnsupportedOperationException();
++ }
++
+ public void initialize(Servlet servlet, ServletRequest request,
+ ServletResponse response, String errorPageURL, boolean needsSession,
+ int bufferSize, boolean autoFlush) {
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockServletContext.java struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/MockServletContext.java
+--- struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockServletContext.java 2008-06-05 00:14:06.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/MockServletContext.java 2012-06-29 10:02:17.919644023 +0200
+@@ -23,16 +23,32 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
++import javax.servlet.Filter;
++import javax.servlet.FilterRegistration;
++import javax.servlet.FilterRegistration.Dynamic;
+ import javax.servlet.RequestDispatcher;
+ import javax.servlet.Servlet;
+ import javax.servlet.ServletContext;
++import javax.servlet.ServletException;
++import javax.servlet.SessionCookieConfig;
++import javax.servlet.SessionTrackingMode;
++import javax.servlet.ServletRegistration;
++import javax.servlet.descriptor.JspConfigDescriptor;
+
+ import java.io.InputStream;
+
++import java.lang.Class;
++import java.lang.ClassLoader;
++import java.lang.IllegalArgumentException;
++import java.lang.IllegalStateException;
++import java.lang.UnsupportedOperationException;
++
+ import java.net.URL;
+
+ import java.util.Enumeration;
++import java.util.EventListener;
+ import java.util.HashMap;
++import java.util.Map;
+ import java.util.Set;
+
+ /**
+@@ -91,6 +107,10 @@
+ throw new UnsupportedOperationException();
+ }
+
++ public String getContextPath() {
++ throw new UnsupportedOperationException();
++ }
++
+ public String getInitParameter(String name) {
+ return ((String) parameters.get(name));
+ }
+@@ -182,4 +202,134 @@
+ attributes.put(name, value);
+ }
+ }
++
++ public JspConfigDescriptor getJspConfigDescriptor() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public ClassLoader getClassLoader() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void declareRoles(String... roleNames) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public <T extends EventListener> T createListener(Class<T> c) throws ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public <T extends EventListener> void addListener(T t) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void addListener(String className) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void addListener(Class<? extends EventListener> listenerClass) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) throws IllegalStateException, IllegalArgumentException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public SessionCookieConfig getSessionCookieConfig() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public Map<String,? extends FilterRegistration> getFilterRegistrations() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public FilterRegistration getFilterRegistration(String filterName) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public <T extends Filter> T createFilter(Class<T> c) throws ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public FilterRegistration.Dynamic addFilter(String filterName, String className) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public Map<String,? extends ServletRegistration> getServletRegistrations() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public ServletRegistration getServletRegistration(String servletName) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public <T extends Servlet> T createServlet(Class<T> c) throws ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public ServletRegistration.Dynamic addServlet(String servletName, String className) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public boolean setInitParameter(String name, String value) {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public int getEffectiveMinorVersion() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
++
++ public int getEffectiveMajorVersion() {
++ // TODO
++ throw new UnsupportedOperationException("Not supported.");
++ }
+ }
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/TestMockBase.java struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/TestMockBase.java
+--- struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/TestMockBase.java 2008-06-05 00:14:06.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/main/java/org/apache/struts/mock/TestMockBase.java 2012-06-29 10:02:17.919644023 +0200
+@@ -64,7 +64,7 @@
+ }
+
+ public static void main(String[] args) {
+- junit.awtui.TestRunner.main(new String[] { TestMockBase.class.getName() });
++ junit.textui.TestRunner.main(new String[] { TestMockBase.class.getName() });
+ }
+
+ public static Test suite() {
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionMessage.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestActionMessage.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionMessage.java 2008-06-05 00:12:56.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestActionMessage.java 2012-06-29 10:02:17.919644023 +0200
+@@ -60,7 +60,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(new String[] {
++ junit.textui.TestRunner.main(new String[] {
+ TestActionMessage.class.getName()
+ });
+ }
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionMessages.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestActionMessages.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionMessages.java 2008-06-05 00:12:58.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestActionMessages.java 2012-06-29 10:02:17.920644023 +0200
+@@ -57,7 +57,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(new String[] {
++ junit.textui.TestRunner.main(new String[] {
+ TestActionMessages.class.getName()
+ });
+ }
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionServlet.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestActionServlet.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionServlet.java 2008-06-05 00:12:58.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestActionServlet.java 2012-06-29 10:02:17.921644023 +0200
+@@ -92,7 +92,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(new String[] {
++ junit.textui.TestRunner.main(new String[] {
+ TestActionServlet.class.getName()
+ });
+ }
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java 2008-06-05 00:12:58.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java 2012-06-29 10:02:17.921644023 +0200
+@@ -93,7 +93,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(new String[] {
++ junit.textui.TestRunner.main(new String[] {
+ TestDynaActionFormClass.class.getName()
+ });
+ }
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java 2008-06-05 00:12:58.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java 2012-06-29 10:02:17.922644023 +0200
+@@ -90,7 +90,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(new String[] {
++ junit.textui.TestRunner.main(new String[] {
+ TestDynaActionForm.class.getName()
+ });
+ }
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java 2008-06-05 00:12:52.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java 2012-06-29 10:02:17.922644023 +0200
+@@ -40,7 +40,7 @@
+ }
+
+ public static void main(String[] args) {
+- junit.awtui.TestRunner.main(new String[] {
++ junit.textui.TestRunner.main(new String[] {
+ TestActionConfigMatcher.class.getName()
+ });
+ }
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java 2008-06-05 00:13:00.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java 2012-06-29 10:02:17.923644022 +0200
+@@ -45,7 +45,7 @@
+ }
+
+ public static void main(String[] args) {
+- junit.awtui.TestRunner.main(new String[] {
++ junit.textui.TestRunner.main(new String[] {
+ TestPropertyMessageResources.class.getName()
+ });
+ }
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestRequestUtils.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/util/TestRequestUtils.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestRequestUtils.java 2008-06-05 00:13:02.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/util/TestRequestUtils.java 2012-06-29 10:02:17.924644022 +0200
+@@ -49,7 +49,7 @@
+ }
+
+ public static void main(String[] args) {
+- junit.awtui.TestRunner.main(new String[] {
++ junit.textui.TestRunner.main(new String[] {
+ TestRequestUtils.class.getName()
+ });
+ }
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java 2008-06-05 00:13:00.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java 2012-06-29 10:02:17.924644022 +0200
+@@ -55,7 +55,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(
++ junit.textui.TestRunner.main(
+ new String[] { TestRequestUtilsPopulate.class.getName()});
+ }
+
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/validator/TestValidWhen.java struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
+--- struts-1.3.10/src/core/src/test/java/org/apache/struts/validator/TestValidWhen.java 2008-06-05 00:12:54.000000000 +0200
++++ struts-1.3.10-gil/src/core/src/test/java/org/apache/struts/validator/TestValidWhen.java 2012-06-29 10:02:17.925644022 +0200
+@@ -57,7 +57,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(new String[] { TestValidWhen.class.getName() });
++ junit.textui.TestRunner.main(new String[] { TestValidWhen.class.getName() });
+ }
+
+ /**
+diff -Nru struts-1.3.10/src/el/pom.xml struts-1.3.10-gil/src/el/pom.xml
+--- struts-1.3.10/src/el/pom.xml 2008-11-28 23:43:44.000000000 +0100
++++ struts-1.3.10-gil/src/el/pom.xml 2012-06-29 10:10:13.913637892 +0200
+@@ -59,15 +59,21 @@
+ <dependencies>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>jstl</artifactId>
++ <groupId>org.jboss.spec.javax.servlet.jstl</groupId>
++ <artifactId>jboss-jstl-api_1.2_spec</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.3</version>
++ <groupId>org.jboss.spec.javax.servlet</groupId>
++ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
++ <version>1.0.1.Final</version>
++ <scope>provided</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
++ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
++ <version>1.0.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
+@@ -90,11 +96,11 @@
+ <optional>true</optional>
+ </dependency>
+
+- <dependency>
++ <!--dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0.6</version>
+- </dependency>
++ </dependency-->
+
+ </dependencies>
+
+diff -Nru struts-1.3.10/src/extras/pom.xml struts-1.3.10-gil/src/extras/pom.xml
+--- struts-1.3.10/src/extras/pom.xml 2008-11-28 23:43:46.000000000 +0100
++++ struts-1.3.10-gil/src/extras/pom.xml 2012-06-29 10:11:35.663636839 +0200
+@@ -65,9 +65,9 @@
+ <dependencies>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.3</version>
++ <groupId>org.jboss.spec.javax.servlet</groupId>
++ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
++ <version>1.0.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
+diff -Nru struts-1.3.10/src/faces/pom.xml struts-1.3.10-gil/src/faces/pom.xml
+--- struts-1.3.10/src/faces/pom.xml 2008-11-28 23:43:46.000000000 +0100
++++ struts-1.3.10-gil/src/faces/pom.xml 2012-06-29 10:12:12.331636366 +0200
+@@ -80,16 +80,16 @@
+ </dependency>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>jsp-api</artifactId>
+- <version>2.0</version>
++ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
++ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
++ <version>1.0.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.3</version>
++ <groupId>org.jboss.spec.javax.servlet</groupId>
++ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
++ <version>1.0.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
+@@ -113,8 +113,8 @@
+
+
+ <dependency>
+- <groupId>myfaces</groupId>
+- <artifactId>myfaces-jsf-api</artifactId>
++ <groupId>org.jboss.spec.javax.faces</groupId>
++ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <version>1.0.9</version>
+ <scope>provided</scope>
+ </dependency>
+diff -Nru struts-1.3.10/src/pom.xml struts-1.3.10-gil/src/pom.xml
+--- struts-1.3.10/src/pom.xml 2012-06-29 10:17:27.603632306 +0200
++++ struts-1.3.10-gil/src/pom.xml 2012-06-29 10:02:17.927644022 +0200
+@@ -114,6 +114,14 @@
+ </execution>
+ </executions>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++ <version>2.5</version>
++ <configuration>
++ <encoding>UTF-8</encoding>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+ </profile>
+@@ -152,8 +160,8 @@
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+- <source>1.4</source>
+- <target>1.4</target>
++ <source>1.5</source>
++ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+@@ -185,14 +193,14 @@
+ <artifactId>dtddoc-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <parseHtml>true</parseHtml>
+ </configuration>
+- </plugin>
++ </plugin-->
+ </plugins>
+ </pluginManagement>
+ <plugins>
+diff -Nru struts-1.3.10/src/scripting/pom.xml struts-1.3.10-gil/src/scripting/pom.xml
+--- struts-1.3.10/src/scripting/pom.xml 2008-11-28 23:43:46.000000000 +0100
++++ struts-1.3.10-gil/src/scripting/pom.xml 2012-06-29 10:14:02.197634951 +0200
+@@ -66,9 +66,9 @@
+ </dependency>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.3</version>
++ <groupId>org.jboss.spec.javax.servlet</groupId>
++ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
++ <version>1.0.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
+@@ -79,7 +79,7 @@
+ </dependency>
+
+ <dependency>
+- <groupId>bsf</groupId>
++ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+diff -Nru struts-1.3.10/src/taglib/pom.xml struts-1.3.10-gil/src/taglib/pom.xml
+--- struts-1.3.10/src/taglib/pom.xml 2008-11-28 23:43:46.000000000 +0100
++++ struts-1.3.10-gil/src/taglib/pom.xml 2012-06-29 10:14:41.891634440 +0200
+@@ -82,12 +82,18 @@
+ </dependency>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.3</version>
++ <groupId>org.jboss.spec.javax.servlet</groupId>
++ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
++ <version>1.0.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+-
++ <dependency>
++ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
++ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
++ <version>1.0.1.Final</version>
++ <scope>provided</scope>
++ </dependency>
++
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-core</artifactId>
+diff -Nru struts-1.3.10/src/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java struts-1.3.10-gil/src/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java
+--- struts-1.3.10/src/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java 2008-06-05 00:04:20.000000000 +0200
++++ struts-1.3.10-gil/src/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java 2012-06-29 10:02:17.928644022 +0200
+@@ -55,7 +55,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(new String[] { TestHtmlTag.class.getName() });
++ junit.textui.TestRunner.main(new String[] { TestHtmlTag.class.getName() });
+ }
+
+ /**
+diff -Nru struts-1.3.10/src/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java struts-1.3.10-gil/src/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java
+--- struts-1.3.10/src/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java 2008-06-05 00:04:22.000000000 +0200
++++ struts-1.3.10-gil/src/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java 2012-06-29 10:02:17.929644022 +0200
+@@ -70,7 +70,7 @@
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+- junit.awtui.TestRunner.main(new String[] { TestTagUtils.class.getName() });
++ junit.textui.TestRunner.main(new String[] { TestTagUtils.class.getName() });
+ }
+
+ /**
+diff -Nru struts-1.3.10/src/tiles/pom.xml struts-1.3.10-gil/src/tiles/pom.xml
+--- struts-1.3.10/src/tiles/pom.xml 2008-11-28 23:43:46.000000000 +0100
++++ struts-1.3.10-gil/src/tiles/pom.xml 2012-06-29 10:15:01.717634185 +0200
+@@ -68,9 +68,15 @@
+ <dependencies>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.3</version>
++ <groupId>org.jboss.spec.javax.servlet</groupId>
++ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
++ <version>1.0.1.Final</version>
++ <scope>provided</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
++ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
++ <version>1.0.1.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
+diff -Nru struts-1.3.10/src/tiles/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java struts-1.3.10-gil/src/tiles/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java
+--- struts-1.3.10/src/tiles/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java 2008-06-05 00:02:02.000000000 +0200
++++ struts-1.3.10-gil/src/tiles/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java 2012-06-29 10:02:17.930644022 +0200
+@@ -55,7 +55,7 @@
+
+
+ public static void main(String args[]) {
+- junit.awtui.TestRunner.main
++ junit.textui.TestRunner.main
+ (new String[] { TestTilesPlugin.class.getName() } );
+ }
+
More information about the scm-commits
mailing list