[struts] replace tomcat 7.x apis with jboss apis

[gil]

commit c602aa49c8d7cc6cc82659d278aa71ba9470bb50
Author: gil <puntogil at 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 at libero.it> 1.3.10-4
+- replace tomcat 7.x apis with jboss apis
+
 * Fri Jun 29 2012 gil cattaneo <puntogil at libero.it> 1.3.10-3
 - replace jakarta-taglibs-standard with jboss-jstl-1.2-api