Building FEST for f16 ?
by Michel Alexandre Salim
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Mario,
One of the component for our Clojure feature we're working on for
Fedora 18, clojure-maven-plugin, requires fest-assert to build. So far
I've been making the components we worked on available for both Fedora
16 and Fedora 17, in addition to Rawhide -- but it's hit a bump now as
fest-{assert,common,util} is currently only available for f17 and above.
Is there a plan to support f16, or failing that, any reason why f16
cannot be easily supported?
Thanks,
- --
Michel Alexandre Salim
Fedora Project Contributor: http://fedoraproject.org/
Email: salimma(a)fedoraproject.org | GPG key ID: A36A937A
Jabber: hircus(a)jabber.ccc.de | IRC: hircus(a)irc.freenode.net
() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJP6vWTAAoJEEr1VKujapN67d0H/33UEitMeYTq84xQhmEZ2YPg
mEDi68okf2Lp69VE6/ONwo+gZ5vapy1/oSo3eupyyBAgII19dHL9x4MGvmUAGWY8
9rWrx/q69KEW0Ekx7aJ2Ik5dEh1pEfetFfUEBa5BtgLHDMDPlmQZFmKebNeSQGlO
ke6vAOOlB7EU2Q0Q+SCIMqXKx5zoODkDfTwADa+ij9djKwCNf0QIyLB3owVSiW+N
ic7RyZ+cdrF5JzmZ4HI958N5g2zBtW75glrMvkMP9lwat7S/U+0W3DUowEEGsS91
VQwubmm06nJfxiVdK6GUnAP8TvpWjQIXyoCr1uP8pXJqlmMC+1cfaogUuvjvpz0=
=IEBe
-----END PGP SIGNATURE-----
11 years, 10 months
Broken dependencies: struts
by Fedora Koji Build System
struts has broken dependencies in the rawhide tree:
On x86_64:
struts-webapps-tomcat5-1.2.9-10.fc16.noarch requires tomcat5
struts-webapps-tomcat5-1.2.9-10.fc16.noarch requires tomcat5
On i386:
struts-webapps-tomcat5-1.2.9-10.fc16.noarch requires tomcat5
struts-webapps-tomcat5-1.2.9-10.fc16.noarch requires tomcat5
Please resolve this as soon as possible.
11 years, 10 months
[struts/f17] replace tomcat 7.x apis with jboss apis
by gil
commit 8662bff326ce486f1ae29710da1434833073934c
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 29 10:56:19 2012 +0200
replace tomcat 7.x apis with jboss apis
struts.spec | 30 ------------------------------
1 files changed, 0 insertions(+), 30 deletions(-)
---
diff --git a/struts.spec b/struts.spec
index 0ae5e5b..289a0c9 100644
--- a/struts.spec
+++ b/struts.spec
@@ -1,11 +1,7 @@
%global master_version 4
Name: struts
Version: 1.3.10
-<<<<<<< HEAD
-Release: 3%{?dist}
-=======
Release: 4%{?dist}
->>>>>>> master
Summary: Web application framework
Group: Development/Libraries
License: ASL 2.0
@@ -20,13 +16,6 @@ Source0: %{name}-%{version}-clean-src.tar.gz
Source1: %{name}-master-%{master_version}-pom.xml
# add struts-master relativePath
Patch0: %{name}-%{version}-parent-pom.patch
-<<<<<<< HEAD
-# fix build for junit servlet-3.0-api
-# change myfaces myfaces-jsf-api 1.0.9 with org.jboss.spec.javax.faces jboss-jsf-api_2.1_spec
-Patch1: %{name}-%{version}-build.patch
-# replace jakarta-taglibs-standard with jboss-jstl-1.2-api
-Patch2: %{name}-%{version}-el-pom.patch
-=======
# add
# org.jboss.spec.javax.el jboss-el-api_2.2_spec
# org.apache.maven.plugins maven-resources-plugin configuration
@@ -40,7 +29,6 @@ Patch2: %{name}-%{version}-el-pom.patch
# maven-compiler-plugin build source/target
# build for junit servlet-3.0-api
Patch1: %{name}-%{version}-jboss.patch
->>>>>>> master
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -54,20 +42,11 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-validator
BuildRequires: bsf
BuildRequires: jakarta-oro
-<<<<<<< HEAD
-BuildRequires: jboss-jsf-2.1-api
-BuildRequires: jboss-jstl-1.2-api
-BuildRequires: tomcat-el-2.2-api
-BuildRequires: tomcat-jsp-2.2-api
-BuildRequires: tomcat-servlet-3.0-api
-
-=======
BuildRequires: jboss-el-2.2-api
BuildRequires: jboss-jsf-2.1-api
BuildRequires: jboss-jsp-2.2-api
BuildRequires: jboss-jstl-1.2-api
BuildRequires: jboss-servlet-3.0-api
->>>>>>> master
# not only a test dep
BuildRequires: junit
@@ -89,16 +68,11 @@ Requires: apache-commons-logging
Requires: apache-commons-validator
Requires: bsf
Requires: jakarta-oro
-<<<<<<< HEAD
-Requires: jboss-jsf-2.1-api
-Requires: jboss-jstl-1.2-api
-=======
Requires: jboss-el-2.2-api
Requires: jboss-jsf-2.1-api
Requires: jboss-jsp-2.2-api
Requires: jboss-jstl-1.2-api
Requires: jboss-servlet-3.0-api
->>>>>>> master
Requires: junit
Requires: java
@@ -138,7 +112,6 @@ find -name "*.jar" -delete
find -name "*.class" -delete
%patch0 -p0
%patch1 -p1
-%patch2 -p0
sed -i 's/\r//' LICENSE.txt NOTICE.txt
@@ -193,12 +166,9 @@ cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
-<<<<<<< HEAD
-=======
* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-4
- replace tomcat 7.x apis with jboss apis
->>>>>>> master
* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-3
- replace jakarta-taglibs-standard with jboss-jstl-1.2-api
11 years, 10 months
[struts/f17: 5/5] replace tomcat 7.x apis with jboss apis
by gil
commit a81dbb4492e67476e7052fde336ddf18c10dc435
Merge: 935d8d8 c602aa4
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 29 10:46:48 2012 +0200
replace tomcat 7.x apis with jboss apis
struts-1.3.10-jboss.patch | 823 +++++++++++++++++++++++++++++++++++++++++++++
struts.spec | 48 +++-
2 files changed, 865 insertions(+), 6 deletions(-)
---
diff --cc struts.spec
index 54c2199,289a0c9..0ae5e5b
--- a/struts.spec
+++ b/struts.spec
@@@ -1,7 -1,7 +1,11 @@@
%global master_version 4
Name: struts
Version: 1.3.10
++<<<<<<< HEAD
+Release: 3%{?dist}
++=======
+ Release: 4%{?dist}
++>>>>>>> master
Summary: Web application framework
Group: Development/Libraries
License: ASL 2.0
@@@ -14,15 -14,21 +18,29 @@@ URL: http://struts.apache.org
Source0: %{name}-%{version}-clean-src.tar.gz
# wget -O struts-master-4-pom.xml http://svn.apache.org/repos/asf/struts/maven/tags/STRUTS_MASTER_4/pom.xml
Source1: %{name}-master-%{master_version}-pom.xml
- # forcing the use of tomcat 7.x apis
- Source2: %{name}-%{version}-depmap
# add struts-master relativePath
Patch0: %{name}-%{version}-parent-pom.patch
++<<<<<<< HEAD
+# fix build for junit servlet-3.0-api
+# change myfaces myfaces-jsf-api 1.0.9 with org.jboss.spec.javax.faces jboss-jsf-api_2.1_spec
+Patch1: %{name}-%{version}-build.patch
+# replace jakarta-taglibs-standard with jboss-jstl-1.2-api
+Patch2: %{name}-%{version}-el-pom.patch
++=======
+ # add
+ # org.jboss.spec.javax.el jboss-el-api_2.2_spec
+ # 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
+ # fix
+ # bsf gId
+ # maven-compiler-plugin build source/target
+ # build for junit servlet-3.0-api
+ Patch1: %{name}-%{version}-jboss.patch
++>>>>>>> master
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@@ -36,12 -42,11 +54,20 @@@ BuildRequires: apache-commons-loggin
BuildRequires: apache-commons-validator
BuildRequires: bsf
BuildRequires: jakarta-oro
++<<<<<<< HEAD
+BuildRequires: jboss-jsf-2.1-api
+BuildRequires: jboss-jstl-1.2-api
+BuildRequires: tomcat-el-2.2-api
+BuildRequires: tomcat-jsp-2.2-api
+BuildRequires: tomcat-servlet-3.0-api
+
++=======
+ BuildRequires: jboss-el-2.2-api
+ BuildRequires: jboss-jsf-2.1-api
+ BuildRequires: jboss-jsp-2.2-api
+ BuildRequires: jboss-jstl-1.2-api
+ BuildRequires: jboss-servlet-3.0-api
++>>>>>>> master
# not only a test dep
BuildRequires: junit
@@@ -63,12 -68,12 +89,17 @@@ Requires: apache-commons-loggin
Requires: apache-commons-validator
Requires: bsf
Requires: jakarta-oro
++<<<<<<< HEAD
+Requires: jboss-jsf-2.1-api
+Requires: jboss-jstl-1.2-api
++=======
+ Requires: jboss-el-2.2-api
+ Requires: jboss-jsf-2.1-api
+ Requires: jboss-jsp-2.2-api
+ Requires: jboss-jstl-1.2-api
+ Requires: jboss-servlet-3.0-api
++>>>>>>> master
Requires: junit
- Requires: tomcat-el-2.2-api
- Requires: tomcat-jsp-2.2-api
- Requires: tomcat-servlet-3.0-api
Requires: java
Requires: jpackage-utils
@@@ -163,6 -166,9 +193,12 @@@ cp -pr src/target/site/apidocs/* %{buil
%doc LICENSE.txt NOTICE.txt
%changelog
++<<<<<<< HEAD
++=======
+ * Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-4
+ - replace tomcat 7.x apis with jboss apis
+
++>>>>>>> master
* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-3
- replace jakarta-taglibs-standard with jboss-jstl-1.2-api
11 years, 10 months
[struts/f17] (5 commits) ...replace tomcat 7.x apis with jboss apis
by gil
Summary of changes:
ded7f9f... replace jakarta-taglibs-standard with jboss-jstl-1.2-api (*)
7ade935... replace jakarta-taglibs-standard with jboss-jstl-1.2-api (*)
dfb104a... replace tomcat 7.x apis with jboss apis (*)
c602aa4... replace tomcat 7.x apis with jboss apis (*)
a81dbb4... replace tomcat 7.x apis with jboss apis
(*) This commit already existed in another branch; no separate mail sent
11 years, 10 months
[struts] replace tomcat 7.x apis with jboss apis
by gil
commit c602aa49c8d7cc6cc82659d278aa71ba9470bb50
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 29 10:36:47 2012 +0200
replace tomcat 7.x apis with jboss apis
struts.spec | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/struts.spec b/struts.spec
index 54c2199..289a0c9 100644
--- a/struts.spec
+++ b/struts.spec
@@ -1,7 +1,7 @@
%global master_version 4
Name: struts
Version: 1.3.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Web application framework
Group: Development/Libraries
License: ASL 2.0
@@ -14,15 +14,21 @@ URL: http://struts.apache.org/
Source0: %{name}-%{version}-clean-src.tar.gz
# wget -O struts-master-4-pom.xml http://svn.apache.org/repos/asf/struts/maven/tags/STRUTS_MASTER_4/pom.xml
Source1: %{name}-master-%{master_version}-pom.xml
-# forcing the use of tomcat 7.x apis
-Source2: %{name}-%{version}-depmap
# add struts-master relativePath
Patch0: %{name}-%{version}-parent-pom.patch
-# fix build for junit servlet-3.0-api
-# change myfaces myfaces-jsf-api 1.0.9 with org.jboss.spec.javax.faces jboss-jsf-api_2.1_spec
-Patch1: %{name}-%{version}-build.patch
-# replace jakarta-taglibs-standard with jboss-jstl-1.2-api
-Patch2: %{name}-%{version}-el-pom.patch
+# add
+# org.jboss.spec.javax.el jboss-el-api_2.2_spec
+# 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
+# fix
+# bsf gId
+# maven-compiler-plugin build source/target
+# build for junit servlet-3.0-api
+Patch1: %{name}-%{version}-jboss.patch
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -36,12 +42,11 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-validator
BuildRequires: bsf
BuildRequires: jakarta-oro
+BuildRequires: jboss-el-2.2-api
BuildRequires: jboss-jsf-2.1-api
+BuildRequires: jboss-jsp-2.2-api
BuildRequires: jboss-jstl-1.2-api
-BuildRequires: tomcat-el-2.2-api
-BuildRequires: tomcat-jsp-2.2-api
-BuildRequires: tomcat-servlet-3.0-api
-
+BuildRequires: jboss-servlet-3.0-api
# not only a test dep
BuildRequires: junit
@@ -63,12 +68,12 @@ Requires: apache-commons-logging
Requires: apache-commons-validator
Requires: bsf
Requires: jakarta-oro
+Requires: jboss-el-2.2-api
Requires: jboss-jsf-2.1-api
+Requires: jboss-jsp-2.2-api
Requires: jboss-jstl-1.2-api
+Requires: jboss-servlet-3.0-api
Requires: junit
-Requires: tomcat-el-2.2-api
-Requires: tomcat-jsp-2.2-api
-Requires: tomcat-servlet-3.0-api
Requires: java
Requires: jpackage-utils
@@ -107,7 +112,6 @@ find -name "*.jar" -delete
find -name "*.class" -delete
%patch0 -p0
%patch1 -p1
-%patch2 -p0
sed -i 's/\r//' LICENSE.txt NOTICE.txt
@@ -123,7 +127,6 @@ cp -p %{SOURCE1} pom.xml
cd src
mvn-rpmbuild \
-Dproject.build.sourceEncoding=UTF-8 \
- -Dmaven.local.depmap.file="%{SOURCE2}" \
install javadoc:aggregate
%install
@@ -163,6 +166,9 @@ cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-4
+- replace tomcat 7.x apis with jboss apis
+
* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-3
- replace jakarta-taglibs-standard with jboss-jstl-1.2-api
11 years, 10 months
[struts] replace tomcat 7.x apis with jboss apis
by gil
commit dfb104a8241847bd2cd33569227ed3aa5c8b7e9b
Author: gil <puntogil(a)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() } );
+ }
+
11 years, 10 months
[Bug 707988] New: Junit4 bundles parts of hamcrest
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: Junit4 bundles parts of hamcrest
https://bugzilla.redhat.com/show_bug.cgi?id=707988
Summary: Junit4 bundles parts of hamcrest
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: junit4
AssignedTo: fnasser(a)redhat.com
ReportedBy: sochotni(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: fnasser(a)redhat.com, dwalluck(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Description of problem:
junit4 bundles hamcrest core files in main jar file. It contains these
files/dirs:
org/hamcrest/
org/hamcrest/core/
org/hamcrest/internal/
org/hamcrest/BaseDescription.class
org/hamcrest/BaseMatcher.class
org/hamcrest/CoreMatchers.class
org/hamcrest/Description.class
org/hamcrest/Factory.class
org/hamcrest/Matcher.class
org/hamcrest/SelfDescribing.class
org/hamcrest/StringDescription.class
org/hamcrest/core/AllOf.class
org/hamcrest/core/AnyOf.class
org/hamcrest/core/DescribedAs.class
org/hamcrest/core/Is.class
org/hamcrest/core/IsAnything.class
org/hamcrest/core/IsEqual.class
org/hamcrest/core/IsInstanceOf.class
org/hamcrest/core/IsNot.class
org/hamcrest/core/IsNull.class
org/hamcrest/core/IsSame.class
org/hamcrest/core/package.html
org/hamcrest/internal/ArrayIterator.class
org/hamcrest/internal/SelfDescribingValue.class
org/hamcrest/internal/SelfDescribingValueIterator.class
org/hamcrest/package.html
Version-Release number of selected component (if applicable):
junit4-4.8.2-2.fc15.noarch
These should be cleaned during build
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
11 years, 10 months
[struts] replace jakarta-taglibs-standard with jboss-jstl-1.2-api
by gil
commit 7ade935a4fa801e8c89b006b1e110391007da07c
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 29 09:33:28 2012 +0200
replace jakarta-taglibs-standard with jboss-jstl-1.2-api
struts.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/struts.spec b/struts.spec
index fdd0c80..54c2199 100644
--- a/struts.spec
+++ b/struts.spec
@@ -1,7 +1,7 @@
%global master_version 4
Name: struts
Version: 1.3.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Web application framework
Group: Development/Libraries
License: ASL 2.0
@@ -21,6 +21,8 @@ Patch0: %{name}-%{version}-parent-pom.patch
# fix build for junit servlet-3.0-api
# change myfaces myfaces-jsf-api 1.0.9 with org.jboss.spec.javax.faces jboss-jsf-api_2.1_spec
Patch1: %{name}-%{version}-build.patch
+# replace jakarta-taglibs-standard with jboss-jstl-1.2-api
+Patch2: %{name}-%{version}-el-pom.patch
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -34,8 +36,8 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-validator
BuildRequires: bsf
BuildRequires: jakarta-oro
-BuildRequires: jakarta-taglibs-standard >= 1.1.2-5
BuildRequires: jboss-jsf-2.1-api
+BuildRequires: jboss-jstl-1.2-api
BuildRequires: tomcat-el-2.2-api
BuildRequires: tomcat-jsp-2.2-api
BuildRequires: tomcat-servlet-3.0-api
@@ -61,8 +63,8 @@ Requires: apache-commons-logging
Requires: apache-commons-validator
Requires: bsf
Requires: jakarta-oro
-Requires: jakarta-taglibs-standard >= 1.1.2-5
Requires: jboss-jsf-2.1-api
+Requires: jboss-jstl-1.2-api
Requires: junit
Requires: tomcat-el-2.2-api
Requires: tomcat-jsp-2.2-api
@@ -105,6 +107,7 @@ find -name "*.jar" -delete
find -name "*.class" -delete
%patch0 -p0
%patch1 -p1
+%patch2 -p0
sed -i 's/\r//' LICENSE.txt NOTICE.txt
@@ -160,6 +163,9 @@ cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-3
+- replace jakarta-taglibs-standard with jboss-jstl-1.2-api
+
* Sat Jun 23 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-2
- removed non-free resources
11 years, 10 months
[struts] replace jakarta-taglibs-standard with jboss-jstl-1.2-api
by gil
commit ded7f9f8202c55d790639d76dda6b4ba83203405
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 29 09:30:24 2012 +0200
replace jakarta-taglibs-standard with jboss-jstl-1.2-api
struts-1.3.10-el-pom.patch | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/struts-1.3.10-el-pom.patch b/struts-1.3.10-el-pom.patch
new file mode 100644
index 0000000..c98d58e
--- /dev/null
+++ b/struts-1.3.10-el-pom.patch
@@ -0,0 +1,27 @@
+--- src/el/pom.xml 2012-06-29 09:05:39.279687759 +0200
++++ src/el/pom.xml-gil 2012-06-29 09:05:39.290687790 +0200
+@@ -59,8 +59,8 @@
+ <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>
+
+@@ -96,11 +96,11 @@
+ <optional>true</optional>
+ </dependency>
+
+- <dependency>
++ <!--dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0.6</version>
+- </dependency>
++ </dependency-->
+
+ </dependencies>
+
11 years, 10 months