[axis2] use servlet api 3.1

[gil]

commit 9ac6555b0766c3f82c505029e2e5633f3788f136
Author: gil <puntogil at libero.it>
Date:   Thu Mar 5 13:14:15 2015 +0100

    use servlet api 3.1

 axis2.spec | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/axis2.spec b/axis2.spec
index 934f177..54c920c 100644
--- a/axis2.spec
+++ b/axis2.spec
@@ -1,6 +1,6 @@
 Name:          axis2
 Version:       1.6.1
-Release:       13%{?dist}
+Release:       14%{?dist}
 Summary:       Java-based Web Services / SOAP / WSDL engine
 License:       ASL 2.0
 URL:           http://axis.apache.org/axis2/java/core/
@@ -26,14 +26,14 @@ BuildRequires: javamail
 BuildRequires: dos2unix
 BuildRequires: maven-remote-resources-plugin
 BuildRequires: apache-commons-fileupload
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: glassfish-servlet-api
 BuildRequires: geronimo-saaj
 BuildRequires: maven-plugin-build-helper
 
 Requires:      log4j12
 Requires:      xerces-j2
 Requires:      javamail
-Requires:      tomcat-servlet-3.0-api
+Requires:      glassfish-servlet-api
 
 %description
 Apache Axis2 is a Web Services / SOAP / WSDL engine, the successor
@@ -54,7 +54,6 @@ API documentation for %{name}.
 %pom_disable_module modules/addressing
 %pom_disable_module modules/fastinfoset
 %pom_disable_module modules/integration
-%pom_disable_module modules/java2wsdl
 %pom_disable_module modules/jibx
 %pom_disable_module modules/json
 %pom_disable_module modules/mex
@@ -86,8 +85,9 @@ API documentation for %{name}.
 %pom_disable_module modules/clustering
 %pom_disable_module modules/corba
 %pom_disable_module modules/osgi
-%pom_disable_module modules/transport/local
-%pom_disable_module modules/transport/http
+#%% pom_disable_module modules/transport/local
+#%% pom_disable_module modules/transport/http
+#%% pom_disable_module modules/java2wsdl
 
 # Remove non standard apidocs final subdir
 %pom_xpath_remove "pom:project/pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin' ]/pom:configuration/pom:destDir"
@@ -103,8 +103,9 @@ API documentation for %{name}.
 
 %patch0 -p0
 
-sed -i "s|>javax.servlet<|>org.apache.tomcat<|" modules/parent/pom.xml modules/kernel/pom.xml
-sed -i "s|>servlet-api<|>tomcat-servlet-api<|" modules/parent/pom.xml modules/kernel/pom.xml
+%pom_xpath_set "pom:properties/pom:servlet.api.version" 3.1.0 modules/parent
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.servlet']/pom:artifactId" javax.servlet-api modules/parent modules/kernel
+%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId = 'javax.servlet']" "<version>1.6.2</version>" modules/kernel
 
 # reference to Parameter is ambiguous both class java.lang.reflect.Parameter in
 # java.lang.reflect and class org.apache.axis2.description.Parameter in org.apache.axis2.description match
@@ -115,7 +116,6 @@ sed -i "s|Parameter generateWrappedArrayTypes|org.apache.axis2.description.Param
 sed -i "s|Parameter extraClassesParam|org.apache.axis2.description.Parameter extraClassesParam|" \
  modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 
-
 %build
 # Tests currently use an auto-generated ant build xml file which
 # fails due to incorrect setting of JAVA_HOME (to JRE instead of JDK home)
@@ -135,6 +135,9 @@ dos2unix NOTICE.txt
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Sat Feb 28 2015 gil cattaneo <puntogil at libero.it> 1.6.1-14
+- use servlet api 3.1
+
 * Thu Jan 29 2015 gil cattaneo <puntogil at libero.it> 1.6.1-13
 - introduce license macro