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 gd...@apache.org on 2005/07/11 19:49:08 UTC
svn commit: r210165 [6/20] - in /webservices/axis/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/util/
core/src/org/apache/axis2/a...
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java Mon Jul 11 10:48:55 2005
@@ -55,7 +55,8 @@
public class SimpleMailListener extends TransportListener implements Runnable {
- protected static Log log = LogFactory.getLog(SimpleMailListener.class.getName());
+ protected static Log log = LogFactory.getLog(
+ SimpleMailListener.class.getName());
private String host;
@@ -88,7 +89,8 @@
e.printStackTrace();
}
try {
- System.out.println("Sleeping for a bit to let the engine start up.");
+ System.out.println(
+ "Sleeping for a bit to let the engine start up.");
Thread.sleep(2000);
} catch (InterruptedException e1) {
log.debug(e1.getMessage(), e1);
@@ -144,7 +146,10 @@
while (!stopped) {
try {
- EmailReceiver receiver = new EmailReceiver(user, host, port, password);
+ EmailReceiver receiver = new EmailReceiver(user,
+ host,
+ port,
+ password);
receiver.connect();
Message[] msgs = receiver.receive();
@@ -153,7 +158,8 @@
for (int i = 0; i < msgs.length; i++) {
MimeMessage msg = (MimeMessage) msgs[i];
if (msg != null) {
- MailWorker worker = new MailWorker(msg, configurationContext);
+ MailWorker worker = new MailWorker(msg,
+ configurationContext);
worker.doWork();
}
msg.setFlag(Flags.Flag.DELETED, true);
@@ -168,7 +174,10 @@
} catch (Exception e) {
//log.debug(Messages.getMessage("exception00"), e); TODO Issue
// #1 CT 07-Feb-2005.
- log.debug("An error occured when running the mail listner." + e.getMessage(), e);
+ log.debug(
+ "An error occured when running the mail listner." +
+ e.getMessage(),
+ e);
e.printStackTrace();
break;
}
@@ -229,17 +238,20 @@
System.out.println("java SimpleMailListener <repository>");
} else {
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ConfigurationContext configurationContext = builder.buildConfigurationContext(args[0]);
+ ConfigurationContext configurationContext = builder.buildConfigurationContext(
+ args[0]);
SimpleMailListener sas = new SimpleMailListener();
TransportInDescription transportIn =
- configurationContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL));
+ configurationContext.getAxisConfiguration().getTransportIn(
+ new QName(Constants.TRANSPORT_MAIL));
if (transportIn != null) {
sas.init(configurationContext, transportIn);
System.out.println("Starting the SimpleMailListener with repository "
- + new File(args[0]).getAbsolutePath());
+ + new File(args[0]).getAbsolutePath());
sas.start();
} else {
- System.out.println("Startup failed, mail transport not configured, Configure the mail trnasport in the axis2.xml file");
+ System.out.println(
+ "Startup failed, mail transport not configured, Configure the mail trnasport in the axis2.xml file");
}
}
}
@@ -247,25 +259,36 @@
/* (non-Javadoc)
* @see org.apache.axis2.transport.TransportListener#init(org.apache.axis2.context.ConfigurationContext, org.apache.axis2.description.TransportInDescription)
*/
- public void init(ConfigurationContext configurationContext, TransportInDescription transportIn)
+ public void init(ConfigurationContext configurationContext,
+ TransportInDescription transportIn)
throws AxisFault {
this.configurationContext = configurationContext;
- user = Utils.getParameterValue(transportIn.getParameter(MailConstants.POP3_USER));
- host = Utils.getParameterValue(transportIn.getParameter(MailConstants.POP3_HOST));
- password = Utils.getParameterValue(transportIn.getParameter(MailConstants.POP3_PASSWORD));
- port = Utils.getParameterValue(transportIn.getParameter(MailConstants.POP3_PORT));
- replyTo = Utils.getParameterValue(transportIn.getParameter(MailConstants.RAPLY_TO));
+ user =
+ Utils.getParameterValue(
+ transportIn.getParameter(MailConstants.POP3_USER));
+ host =
+ Utils.getParameterValue(
+ transportIn.getParameter(MailConstants.POP3_HOST));
+ password =
+ Utils.getParameterValue(
+ transportIn.getParameter(MailConstants.POP3_PASSWORD));
+ port =
+ Utils.getParameterValue(
+ transportIn.getParameter(MailConstants.POP3_PORT));
+ replyTo =
+ Utils.getParameterValue(
+ transportIn.getParameter(MailConstants.RAPLY_TO));
if (user == null || host == null || password == null || port == null) {
throw new AxisFault("user, port, host or password not set, "
- + " [user null = "
- + (user == null)
- + ", password null= "
- + (password == null)
- + ", host null "
- + (host == null)
- + ",port null "
- + (port == null));
+ + " [user null = "
+ + (user == null)
+ + ", password null= "
+ + (password == null)
+ + ", host null "
+ + (host == null)
+ + ",port null "
+ + (port == null));
}
}
@@ -275,7 +298,8 @@
*/
public EndpointReference replyToEPR(String serviceName) throws AxisFault {
// TODO Auto-generated method stub
- return new EndpointReference(AddressingConstants.WSA_REPLY_TO, replyTo + "/services/" + serviceName);
+ return new EndpointReference(AddressingConstants.WSA_REPLY_TO,
+ replyTo + "/services/" + serviceName);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java Mon Jul 11 10:48:55 2005
@@ -13,7 +13,8 @@
public class MailServer {
Storage st = null;
public ConfigurationContext configurationContext = null;
- protected static Log log = LogFactory.getLog(SimpleMailListener.class.getName());
+ protected static Log log = LogFactory.getLog(
+ SimpleMailListener.class.getName());
public MailServer(String dir, int popPort, int smtpPort) throws AxisFault {
try {
@@ -23,24 +24,30 @@
log.error(e);
}
try {
- System.out.println("Sleeping for a bit to let the engine start up.");
+ System.out.println(
+ "Sleeping for a bit to let the engine start up.");
Thread.sleep(2000);
} catch (InterruptedException e1) {
log.error(e1);
}
st = new Storage();
// Start up the two servers and lets have some fun. - CT
- SMTPServer smtpServer = new SMTPServer(st, configurationContext, smtpPort);
+ SMTPServer smtpServer = new SMTPServer(st,
+ configurationContext,
+ smtpPort);
smtpServer.start();
POP3Server pop3Server = new POP3Server(st, popPort);
pop3Server.start();
}
- public MailServer(ConfigurationContext configurationContext, int popPort, int smtpPort) throws AxisFault {
+ public MailServer(ConfigurationContext configurationContext,
+ int popPort,
+ int smtpPort) throws AxisFault {
this.configurationContext = configurationContext;
try {
- System.out.println("Sleeping for a bit to let the engine start up.");
+ System.out.println(
+ "Sleeping for a bit to let the engine start up.");
Thread.sleep(2000);
} catch (InterruptedException e1) {
log.error(e1);
@@ -48,7 +55,9 @@
st = new Storage();
// Start up the two servers and lets have some fun. - CT
- SMTPServer smtpServer = new SMTPServer(st, configurationContext, smtpPort);
+ SMTPServer smtpServer = new SMTPServer(st,
+ configurationContext,
+ smtpPort);
smtpServer.start();
POP3Server pop3Server = new POP3Server(st, popPort);
pop3Server.start();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java Mon Jul 11 10:48:55 2005
@@ -52,7 +52,8 @@
}
}
- public void processMail(ConfigurationContext confContext, MimeMessage mimeMessage) {
+ public void processMail(ConfigurationContext confContext,
+ MimeMessage mimeMessage) {
// create an Axis server
AxisEngine engine = new AxisEngine(confContext);
MessageContext msgContext = null;
@@ -60,12 +61,17 @@
try {
msgContext =
new MessageContext(confContext,
- confContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL)),
- confContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL)));
+ confContext.getAxisConfiguration().getTransportIn(
+ new QName(Constants.TRANSPORT_MAIL)),
+ confContext.getAxisConfiguration().getTransportOut(
+ new QName(Constants.TRANSPORT_MAIL)));
msgContext.setServerSide(true);
- msgContext.setProperty(MailConstants.CONTENT_TYPE, mimeMessage.getContentType());
- msgContext.setWSAAction(getMailHeader(MailConstants.HEADER_SOAP_ACTION, mimeMessage));
+ msgContext.setProperty(MailConstants.CONTENT_TYPE,
+ mimeMessage.getContentType());
+ msgContext.setWSAAction(
+ getMailHeader(MailConstants.HEADER_SOAP_ACTION,
+ mimeMessage));
String serviceURL = mimeMessage.getSubject();
if (serviceURL == null) {
@@ -74,14 +80,18 @@
String replyTo = ((InternetAddress) mimeMessage.getReplyTo()[0]).getAddress();
if (replyTo != null) {
- msgContext.setReplyTo(new EndpointReference(AddressingConstants.WSA_REPLY_TO, replyTo));
+ msgContext.setReplyTo(
+ 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));
+ msgContext.setTo(
+ new EndpointReference(AddressingConstants.WSA_FROM,
+ recepainets + "/" + serviceURL));
}
// add the SOAPEnvelope
@@ -89,7 +99,8 @@
System.out.println("message[" + message + "]");
ByteArrayInputStream bais =
new ByteArrayInputStream(message.getBytes());
- XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(bais);
+ XMLStreamReader reader = XMLInputFactory.newInstance()
+ .createXMLStreamReader(bais);
StAXBuilder builder = new StAXSOAPModelBuilder(reader);
msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
// invoke the Axis engine
@@ -98,7 +109,8 @@
AxisFault af;
if (e instanceof AxisFault) {
af = (AxisFault) e;
- log.debug("Error occured while trying to process the mail.", af);
+ log.debug("Error occured while trying to process the mail.",
+ af);
} else {
af = AxisFault.makeFault(e);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java Mon Jul 11 10:48:55 2005
@@ -8,7 +8,11 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
import java.net.Socket;
import java.util.ArrayList;
import java.util.StringTokenizer;
@@ -28,9 +32,11 @@
public void run() {
try {
InputStream inputStream = socket.getInputStream();
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ BufferedReader bufferedReader = new BufferedReader(
+ new InputStreamReader(inputStream));
- PrintWriter printWriter = new PrintWriter(socket.getOutputStream(), true);
+ PrintWriter printWriter = new PrintWriter(socket.getOutputStream(),
+ true);
printWriter.println(MailConstants.OK + " POP3 server ready");
String s;
@@ -68,7 +74,8 @@
} else if (((String) tokens.get(0)).equals(MailConstants.PASS)) {
printWriter.println(MailConstants.OK); // Passwords are not checked.
} else if (input.equals(MailConstants.QUIT)) {
- printWriter.println(MailConstants.OK + "POP3 server signing off");
+ printWriter.println(
+ MailConstants.OK + "POP3 server signing off");
doneProcess = true;
} else if (input.equals(MailConstants.STAT)) {
printWriter.println(MailConstants.OK + messages.size() + " 1"); // We take the maildrop size as one.
@@ -77,14 +84,24 @@
try {
int optArg = Integer.parseInt((String) tokens.get(1));
int messageArrayIndex = optArg - 1;
- if ((messageArrayIndex < messages.size()) && (messageArrayIndex >= 0)) { // that is OK careful with numbering
- printWriter.println(MailConstants.OK + messageArrayIndex + 1 + " 120"); // Mail size of 120 is just some number.
+ if ((messageArrayIndex < messages.size()) &&
+ (messageArrayIndex >= 0)) { // that is OK careful with numbering
+ printWriter.println(
+ MailConstants.OK + messageArrayIndex + 1 +
+ " 120"); // Mail size of 120 is just some number.
} else {
- printWriter.println(MailConstants.ERR + "no such message, only " + (messages.size() + 1) + " messages in maildrop");
+ printWriter.println(
+ MailConstants.ERR +
+ "no such message, only " +
+ (messages.size() + 1) +
+ " messages in maildrop");
}
} catch (NumberFormatException e) {
e.printStackTrace();
- printWriter.println(MailConstants.ERR + "problem passing the index. Index submited was " + (String) tokens.get(1));
+ printWriter.println(
+ MailConstants.ERR +
+ "problem passing the index. Index submited was " +
+ (String) tokens.get(1));
}
} else {
printWriter.println(MailConstants.OK + messages.size());
@@ -129,7 +146,8 @@
} catch (NumberFormatException e) {
printWriter.println(MailConstants.ERR);
}
- } else if (((String) tokens.get(0)).equals(MailConstants.NOOP) || ((String) tokens.get(0)).equals(MailConstants.RSET)) {
+ } else if (((String) tokens.get(0)).equals(MailConstants.NOOP) ||
+ ((String) tokens.get(0)).equals(MailConstants.RSET)) {
printWriter.println(MailConstants.OK);
} else {
printWriter.println(MailConstants.ERR);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java Mon Jul 11 10:48:55 2005
@@ -17,7 +17,9 @@
private ConfigurationContext configurationContext;
private int port;
- public SMTPServer(Storage st, ConfigurationContext configurationContext, int port) {
+ public SMTPServer(Storage st,
+ ConfigurationContext configurationContext,
+ int port) {
this.st = st;
this.configurationContext = configurationContext;
this.port = port;
@@ -41,7 +43,9 @@
//wait for a client
Socket socket = ss.accept();
- SMTPWorker thread = new SMTPWorker(socket, st, configurationContext);
+ SMTPWorker thread = new SMTPWorker(socket,
+ st,
+ configurationContext);
thread.start();
} catch (IOException ex) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java Mon Jul 11 10:48:55 2005
@@ -2,9 +2,17 @@
import org.apache.axis2.context.ConfigurationContext;
-import javax.mail.*;
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.net.Socket;
import java.util.ArrayList;
import java.util.Properties;
@@ -35,15 +43,23 @@
boolean bodyData = false;
- public SMTPWorker(Socket socket, Storage st, ConfigurationContext configurationContext) {
+ public SMTPWorker(Socket socket,
+ Storage st,
+ ConfigurationContext configurationContext) {
try {
this.st = st;
this.configurationContext = configurationContext;
//get the streams from the socket and save in instance variables.
- reader = new BufferedReader(new InputStreamReader(socket
- .getInputStream()));
- writer = new BufferedWriter(new OutputStreamWriter(socket
- .getOutputStream()));
+ reader =
+ new BufferedReader(
+ new InputStreamReader(
+ socket
+ .getInputStream()));
+ writer =
+ new BufferedWriter(
+ new OutputStreamWriter(
+ socket
+ .getOutputStream()));
} catch (IOException ex) {
ex.printStackTrace();
}
@@ -77,8 +93,10 @@
}
for (int idx = 0; idx < receivers.size(); idx++) {
try {
- MailSorter mSort = new MailSorter(this.st, this.configurationContext);
- mSort.sort((String) receivers.get(idx), new MimeMessage(mail));
+ MailSorter mSort = new MailSorter(this.st,
+ this.configurationContext);
+ mSort.sort((String) receivers.get(idx),
+ new MimeMessage(mail));
} catch (MessagingException e1) {
e1.printStackTrace();
}
@@ -163,7 +181,8 @@
String toStr = input.substring(start, end);
try {
- mail.addRecipient(Message.RecipientType.TO, new MailAddress(toStr));
+ mail.addRecipient(Message.RecipientType.TO,
+ new MailAddress(toStr));
receivers.add(toStr);
} catch (MessagingException e) {
// TODO Auto-generated catch block
@@ -191,7 +210,9 @@
if (bodyData) {
temp += input;
mail.setContent(temp, "text/plain");
- System.out.println("\n\n\n---------------" + temp + "---------------\n\n\n");
+ System.out.println(
+ "\n\n\n---------------" + temp +
+ "---------------\n\n\n");
} else {
mail.addHeaderLine(input);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java Mon Jul 11 10:48:55 2005
@@ -51,7 +51,8 @@
public TCPServer(int port, String dir) throws AxisFault {
try {
ConfigurationContextFactory erfac = new ConfigurationContextFactory();
- ConfigurationContext configContext = erfac.buildConfigurationContext(dir);
+ ConfigurationContext configContext = erfac.buildConfigurationContext(
+ dir);
this.configContext = configContext;
Thread.sleep(3000);
serversocket = new ServerSocket(port);
@@ -85,7 +86,8 @@
break;
}
if (socket != null) {
- configContext.getThreadPool().addWorker(new TCPWorker(configContext, socket));
+ configContext.getThreadPool().addWorker(
+ new TCPWorker(configContext, socket));
}
} catch (AxisFault e) {
log.error(e);
@@ -109,7 +111,9 @@
*/
public EndpointReference replyToEPR(String serviceName) throws AxisFault {
return new EndpointReference(AddressingConstants.WSA_REPLY_TO,
- "tcp://127.0.0.1:" + (serversocket.getLocalPort()) + "/axis/services/" + serviceName);
+ "tcp://127.0.0.1:" + (serversocket.getLocalPort()) +
+ "/axis/services/" +
+ serviceName);
}
/* (non-Javadoc)
@@ -124,7 +128,8 @@
}
}
- public void init(ConfigurationContext axisConf, TransportInDescription transprtIn)
+ public void init(ConfigurationContext axisConf,
+ TransportInDescription transprtIn)
throws AxisFault {
this.configContext = axisConf;
Parameter param = transprtIn.getParameter(PARAM_PORT);
@@ -134,17 +139,23 @@
}
- public static void main(String[] args) throws AxisFault, NumberFormatException {
+ public static void main(String[] args) throws AxisFault,
+ NumberFormatException {
if (args.length != 2) {
System.out.println("TCPServer repositoryLocation port");
} else {
File repository = new File(args[0]);
if (!repository.exists()) {
- System.out.print("Repository file does not exists .. initializing repository");
+ System.out.print(
+ "Repository file does not exists .. initializing repository");
}
- TCPServer tcpServer = new TCPServer(Integer.parseInt(args[1]), repository.getAbsolutePath());
- System.out.println("[Axis2] Using the Repository " + repository.getAbsolutePath());
- System.out.println("[Axis2] Starting the TCP Server on port " + args[1]);
+ TCPServer tcpServer = new TCPServer(Integer.parseInt(args[1]),
+ repository.getAbsolutePath());
+ System.out.println(
+ "[Axis2] Using the Repository " +
+ repository.getAbsolutePath());
+ System.out.println(
+ "[Axis2] Starting the TCP Server on port " + args[1]);
tcpServer.start();
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java Mon Jul 11 10:48:55 2005
@@ -61,24 +61,29 @@
//TCP no headers :)
}
- public void finalizeSendWithOutputStreamFromIncomingConnection(MessageContext msgContext, OutputStream out) {
+ public void finalizeSendWithOutputStreamFromIncomingConnection(
+ MessageContext msgContext, OutputStream out) {
}
- public void finalizeSendWithToAddress(MessageContext msgContext, OutputStream out) throws AxisFault {
+ public void finalizeSendWithToAddress(MessageContext msgContext,
+ OutputStream out) throws AxisFault {
try {
socket.shutdownOutput();
- msgContext.setProperty(MessageContext.TRANSPORT_IN, socket.getInputStream());
+ msgContext.setProperty(MessageContext.TRANSPORT_IN,
+ socket.getInputStream());
} catch (IOException e) {
throw new AxisFault(e);
}
}
- protected OutputStream openTheConnection(EndpointReference toURL, MessageContext msgContext) throws AxisFault {
+ protected OutputStream openTheConnection(EndpointReference toURL,
+ MessageContext msgContext) throws AxisFault {
if (toURL != null) {
try {
URL url = new URL(toURL.getAddress());
SocketAddress add =
- new InetSocketAddress(url.getHost(), url.getPort() == -1 ? 80 : url.getPort());
+ new InetSocketAddress(url.getHost(),
+ url.getPort() == -1 ? 80 : url.getPort());
socket = new Socket();
socket.connect(add);
return socket.getOutputStream();
@@ -92,13 +97,15 @@
}
}
- public OutputStream startSendWithOutputStreamFromIncomingConnection(MessageContext msgContext,
- OutputStream out)
+ public OutputStream startSendWithOutputStreamFromIncomingConnection(
+ MessageContext msgContext,
+ OutputStream out)
throws AxisFault {
return out;
}
- public OutputStream startSendWithToAddress(MessageContext msgContext, OutputStream out) {
+ public OutputStream startSendWithToAddress(MessageContext msgContext,
+ OutputStream out) {
return out;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java Mon Jul 11 10:48:55 2005
@@ -54,20 +54,24 @@
try {
Reader in = new InputStreamReader(socket.getInputStream());
TransportOutDescription transportOut =
- configurationContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_TCP));
+ configurationContext.getAxisConfiguration()
+ .getTransportOut(new QName(Constants.TRANSPORT_TCP));
msgContext =
new MessageContext(configurationContext,
- configurationContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_TCP)),
- transportOut);
+ configurationContext.getAxisConfiguration()
+ .getTransportIn(new QName(Constants.TRANSPORT_TCP)),
+ transportOut);
msgContext.setServerSide(true);
OutputStream out = socket.getOutputStream();
msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
AxisEngine engine = new AxisEngine(configurationContext);
try {
- XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(in);
+ XMLStreamReader xmlreader = XMLInputFactory.newInstance()
+ .createXMLStreamReader(in);
StAXBuilder builder = new StAXSOAPModelBuilder(xmlreader);
- msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
+ msgContext.setEnvelope(
+ (SOAPEnvelope) builder.getDocumentElement());
} catch (Exception e) {
throw new AxisFault(e.getMessage(), e);
}
@@ -77,7 +81,8 @@
try {
AxisEngine engine = new AxisEngine(configurationContext);
if (msgContext != null) {
- msgContext.setProperty(MessageContext.TRANSPORT_OUT, socket.getOutputStream());
+ msgContext.setProperty(MessageContext.TRANSPORT_OUT,
+ socket.getOutputStream());
engine.handleFault(msgContext, e);
}
} catch (Exception e1) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Mon Jul 11 10:48:55 2005
@@ -16,7 +16,13 @@
package org.apache.axis2.util;
import org.apache.axis2.Constants;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.Flow;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.PhaseRule;
+import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.Handler;
@@ -31,7 +37,9 @@
public class Utils {
- public static void addHandler(Flow flow, Handler handler, String phaseName) {
+ public static void addHandler(Flow flow,
+ Handler handler,
+ String phaseName) {
HandlerDescription handlerDesc = new HandlerDescription();
PhaseRule rule = new PhaseRule(phaseName);
handlerDesc.setRules(rule);
@@ -78,7 +86,9 @@
QName opName) {
ServiceDescription service = new ServiceDescription(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
- service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS, className));
+ service.addParameter(
+ new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
+ className));
OperationDescription axisOp = new OperationDescription(opName);
axisOp.setMessageReciever(messageReceiver);
@@ -100,9 +110,9 @@
String className,
QName opName) {
return createSimpleService(serviceName,
- new RawXMLINOutMessageReceiver(),
- className,
- opName);
+ new RawXMLINOutMessageReceiver(),
+ className,
+ opName);
}
// public static void addHandlers(Flow flow, Phase phase) throws AxisFault {
@@ -113,7 +123,8 @@
// }
// }
// }
- public static void resolvePhases(AxisConfiguration axisconfig, ServiceDescription serviceDesc)
+ public static void resolvePhases(AxisConfiguration axisconfig,
+ ServiceDescription serviceDesc)
throws AxisFault, PhaseException {
PhaseResolver pr = new PhaseResolver(axisconfig, serviceDesc);
pr.buildchains();
@@ -128,13 +139,16 @@
}
- public static String[] parseRequestURLForServiceAndOperation(String filePart) {
+ public static String[] parseRequestURLForServiceAndOperation(
+ String filePart) {
String[] values = new String[2];
int index = filePart.lastIndexOf(Constants.REQUEST_URL_PREFIX);
String serviceStr = null;
if (-1 != index) {
- serviceStr = filePart.substring(index + Constants.REQUEST_URL_PREFIX.length() + 1);
+ serviceStr =
+ filePart.substring(
+ index + Constants.REQUEST_URL_PREFIX.length() + 1);
if ((index = serviceStr.indexOf('/')) > 0) {
values[0] = serviceStr.substring(0, index);
int lastIndex = serviceStr.indexOf('?');
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/tcpmon.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/tcpmon.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/tcpmon.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/tcpmon.java Mon Jul 11 10:48:55 2005
@@ -31,7 +31,13 @@
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URL;
@@ -166,8 +172,9 @@
mainPane = new JPanel(layout);
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
- mainPane.add(new JLabel(getMessage("newTCP00", "Create a new TCP/IP Monitor...")
- + " "), c);
+ mainPane.add(new JLabel(getMessage("newTCP00",
+ "Create a new TCP/IP Monitor...")
+ + " "), c);
// Add some blank space
mainPane.add(Box.createRigidArea(new Dimension(1, 5)), c);
@@ -177,8 +184,9 @@
JPanel tmpPanel = new JPanel(new GridBagLayout());
c.anchor = GridBagConstraints.WEST;
c.gridwidth = 1;
- tmpPanel.add(new JLabel(getMessage("listenPort00", "Listen Port #")
- + " "), c);
+ tmpPanel.add(new JLabel(getMessage("listenPort00",
+ "Listen Port #")
+ + " "), c);
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
tmpPanel.add(port = new NumberField(4), c);
@@ -206,11 +214,11 @@
tport.setEnabled(state);
host.setEnabled(state);
hostLabel.setForeground(state
- ? Color.black
- : Color.gray);
+ ? Color.black
+ : Color.gray);
tportLabel.setForeground(state
- ? Color.black
- : Color.gray);
+ ? Color.black
+ : Color.gray);
}
}
});
@@ -218,8 +226,9 @@
c.gridwidth = 1;
mainPane.add(Box.createRigidArea(new Dimension(25, 0)));
mainPane.add(hostLabel =
- new JLabel(getMessage("targetHostname00", "Target Hostname")
- + " "), c);
+ new JLabel(getMessage("targetHostname00",
+ "Target Hostname")
+ + " "), c);
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
host = new HostnameField(30);
@@ -229,8 +238,8 @@
c.gridwidth = 1;
mainPane.add(Box.createRigidArea(new Dimension(25, 0)));
mainPane.add(tportLabel =
- new JLabel(getMessage("targetPort00", "Target Port #")
- + " "), c);
+ new JLabel(getMessage("targetPort00", "Target Port #")
+ + " "), c);
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
tport = new NumberField(4);
@@ -251,11 +260,11 @@
tport.setEnabled(!state);
host.setEnabled(!state);
hostLabel.setForeground(state
- ? Color.gray
- : Color.black);
+ ? Color.gray
+ : Color.black);
tportLabel.setForeground(state
- ? Color.gray
- : Color.black);
+ ? Color.gray
+ : Color.black);
}
}
});
@@ -270,7 +279,7 @@
// /////////////////////////////////////////////////////////////////
JPanel opts = new JPanel(new GridBagLayout());
opts.setBorder(new TitledBorder(getMessage("options00",
- "Options")));
+ "Options")));
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
mainPane.add(opts, c);
@@ -280,12 +289,13 @@
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
final String proxySupport = getMessage("proxySupport00",
- "HTTP Proxy Support");
+ "HTTP Proxy Support");
opts.add(HTTPProxyBox = new JCheckBox(proxySupport), c);
c.anchor = GridBagConstraints.WEST;
c.gridwidth = 1;
opts.add(HTTPProxyHostLabel =
- new JLabel(getMessage("hostname00", "Hostname") + " "), c);
+ new JLabel(getMessage("hostname00", "Hostname") + " "),
+ c);
HTTPProxyHostLabel.setForeground(Color.gray);
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
@@ -294,7 +304,7 @@
c.anchor = GridBagConstraints.WEST;
c.gridwidth = 1;
opts.add(HTTPProxyPortLabel =
- new JLabel(getMessage("port00", "Port #") + " "), c);
+ new JLabel(getMessage("port00", "Port #") + " "), c);
HTTPProxyPortLabel.setForeground(Color.gray);
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
@@ -324,11 +334,11 @@
HTTPProxyHost.setEnabled(tmp != null);
HTTPProxyPort.setEnabled(tmp != null);
HTTPProxyHostLabel.setForeground((tmp != null)
- ? Color.black
- : Color.gray);
+ ? Color.black
+ : Color.gray);
HTTPProxyPortLabel.setForeground((tmp != null)
- ? Color.black
- : Color.gray);
+ ? Color.black
+ : Color.gray);
if (tmp != null) {
HTTPProxyBox.setSelected(true);
HTTPProxyHost.setText(tmp);
@@ -347,14 +357,14 @@
c.anchor = GridBagConstraints.WEST;
c.gridwidth = GridBagConstraints.REMAINDER;
final String delaySupport = getMessage("delay00",
- "Simulate Slow Connection");
+ "Simulate Slow Connection");
opts.add(delayBox = new JCheckBox(delaySupport), c);
// bytes per pause
c.anchor = GridBagConstraints.WEST;
c.gridwidth = 1;
delayBytesLabel = new JLabel(getMessage("delay01",
- "Bytes per Pause"));
+ "Bytes per Pause"));
opts.add(delayBytesLabel, c);
delayBytesLabel.setForeground(Color.gray);
c.anchor = GridBagConstraints.WEST;
@@ -366,7 +376,7 @@
c.anchor = GridBagConstraints.WEST;
c.gridwidth = 1;
delayTimeLabel = new JLabel(getMessage("delay02",
- "Delay in Milliseconds"));
+ "Delay in Milliseconds"));
opts.add(delayTimeLabel, c);
delayTimeLabel.setForeground(Color.gray);
c.anchor = GridBagConstraints.WEST;
@@ -426,8 +436,8 @@
}
try {
l = new Listener(noteb, null, lPort, tHost, tPort,
- proxyButton.isSelected(),
- slowLink);
+ proxyButton.isSelected(),
+ slowLink);
} catch (Exception e) {
e.printStackTrace();
}
@@ -498,7 +508,10 @@
*/
public void run() {
try {
- listener.setLeft(new JLabel(getMessage("wait00", " Waiting for Connection...")));
+ listener.setLeft(
+ new JLabel(
+ getMessage("wait00",
+ " Waiting for Connection...")));
listener.repaint();
sSocket = new ServerSocket(port);
for (; ;) {
@@ -767,7 +780,7 @@
int thisIndent = -1, nextIndent = -1, previousIndent = -1;
if (tmodel != null) {
String tmpStr = (String) tmodel.getValueAt(tableIndex,
- REQ_COLUMN);
+ REQ_COLUMN);
if (!"".equals(tmpStr)) {
reqSaved = tmpStr.length();
}
@@ -820,7 +833,7 @@
}
if ((tmodel != null) && (reqSaved < 50)) {
String old = (String) tmodel.getValueAt(tableIndex,
- REQ_COLUMN);
+ REQ_COLUMN);
old = old + new String(buffer, saved, len);
if (old.length() > 50) {
old = old.substring(0, 50);
@@ -1110,18 +1123,18 @@
fromHost = "resend";
}
String dateformat = getMessage("dateformat00",
- "yyyy-MM-dd HH:mm:ss");
+ "yyyy-MM-dd HH:mm:ss");
DateFormat df = new SimpleDateFormat(dateformat);
time = df.format(new Date());
int count = listener.connections.size();
listener.tableModel.insertRow(count + 1,
- new Object[]{
- getMessage("active00",
- "Active"),
- time,
- fromHost,
- listener.hostField.getText(),
- ""});
+ new Object[]{
+ getMessage("active00",
+ "Active"),
+ time,
+ fromHost,
+ listener.hostField.getText(),
+ ""});
listener.connections.add(this);
inputText = new JTextArea(null, null, 20, 80);
inputScroll = new JScrollPane(inputText);
@@ -1204,17 +1217,17 @@
targetPort = 80;
}
listener.tableModel.setValueAt(targetHost,
- index + 1,
- OUTHOST_COLUMN);
+ index + 1,
+ OUTHOST_COLUMN);
bufferedData = bufferedData.substring(0, start)
+ url.getFile()
+ bufferedData.substring(end);
} else {
url = new URL("http://" + targetHost + ":"
- + targetPort + "/" + urlString);
+ + targetPort + "/" + urlString);
listener.tableModel.setValueAt(targetHost,
- index + 1,
- OUTHOST_COLUMN);
+ index + 1,
+ OUTHOST_COLUMN);
bufferedData = bufferedData.substring(0, start)
+ url.toExternalForm()
+ bufferedData.substring(end);
@@ -1287,7 +1300,7 @@
+ " ";
s1 = s1.substring(0, 51);
listener.tableModel.setValueAt(s1, index + 1,
- REQ_COLUMN);
+ REQ_COLUMN);
}
}
if (targetPort == -1) {
@@ -1305,8 +1318,8 @@
// this is the channel to the endpoint
rr1 = new SocketRR(this, inSocket, tmpIn1, outSocket, tmpOut2,
- inputText, format, listener.tableModel,
- index + 1, "request:", slowLink);
+ inputText, format, listener.tableModel,
+ index + 1, "request:", slowLink);
// create the response slow link from the inbound slow link
SlowLinkSimulator responseLink =
@@ -1314,8 +1327,8 @@
// this is the channel from the endpoint
rr2 = new SocketRR(this, outSocket, tmpIn2, inSocket, tmpOut1,
- outputText, format, null, 0, "response:",
- responseLink);
+ outputText, format, null, 0, "response:",
+ responseLink);
while ((rr1 != null) || (rr2 != null)) {
// Only loop as long as the connection to the target
@@ -1325,15 +1338,17 @@
// while( !rr2.isDone() )
if ((null != rr1) && rr1.isDone()) {
if ((index >= 0) && (rr2 != null)) {
- listener.tableModel.setValueAt(getMessage("resp00", "Resp"), 1 + index,
- STATE_COLUMN);
+ listener.tableModel.setValueAt(
+ getMessage("resp00", "Resp"), 1 + index,
+ STATE_COLUMN);
}
rr1 = null;
}
if ((null != rr2) && rr2.isDone()) {
if ((index >= 0) && (rr1 != null)) {
- listener.tableModel.setValueAt(getMessage("req00", "Req"), 1 + index,
- STATE_COLUMN);
+ listener.tableModel.setValueAt(
+ getMessage("req00", "Req"), 1 + index,
+ STATE_COLUMN);
}
rr2 = null;
}
@@ -1358,16 +1373,18 @@
* outSocket = null ;
*/
if (index >= 0) {
- listener.tableModel.setValueAt(getMessage("done00", "Done"),
- 1 + index, STATE_COLUMN);
+ listener.tableModel.setValueAt(
+ getMessage("done00", "Done"),
+ 1 + index, STATE_COLUMN);
}
} catch (Exception e) {
StringWriter st = new StringWriter();
PrintWriter wr = new PrintWriter(st);
int index = listener.connections.indexOf(this);
if (index >= 0) {
- listener.tableModel.setValueAt(getMessage("error00", "Error"), 1 + index,
- STATE_COLUMN);
+ listener.tableModel.setValueAt(
+ getMessage("error00", "Error"), 1 + index,
+ STATE_COLUMN);
}
e.printStackTrace(wr);
wr.close();
@@ -1612,14 +1629,14 @@
top.add(stopButton = new JButton(start));
top.add(Box.createRigidArea(new Dimension(5, 0)));
top.add(new JLabel(" "
- + getMessage("listenPort01", "Listen Port:")
- + " ", SwingConstants.RIGHT));
+ + getMessage("listenPort01", "Listen Port:")
+ + " ", SwingConstants.RIGHT));
top.add(portField = new JTextField("" + listenPort, 4));
top.add(new JLabel(" " + getMessage("host00", "Host:"),
- SwingConstants.RIGHT));
+ SwingConstants.RIGHT));
top.add(hostField = new JTextField(host, 30));
top.add(new JLabel(" " + getMessage("port02", "Port:") + " ",
- SwingConstants.RIGHT));
+ SwingConstants.RIGHT));
top.add(tPortField = new JTextField("" + targetPort, 4));
top.add(Box.createRigidArea(new Dimension(5, 0)));
top.add(isProxyBox = new JCheckBox(getMessage("proxy00", "Proxy")));
@@ -1641,7 +1658,7 @@
stopButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
if (getMessage("stop00",
- "Stop").equals(event.getActionCommand())) {
+ "Stop").equals(event.getActionCommand())) {
stop();
}
if (start.equals(event.getActionCommand())) {
@@ -1662,11 +1679,12 @@
getMessage("request00", "Request...")}, 0);
tableModel.addRow(new Object[]{"---",
getMessage("mostRecent00",
- "Most Recent"),
+ "Most Recent"),
"---", "---", "---"});
connectionTable = new JTable(1, 2);
connectionTable.setModel(tableModel);
- connectionTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ connectionTable.setSelectionMode(
+ ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
// Reduce the STATE column and increase the REQ column
TableColumn col;
@@ -1684,8 +1702,12 @@
(ListSelectionModel) event.getSource();
int divLoc = outPane.getDividerLocation();
if (m.isSelectionEmpty()) {
- setLeft(new JLabel(" "
- + getMessage("wait00", "Waiting for Connection...")));
+ setLeft(
+ new JLabel(
+ " "
+ +
+ getMessage("wait00",
+ "Waiting for Connection...")));
setRight(new JLabel(""));
removeButton.setEnabled(false);
removeAllButton.setEnabled(false);
@@ -1695,9 +1717,12 @@
int row = m.getLeadSelectionIndex();
if (row == 0) {
if (connections.size() == 0) {
- setLeft(new JLabel(" "
- + getMessage("wait00",
- "Waiting for connection...")));
+ setLeft(
+ new JLabel(
+ " "
+ +
+ getMessage("wait00",
+ "Waiting for connection...")));
setRight(new JLabel(""));
removeButton.setEnabled(false);
removeAllButton.setEnabled(false);
@@ -1715,7 +1740,7 @@
}
} else {
Connection conn = (Connection) connections.get(row
- - 1);
+ - 1);
setLeft(conn.inputScroll);
setRight(conn.outputScroll);
removeButton.setEnabled(true);
@@ -1735,7 +1760,7 @@
buttons.setLayout(new BoxLayout(buttons, BoxLayout.X_AXIS));
buttons.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
final String removeSelected = getMessage("removeSelected00",
- "Remove Selected");
+ "Remove Selected");
buttons.add(removeButton = new JButton(removeSelected));
buttons.add(Box.createRigidArea(new Dimension(5, 0)));
final String removeAll = getMessage("removeAll00", "Remove All");
@@ -1766,25 +1791,26 @@
leftPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
leftPanel.setLayout(new BoxLayout(leftPanel, BoxLayout.Y_AXIS));
leftPanel.add(new JLabel(" "
- + getMessage("request01", "Request")));
+ + getMessage("request01", "Request")));
leftPanel.add(new JLabel(" "
- + getMessage("wait01",
- "Waiting for connection")));
+ + getMessage("wait01",
+ "Waiting for connection")));
rightPanel = new JPanel();
rightPanel.setLayout(new BoxLayout(rightPanel, BoxLayout.Y_AXIS));
rightPanel.add(new JLabel(" "
- + getMessage("response00", "Response")));
+ + getMessage("response00", "Response")));
rightPanel.add(new JLabel(""));
outPane = new JSplitPane(0, leftPanel, rightPanel);
outPane.setDividerSize(4);
pane2.add(outPane, BorderLayout.CENTER);
JPanel bottomButtons = new JPanel();
bottomButtons.setLayout(new BoxLayout(bottomButtons,
- BoxLayout.X_AXIS));
+ BoxLayout.X_AXIS));
bottomButtons.setBorder(BorderFactory.createEmptyBorder(5, 5, 5,
- 5));
- bottomButtons.add(xmlFormatBox =
- new JCheckBox(getMessage("xmlFormat00", "XML Format")));
+ 5));
+ bottomButtons.add(
+ xmlFormatBox =
+ new JCheckBox(getMessage("xmlFormat00", "XML Format")));
bottomButtons.add(Box.createRigidArea(new Dimension(5, 0)));
final String save = getMessage("save00", "Save");
bottomButtons.add(saveButton = new JButton(save));
@@ -1969,21 +1995,24 @@
&& (lsm.getLeadSelectionIndex() == 0))) {
rc = Integer.parseInt(portField.getText());
out.write("\n==============\n".getBytes());
- out.write(((getMessage("listenPort01", "Listen Port:")
- + " " + rc + "\n")).getBytes());
- out.write((getMessage("targetHost01", "Target Host:")
- + " " + hostField.getText()
- + "\n").getBytes());
+ out.write(((getMessage("listenPort01",
+ "Listen Port:")
+ + " " + rc + "\n")).getBytes());
+ out.write((getMessage("targetHost01",
+ "Target Host:")
+ + " " + hostField.getText()
+ + "\n").getBytes());
rc = Integer.parseInt(tPortField.getText());
- out.write(((getMessage("targetPort01", "Target Port:")
- + " " + rc + "\n")).getBytes());
+ out.write(((getMessage("targetPort01",
+ "Target Port:")
+ + " " + rc + "\n")).getBytes());
out.write((("==== "
- + getMessage("request01", "Request")
- + " ====\n")).getBytes());
+ + getMessage("request01", "Request")
+ + " ====\n")).getBytes());
out.write(conn.inputText.getText().getBytes());
out.write((("==== "
- + getMessage("response00", "Response")
- + " ====\n")).getBytes());
+ + getMessage("response00", "Response")
+ + " ====\n")).getBytes());
out.write(conn.outputText.getText().getBytes());
out.write("\n==============\n".getBytes());
}
@@ -2040,8 +2069,8 @@
System.err.println("CL: " + newLen);
System.err.println("Hdrs: '" + headers + "'");
System.err.println("subTEXT: '"
- + text.substring(pos3, pos3 + newLen)
- + "'");
+ + text.substring(pos3, pos3 + newLen)
+ + "'");
text = headers.substring(0, pos1) + "Content-Length: "
+ newLen + "\n" + headers.substring(pos2 + 1)
+ text.substring(pos3);
@@ -2074,10 +2103,10 @@
Listener l = null;
if (targetHost == null) {
l = new Listener(notebook, null, listenPort, targetHost,
- targetPort, true, null);
+ targetPort, true, null);
} else {
l = new Listener(notebook, null, listenPort, targetHost,
- targetPort, false, null);
+ targetPort, false, null);
}
notebook.setSelectedIndex(1);
l.HTTPProxyHost = System.getProperty("http.proxyHost");
@@ -2162,8 +2191,9 @@
int p1 = Integer.parseInt(args[0]);
new tcpmon(p1, null, 0);
} else if (args.length != 0) {
- System.err.println(getMessage("usage00", "Usage:")
- + " tcpmon [listenPort targetHost targetPort]\n");
+ System.err.println(
+ getMessage("usage00", "Usage:")
+ + " tcpmon [listenPort targetHost targetPort]\n");
} else {
new tcpmon(0, null, 0);
}
@@ -2298,7 +2328,9 @@
* @param attributes
* @throws BadLocationException
*/
- public void insertString(int offset, String string, AttributeSet attributes)
+ public void insertString(int offset,
+ String string,
+ AttributeSet attributes)
throws BadLocationException {
if (string == null) {
return;
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/AbstractTestCase.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/AbstractTestCase.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/AbstractTestCase.java Mon Jul 11 10:48:55 2005
@@ -27,8 +27,13 @@
extends TestCase {
protected String testDir = "test" + File.separator;
protected String sampleDir = "samples" + File.separator;
- protected String outDir = "target" + File.separator + "generated" + File.separator + "samples" + File.separator;
- protected String tempDir = "target" + File.separator + "generated" + File.separator + "temp";
+ protected String outDir = "target" + File.separator + "generated" +
+ File.separator +
+ "samples" +
+ File.separator;
+ protected String tempDir = "target" + File.separator + "generated" +
+ File.separator +
+ "temp";
protected String testResourceDir = "test-resources";
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/AnyContentTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/AnyContentTypeTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/AnyContentTypeTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/AnyContentTypeTest.java Mon Jul 11 10:48:55 2005
@@ -37,14 +37,21 @@
}
public void testAddAndGetReferenceValue() {
- System.out.println("Testing by putting more than 5 values in this. (this is initialized for 5)");
+ System.out.println(
+ "Testing by putting more than 5 values in this. (this is initialized for 5)");
for (int i = 0; i < 10; i++) {
- anyContentType.addReferenceValue(new QName("http://www.opensouce.lk/" + i, "" + i), "value " + i * 100);
+ anyContentType.addReferenceValue(
+ new QName("http://www.opensouce.lk/" + i, "" + i),
+ "value " + i * 100);
}
for (int i = 0; i < 10; i++) {
- String value = anyContentType.getReferenceValue(new QName("http://www.opensouce.lk/" + i, "" + i));
- assertEquals("Input value differs from what is taken out from AnyContentType", value, "value " + i * 100);
+ String value = anyContentType.getReferenceValue(
+ new QName("http://www.opensouce.lk/" + i, "" + i));
+ assertEquals(
+ "Input value differs from what is taken out from AnyContentType",
+ value,
+ "value " + i * 100);
}
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/EndpointReferenceTypeTest.java Mon Jul 11 10:48:55 2005
@@ -40,37 +40,56 @@
}
public void testGetAndSetMessageInformationHeaderType() {
- assertEquals("MessageInformationHeaderType not set properly in the constructor", headerType, endpointReference.getMessageInformationHeaderType());
-
- endpointReference.setMessageInformationHeaderType(AddressingConstants.WSA_REPLY_TO);
- assertEquals("MessageInformationHeaderType not set properly in the setter method", AddressingConstants.WSA_REPLY_TO, endpointReference.getMessageInformationHeaderType());
+ assertEquals(
+ "MessageInformationHeaderType not set properly in the constructor",
+ headerType,
+ endpointReference.getMessageInformationHeaderType());
+
+ endpointReference.setMessageInformationHeaderType(
+ AddressingConstants.WSA_REPLY_TO);
+ assertEquals(
+ "MessageInformationHeaderType not set properly in the setter method",
+ AddressingConstants.WSA_REPLY_TO,
+ endpointReference.getMessageInformationHeaderType());
}
public void testGetAndSetAddress() {
- assertEquals("Address not set properly in the constructor", address, endpointReference.getAddress());
+ assertEquals("Address not set properly in the constructor",
+ address,
+ endpointReference.getAddress());
String newAddress = "http://www.axis2.com";
endpointReference.setAddress(newAddress);
- assertEquals("Address not set properly in the setter method", newAddress, endpointReference.getAddress());
+ assertEquals("Address not set properly in the setter method",
+ newAddress,
+ endpointReference.getAddress());
}
public void testGetAndSetPortType() {
QName portType = new QName("www.someport.com", "port");
endpointReference.setInterfaceName(portType);
- assertEquals("PortType not set/get properly", portType, endpointReference.getInterfaceName());
+ assertEquals("PortType not set/get properly",
+ portType,
+ endpointReference.getInterfaceName());
}
public void testGetAndSetReferenceProperties() {
AnyContentType anyContentType = new AnyContentType();
for (int i = 0; i < 10; i++) {
- anyContentType.addReferenceValue(new QName("http://www.opensouce.lk/" + i, "" + i), "value " + i * 100);
+ anyContentType.addReferenceValue(
+ new QName("http://www.opensouce.lk/" + i, "" + i),
+ "value " + i * 100);
}
endpointReference.setReferenceProperties(anyContentType);
AnyContentType retrievedAnyContentType = endpointReference.getReferenceProperties();
for (int i = 0; i < 10; i++) {
- String value = retrievedAnyContentType.getReferenceValue(new QName("http://www.opensouce.lk/" + i, "" + i));
- assertEquals("Input value differs from what is taken out from AnyContentType", value, "value " + i * 100);
+ String value = retrievedAnyContentType.getReferenceValue(
+ new QName("http://www.opensouce.lk/" + i, "" + i));
+ assertEquals(
+ "Input value differs from what is taken out from AnyContentType",
+ value,
+ "value " + i * 100);
}
}
@@ -78,28 +97,44 @@
public void testGetAndSetReferenceParameters() {
AnyContentType anyContentType = new AnyContentType();
for (int i = 0; i < 10; i++) {
- anyContentType.addReferenceValue(new QName("http://www.opensouce.lk/" + i, "" + i), "value " + i * 50);
+ anyContentType.addReferenceValue(
+ new QName("http://www.opensouce.lk/" + i, "" + i),
+ "value " + i * 50);
}
endpointReference.setReferenceParameters(anyContentType);
AnyContentType retrievedAnyContentType = endpointReference.getReferenceParameters();
for (int i = 0; i < 10; i++) {
- String value = retrievedAnyContentType.getReferenceValue(new QName("http://www.opensouce.lk/" + i, "" + i));
- assertEquals("Input value differs from what is taken out from AnyContentType", value, "value " + i * 50);
+ String value = retrievedAnyContentType.getReferenceValue(
+ new QName("http://www.opensouce.lk/" + i, "" + i));
+ assertEquals(
+ "Input value differs from what is taken out from AnyContentType",
+ value,
+ "value " + i * 50);
}
}
public void testGetAndSetServiceName() {
- ServiceName serviceName = new ServiceName(new QName("www.someservicename.org", "service"));
+ ServiceName serviceName = new ServiceName(
+ new QName("www.someservicename.org", "service"));
endpointReference.setServiceName(serviceName);
ServiceName retrievedServiceName = endpointReference.getServiceName();
- assertEquals("ServiceName name has not been get/set properly", serviceName.getName(), retrievedServiceName.getName());
-
- serviceName = new ServiceName(new QName("www.someservicename.org", "service"), "portName");
+ assertEquals("ServiceName name has not been get/set properly",
+ serviceName.getName(),
+ retrievedServiceName.getName());
+
+ serviceName =
+ new ServiceName(
+ new QName("www.someservicename.org", "service"),
+ "portName");
endpointReference.setServiceName(serviceName);
retrievedServiceName = endpointReference.getServiceName();
- assertEquals("ServiceName name has not been get/set properly", serviceName.getName(), retrievedServiceName.getName());
- assertEquals("ServiceName portName has not been get/set properly", serviceName.getEndpointName(), retrievedServiceName.getEndpointName());
+ assertEquals("ServiceName name has not been get/set properly",
+ serviceName.getName(),
+ retrievedServiceName.getName());
+ assertEquals("ServiceName portName has not been get/set properly",
+ serviceName.getEndpointName(),
+ retrievedServiceName.getEndpointName());
}
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java Mon Jul 11 10:48:55 2005
@@ -37,27 +37,40 @@
public void testGetAddress() {
relatesTo = new RelatesTo(address, relationshipType);
- assertEquals("RelatesTo address has not been set properly in the constructor", relatesTo.getValue(), address);
+ assertEquals(
+ "RelatesTo address has not been set properly in the constructor",
+ relatesTo.getValue(),
+ address);
String newAddress = "www.newRelation.org";
relatesTo.setValue(newAddress);
- assertEquals("RelatesTo address has not been get/set properly", relatesTo.getValue(), newAddress);
+ assertEquals("RelatesTo address has not been get/set properly",
+ relatesTo.getValue(),
+ newAddress);
}
public void testGetRelationshipType() {
relatesTo = new RelatesTo(address, relationshipType);
- assertEquals("RelatesTo RelationshipType has not been set properly in the constructor", relatesTo.getRelationshipType(), relationshipType);
+ assertEquals(
+ "RelatesTo RelationshipType has not been set properly in the constructor",
+ relatesTo.getRelationshipType(),
+ relationshipType);
String newRelationshipType = "AnyOtherType";
relatesTo.setRelationshipType(newRelationshipType);
- assertEquals("RelatesTo address has not been get/set properly", relatesTo.getRelationshipType(), newRelationshipType);
+ assertEquals("RelatesTo address has not been get/set properly",
+ relatesTo.getRelationshipType(),
+ newRelationshipType);
}
public void testSingleArgumentConstructor() {
relatesTo = new RelatesTo(address);
- assertEquals("RelatesTo address has not been set properly in the constructor", relatesTo.getValue(), address);
+ assertEquals(
+ "RelatesTo address has not been set properly in the constructor",
+ relatesTo.getValue(),
+ address);
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java Mon Jul 11 10:48:55 2005
@@ -52,12 +52,13 @@
ConfigurationContext configurationContext =
new ConfigurationContext(axisConfiguration);
ServiceContext serviceCOntext =
- configurationContext.createServiceContext(serviceDescription.getName());
+ configurationContext.createServiceContext(
+ serviceDescription.getName());
MessageContext msgctx =
new MessageContext(configurationContext);
OperationContext opContext =
operationDescription.findOperationContext(msgctx,
- serviceCOntext);
+ serviceCOntext);
msgctx.setServiceContext(serviceCOntext);
//test the complte Hisracy built
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java Mon Jul 11 10:48:55 2005
@@ -39,23 +39,32 @@
public void testMEPfindingOnRelatesTO() throws Exception {
- ServiceContext sessionContext = new ServiceContext(new ServiceDescription(), new ConfigurationContext(null));
+ ServiceContext sessionContext = new ServiceContext(
+ new ServiceDescription(), new ConfigurationContext(null));
MessageContext messageContext1 = this.getBasicMessageContext();
- messageContext1.setMessageID(new Long(System.currentTimeMillis()).toString());
- OperationDescription axisOperation = new OperationDescription(new QName("test"));
- OperationContext operationContext1 = axisOperation.findOperationContext(messageContext1, sessionContext);
+ messageContext1.setMessageID(
+ new Long(System.currentTimeMillis()).toString());
+ OperationDescription axisOperation = new OperationDescription(
+ new QName("test"));
+ OperationContext operationContext1 = axisOperation.findOperationContext(
+ messageContext1, sessionContext);
MessageContext messageContext2 = this.getBasicMessageContext();
- messageContext2.setMessageID(new Long(System.currentTimeMillis()).toString());
- messageContext2.getMessageInformationHeaders().setRelatesTo(new RelatesTo(messageContext1.getMessageID()));
- OperationContext operationContext2 = axisOperation.findOperationContext(messageContext2, sessionContext);
+ messageContext2.setMessageID(
+ new Long(System.currentTimeMillis()).toString());
+ messageContext2.getMessageInformationHeaders().setRelatesTo(
+ new RelatesTo(messageContext1.getMessageID()));
+ OperationContext operationContext2 = axisOperation.findOperationContext(
+ messageContext2, sessionContext);
assertEquals(operationContext1, operationContext2);
}
public MessageContext getBasicMessageContext() throws AxisFault {
- return new MessageContext(engineCtx, new TransportInDescription(new QName("axis")), new TransportOutDescription(new QName("axis")));
+ return new MessageContext(engineCtx,
+ new TransportInDescription(new QName("axis")),
+ new TransportOutDescription(new QName("axis")));
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java Mon Jul 11 10:48:55 2005
@@ -33,11 +33,13 @@
public void testBadModuleXML() {
try {
- InputStream in = new FileInputStream(getTestResourceFile("deployment/Badmodule.xml"));
+ InputStream in = new FileInputStream(
+ getTestResourceFile("deployment/Badmodule.xml"));
DeploymentParser parser = new DeploymentParser(in, null);
AxisConfigurationImpl glabl = new AxisConfigurationImpl();
parser.processGlobalConfig(glabl, DeploymentConstants.AXIS2CONFIG);
- fail("this must failed gracefully with DeploymentException or FileNotFoundException");
+ fail(
+ "this must failed gracefully with DeploymentException or FileNotFoundException");
} catch (FileNotFoundException e) {
return;
} catch (DeploymentException e) {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServerXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServerXMLTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServerXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServerXMLTest.java Mon Jul 11 10:48:55 2005
@@ -33,11 +33,13 @@
public void testBadServerXML() {
try {
- InputStream in = new FileInputStream(getTestResourceFile("deployment/BadServer.xml"));
+ InputStream in = new FileInputStream(
+ getTestResourceFile("deployment/BadServer.xml"));
DeploymentParser parser = new DeploymentParser(in, null);
AxisConfigurationImpl glabl = new AxisConfigurationImpl();
parser.processGlobalConfig(glabl, DeploymentConstants.AXIS2CONFIG);
- fail("this must failed gracefully with DeploymentException or FileNotFoundException");
+ fail(
+ "this must failed gracefully with DeploymentException or FileNotFoundException");
} catch (FileNotFoundException e) {
return;
} catch (DeploymentException e) {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServiceXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServiceXMLTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServiceXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/BadServiceXMLTest.java Mon Jul 11 10:48:55 2005
@@ -33,11 +33,13 @@
public void testBadServiceXML() {
try {
- InputStream in = new FileInputStream(getTestResourceFile("deployment/BadService.xml"));
+ InputStream in = new FileInputStream(
+ getTestResourceFile("deployment/BadService.xml"));
DeploymentParser parser = new DeploymentParser(in, null);
ServiceDescription axisService = new ServiceDescription();
parser.parseServiceXML(axisService);
- fail("this must failed gracefully with DeploymentException or FileNotFoundException");
+ fail(
+ "this must failed gracefully with DeploymentException or FileNotFoundException");
} catch (FileNotFoundException e) {
return;
} catch (DeploymentException e) {