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 di...@apache.org on 2008/04/24 21:39:26 UTC

svn commit: r651358 [1/2] - in /webservices/axis2/trunk/java/modules: documentation/ documentation/xdocs/@axis2_version_dir@/ fastinfoset/test-resources/ integration/ integration/conf/ integration/test-resources/ integration/test-resources/deployment/ ...

Author: dims
Date: Thu Apr 24 12:38:47 2008
New Revision: 651358

URL: http://svn.apache.org/viewvc?rev=651358&view=rev
Log:
nuke the stale mail and jms transports (see traffic on axis-dev)

Removed:
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/jms-transport.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/mail-configuration.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/mail-transport.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/
    webservices/axis2/trunk/java/modules/kernel/resources/smtpfault-module.xml
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/
    webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/jms/
    webservices/axis2/trunk/java/modules/samples/jms/
    webservices/axis2/trunk/java/modules/samples/script/mail-test.xml
    webservices/axis2/trunk/java/modules/samples/script/wsdl-test.xml
Modified:
    webservices/axis2/trunk/java/modules/documentation/pom.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/adv-userguide.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/contents.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/toc.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/transport_howto.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/userguide-forfurtherstudy.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/itest-build.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/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/chunking-disabled-axis2.xml
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.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/test-resources/axis2.xml
    webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.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/kernel/pom.xml
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/bad-axis2.xml
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/messageFormatterTest/bad-axis2.xml
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
    webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml
    webservices/axis2/trunk/java/modules/osgi/resources/WEB-INF/axis2.xml
    webservices/axis2/trunk/java/modules/parent/pom.xml
    webservices/axis2/trunk/java/modules/saaj/test-resources/axis2.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/pom.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/webapp/pom.xml

Modified: webservices/axis2/trunk/java/modules/documentation/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/pom.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/pom.xml Thu Apr 24 12:38:47 2008
@@ -211,10 +211,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
         </dependency>

Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/adv-userguide.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/%40axis2_version_dir%40/adv-userguide.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/adv-userguide.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/adv-userguide.xml Thu Apr 24 12:38:47 2008
@@ -466,9 +466,7 @@
 different transports, please refer to the following documents.</p>
 <ol>
   <li><a href="tcp-transport.html" target="_blank">TCP Transport</a></li>
-  <li><a href="mail-transport.html" target="_blank">Mail Transport</a></li>
   <li><a href="http-transport.html" target="_blank">HTTP Transports</a></li>
-  <li><a href="jms-transport.html" target="_blank">JMS Transports</a></li>
 </ol>
 
 <h3>Attachments</h3>

Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/contents.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/%40axis2_version_dir%40/contents.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/contents.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/contents.xml Thu Apr 24 12:38:47 2008
@@ -175,15 +175,8 @@
 <ul>
 <li><a href="tcp-transport.html">TCP Transport</a> - A guide to
 sending and receiving SOAP messages via TCP in Axis2</li>
-<li><a href="mail-transport.html">Mail Transport</a> - Explains how
-to invoke a service using a Mail transport</li>
-<li><a href="mail-configuration.html">Mail Transport
-Configuration</a> - A guide to configuring Axis2 in order to get
-mail transport working</li>
 <li><a>HTTP Transports</a> - A description on HTTP sender and HTTP
 receiver in Axis2</li>
-<li><a href="jms-transport.html">JMS Transport</a> - A description
-on JMS sender and JMS receiver in Axis2</li>
 <li><a href="transport_howto.html">Write Your Own Axis2
 Transport</a> - A quick and easy guide to create your own Axis2
 Transport protocol</li>

Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/toc.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/%40axis2_version_dir%40/toc.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/toc.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/toc.xml Thu Apr 24 12:38:47 2008
@@ -105,13 +105,8 @@
 <ul>
 <li>18.1 <a href="http-transport.html" target="mainFrame">HTTP
 Transport</a></li>
-<li>18.2 <a href="jms-transport.html" target="mainFrame">JMS
-Transport</a></li>
 <li>18.3 <a href="tcp-transport.html" target="mainFrame">TCP
 Transport</a></li>
