Author: veithen
Date: Sat Jul 3 20:56:40 2010
New Revision: 960267
URL: http://svn.apache.org/viewvc?rev=960267&view=rev
Log:
Removed the dependency on the transports project. The TCP transport is actually
never used in the integration tests. It is only loaded in axis2.xml for
historical reasons.
Removed:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilsTCPServer.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sat Jul
3 20:56:40 2010
@@ -765,11 +765,6 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <version>${axis2.transport.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
<version>${axis2.version}</version>
</dependency>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
Sat Jul 3 20:56:40 2010
@@ -138,20 +138,10 @@
<!--<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>-->
<!--</transportReceiver>-->
- <transportReceiver name="tcp"
- class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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"
locked="false">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:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -32,15 +32,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -24,15 +24,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.0</parameter>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -24,15 +24,10 @@
<parameter name="transport.mail.replyToAddress"
locked="false">ax...@127.0.0.1</parameter>
</transportReceiver> -->
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">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" locked="false">HTTP/1.1</parameter>
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=960267&r1=960266&r2=960267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sat Jul 3 20:56:40 2010
@@ -385,7 +385,6 @@
<rahas.mar.version>SNAPSHOT</rahas.mar.version>
<axis2.version>SNAPSHOT</axis2.version>
- <axis2.transport.version>1.1.0-SNAPSHOT</axis2.transport.version>
<addressing.mar.version>SNAPSHOT</addressing.mar.version>
<wss4j.version>1.5.8</wss4j.version>
