[struts/f17: 5/5] replace tomcat 7.x apis with jboss apis

[gil]

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