-<li>18.4 <a href="mail-transport.html" target="mainFrame">Mail
-Transport</a> / <a href="mail-configuration.html" target=
-"mainFrame">(Configuration)</a></li>
 <li>18.5 <a href="transport_howto.html" target="mainFrame">Custom
 Transport</a></li>
 </ul>

Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/transport_howto.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/%40axis2_version_dir%40/transport_howto.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/transport_howto.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/transport_howto.xml Thu Apr 24 12:38:47 2008
@@ -43,9 +43,6 @@
   transport.</li>
   <li><b>TCP</b> - This is the most simple transport, but needs Addressing
     support to be functional.</li>
-  <li><b>SMTP</b> - This can work off a single email account or a mail
-    server. The Mail Transport Receiver is a thread that checks for emails in
-    fixed time intervals.</li>
 </ul>
 
 <p>To understand the rest of this document you will need some understanding
@@ -224,8 +221,7 @@
   &lt;/transportSender&gt;
   </pre>
 </source>
-<p>Have a look at org.apache.Axis2.transport.mail.MailTransportSender for a
-very simple Transport Sender. Also have a look at
+<p>Have a look at
 org.apache.Axis2.transport.http.CommonsHTTPTransportSender which is used to
 send HTTP responses.</p>
 

Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/userguide-forfurtherstudy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/%40axis2_version_dir%40/userguide-forfurtherstudy.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/userguide-forfurtherstudy.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/@axis2_version_dir@/userguide-forfurtherstudy.xml Thu Apr 24 12:38:47 2008
@@ -106,8 +106,6 @@
 "http://ws.apache.org/axis2/@axis2_version_dir@/rest-ws.html">http://ws.apache.org/axis2/@axis2_version_dir@/rest-ws.html</a></p>
 <p>TCP Transport-<a href=
 "http://ws.apache.org/axis2/@axis2_version_dir@/tcp-transport.html">http://ws.apache.org/axis2/@axis2_version_dir@/tcp-transport.html</a></p>
-<p>Mail Transport-<a href=
-"http://ws.apache.org/axis2/@axis2_version_dir@/mail-transport.html">http://ws.apache.org/axis2/@axis2_version_dir@/mail-transport.html</a></p>
 <p>HTTP Transports-<a href=
 "http://ws.apache.org/axis2/@axis2_version_dir@/http-transport.html">http://ws.apache.org/axis2/@axis2_version_dir@/http-transport.html</a></p>
 <p>MTOM with Axis2-<a href=

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=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/test-resources/axis2.xml Thu Apr 24 12:38:47 2008
@@ -161,36 +161,6 @@
         <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter>            -->
     </transportReceiver>
 
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-    </transportReceiver>-->
-
-    <!--Uncomment if you want to have SMTP transport support-->
-    <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
-    <!--</transportReceiver>-->
-
 	<!--Uncomment if you want to have TCP transport support-->
     <!--transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
@@ -222,19 +192,6 @@
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportSender name="jms"
-                     class="org.apache.axis2.transport.jms.JMSSender"/>
-    -->
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/conf/axis2.xml Thu Apr 24 12:38:47 2008
@@ -127,36 +127,6 @@
         <!-- <parameter name="threadKeepAliveTimeUnit"  >MILLISECONDS</parameter>            -->
     </transportReceiver>
     
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61654</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61654</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61654</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-    </transportReceiver>-->
-
-    <!--Uncomment if you want to have SMTP transport support-->
-    <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
-    <!--</transportReceiver>-->
-
     <transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
@@ -183,18 +153,6 @@
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
-    <transportSender name="jms"
-                     class="org.apache.axis2.transport.jms.JMSSender"/>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
-
     <!-- ================================================= -->
     <!-- Global Modules  -->
     <!-- ================================================= -->

Modified: webservices/axis2/trunk/java/modules/integration/itest-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/itest-build.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-build.xml Thu Apr 24 12:38:47 2008
@@ -239,42 +239,6 @@
 		<copy file="test/org/apache/axis2/engine/chunking-disabled-axis2.xml"
     	                  tofile="target/test-resources/chunking-disabledRepository/conf/axis2.xml"/>
 
