You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by as...@apache.org on 2008/09/22 13:30:18 UTC
svn commit: r697784 [2/2] - in /webservices/commons/trunk/modules/transport:
./ modules/base/ modules/base/src/main/java/org/apache/axis2/format/
modules/base/src/main/java/org/apache/axis2/transport/base/
modules/base/src/main/java/org/apache/axis2/tr...
Modified: webservices/commons/trunk/modules/transport/modules/local/src/org/apache/axis2/transport/local/LocalResponder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/local/src/org/apache/axis2/transport/local/LocalResponder.java (original)
+++ webservices/commons/trunk/modules/transport/modules/local/src/org/apache/axis2/transport/local/LocalResponder.java Mon Sep 22 04:30:15 2008
@@ -28,7 +28,7 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.transport.TransportSender;
import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.HTTPTransportUtils;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -69,8 +69,8 @@
// Check for the REST behaviour, if you desire rest beahaviour
// put a <parameter name="doREST" value="true"/> at the axis2.xml
- msgContext.setDoingMTOM(HTTPTransportUtils.doWriteMTOM(msgContext));
- msgContext.setDoingSwA(HTTPTransportUtils.doWriteSwA(msgContext));
+ msgContext.setDoingMTOM(BaseUtils.doWriteMTOM(msgContext));
+ msgContext.setDoingSwA(BaseUtils.doWriteSwA(msgContext));
EndpointReference epr = null;
Modified: webservices/commons/trunk/modules/transport/modules/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/local/src/org/apache/axis2/transport/local/LocalTransportSender.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/local/src/org/apache/axis2/transport/local/LocalTransportSender.java (original)
+++ webservices/commons/trunk/modules/transport/modules/local/src/org/apache/axis2/transport/local/LocalTransportSender.java Mon Sep 22 04:30:15 2008
@@ -28,7 +28,7 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.transport.TransportSender;
import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.HTTPTransportUtils;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -61,8 +61,8 @@
// Check for the REST behaviour, if you desire rest beahaviour
// put a <parameter name="doREST" value="true"/> at the axis2.xml
- msgContext.setDoingMTOM(HTTPTransportUtils.doWriteMTOM(msgContext));
- msgContext.setDoingSwA(HTTPTransportUtils.doWriteSwA(msgContext));
+ msgContext.setDoingMTOM(BaseUtils.doWriteMTOM(msgContext));
+ msgContext.setDoingSwA(BaseUtils.doWriteSwA(msgContext));
OutputStream out;
EndpointReference epr = msgContext.getTo();
Added: webservices/commons/trunk/modules/transport/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/pom.xml?rev=697784&view=auto
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/pom.xml (added)
+++ webservices/commons/trunk/modules/transport/modules/mail/pom.xml Mon Sep 22 04:30:15 2008
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-mail</artifactId>
+ <name>Apache Axis2 - Mail Transport</name>
+ <description>Apache Axis2 - Mail Transport</description>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies><!--
+
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ --><!-- Axis2 --><!--
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-niossl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>-->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-base</artifactId>
+ <version>${axis2-transport-base.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <properties>
+ <axiom.version>SNAPSHOT</axiom.version>
+ <axis2.version>SNAPSHOT</axis2.version>
+ <commons.logging.version>1.1</commons.logging.version>
+ <axis2-transport-base.version>SNAPSHOT</axis2-transport-base.version>
+ </properties>
+
+</project>
\ No newline at end of file
Modified: webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java Mon Sep 22 04:30:15 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.mail;
+package org.apache.axis2.transport.mail;
import javax.mail.Session;
@@ -88,6 +88,6 @@
public static final String MAIL_HEADER_REFERENCES = "References";
// Custom headers
- /** @see org.apache.synapse.transport.mail.WSMimeMessage */
+ /** @see org.apache.axis2.transport.mail.WSMimeMessage */
public static final String MAIL_HEADER_X_MESSAGE_ID= "X-Message-ID";
}
Modified: webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java Mon Sep 22 04:30:15 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.mail;
+package org.apache.axis2.transport.mail;
import org.apache.axis2.transport.OutTransportInfo;
Modified: webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java Mon Sep 22 04:30:15 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.mail;
+package org.apache.axis2.transport.mail;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -27,11 +27,11 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportInDescription;
-import org.apache.synapse.transport.base.AbstractPollingTransportListener;
-import org.apache.synapse.transport.base.BaseConstants;
-import org.apache.synapse.transport.base.BaseUtils;
-import org.apache.synapse.transport.base.ManagementSupport;
-import org.apache.synapse.transport.base.ParamUtils;
+import org.apache.axis2.transport.base.AbstractPollingTransportListener;
+import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.axis2.transport.base.BaseUtils;
+import org.apache.axis2.transport.base.ManagementSupport;
+import org.apache.axis2.transport.base.ParamUtils;
import javax.mail.*;
import javax.mail.internet.AddressException;
Modified: webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java Mon Sep 22 04:30:15 2008
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.synapse.transport.mail;
+package org.apache.axis2.transport.mail;
-import org.apache.synapse.format.MessageFormatterEx;
-import org.apache.synapse.format.MessageFormatterExAdapter;
-import org.apache.synapse.transport.base.AbstractTransportSender;
-import org.apache.synapse.transport.base.BaseConstants;
-import org.apache.synapse.transport.base.BaseUtils;
-import org.apache.synapse.transport.base.ManagementSupport;
+import org.apache.axis2.format.MessageFormatterEx;
+import org.apache.axis2.format.MessageFormatterExAdapter;
+import org.apache.axis2.transport.base.AbstractTransportSender;
+import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.axis2.transport.base.BaseUtils;
+import org.apache.axis2.transport.base.ManagementSupport;
import org.apache.commons.logging.LogFactory;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
Modified: webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailUtils.java Mon Sep 22 04:30:15 2008
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.synapse.transport.mail;
+package org.apache.axis2.transport.mail;
-import org.apache.synapse.transport.base.BaseUtils;
+import org.apache.axis2.transport.base.*;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.axiom.soap.SOAP12Constants;
Modified: webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/PollTableEntry.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/PollTableEntry.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/PollTableEntry.java (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/PollTableEntry.java Mon Sep 22 04:30:15 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.mail;
+package org.apache.axis2.transport.mail;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +29,7 @@
import javax.mail.internet.InternetAddress;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.synapse.transport.base.AbstractPollTableEntry;
+import org.apache.axis2.transport.base.AbstractPollTableEntry;
/**
* Holds information about an entry in the VFS transport poll table used by the
Modified: webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java (original)
+++ webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java Mon Sep 22 04:30:15 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.transport.mail;
+package org.apache.axis2.transport.mail;
import org.apache.axiom.om.util.UUIDGenerator;
Modified: webservices/commons/trunk/modules/transport/modules/tcp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/pom.xml?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/tcp/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/tcp/pom.xml Mon Sep 22 04:30:15 2008
@@ -29,7 +29,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-tcp</artifactId>
- <name>Transports - TCP</name>
+ <name>Apache Axis2 - TCP Transport</name>
<description>This inclues all the available transports in Axis2</description>
<dependencies>
<dependency>
Modified: webservices/commons/trunk/modules/transport/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java (original)
+++ webservices/commons/trunk/modules/transport/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java Mon Sep 22 04:30:15 2008
@@ -29,7 +29,7 @@
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.TransportSender;
import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.HTTPTransportUtils;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.axis2.util.URL;
import java.io.IOException;
@@ -72,8 +72,8 @@
// Check for the REST behaviour, if you desire rest beahaviour
// put a <parameter name="doREST" value="true"/> at the axis2.xml
- msgContext.setDoingMTOM(HTTPTransportUtils.doWriteMTOM(msgContext));
- msgContext.setDoingSwA(HTTPTransportUtils.doWriteSwA(msgContext));
+ msgContext.setDoingMTOM(BaseUtils.doWriteMTOM(msgContext));
+ msgContext.setDoingSwA(BaseUtils.doWriteSwA(msgContext));
OutputStream out;
EndpointReference epr = null;
Modified: webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/xmpp/pom.xml Mon Sep 22 04:30:15 2008
@@ -29,7 +29,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>axis2-transport-xmpp</artifactId>
- <name>Transports - XMPP</name>
+ <name>Apache Axis2 - XMPP Transport</name>
<description>This inclues all the available transports in Axis2 </description>
<dependencies>
<dependency>
Modified: webservices/commons/trunk/modules/transport/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/pom.xml?rev=697784&r1=697783&r2=697784&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/pom.xml Mon Sep 22 04:30:15 2008
@@ -34,11 +34,13 @@
<packaging>pom</packaging>
<name>Axis2 Transport - Root</name>
<modules>
+ <module>modules/base</module>
<module>modules/http</module>
<module>modules/tcp</module>
- <module>modules/jms</module>
<module>modules/local</module>
<module>modules/xmpp</module>
+ <module>modules/mail</module>
+ <module>modules/jms</module>
</modules>
<profiles>
<profile>