You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2012/05/18 05:32:32 UTC

svn commit: r1339965 - in /geronimo/bundles/trunk/axis2: NOTICE pom.xml src/main/java/org/apache/axis2/transport/http/HTTPSender.java

Author: xuhaihong
Date: Fri May 18 03:32:32 2012
New Revision: 1339965

URL: http://svn.apache.org/viewvc?rev=1339965&view=rev
Log:
a. Remove unrequired changes from Geronimo side, as it is fixed with AXIS2-5093
b. Add comments to indicate the corresponding Axis2 JIRA NO.

Removed:
    geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/transport/http/HTTPSender.java
Modified:
    geronimo/bundles/trunk/axis2/NOTICE
    geronimo/bundles/trunk/axis2/pom.xml

Modified: geronimo/bundles/trunk/axis2/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2/NOTICE?rev=1339965&r1=1339964&r2=1339965&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2/NOTICE (original)
+++ geronimo/bundles/trunk/axis2/NOTICE Fri May 18 03:32:32 2012
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2011 The Apache Software Foundation
+Copyright 2003-2012 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/bundles/trunk/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2/pom.xml?rev=1339965&r1=1339964&r2=1339965&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2/pom.xml (original)
+++ geronimo/bundles/trunk/axis2/pom.xml Fri May 18 03:32:32 2012
@@ -279,6 +279,7 @@
                         <Embed-Dependency> *;inline=META-INF/services/**|META-INF/*.xml|*.xml|org/apache/axis2**</Embed-Dependency>
                         <Include-Resource>
                            {maven-resources},
+                           <!--AXIS2-4993-->
                            org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.class=target/classes/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.class,
                            org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler$1.class=target/classes/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler$1.class,
                            org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler$2.class=target/classes/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler$2.class,
@@ -295,6 +296,8 @@
                            org/apache/axis2/jaxws/message/databinding/JAXBUtils$3.class=target/classes/org/apache/axis2/jaxws/message/databinding/JAXBUtils$3.class,
                            org/apache/axis2/jaxws/message/databinding/JAXBUtils$2.class=target/classes/org/apache/axis2/jaxws/message/databinding/JAXBUtils$2.class,
                            org/apache/axis2/jaxws/message/databinding/JAXBUtils$1.class=target/classes/org/apache/axis2/jaxws/message/databinding/JAXBUtils$1.class,
+                           
+                           <!--AXIS2-5022-->
                            org/apache/axis2/addressing/AddressingConstants.class=target/classes/org/apache/axis2/addressing/AddressingConstants.class,
                            org/apache/axis2/addressing/AddressingConstants$Submission.class=target/classes/org/apache/axis2/addressing/AddressingConstants$Submission.class,
                            org/apache/axis2/addressing/AddressingConstants$Final.class=target/classes/org/apache/axis2/addressing/AddressingConstants$Final.class,
@@ -309,13 +312,14 @@
                            org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl$4.class=target/classes/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl$4.class,
                            org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl$5.class=target/classes/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl$5.class,
                            org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl$6.class=target/classes/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl$6.class,
-                           org/apache/axis2/transport/http/AbstractHTTPSender.class=target/classes/org/apache/axis2/transport/http/AbstractHTTPSender.class,
                            
-                           <!--Axis2-5062-->
-                           org/apache/axis2/transport/http/HTTPSender.class=target/classes/org/apache/axis2/transport/http/HTTPSender.class,
+                           <!--AXIS2-4996, Axis2-5039-->
+                           org/apache/axis2/transport/http/AbstractHTTPSender.class=target/classes/org/apache/axis2/transport/http/AbstractHTTPSender.class,                                                      
                            
                            <!--Axis2-5039-->
                            org/apache/axis2/client/OperationClient.class=target/classes/org/apache/axis2/client/OperationClient.class,
+                           
+                           <!--Axis2-5040-->
                            org/apache/axis2/jaxws/description/impl/PostRI216MethodRetrieverImpl.class=target/classes/org/apache/axis2/jaxws/description/impl/PostRI216MethodRetrieverImpl.class,
                            
                            <!--Axis2-5023-->