-		<!-- Create JMS enabled Server Repository -->
-		<mkdir dir="target/test-resources/jms-enabled-server-repository"/>
-		<mkdir dir="target/test-resources/jms-enabled-server-repository/conf"/>
-		<mkdir dir="target/test-resources/jms-enabled-server-repository/modules"/>
-		<copy file="test/org/apache/axis2/jms/jms-enabled-server-axis2.xml"
-    	                  tofile="target/test-resources/jms-enabled-server-repository/conf/axis2.xml"/>
-		<copy file="../addressing/target/addressing-${addressing_version}.mar"
-    	                  tofile="target/test-resources/jms-enabled-server-repository/modules/addressing-${addressing_version}.mar"/>
-
-		<!-- Create JMS enabled Client Repository -->
-		<mkdir dir="target/test-resources/jms-enabled-client-repository"/>
-		<mkdir dir="target/test-resources/jms-enabled-client-repository/conf"/>
-		<mkdir dir="target/test-resources/jms-enabled-client-repository/modules"/>
-		<copy file="test/org/apache/axis2/jms/jms-enabled-client-axis2.xml"
-    	                  tofile="target/test-resources/jms-enabled-client-repository/conf/axis2.xml"/>
-		<copy file="../addressing/target/addressing-${addressing_version}.mar"
-    	                  tofile="target/test-resources/jms-enabled-client-repository/modules/addressing-${addressing_version}.mar"/>
-
-		<!-- Create Mail Client transport enabled Repository -->
-		<mkdir dir="target/test-resources/mail-transport-client-enabledRepository"/>
-		<mkdir dir="target/test-resources/mail-transport-client-enabledRepository/conf"/>
-		<mkdir dir="target/test-resources/mail-transport-client-enabledRepository/modules"/>
-		<copy file="test/org/apache/axis2/mail/mail-enabled-client-axis2.xml"
-    	                  tofile="target/test-resources/mail-transport-client-enabledRepository/conf/axis2.xml"/>
-		<copy file="../addressing/target/addressing-${addressing_version}.mar"
-    	                  tofile="target/test-resources/mail-transport-client-enabledRepository/modules/addressing-${addressing_version}.mar"/>
-
-		<!-- Create Mail Server transport enabled Repository -->
-		<mkdir dir="target/test-resources/mail-transport-server-enabledRepository"/>
-		<mkdir dir="target/test-resources/mail-transport-server-enabledRepository/conf"/>
-		<mkdir dir="target/test-resources/mail-transport-server-enabledRepository/modules"/>
-		<copy file="test/org/apache/axis2/mail/mail-enabled-server-axis2.xml"
-    	                  tofile="target/test-resources/mail-transport-server-enabledRepository/conf/axis2.xml"/>
-		<copy file="../addressing/target/addressing-${addressing_version}.mar"
-    	                  tofile="target/test-resources/mail-transport-server-enabledRepository/modules/addressing-${addressing_version}.mar"/>
-
 		<mkdir dir="target/test-resources/MessageContextInjectionRepo"/>
 		<mkdir dir="target/test-resources/integrationRepo/modules"/>
 		<mkdir dir="target/test-resources/integrationRepo/conf"/>

Modified: webservices/axis2/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/pom.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/pom.xml Thu Apr 24 12:38:47 2008
@@ -307,10 +307,6 @@
             <artifactId>xmlbeans</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-        </dependency>
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>
@@ -336,11 +332,6 @@
                 <jdk>1.4</jdk>
             </activation>
             <dependencies>
-                <dependency>
-                    <groupId>org.apache.activemq</groupId>
-                    <artifactId>apache-activemq</artifactId>
-                    <version>${activemq.version-jdk14}</version>
-                </dependency>
             </dependencies>
             <build>
                 <plugins>
@@ -366,9 +357,6 @@
                                 <exclude>**/*InteropStubTest.java</exclude>
                                 <exclude>**/*ServiceGroupContextTest.java</exclude>
                                 <exclude>**/*EchoRawSwAFileInputTest.java</exclude>
-                                <exclude>**org/apache/axis2/mail/*.java</exclude>
-                                <exclude>**org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java
-                                </exclude>
                                 <exclude>**org/apache/axis2/soap12testing/soap12testsuite/*.java</exclude>
                                 <exclude>**/ScenarioST1Test.java</exclude>
                                 <exclude>**/samples/wsdl/perf2/*.java</exclude>
@@ -413,9 +401,6 @@
                                 <exclude>**/*InteropStubTest.java</exclude>
                                 <exclude>**/*ServiceGroupContextTest.java</exclude>
                                 <exclude>**/*EchoRawSwAFileInputTest.java</exclude>
