axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r761709 - in /webservices/axis2/trunk/java: ./ modules/clustering/ modules/codegen/ modules/distribution/ modules/distribution/src/main/assembly/ modules/fastinfoset/test-resources/ modules/integration/ modules/integration/conf/ modules/int...
Date Fri, 03 Apr 2009 15:29:05 GMT
Author: gawor
Date: Fri Apr  3 15:29:03 2009
New Revision: 761709

URL: http://svn.apache.org/viewvc?rev=761709&view=rev
Log:
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/trunk/java/modules/transport/
    webservices/axis2/trunk/java/modules/transport/http/
    webservices/axis2/trunk/java/modules/transport/http/pom.xml   (contents, props changed)
      - copied, changed from r761344, webservices/commons/trunk/modules/transport/modules/http/pom.xml
    webservices/axis2/trunk/java/modules/transport/http/src/   (props changed)
      - copied from r761344, webservices/commons/trunk/modules/transport/modules/http/src/
    webservices/axis2/trunk/java/modules/transport/local/   (props changed)
      - copied from r761708, webservices/commons/trunk/modules/transport/modules/local/
Removed:
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
Modified:
    webservices/axis2/trunk/java/modules/clustering/pom.xml
    webservices/axis2/trunk/java/modules/codegen/pom.xml
    webservices/axis2/trunk/java/modules/distribution/pom.xml
    webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
    webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml
    webservices/axis2/trunk/java/modules/integration/conf/axis2.xml
    webservices/axis2/trunk/java/modules/integration/pom.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
    webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
    webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml
    webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/axis2.xml
    webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/axis2_addressing.xml
    webservices/axis2/trunk/java/modules/jaxws/pom.xml
    webservices/axis2/trunk/java/modules/jaxws/test-resources/axis2.xml
    webservices/axis2/trunk/java/modules/jibx/pom.xml
    webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml
    webservices/axis2/trunk/java/modules/json/pom.xml
    webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml
    webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
    webservices/axis2/trunk/java/modules/metadata/pom.xml
    webservices/axis2/trunk/java/modules/osgi/pom.xml
    webservices/axis2/trunk/java/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml
    webservices/axis2/trunk/java/modules/parent/pom.xml
    webservices/axis2/trunk/java/modules/saaj/pom.xml
    webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml
    webservices/axis2/trunk/java/modules/samples/book/pom.xml
    webservices/axis2/trunk/java/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
    webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml
    webservices/axis2/trunk/java/modules/samples/userguide/conf/axis2.xml
    webservices/axis2/trunk/java/modules/samples/yahoojsonsearch/resources/axis2.xml
    webservices/axis2/trunk/java/modules/transport/local/pom.xml
    webservices/axis2/trunk/java/pom.xml

Modified: webservices/axis2/trunk/java/modules/clustering/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/clustering/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml Fri Apr  3 15:29:03 2009
@@ -63,7 +63,8 @@
                 <include>modules/tool/**</include>
                 <include>modules/transports/**</include>
                 <include>modules/webapp/**</include>
-                <include>modules/xmlbeans/**</include>                
+                <include>modules/xmlbeans/**</include> 
+                <include>modules/transport/**</include>               
             </includes>
 
 	    <excludes>

Modified: webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/conf/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/conf/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SwA-enabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SwA-fileCache-enabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/deployment/deployment.both.axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml Fri Apr  3 15:29:03 2009
@@ -264,21 +264,10 @@
         <parameter name="transport.listener.interval">3000</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/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-enabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/swa/SwA-fileCache-enabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/pom.xml Fri Apr  3 15:29:03 2009
@@ -37,17 +37,15 @@
             <artifactId>axis2-kernel</artifactId>
             <version>${version}</version>
         </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.ant</groupId>

Modified: webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/jaxws-integration/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/jaxws-integration/test-resources/axis2_addressing.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/axis2_addressing.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/axis2_addressing.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test-resources/axis2_addressing.xml Fri Apr  3 15:29:03 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/trunk/java/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/jaxws/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test-resources/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test-resources/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/json/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/json/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/json/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Fri Apr  3 15:29:03 2009
@@ -219,8 +219,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/trunk/java/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/metadata/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/osgi/pom.xml Fri Apr  3 15:29:03 2009
@@ -165,16 +165,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/trunk/java/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Fri Apr  3 15:29:03 2009
@@ -149,9 +149,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>
@@ -660,39 +657,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/trunk/java/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/pom.xml Fri Apr  3 15:29:03 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/trunk/java/modules/saaj/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/samples/book/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/book/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/book/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/book/pom.xml Fri Apr  3 15:29:03 2009
@@ -116,11 +116,6 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-transport-tcp</artifactId>
-			<version>SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis2</groupId>
 			<artifactId>axis2-transport-local</artifactId>
 			<version>SNAPSHOT</version>
 		</dependency>

Modified: webservices/axis2/trunk/java/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/samples/userguide/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/userguide/conf/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/userguide/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/userguide/conf/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/samples/yahoojsonsearch/resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/yahoojsonsearch/resources/axis2.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/yahoojsonsearch/resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/yahoojsonsearch/resources/axis2.xml Fri Apr  3 15:29:03 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/trunk/java/modules/transport/http/pom.xml (from r761344, webservices/commons/trunk/modules/transport/modules/http/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/transport/http/pom.xml?p2=webservices/axis2/trunk/java/modules/transport/http/pom.xml&p1=webservices/commons/trunk/modules/transport/modules/http/pom.xml&r1=761344&r2=761709&rev=761709&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/transport/http/pom.xml Fri Apr  3 15:29:03 2009
@@ -24,9 +24,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-transport</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <artifactId>axis2-parent</artifactId>
+        <version>SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <artifactId>axis2-transport-http</artifactId>
     <name>Apache Axis2 - Transport - HTTP</name>
@@ -37,20 +37,6 @@
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>test</testSourceDirectory>
         <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.3</version>
-              <configuration>
-                  <systemProperties>
-                      <property>
-                          <name>log4j.configuration</name>
-                          <value>file:../../log4j.properties</value>
-                      </property>
-                  </systemProperties>
-              </configuration>
-          </plugin>
-
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -89,37 +75,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-transport-testkit</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

Propchange: webservices/axis2/trunk/java/modules/transport/http/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/axis2/trunk/java/modules/transport/http/pom.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/axis2/trunk/java/modules/transport/http/src/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/axis2/trunk/java/modules/transport/local/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr  3 15:29:03 2009
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings

Propchange: webservices/axis2/trunk/java/modules/transport/local/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: webservices/axis2/trunk/java/modules/transport/local/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/transport/local/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/transport/local/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/transport/local/pom.xml Fri Apr  3 15:29:03 2009
@@ -24,9 +24,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-transport</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <artifactId>axis2-parent</artifactId>
+        <version>SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <artifactId>axis2-transport-local</artifactId>
     <name>Apache Axis2 - Transport - Local</name>
@@ -75,8 +75,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?rev=761709&r1=761708&r2=761709&view=diff
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Fri Apr  3 15:29:03 2009
@@ -73,6 +73,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>



Mime
View raw message