You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ga...@apache.org on 2009/04/06 16:50:09 UTC
svn commit: r762368 - in /webservices/axis2/branches/java/1_5: ./
modules/clustering/ modules/codegen/ modules/distribution/
modules/fastinfoset/test-resources/ modules/integration/
modules/integration/conf/ modules/integration/test-resources/ modules/...
Author: gawor
Date: Mon Apr 6 14:50:06 2009
New Revision: 762368
URL: http://svn.apache.org/viewvc?rev=762368&view=rev
Log:
Merged r761709: 1) Move transport local and http modules to Axis2 (in order to remove a circular dependency) and 2) Remove or comment out references tcp transport in configuration files
Added:
webservices/axis2/branches/java/1_5/modules/transport/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/
webservices/axis2/branches/java/1_5/modules/transport/http/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/
webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml
- copied, changed from r761709, webservices/axis2/trunk/java/modules/transport/http/pom.xml
webservices/axis2/branches/java/1_5/modules/transport/http/src/ (props changed)
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/src/
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AbstractAgent.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CommonsTransportHeaders.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/CommonsTransportHeaders.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/CustomListener.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/CustomListener.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorkerFactory.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorkerFactory.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/HttpTransportProperties.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/HttpTransportProperties.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/ProxyConfiguration.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/ProxyConfiguration.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/RESTRequestEntity.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/RESTRequestEntity.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/RESTRequestEntity2.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/RESTRequestEntity2.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/TransportHeaders.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/TransportHeaders.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnection.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnection.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpRequest.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpRequest.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpRequestImpl.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpRequestImpl.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponse.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponse.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisParams.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisParams.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/ConnectionListenerFailureHandler.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/ConnectionListenerFailureHandler.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListenerFailureHandler.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListenerFailureHandler.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpConnectionManager.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpConnectionManager.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpFactory.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpFactory.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpUtils.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpUtils.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/IOProcessor.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/IOProcessor.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/IOProcessorCallback.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/IOProcessorCallback.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/SessionManager.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/SessionManager.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/Worker.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/Worker.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/server/WorkerFactory.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/server/WorkerFactory.java
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/util/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/util/
webservices/axis2/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
webservices/axis2/branches/java/1_5/modules/transport/local/ (props changed)
- copied from r761709, webservices/axis2/trunk/java/modules/transport/local/
webservices/axis2/branches/java/1_5/modules/transport/local/pom.xml
- copied, changed from r761709, webservices/axis2/trunk/java/modules/transport/local/pom.xml
webservices/axis2/branches/java/1_5/modules/transport/local/src/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/local/src/
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/apache/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/apache/
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/apache/axis2/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/apache/axis2/
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/apache/axis2/transport/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/apache/axis2/transport/
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/apache/axis2/transport/local/
- copied from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/apache/axis2/transport/local/
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponseTransportOutDescription.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponseTransportOutDescription.java
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
webservices/axis2/branches/java/1_5/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
- copied unchanged from r761709, webservices/axis2/trunk/java/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
Removed:
webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
Modified:
webservices/axis2/branches/java/1_5/ (props changed)
webservices/axis2/branches/java/1_5/modules/clustering/pom.xml
webservices/axis2/branches/java/1_5/modules/codegen/pom.xml
webservices/axis2/branches/java/1_5/modules/distribution/pom.xml
webservices/axis2/branches/java/1_5/modules/fastinfoset/test-resources/axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/conf/axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/pom.xml
webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-enabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test-resources/deployment/deployment.both.axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
webservices/axis2/branches/java/1_5/modules/java2wsdl/pom.xml
webservices/axis2/branches/java/1_5/modules/jaxws-integration/pom.xml
webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2.xml
webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2_addressing.xml
webservices/axis2/branches/java/1_5/modules/jaxws/pom.xml
webservices/axis2/branches/java/1_5/modules/jaxws/test-resources/axis2.xml
webservices/axis2/branches/java/1_5/modules/jibx/pom.xml
webservices/axis2/branches/java/1_5/modules/jibx/test-resources/repo/conf/axis2.xml
webservices/axis2/branches/java/1_5/modules/json/pom.xml
webservices/axis2/branches/java/1_5/modules/json/test-resources/axis2.xml
webservices/axis2/branches/java/1_5/modules/kernel/conf/axis2.xml
webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed)
webservices/axis2/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed)
webservices/axis2/branches/java/1_5/modules/metadata/pom.xml
webservices/axis2/branches/java/1_5/modules/osgi/pom.xml
webservices/axis2/branches/java/1_5/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml
webservices/axis2/branches/java/1_5/modules/parent/pom.xml
webservices/axis2/branches/java/1_5/modules/saaj/pom.xml
webservices/axis2/branches/java/1_5/modules/saaj/test-resources/axis2.xml
webservices/axis2/branches/java/1_5/modules/samples/book/pom.xml
webservices/axis2/branches/java/1_5/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
webservices/axis2/branches/java/1_5/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml
webservices/axis2/branches/java/1_5/modules/samples/userguide/conf/axis2.xml
webservices/axis2/branches/java/1_5/modules/samples/yahoojsonsearch/resources/axis2.xml
webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed)
webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed)
webservices/axis2/branches/java/1_5/pom.xml
Propchange: webservices/axis2/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 6 14:50:06 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761770,761952
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952
Modified: webservices/axis2/branches/java/1_5/modules/clustering/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/clustering/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/clustering/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/clustering/pom.xml Mon Apr 6 14:50:06 2009
@@ -39,18 +39,15 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: webservices/axis2/branches/java/1_5/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/codegen/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/codegen/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/codegen/pom.xml Mon Apr 6 14:50:06 2009
@@ -45,13 +45,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-local</artifactId>
- <version>${transport.local.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-http</artifactId>
- <version>${transport.http.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: webservices/axis2/branches/java/1_5/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/distribution/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/distribution/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/distribution/pom.xml Mon Apr 6 14:50:06 2009
@@ -225,14 +225,12 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
</dependency>
</dependencies>
<distributionManagement>
Modified: webservices/axis2/branches/java/1_5/modules/fastinfoset/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/fastinfoset/test-resources/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/fastinfoset/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/fastinfoset/test-resources/axis2.xml Mon Apr 6 14:50:06 2009
@@ -161,21 +161,10 @@
<!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> -->
</transportReceiver>
- <!--Uncomment if you want to have TCP transport support-->
- <!--transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter-->>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncommet following paramter , and set as you required.-->
- <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
- <!-- /transportReceiver -->
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/integration/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/conf/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/conf/axis2.xml Mon Apr 6 14:50:06 2009
@@ -127,20 +127,10 @@
<!-- <parameter name="threadKeepAliveTimeUnit" >MILLISECONDS</parameter> -->
</transportReceiver>
- <transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncommet following paramter , and set as you required.-->
- <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/pom.xml Mon Apr 6 14:50:06 2009
@@ -43,17 +43,15 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-enabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-enabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -49,10 +49,6 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
@@ -60,7 +56,6 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- ================================================= -->
Modified: webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -51,10 +51,6 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
@@ -62,7 +58,6 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- ================================================= -->
Modified: webservices/axis2/branches/java/1_5/modules/integration/test-resources/deployment/deployment.both.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test-resources/deployment/deployment.both.axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test-resources/deployment/deployment.both.axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test-resources/deployment/deployment.both.axis2.xml Mon Apr 6 14:50:06 2009
@@ -39,15 +39,10 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.0</parameter>
Modified: webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -47,10 +47,6 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
@@ -58,7 +54,6 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- ================================================= -->
Modified: webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -49,10 +49,6 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
@@ -60,7 +56,6 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- ================================================= -->
Modified: webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-enabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-enabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -49,10 +49,6 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
@@ -60,7 +56,6 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- ================================================= -->
Modified: webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -51,10 +51,6 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
@@ -62,7 +58,6 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- ================================================= -->
Modified: webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Mon Apr 6 14:50:06 2009
@@ -113,8 +113,8 @@
method.addChild(value);
Options options = new Options();
options.setTo(targetEPR);
- options.setTransportInProtocol(Constants.TRANSPORT_TCP);
- options.setUseSeparateListener(true);
+ options.setTransportInProtocol(Constants.TRANSPORT_LOCAL);
+ options.setUseSeparateListener(false);
options.setAction(operationName.getLocalPart());
ServiceClient sender = new ServiceClient(configConetxt, service);
Modified: webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -66,15 +66,10 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
Modified: webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -42,10 +42,6 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
@@ -55,7 +51,6 @@
<parameter name="Transfer-Encoding">chunked</parameter>
</transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- ================================================= -->
Modified: webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml Mon Apr 6 14:50:06 2009
@@ -43,15 +43,10 @@
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
Modified: webservices/axis2/branches/java/1_5/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/java2wsdl/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/java2wsdl/pom.xml Mon Apr 6 14:50:06 2009
@@ -38,16 +38,14 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
Modified: webservices/axis2/branches/java/1_5/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jaxws-integration/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jaxws-integration/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/jaxws-integration/pom.xml Mon Apr 6 14:50:06 2009
@@ -63,16 +63,14 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2.xml Mon Apr 6 14:50:06 2009
@@ -139,20 +139,10 @@
<!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
</transportReceiver>
- <transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6061</parameter>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncomment following parameter , and set as you required.-->
- <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
@@ -325,4 +315,4 @@
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
-</axisconfig>
\ No newline at end of file
+</axisconfig>
Modified: webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2_addressing.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2_addressing.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2_addressing.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/jaxws-integration/test-resources/axis2_addressing.xml Mon Apr 6 14:50:06 2009
@@ -192,21 +192,10 @@
<!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> -->
</transportReceiver>
- <!--Uncomment if you want to have TCP transport support-->
- <!--transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter-->>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncomment the following paramter , and set it as you required.-->
- <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
- <!-- /transportReceiver -->
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jaxws/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jaxws/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/jaxws/pom.xml Mon Apr 6 14:50:06 2009
@@ -88,17 +88,14 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: webservices/axis2/branches/java/1_5/modules/jaxws/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jaxws/test-resources/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jaxws/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/jaxws/test-resources/axis2.xml Mon Apr 6 14:50:06 2009
@@ -137,20 +137,10 @@
<!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
</transportReceiver>
- <transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6061</parameter>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncomment following parameter , and set as you required.-->
- <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
@@ -310,4 +300,4 @@
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
</phaseOrder>
-</axisconfig>
\ No newline at end of file
+</axisconfig>
Modified: webservices/axis2/branches/java/1_5/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jibx/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jibx/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/jibx/pom.xml Mon Apr 6 14:50:06 2009
@@ -38,16 +38,14 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: webservices/axis2/branches/java/1_5/modules/jibx/test-resources/repo/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jibx/test-resources/repo/conf/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jibx/test-resources/repo/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/jibx/test-resources/repo/conf/axis2.xml Mon Apr 6 14:50:06 2009
@@ -63,20 +63,10 @@
<!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
</transportReceiver>
- <transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncommet following paramter , and set as you required.-->
- <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/json/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/json/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/json/pom.xml Mon Apr 6 14:50:06 2009
@@ -42,16 +42,14 @@
<artifactId>jettison</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: webservices/axis2/branches/java/1_5/modules/json/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/json/test-resources/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/json/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/json/test-resources/axis2.xml Mon Apr 6 14:50:06 2009
@@ -165,21 +165,10 @@
<!-- <parameter name="threadKeepAliveTimeUnit" >MILLISECONDS</parameter> -->
</transportReceiver>
- <!--Uncomment if you want to have TCP transport support-->
- <!--transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter-->>
- <!--If you want to give your own host address for EPR generation-->
- <!--uncommet following paramter , and set as you required.-->
- <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
- <!-- /transportReceiver -->
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/kernel/conf/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/kernel/conf/axis2.xml Mon Apr 6 14:50:06 2009
@@ -213,8 +213,11 @@
<!-- Transport Outs -->
<!-- ================================================= -->
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--
<transportSender name="tcp"
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ -->
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Propchange: webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 6 14:50:06 2009
@@ -0,0 +1 @@
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709
Propchange: webservices/axis2/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 6 14:50:06 2009
@@ -0,0 +1 @@
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709
Modified: webservices/axis2/branches/java/1_5/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/metadata/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/metadata/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/metadata/pom.xml Mon Apr 6 14:50:06 2009
@@ -79,18 +79,15 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: webservices/axis2/branches/java/1_5/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/osgi/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/osgi/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/osgi/pom.xml Mon Apr 6 14:50:06 2009
@@ -164,16 +164,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: webservices/axis2/branches/java/1_5/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml Mon Apr 6 14:50:06 2009
@@ -180,7 +180,7 @@
<!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> -->
<!--</transportReceiver>-->
- <!--Uncomment if you want to have TCP transport support-->
+ <!--Uncomment if you want to have TCP transport support-->
<!--transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
<parameter name="port">6060</parameter-->>
@@ -193,8 +193,11 @@
<!-- Transport Outs -->
<!-- ================================================= -->
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--
<transportSender name="tcp"
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ -->
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/parent/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/parent/pom.xml Mon Apr 6 14:50:06 2009
@@ -148,9 +148,6 @@
<smack.version>3.0.4</smack.version>
<commons.lang.version>2.3</commons.lang.version>
<javax.mail.version>1.4</javax.mail.version>
- <transport.http.version>1.0-SNAPSHOT</transport.http.version>
- <transport.tcp.version>1.0-SNAPSHOT</transport.tcp.version>
- <transport.local.version>1.0-SNAPSHOT</transport.local.version>
<!-- The build failing if tests are skipped is very annoying -->
<failIfNoTests>false</failIfNoTests>
<m2Repository>'${settings.localRepository}'</m2Repository>
@@ -659,39 +656,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-http</artifactId>
- <version>${transport.http.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <version>${transport.tcp.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${transport.local.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>${ant.version}</version>
Modified: webservices/axis2/branches/java/1_5/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/saaj/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/saaj/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/saaj/pom.xml Mon Apr 6 14:50:06 2009
@@ -43,18 +43,15 @@
<artifactId>geronimo-saaj_1.3_spec</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: webservices/axis2/branches/java/1_5/modules/saaj/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/saaj/test-resources/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/saaj/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/saaj/test-resources/axis2.xml Mon Apr 6 14:50:06 2009
@@ -47,10 +47,6 @@
<parameter name="port">6060</parameter>
</transportReceiver>
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port">6060</parameter>
- </transportReceiver>
-
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
@@ -58,7 +54,6 @@
<transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
</transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<!-- ================================================= -->
Modified: webservices/axis2/branches/java/1_5/modules/samples/book/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/samples/book/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/samples/book/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/samples/book/pom.xml Mon Apr 6 14:50:06 2009
@@ -109,6 +109,16 @@
<artifactId>geronimo-activation_1.1_spec</artifactId>
<version>1.0.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
Modified: webservices/axis2/branches/java/1_5/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml Mon Apr 6 14:50:06 2009
@@ -194,7 +194,7 @@
<!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> -->
</transportReceiver>
- <!--Uncomment if you want to have TCP transport support-->
+ <!--Uncomment if you want to have TCP transport support-->
<!--transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
<parameter name="port">6060</parameter-->>
@@ -207,8 +207,11 @@
<!-- Transport Outs -->
<!-- ================================================= -->
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--
<transportSender name="tcp"
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ -->
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml Mon Apr 6 14:50:06 2009
@@ -206,8 +206,11 @@
<!-- Transport Outs -->
<!-- ================================================= -->
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--
<transportSender name="tcp"
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ -->
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/samples/userguide/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/samples/userguide/conf/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/samples/userguide/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/samples/userguide/conf/axis2.xml Mon Apr 6 14:50:06 2009
@@ -141,7 +141,7 @@
<!-- <parameter name="threadKeepAliveTimeUnit" >MILLISECONDS</parameter> -->
</transportReceiver>
- <!--Uncomment if you want to have TCP transport support-->
+ <!--Uncomment if you want to have TCP transport support-->
<!--transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
<parameter name="port">6060</parameter-->>
@@ -154,8 +154,11 @@
<!-- Transport Outs -->
<!-- ================================================= -->
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--
<transportSender name="tcp"
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ -->
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: webservices/axis2/branches/java/1_5/modules/samples/yahoojsonsearch/resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/samples/yahoojsonsearch/resources/axis2.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/samples/yahoojsonsearch/resources/axis2.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/samples/yahoojsonsearch/resources/axis2.xml Mon Apr 6 14:50:06 2009
@@ -167,7 +167,7 @@
<!-- <parameter name="threadKeepAliveTimeUnit" >MILLISECONDS</parameter> -->
</transportReceiver>
- <!--Uncomment if you want to have TCP transport support-->
+ <!--Uncomment if you want to have TCP transport support-->
<!--transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
<parameter name="port">6060</parameter-->>
@@ -180,8 +180,11 @@
<!-- Transport Outs -->
<!-- ================================================= -->
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--
<transportSender name="tcp"
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ -->
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Copied: webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml (from r761709, webservices/axis2/trunk/java/modules/transport/http/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml?p2=webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml&p1=webservices/axis2/trunk/java/modules/transport/http/pom.xml&r1=761709&r2=762368&rev=762368&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/transport/http/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml Mon Apr 6 14:50:06 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-http</artifactId>
Propchange: webservices/axis2/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: webservices/axis2/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 6 14:50:06 2009
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings
Propchange: webservices/axis2/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: webservices/axis2/branches/java/1_5/modules/transport/local/pom.xml (from r761709, webservices/axis2/trunk/java/modules/transport/local/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/transport/local/pom.xml?p2=webservices/axis2/branches/java/1_5/modules/transport/local/pom.xml&p1=webservices/axis2/trunk/java/modules/transport/local/pom.xml&r1=761709&r2=762368&rev=762368&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/transport/local/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/transport/local/pom.xml Mon Apr 6 14:50:06 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-local</artifactId>
Propchange: webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 6 14:50:06 2009
@@ -0,0 +1 @@
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709
Propchange: webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 6 14:50:06 2009
@@ -0,0 +1 @@
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709
Modified: webservices/axis2/branches/java/1_5/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/pom.xml?rev=762368&r1=762367&r2=762368&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/pom.xml Mon Apr 6 14:50:06 2009
@@ -72,6 +72,8 @@
<module>modules/clustering</module>
<module>modules/corba</module>
<module>modules/osgi</module>
+ <module>modules/transport/local</module>
+ <module>modules/transport/http</module>
</modules>
<profiles>
<profile>