-                                <exclude>**org/apache/axis2/mail/*.java</exclude>
-                                <exclude>**org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java
-                                </exclude>
                                 <exclude>**org/apache/axis2/soap12testing/soap12testsuite/*.java</exclude>
                                 <exclude>**/ScenarioST1Test.java</exclude>
                                 <exclude>**/samples/wsdl/perf2/*.java</exclude>
@@ -460,9 +445,6 @@
                                 <exclude>**/*InteropStubTest.java</exclude>
                                 <exclude>**/*ServiceGroupContextTest.java</exclude>
                                 <exclude>**/*EchoRawSwAFileInputTest.java</exclude>
-                                <exclude>**org/apache/axis2/mail/*.java</exclude>
-                                <exclude>**org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java
-                                </exclude>
                                 <exclude>**org/apache/axis2/soap12testing/soap12testsuite/*.java</exclude>
                                 <exclude>**/ScenarioST1Test.java</exclude>
                                 <exclude>**/samples/wsdl/perf2/*.java</exclude>

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -49,15 +49,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -71,16 +62,6 @@
     </transportSender>
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-    <transportSender name="jms" class="org.apache.axis2.transport.jms.JMSSender"/>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -51,15 +51,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -73,16 +64,6 @@
     </transportSender>
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-    <transportSender name="jms" class="org.apache.axis2.transport.jms.JMSSender"/>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -39,15 +39,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -65,14 +56,6 @@
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
     </transportSender>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
   <phaseOrder type="InFlow">
         <!--  System pre defined phases       -->
          <phase name="Transport">

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -47,15 +47,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -69,15 +60,6 @@
     </transportSender>
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -49,15 +49,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -71,15 +62,6 @@
     </transportSender>
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -49,15 +49,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -71,15 +62,6 @@
     </transportSender>
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -51,15 +51,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -73,15 +64,6 @@
     </transportSender>
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -66,15 +66,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -92,15 +83,6 @@
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
     </transportSender>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -42,15 +42,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -66,15 +57,6 @@
 
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -149,8 +149,6 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <!--<transportSender name="jms"-->
-                     <!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
     <transportSender name="tcp"
                      class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local"

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -192,45 +192,6 @@
         <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter>            -->
     </transportReceiver>
 
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-    </transportReceiver>-->
-
-    <!-- ================================================= -->
-    <!-- Mail Transport Listener  -->
-    <!-- This is a sample configuration. It assumes a mail server running in localhost.
-         Listener pops  messages that comes to the email address red@localhost. Users
-         password is red. Listener connect to the server every 3000 milliseconds.
-         Parameters with "transport." prefix is Axis2 specific. Others are all from Java Mail API. 
-         http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
-     -->
-    <!-- ================================================= -->
-    <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.SimpleMailListener">
-        <parameter name="mail.pop3.host">localhost</parameter>
-        <parameter name="mail.pop3.user">red</parameter>
-        <parameter name="mail.store.protocol">pop3</parameter>
-        <parameter name="transport.mail.pop3.password">red</parameter>
-        <parameter name="transport.mail.replyToAddress">red@localhost</parameter>
-        <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">
@@ -263,24 +224,6 @@
         <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
     
-    <!-- Please enable this if you need the java transport -->
-    <!-- <transportSender name="java"
-                     class="org.apache.axis2.transport.java.JavaTransportSender"/> -->
-
-    <!--<transportSender name="jms"-->
-                     <!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
-
-    <!-- ================================================= -->
-    <!-- Mail Transport Sender  -->
-    <!--Only need to uncomment the sender. Configuration is achieved with every client.
-        At any instant mail host should be given. Sample configuration has been given.
-        http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
-   -->
-    <!-- ================================================= -->
-   <!--<transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-        <parameter name="mail.smtp.host">localhost</parameter>
-    </transportSender>-->
-
     <!-- ================================================= -->
     <!-- Global Modules  -->
     <!-- ================================================= -->

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=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test-resources/axis2.xml Thu Apr 24 12:38:47 2008
@@ -149,8 +149,6 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <!--<transportSender name="jms"-->
-                     <!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
     <transportSender name="tcp"
                      class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local"

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=651358&r1=651357&r2=651358&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 Thu Apr 24 12:38:47 2008
@@ -63,15 +63,6 @@
         <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
     </transportReceiver>
 
-    <!--Uncomment if you want to have SMTP transport support-->
-    <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
-    <!--</transportReceiver>-->
-
     <transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
@@ -98,15 +89,6 @@
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/json/test-resources/axis2.xml Thu Apr 24 12:38:47 2008
@@ -165,36 +165,6 @@
         <!-- <parameter name="threadKeepAliveTimeUnit"  >MILLISECONDS</parameter>            -->
     </transportReceiver>
     
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-    </transportReceiver>-->
-
-    <!--Uncomment if you want to have SMTP transport support-->
-    <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
-    <!--</transportReceiver>-->
-
 	<!--Uncomment if you want to have TCP transport support-->
     <!--transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
@@ -222,19 +192,6 @@
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportSender name="jms"
-                     class="org.apache.axis2.transport.jms.JMSSender"/>
-    -->
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

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=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Thu Apr 24 12:38:47 2008
@@ -193,46 +193,7 @@
         <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter>            -->
     </transportReceiver>
 
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-    </transportReceiver>-->
-
-    <!-- ================================================= -->
-    <!-- Mail Transport Listener  -->
-    <!-- This is a sample configuration. It assumes a mail server running in localhost.
-         Listener pops  messages that comes to the email address red@localhost. Users
-         password is red. Listener connect to the server every 3000 milliseconds.
-         Parameters with "transport." prefix is Axis2 specific. Others are all from Java Mail API. 
-         http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
-     -->
-    <!-- ================================================= -->
-    <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.SimpleMailListener">
-        <parameter name="mail.pop3.host">localhost</parameter>
-        <parameter name="mail.pop3.user">red</parameter>
-        <parameter name="mail.store.protocol">pop3</parameter>
-        <parameter name="transport.mail.pop3.password">red</parameter>
-        <parameter name="transport.mail.replyToAddress">red@localhost</parameter>
-        <parameter name="transport.listener.interval">3000</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-->>
@@ -267,20 +228,6 @@
     <!-- Please enable this if you need the java transport -->
     <!-- <transportSender name="java"
                      class="org.apache.axis2.transport.java.JavaTransportSender"/> -->
-
-    <!--<transportSender name="jms"-->
-                     <!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
-
-    <!-- ================================================= -->
-    <!-- Mail Transport Sender  -->
-    <!--Only need to uncomment the sender. Configuration is achieved with every client.
-        At any instant mail host should be given. Sample configuration has been given.
-        http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
-   -->
-    <!-- ================================================= -->
-   <!--<transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-        <parameter name="mail.smtp.host">localhost</parameter>
-    </transportSender>-->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Thu Apr 24 12:38:47 2008
@@ -100,10 +100,6 @@
             <artifactId>annogen</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
@@ -249,28 +245,6 @@
                                 <property name="maven.build.dir" location="${basedir}/target"/>
                                 <ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true"
                                      dir="test-resources/"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>fault-module-package</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <property name="aar.tmp.dir" location="${basedir}/target/tmp"/>
-                                <mkdir dir="${aar.tmp.dir}/META-INF"/>
-                                <copy file="${basedir}/resources/smtpfault-module.xml"
-                                      tofile="${aar.tmp.dir}/META-INF/module.xml"/>
-                                <copy todir="${aar.tmp.dir}">
-                                    <fileset dir="${basedir}/target/classes">
-                                        <include name="**/*SMTPFaultHandler.class"/>
-                                    </fileset>
-                                </copy>
-                                <jar destfile="${basedir}/target/smtpfault.mar" basedir="${aar.tmp.dir}"/>
-                                <delete dir="${aar.tmp.dir}"/>
                             </tasks>
                         </configuration>
                         <goals>

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java Thu Apr 24 12:38:47 2008
@@ -286,6 +286,11 @@
     // Keys to access JAXWS Request and Response SOAP Headers
     public static final String JAXWS_OUTBOUND_SOAP_HEADERS  = "jaxws.binding.soap.headers.outbound";
     public static final String JAXWS_INBOUND_SOAP_HEADERS = "jaxws.binding.soap.headers.inbound";
