gil pushed to struts (master). "use servlet 3.1 apis"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 31 07:20:20 UTC 2015
>From 2fc1e1eb593e906012ca2eab9d88aa2652caba6b Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Tue, 31 Mar 2015 09:20:03 +0200
Subject: use servlet 3.1 apis
diff --git a/struts-1.3.10-jboss.patch b/struts-1.3.10-jboss.patch
index 833aa6c..2e3f3f9 100644
--- a/struts-1.3.10-jboss.patch
+++ b/struts-1.3.10-jboss.patch
@@ -1,6 +1,6 @@
-diff -Nru struts-1.3.10/src/core/pom.xml struts-1.3.10-gil/src/core/pom.xml
+diff -Nru struts-1.3.10/src/core/pom.xml struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/pom.xml 2015-03-31 08:28:16.412303402 +0200
@@ -156,16 +156,28 @@
</exclusions>
</dependency>
@@ -9,20 +9,20 @@ diff -Nru struts-1.3.10/src/core/pom.xml struts-1.3.10-gil/src/core/pom.xml
- <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>
++ <artifactId>jboss-servlet-api_3.1_spec</artifactId>
++ <version>1.0.0.Beta1</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>
++ <artifactId>jboss-jsp-api_2.3_spec</artifactId>
++ <version>1.0.0.Beta1</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>
++ <artifactId>jboss-el-api_3.0_spec</artifactId>
++ <version>1.0.0.Alpha1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -34,10 +34,10 @@ diff -Nru struts-1.3.10/src/core/pom.xml struts-1.3.10-gil/src/core/pom.xml
</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
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java struts-1.3.10.servlet/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 @@
++++ struts-1.3.10.servlet/src/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java 2015-03-31 08:56:40.550157551 +0200
+@@ -20,16 +20,29 @@
*/
package org.apache.struts.mock;
@@ -53,6 +53,7 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpSe
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
++import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Part;
import java.io.BufferedReader;
@@ -66,7 +67,7 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpSe
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Locale;
-@@ -425,4 +437,85 @@
+@@ -425,4 +438,100 @@
public void setCharacterEncoding(String name) {
throw new UnsupportedOperationException();
}
@@ -151,10 +152,25 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpSe
+ throw new UnsupportedOperationException("Not supported.");
+ }
+
++ public <T extends HttpUpgradeHandler> T upgrade(Class<T> arg0) throws IOException, ServletException {
++ // TODO
++ throw new UnsupportedOperationException("Not implemented yet");
++ }
++
++ public String changeSessionId() {
++ // TODO
++ throw new UnsupportedOperationException("Not implemented yet");
++ }
++
++ public long getContentLengthLong() {
++ // TODO
++ throw new UnsupportedOperationException("Not implemented yet");
++ }
++
}
-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
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java 2015-03-31 07:56:50.362159343 +0200
@@ -20,6 +20,7 @@
*/
package org.apache.struts.mock;
@@ -171,7 +187,7 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpSe
import java.util.Locale;
/**
-@@ -169,7 +171,40 @@
+@@ -169,7 +171,46 @@
throw new UnsupportedOperationException();
}
@@ -211,10 +227,16 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockHttpSe
+ // TODO
+ throw new UnsupportedOperationException("Not supported.");
+ }
++
++ public void setContentLengthLong(long arg0) {
++ // TODO
++ throw new UnsupportedOperationException("Not implemented yet");
++ }
++
}
-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
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockPageContext.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/main/java/org/apache/struts/mock/MockPageContext.java 2015-03-31 07:43:49.344342782 +0200
@@ -20,6 +20,7 @@
*/
package org.apache.struts.mock;
@@ -255,9 +277,9 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockPageCo
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
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockServletContext.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/main/java/org/apache/struts/mock/MockServletContext.java 2015-03-31 07:47:50.052558113 +0200
@@ -23,16 +23,32 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -302,7 +324,7 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockServle
public String getInitParameter(String name) {
return ((String) parameters.get(name));
}
-@@ -182,4 +202,134 @@
+@@ -182,4 +202,139 @@
attributes.put(name, value);
}
}
@@ -436,10 +458,15 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/MockServle
+ // TODO
+ throw new UnsupportedOperationException("Not supported.");
+ }
++
++ public String getVirtualServerName() {
++ // TODO
++ throw new UnsupportedOperationException("Not implemented yet");
++ }
}
-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
+diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/TestMockBase.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/main/java/org/apache/struts/mock/TestMockBase.java 2015-03-31 07:43:49.345342733 +0200
@@ -64,7 +64,7 @@
}
@@ -449,9 +476,9 @@ diff -Nru struts-1.3.10/src/core/src/main/java/org/apache/struts/mock/TestMockBa
}
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionMessage.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/action/TestActionMessage.java 2015-03-31 07:43:49.345342733 +0200
@@ -60,7 +60,7 @@
* @param theArgs the arguments. Not used
*/
@@ -461,9 +488,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActi
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionMessages.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/action/TestActionMessages.java 2015-03-31 07:43:49.346342684 +0200
@@ -57,7 +57,7 @@
* @param theArgs the arguments. Not used
*/
@@ -473,9 +500,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActi
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActionServlet.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/action/TestActionServlet.java 2015-03-31 07:43:49.346342684 +0200
@@ -92,7 +92,7 @@
* @param theArgs the arguments. Not used
*/
@@ -485,9 +512,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestActi
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java 2015-03-31 07:43:49.347342635 +0200
@@ -93,7 +93,7 @@
* @param theArgs the arguments. Not used
*/
@@ -497,9 +524,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestDyna
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java 2015-03-31 07:43:49.347342635 +0200
@@ -90,7 +90,7 @@
* @param theArgs the arguments. Not used
*/
@@ -509,9 +536,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/action/TestDyna
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java 2015-03-31 07:43:49.347342635 +0200
@@ -40,7 +40,7 @@
}
@@ -521,9 +548,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/config/TestActi
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java 2015-03-31 07:43:49.348342586 +0200
@@ -45,7 +45,7 @@
}
@@ -533,9 +560,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestProper
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestRequestUtils.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/util/TestRequestUtils.java 2015-03-31 07:43:49.348342586 +0200
@@ -49,7 +49,7 @@
}
@@ -545,9 +572,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestReques
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java 2015-03-31 07:43:49.348342586 +0200
@@ -55,7 +55,7 @@
* @param theArgs the arguments. Not used
*/
@@ -557,9 +584,9 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/util/TestReques
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
+diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/validator/TestValidWhen.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/core/src/test/java/org/apache/struts/validator/TestValidWhen.java 2015-03-31 07:43:49.349342537 +0200
@@ -57,7 +57,7 @@
* @param theArgs the arguments. Not used
*/
@@ -569,18 +596,19 @@ diff -Nru struts-1.3.10/src/core/src/test/java/org/apache/struts/validator/TestV
}
/**
-diff -Nru struts-1.3.10/src/el/pom.xml struts-1.3.10-gil/src/el/pom.xml
+diff -Nru struts-1.3.10/src/el/pom.xml struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/el/pom.xml 2015-03-31 08:25:36.526131160 +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>
+- <version>1.0.2</version>
++ <groupId>org.apache.taglibs</groupId>
++ <artifactId>taglibs-standard-jstlel</artifactId>
++ <version>1.2.3</version>
</dependency>
<dependency>
@@ -588,14 +616,14 @@ diff -Nru struts-1.3.10/src/el/pom.xml struts-1.3.10-gil/src/el/pom.xml
- <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>
++ <artifactId>jboss-servlet-api_3.1_spec</artifactId>
++ <version>1.0.0.Beta1</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>
++ <artifactId>jboss-jsp-api_2.3_spec</artifactId>
++ <version>1.0.0.Beta1</version>
<scope>provided</scope>
</dependency>
@@ -613,9 +641,9 @@ diff -Nru struts-1.3.10/src/el/pom.xml struts-1.3.10-gil/src/el/pom.xml
</dependencies>
-diff -Nru struts-1.3.10/src/extras/pom.xml struts-1.3.10-gil/src/extras/pom.xml
+diff -Nru struts-1.3.10/src/extras/pom.xml struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/extras/pom.xml 2015-03-31 08:09:26.370437125 +0200
@@ -65,9 +65,9 @@
<dependencies>
@@ -624,14 +652,14 @@ diff -Nru struts-1.3.10/src/extras/pom.xml struts-1.3.10-gil/src/extras/pom.xml
- <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>
++ <artifactId>jboss-servlet-api_3.1_spec</artifactId>
++ <version>1.0.0.Beta1</version>
<scope>provided</scope>
</dependency>
-diff -Nru struts-1.3.10/src/faces/pom.xml struts-1.3.10-gil/src/faces/pom.xml
+diff -Nru struts-1.3.10/src/faces/pom.xml struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/faces/pom.xml 2015-03-31 08:08:42.318576893 +0200
@@ -80,16 +80,16 @@
</dependency>
@@ -640,8 +668,8 @@ diff -Nru struts-1.3.10/src/faces/pom.xml struts-1.3.10-gil/src/faces/pom.xml
- <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>
++ <artifactId>jboss-jsp-api_2.3_spec</artifactId>
++ <version>1.0.0.Beta1</version>
<scope>provided</scope>
</dependency>
@@ -650,25 +678,27 @@ diff -Nru struts-1.3.10/src/faces/pom.xml struts-1.3.10-gil/src/faces/pom.xml
- <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>
++ <artifactId>jboss-servlet-api_3.1_spec</artifactId>
++ <version>1.0.0.Beta1</version>
<scope>provided</scope>
</dependency>
-@@ -113,8 +113,8 @@
+@@ -113,9 +113,9 @@
<dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-jsf-api</artifactId>
+- <version>1.0.9</version>
+ <groupId>org.jboss.spec.javax.faces</groupId>
-+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
- <version>1.0.9</version>
++ <artifactId>jboss-jsf-api_2.2_spec</artifactId>
++ <version>2.2.0</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
+
+diff -Nru struts-1.3.10/src/pom.xml struts-1.3.10.servlet/src/pom.xml
+--- struts-1.3.10/src/pom.xml 2015-03-31 09:16:23.559048543 +0200
++++ struts-1.3.10.servlet/src/pom.xml 2015-03-31 09:17:41.953240637 +0200
@@ -114,6 +114,14 @@
</execution>
</executions>
@@ -690,8 +720,8 @@ diff -Nru struts-1.3.10/src/pom.xml struts-1.3.10-gil/src/pom.xml
<configuration>
- <source>1.4</source>
- <target>1.4</target>
-+ <source>1.5</source>
-+ <target>1.5</target>
++ <source>1.6</source>
++ <target>1.6</target>
</configuration>
</plugin>
<plugin>
@@ -712,9 +742,9 @@ diff -Nru struts-1.3.10/src/pom.xml struts-1.3.10-gil/src/pom.xml
</plugins>
</pluginManagement>
<plugins>
-diff -Nru struts-1.3.10/src/scripting/pom.xml struts-1.3.10-gil/src/scripting/pom.xml
+diff -Nru struts-1.3.10/src/scripting/pom.xml struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/scripting/pom.xml 2015-03-31 08:06:48.958083246 +0200
@@ -66,9 +66,9 @@
</dependency>
@@ -723,8 +753,8 @@ diff -Nru struts-1.3.10/src/scripting/pom.xml struts-1.3.10-gil/src/scripting/po
- <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>
++ <artifactId>jboss-servlet-api_3.1_spec</artifactId>
++ <version>1.0.0.Beta1</version>
<scope>provided</scope>
</dependency>
@@ -737,9 +767,9 @@ diff -Nru struts-1.3.10/src/scripting/pom.xml struts-1.3.10-gil/src/scripting/po
<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
+diff -Nru struts-1.3.10/src/taglib/pom.xml struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/taglib/pom.xml 2015-03-31 08:06:24.202285730 +0200
@@ -82,12 +82,18 @@
</dependency>
@@ -748,24 +778,24 @@ diff -Nru struts-1.3.10/src/taglib/pom.xml struts-1.3.10-gil/src/taglib/pom.xml
- <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>
++ <artifactId>jboss-servlet-api_3.1_spec</artifactId>
++ <version>1.0.0.Beta1</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>
++ <artifactId>jboss-jsp-api_2.3_spec</artifactId>
++ <version>1.0.0.Beta1</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
+diff -Nru struts-1.3.10/src/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java 2015-03-31 07:43:49.353342342 +0200
@@ -55,7 +55,7 @@
* @param theArgs the arguments. Not used
*/
@@ -775,9 +805,9 @@ diff -Nru struts-1.3.10/src/taglib/src/test/java/org/apache/struts/taglib/html/T
}
/**
-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
+diff -Nru struts-1.3.10/src/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java 2015-03-31 07:43:49.353342342 +0200
@@ -70,7 +70,7 @@
* @param theArgs the arguments. Not used
*/
@@ -787,9 +817,9 @@ diff -Nru struts-1.3.10/src/taglib/src/test/java/org/apache/struts/taglib/TestTa
}
/**
-diff -Nru struts-1.3.10/src/tiles/pom.xml struts-1.3.10-gil/src/tiles/pom.xml
+diff -Nru struts-1.3.10/src/tiles/pom.xml struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/tiles/pom.xml 2015-03-31 08:04:28.548903458 +0200
@@ -68,9 +68,15 @@
<dependencies>
@@ -798,20 +828,20 @@ diff -Nru struts-1.3.10/src/tiles/pom.xml struts-1.3.10-gil/src/tiles/pom.xml
- <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>
++ <artifactId>jboss-servlet-api_3.1_spec</artifactId>
++ <version>1.0.0.Beta1</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>
++ <artifactId>jboss-jsp-api_2.3_spec</artifactId>
++ <version>1.0.0.Beta1</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
+diff -Nru struts-1.3.10/src/tiles/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java struts-1.3.10.servlet/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
++++ struts-1.3.10.servlet/src/tiles/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java 2015-03-31 07:43:49.354342293 +0200
@@ -55,7 +55,7 @@
diff --git a/struts.spec b/struts.spec
index 55b45c6..273f6eb 100644
--- a/struts.spec
+++ b/struts.spec
@@ -16,17 +16,17 @@ Source1: %{name}-master-%{master_version}-pom.xml
# add struts-master relativePath
Patch0: %{name}-%{version}-parent-pom.patch
# add
-# org.jboss.spec.javax.el jboss-el-api_2.2_spec
+# org.jboss.spec.javax.el
# org.apache.maven.plugins maven-resources-plugin configuration
# change
-# myfaces myfaces-jsf-api 1.0.9 with org.jboss.spec.javax.faces jboss-jsf-api_2.1_spec
-# jakarta-taglibs-standard with jboss-jstl-1.2-api
-# javax.servlet servlet-api with org.jboss.spec.javax.servlet jboss-servlet-api_3.0_spec
-# javax.servlet jsp-api with org.jboss.spec.javax.servlet.jsp jboss-jsp-api_2.2_spec
+# myfaces myfaces-jsf-api 1.0.9 with org.jboss.spec.javax.faces
+# jakarta-taglibs-standard with taglibs-standard-jstlel
+# javax.servlet servlet-api with org.jboss.spec.javax.servlet
+# javax.servlet jsp-api with org.jboss.spec.javax.servlet.jsp
# fix
# bsf gId
# maven-compiler-plugin build source/target
-# build for junit servlet-3.0-api
+# build for junit servlet-3.1-api
Patch1: %{name}-%{version}-jboss.patch
# Thanks to Arun Babu Neelicattu aneelica at redhat.com
# and Brandon.Vincent at asu.edu
@@ -48,11 +48,11 @@ BuildRequires: mvn(log4j:log4j:1.2.17)
BuildRequires: mvn(log4j:log4j)
%endif
BuildRequires: mvn(org.apache.bsf:bsf)
-BuildRequires: mvn(org.jboss.spec.javax.el:jboss-el-api_2.2_spec)
-BuildRequires: mvn(org.jboss.spec.javax.faces:jboss-jsf-api_2.1_spec)
-BuildRequires: mvn(org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec)
-BuildRequires: mvn(org.jboss.spec.javax.servlet.jstl:jboss-jstl-api_1.2_spec)
-BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec)
+BuildRequires: mvn(org.apache.taglibs:taglibs-standard-jstlel)
+BuildRequires: mvn(org.jboss.spec.javax.el:jboss-el-api_3.0_spec)
+BuildRequires: mvn(org.jboss.spec.javax.faces:jboss-jsf-api_2.2_spec)
+BuildRequires: mvn(org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.3_spec)
+BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec)
BuildRequires: mvn(oro:oro)
BuildRequires: maven-local
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/struts.git/commit/?h=master&id=2fc1e1eb593e906012ca2eab9d88aa2652caba6b
More information about the scm-commits
mailing list