You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by he...@apache.org on 2005/06/28 14:30:12 UTC
svn commit: r202165 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/clientapi/
core/src/org/apache/axis/transport/mail/ samples/test/org/apache/axis/mail/
Author: hemapani
Date: Tue Jun 28 05:30:11 2005
New Revision: 202165
URL: http://svn.apache.org/viewcvs?rev=202165&view=rev
Log:
checking in the updates for the Simple Mail Server
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MessageSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListener.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/mail/MailRequestResponseRawXMLTest.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MessageSender.java?rev=202165&r1=202164&r2=202165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MessageSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MessageSender.java Tue Jun 28 05:30:11 2005
@@ -42,8 +42,11 @@
super(assumeServiceContext());
}
public void send(String opName, OMElement toSend) throws AxisFault {
- OperationDescription axisOp = new OperationDescription(new QName(opName));
- serviceContext.getServiceConfig().addOperation(axisOp);
+ OperationDescription axisOp = serviceContext.getServiceConfig().getOperation(opName);
+ if(axisOp == null){
+ axisOp = new OperationDescription(new QName(opName));
+ serviceContext.getServiceConfig().addOperation(axisOp);
+ }
super.send(axisOp, prepareTheSystem(toSend));
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java?rev=202165&r1=202164&r2=202165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java Tue Jun 28 05:30:11 2005
@@ -72,7 +72,7 @@
});
MimeMessage msg = new MimeMessage(session);
-
+ msg.setFrom(new InternetAddress((user)));
msg.addRecipient(Message.RecipientType.TO, new InternetAddress(targetEmail));
msg.setSubject(subject);
msg.setText(message);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java?rev=202165&r1=202164&r2=202165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java Tue Jun 28 05:30:11 2005
@@ -32,6 +32,8 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.ConfigurationContext;
import org.apache.axis.context.MessageContext;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
@@ -75,13 +77,11 @@
MessageContext msgContext = null;
// create and initialize a message context
try {
- msgContext =
- new MessageContext(
- reg,
- reg.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL)),
- reg.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL)));
+ TransportInDescription transportIn = reg.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL));
+ TransportOutDescription transportOut = reg.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL));
+
+ msgContext = new MessageContext(reg,transportIn,transportOut);
msgContext.setServerSide(true);
-
msgContext.setProperty(MailConstants.CONTENT_TYPE, mimeMessage.getContentType());
msgContext.setWSAAction(getMailHeader(MailConstants.HEADER_SOAP_ACTION));
@@ -96,13 +96,11 @@
new EndpointReference(AddressingConstants.WSA_REPLY_TO, replyTo));
}
-
-
String recepainets = ((InternetAddress) mimeMessage.getAllRecipients()[0]).getAddress();
-
-
if (recepainets != null) {
msgContext.setTo(new EndpointReference(AddressingConstants.WSA_FROM, recepainets+ "/"+serviceURL));
+ }else{
+ throw new AxisFault("No receptineist found in the Email");
}
// add the SOAPEnvelope
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListener.java?rev=202165&r1=202164&r2=202165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListener.java Tue Jun 28 05:30:11 2005
@@ -158,7 +158,7 @@
MimeMessage msg = (MimeMessage) msgs[i];
if (msg != null) {
MailWorker worker = new MailWorker(msg, configurationContext);
- configurationContext.getThreadPool().addWorker(worker);
+ worker.doWork();
}
msg.setFlag(Flags.Flag.DELETED, true);
}
@@ -166,6 +166,8 @@
}
receiver.disconnect();
+ //Waiting for 3 seconds.
+ Thread.sleep(3000);
} catch (Exception e) {
//log.debug(Messages.getMessage("exception00"), e); TODO Issue
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/mail/MailRequestResponseRawXMLTest.java?rev=202165&r1=202164&r2=202165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/mail/MailRequestResponseRawXMLTest.java Tue Jun 28 05:30:11 2005
@@ -50,6 +50,8 @@
import org.apache.axis.soap.SOAPEnvelope;
import org.apache.axis.transport.mail.MailTransportSender;
import org.apache.axis.transport.mail.SimpleMailListener;
+import org.apache.axis.transport.mail.server.MailConstants;
+import org.apache.axis.transport.mail.server.MailServer;
import org.apache.axis.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,7 +60,7 @@
private EndpointReference targetEPR =
new EndpointReference(
AddressingConstants.WSA_TO,
- "axis2-server@127.0.0.1" + "/axis/services/EchoXMLService/echoOMElement");
+ "foo@127.0.0.1" + "/axis/services/EchoXMLService/echoOMElement");
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoOMElement");
@@ -80,9 +82,11 @@
}
protected void setUp() throws Exception {
+ ConfigurationContext configContext = createServerConfigurationContext();
+ MailServer server = new MailServer(configContext,MailConstants.POP_SERVER_PORT,MailConstants.SMTP_SERVER_PORT);
SimpleMailListener ml = new SimpleMailListener();
- ConfigurationContext configContext = createServerConfigurationContext();
+
ml.init(
configContext,
configContext.getAxisConfiguration().getTransportIn(
@@ -171,21 +175,23 @@
TransportInDescription transportIn =
new TransportInDescription(new QName(Constants.TRANSPORT_MAIL));
transportIn.addParameter(new ParameterImpl("transport.mail.pop3.host", "127.0.0.1"));
- transportIn.addParameter(new ParameterImpl("transport.mail.pop3.user", "axis2-server"));
+ transportIn.addParameter(new ParameterImpl("transport.mail.pop3.user", "foo"));
transportIn.addParameter(new ParameterImpl("transport.mail.pop3.password", "axis2"));
- transportIn.addParameter(new ParameterImpl("transport.mail.pop3.port", "110"));
+ transportIn.addParameter(new ParameterImpl("transport.mail.pop3.port", "1134"));
transportIn.addParameter(
- new ParameterImpl("transport.mail.replyToAddress", "axis2-server@127.0.0.1"));
+ new ParameterImpl("transport.mail.replyToAddress", "foo@127.0.0.1"));
transportIn.setReciver(new SimpleMailListener());
+ transportIn.getReciever().init(configContext,transportIn);
TransportOutDescription transportOut =
new TransportOutDescription(new QName(Constants.TRANSPORT_MAIL));
transportOut.addParameter(new ParameterImpl("transport.mail.smtp.host", "127.0.0.1"));
- transportOut.addParameter(new ParameterImpl("transport.mail.smtp.user", "axis2-server"));
+ transportOut.addParameter(new ParameterImpl("transport.mail.smtp.user", "foo@127.0.0.1"));
transportOut.addParameter(new ParameterImpl("transport.mail.smtp.password", "axis2"));
- transportOut.addParameter(new ParameterImpl("transport.mail.smtp.port", "25"));
+ transportOut.addParameter(new ParameterImpl("transport.mail.smtp.port", "1049"));
transportOut.setSender(new MailTransportSender());
+ transportOut.getSender().init(configContext,transportOut);
configContext.getAxisConfiguration().addTransportIn(transportIn);
configContext.getAxisConfiguration().addTransportOut(transportOut);
@@ -200,21 +206,23 @@
TransportInDescription transportIn =
new TransportInDescription(new QName(Constants.TRANSPORT_MAIL));
transportIn.addParameter(new ParameterImpl("transport.mail.pop3.host", "127.0.0.1"));
- transportIn.addParameter(new ParameterImpl("transport.mail.pop3.user", "axis2-client"));
+ transportIn.addParameter(new ParameterImpl("transport.mail.pop3.user", "bar"));
transportIn.addParameter(new ParameterImpl("transport.mail.pop3.password", "axis2"));
- transportIn.addParameter(new ParameterImpl("transport.mail.pop3.port", "110"));
+ transportIn.addParameter(new ParameterImpl("transport.mail.pop3.port", "1134"));
transportIn.addParameter(
- new ParameterImpl("transport.mail.replyToAddress", "axis2-client@127.0.0.1"));
+ new ParameterImpl("transport.mail.replyToAddress", "bar@127.0.0.1"));
transportIn.setReciver(new SimpleMailListener());
+ transportIn.getReciever().init(configContext,transportIn);
TransportOutDescription transportOut =
new TransportOutDescription(new QName(Constants.TRANSPORT_MAIL));
transportOut.addParameter(new ParameterImpl("transport.mail.smtp.host", "127.0.0.1"));
- transportOut.addParameter(new ParameterImpl("transport.mail.smtp.user", "axis2-client"));
+ transportOut.addParameter(new ParameterImpl("transport.mail.smtp.user", "bar@127.0.0.1"));
transportOut.addParameter(new ParameterImpl("transport.mail.smtp.password", "axis2"));
- transportOut.addParameter(new ParameterImpl("transport.mail.smtp.port", "25"));
+ transportOut.addParameter(new ParameterImpl("transport.mail.smtp.port", "1049"));
transportOut.setSender(new MailTransportSender());
+ transportOut.getSender().init(configContext,transportOut);
configContext.getAxisConfiguration().addTransportIn(transportIn);
configContext.getAxisConfiguration().addTransportOut(transportOut);