+
+    /**
+     * A MessageContext property or client Option stating the JMS correlation id
+     */
+    public static final String JMS_COORELATION_ID = "JMS_COORELATION_ID";
     
     public static interface Configuration {
         public static final String ENABLE_REST = "enableREST";

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml Thu Apr 24 12:38:47 2008
@@ -159,8 +159,6 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <!--<transportSender name="jms"-->
-                     <!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
     <transportSender name="tcp"
                      class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local"

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java Thu Apr 24 12:38:47 2008
@@ -51,8 +51,10 @@
 	private XMPPConnectionFactory xmppConnectionFactory = null;
 	private ConfigurationContext configurationContext = null;
 	private Executor workerPool = null;
+    
+    public final static String CONTENT_TYPE = "mail.contenttype";
 
-	public XMPPPacketListener(XMPPConnectionFactory xmppConnectionFactory, ConfigurationContext configurationContext, Executor workerPool) {
+    public XMPPPacketListener(XMPPConnectionFactory xmppConnectionFactory, ConfigurationContext configurationContext, Executor workerPool) {
 		this.xmppConnectionFactory = xmppConnectionFactory;
 		this.configurationContext = configurationContext;
 		this.workerPool = workerPool;
@@ -96,7 +98,7 @@
 				msgContext.setServerSide(isServerSide.booleanValue());
 			}
 			msgContext.setProperty(
-					org.apache.axis2.transport.mail.Constants.CONTENT_TYPE,
+					CONTENT_TYPE,
 					"text/xml");
 			msgContext.setProperty(
 					Constants.Configuration.CHARACTER_SET_ENCODING, "UTF-8");

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Thu Apr 24 12:38:47 2008
@@ -55,7 +55,6 @@
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.transport.jms.JMSConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -210,10 +209,10 @@
     		log.debug("Incoming Transport is JMS, lets check for JMS correlation id");
     		
 	    	String correlationId =
-	            (String) inMessageContext.getProperty(JMSConstants.JMS_COORELATION_ID);
+	            (String) inMessageContext.getProperty(Constants.JMS_COORELATION_ID);
 	    	log.debug("Correlation id is " + correlationId);
 	        if (correlationId != null && correlationId.length() > 0) {
-	        	outMessageContext.setProperty(JMSConstants.JMS_COORELATION_ID, correlationId);
+	        	outMessageContext.setProperty(Constants.JMS_COORELATION_ID, correlationId);
 	        }
     	}
     }

Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/ConfigWithObservers/axis2.xml Thu Apr 24 12:38:47 2008
@@ -46,15 +46,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -69,14 +60,6 @@
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL">HTTP/1.0</parameter>
     </transportSender>
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml Thu Apr 24 12:38:47 2008
@@ -179,19 +179,6 @@
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportSender name="jms"
-                     class="org.apache.axis2.transport.jms.JMSSender"/>
-    -->
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/axis2.xml Thu Apr 24 12:38:47 2008
@@ -146,36 +146,6 @@
         <!-- <parameter name="threadKeepAliveTimeUnit"  >MILLISECONDS</parameter>            -->
     </transportReceiver>
     
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-    </transportReceiver>-->
-
-    <!--Uncomment if you want to have SMTP transport support-->
-    <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
-    <!--</transportReceiver>-->
-
 	<!--Uncomment if you want to have TCP transport support-->
     <!--transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
