On Mon, Sep 6, 2010 at 1:08 AM, <[email protected]> wrote:
> Author: veithen
> Date: Sun Sep 5 19:38:56 2010
> New Revision: 992877
>
> URL: http://svn.apache.org/viewvc?rev=992877&view=rev
> Log:
> Attempt to solve both the CLOSE_WAIT issue and AXIS2-4751 on the trunk:
> * Reverted r963710 (Jarek's second change for AXIS2-4751 on the trunk) to
> get back to the correct baseline for merging r790721.
> * Merged r790721 (CLOSE_WAIT issue) from the 1.5 branch back to the trunk.
> This had never been done, presumably because it caused issues in Rampart
> (that were actually due to a bug in Rampart, fixed in r992868).
> * Merged r824340 (Another change to AbstractHTTPSender that Glen only
> applied to the 1.5 branch) to the trunk.
> * Merged r958718 (Jarek's original change for AXIS2-4751 on the 1.5 branch)
> to the trunk.
>
> Modified:
> axis/axis2/java/core/trunk/ (props changed)
>
>
> axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/attribute.xsd
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
> (props changed)
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/package-info.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
> (props changed)
> axis/axis2/java/core/trunk/modules/transport/http/pom.xml (props
> changed)
> axis/axis2/java/core/trunk/modules/transport/http/src/ (props changed)
>
>
> axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
> axis/axis2/java/core/trunk/modules/transport/local/ (props changed)
>
>
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
> (props changed)
>
>
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
> (props changed)
>
> Propchange: axis/axis2/java/core/trunk/
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
> -/axis/axis2/java/core/branches/java/1_5:966825,986944
>
> -/webservices/axis2/branches/java/1_5:745088,749052,749058,751161,751271,760467,765840,790721
> +/axis/axis2/java/core/branches/java/1_5:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/attribute.xsd
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1 +1 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test-resources/testsuite/attribute.xsd:966825,986944
>
> +/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test-resources/testsuite/attribute.xsd:958718,966825,986944
>
> Propchange:
> axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1 +1 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd:966825,986944
>
> +/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test-resources/testsuite/chameleon_include.xsd:958718,966825,986944
>
> Propchange:
> axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1 +1 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs:966825,986944
>
> +/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs:958718,966825,986944
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181:966825*,986944*
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181:958718*,966825*,986944*
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181:745088,749052,749058,751161,751271,760467,765840,790721,824340*
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/package-info.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:765840
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:765840
>
> +/axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:765840,790721,824340
>
> Propchange: axis/axis2/java/core/trunk/modules/transport/http/pom.xml
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,3 +1,3 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml:765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml:765840,790721,824340
> /webservices/axis2/tags/java/v1.5/modules/transport/http/pom.xml:790721
>
> Propchange: axis/axis2/java/core/trunk/modules/transport/http/src/
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/transport/http/src:966825,986944
> -/webservices/axis2/branches/java/1_5/modules/transport/http/src:765840
>
> +/axis/axis2/java/core/branches/java/1_5/modules/transport/http/src:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/transport/http/src:765840,790721,824340
>
> Modified:
> axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
> URL:
> http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?rev=992877&r1=992876&r2=992877&view=diff
>
> ==============================================================================
> ---
> axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
> (original)
> +++
> axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
> Sun Sep 5 19:38:56 2010
> @@ -25,12 +25,13 @@ import org.apache.axiom.om.OMOutputForma
> import org.apache.axis2.AxisFault;
> import org.apache.axis2.Constants;
> import org.apache.axis2.context.MessageContext;
> -import org.apache.axis2.context.ConfigurationContext;
> import org.apache.axis2.context.OperationContext;
> +import org.apache.axis2.context.ConfigurationContext;
> import org.apache.axis2.description.TransportOutDescription;
> import org.apache.axis2.i18n.Messages;
> import org.apache.axis2.transport.MessageFormatter;
> import org.apache.axis2.transport.TransportUtils;
> +import org.apache.axis2.util.JavaUtils;
> import org.apache.axis2.wsdl.WSDLConstants;
> import org.apache.commons.httpclient.Credentials;
> import org.apache.commons.httpclient.Header;
> @@ -49,6 +50,8 @@ import org.apache.commons.httpclient.Use
> import org.apache.commons.httpclient.auth.AuthPolicy;
> import org.apache.commons.httpclient.auth.AuthScope;
> import org.apache.commons.httpclient.params.HttpMethodParams;
> +import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
> +import org.apache.commons.httpclient.params.HttpClientParams;
> import org.apache.commons.httpclient.protocol.Protocol;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> @@ -510,21 +513,16 @@ public abstract class AbstractHTTPSender
>
> HTTPConstants.MULTITHREAD_HTTP_CONNECTION_MANAGER);
> if (connManager == null) {
> log.trace("Making new ConnectionManager");
> - connManager = new
> MultiThreadedHttpConnectionManager();
> - /*
> - * Commented out for now as bugs in other parts of
> Axis2 cause test failures when
> - * proper connection reuse is enabled.
> - */
> - //
> configContext.setProperty(HTTPConstants.MULTITHREAD_HTTP_CONNECTION_MANAGER,
> - // connManager);
> -
> + connManager = new
> MultiThreadedHttpConnectionManager();
> +
> configContext.setProperty(HTTPConstants.MULTITHREAD_HTTP_CONNECTION_MANAGER,
> + connManager);
> }
>
-1 on this change.
This tries to solve the problem by introducing another problem. Now since
configuration context is set to use one MultiThreadedHttpConnectionManager
it can only make two simultaneous connections for one host.
If some one wants this behavior it can be easily done even with the earlier
code by setting appropriate parameters.
thanks,
Amila.
> }
> }
>
> /*
> - * Create a new instance of HttpClient since it is not
> - * used in thread-safe way here.
> + * Create a new instance of HttpClient since the way
> + * it is used here it's not fully thread-safe.
> */
> httpClient = new HttpClient(connManager);
>
> @@ -541,7 +539,8 @@ public abstract class AbstractHTTPSender
> HttpMethod method) throws IOException {
> HostConfiguration config = this.getHostConfiguration(httpClient,
> msgContext, url);
>
> - msgContext.setProperty(HTTPConstants.HTTP_METHOD, method);
> + if (!msgContext.getOptions().isUseSeparateListener())
> + msgContext.setProperty(HTTPConstants.HTTP_METHOD, method);
>
> // set the custom headers, if available
> addCustomHeaders(method, msgContext);
>
> Propchange: axis/axis2/java/core/trunk/modules/transport/local/
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/transport/local:966825,986944
> -/webservices/axis2/branches/java/1_5/modules/transport/local:765840
>
> +/axis/axis2/java/core/branches/java/1_5/modules/transport/local:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/transport/local:765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport:966825*,986944*
>
> -/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport:958718*,966825*,986944*
>
> +/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport:745088,749052,749058,751161,751271,760467,765840,790721,824340*
>
> Propchange:
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http:966825*,986944*
>
> -/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http:958718*,966825*,986944*
>
> +/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http:745088,749052,749058,751161,751271,760467,765840,790721,824340*
>
> Propchange:
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:745088,749052,749058,751161,751271,760467,765840,790721
>
> +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:745088,749052,749058,751161,751271,760467,765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:765840
>
> +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:765840,790721,824340
>
> Propchange:
> axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Sep 5 19:38:56 2010
> @@ -1,2 +1,2 @@
>
> -/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:966825,986944
>
> -/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:765840
>
> +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:958718,966825,986944
>
> +/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:765840,790721,824340
>
>
>
--
Amila Suriarachchi
WSO2 Inc.
blog: http://amilachinthaka.blogspot.com/