@@ -203,19 +173,6 @@
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportSender name="jms"
-                     class="org.apache.axis2.transport.jms.JMSSender"/>
-    -->
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/bad-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/bad-axis2.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/bad-axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/builderSelectorTest/bad-axis2.xml Thu Apr 24 12:38:47 2008
@@ -144,36 +144,6 @@
         <!-- <parameter name="threadKeepAliveTimeUnit"  >MILLISECONDS</parameter>            -->
     </transportReceiver>
     
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-    </transportReceiver>-->
-
-    <!--Uncomment if you want to have SMTP transport support-->
-    <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
-    <!--</transportReceiver>-->
-
 	<!--Uncomment if you want to have TCP transport support-->
     <!--transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
@@ -201,19 +171,6 @@
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
-    <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
-    <transportSender name="jms"
-                     class="org.apache.axis2.transport.jms.JMSSender"/>
-    -->
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml?rev=651358&r1=651357&r2=651358&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/hostConfigrepo/axis2.xml Thu Apr 24 12:38:47 2008
@@ -59,15 +59,6 @@
         <parameter name="port">6060</parameter>
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user">axis2</parameter>
-          <parameter name="transport.mail.pop3.password">axis2</parameter>
-          <parameter name="transport.mail.pop3.port">110</parameter>
-          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port">6060</parameter>
     </transportReceiver>
@@ -85,15 +76,6 @@
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL">HTTP/1.1</parameter>
     </transportSender>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user">axis2</parameter>
-       <parameter name="transport.mail.smtp.password">axis2</parameter>
-       <parameter name="transport.mail.smtp.port">25</parameter>
-   </transportSender>
-   -->
 
     <!-- ================================================= -->
     <!-- Global Modules  -->



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org