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 ru...@apache.org on 2006/01/05 16:03:50 UTC
svn commit: r366192 [2/3] - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/
adb/src/org/apache/axis2/databinding/deserializers/
adb/src/org/apache/axis2/databinding/types/
adb/test/org/apache/axis2/databinding/ addressin...
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/AdminAppException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/AdminAppException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/AdminAppException.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/AdminAppException.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,10 @@
package org.apache.axis2.transport.http.server;
public class AdminAppException extends Exception {
- public AdminAppException() {
+
+ private static final long serialVersionUID = -968033744797396457L;
+
+ public AdminAppException() {
}
public AdminAppException(String message) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/HttpServiceHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/HttpServiceHandler.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/HttpServiceHandler.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/HttpServiceHandler.java Thu Jan 5 07:00:02 2006
@@ -63,7 +63,6 @@
throw new IllegalArgumentException("Request may not be null");
}
- boolean complete = false;
SimpleResponse response = new SimpleResponse();
this.service.process(request, response);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/InvokeException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/InvokeException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/InvokeException.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/InvokeException.java Thu Jan 5 07:00:02 2006
@@ -22,7 +22,10 @@
* general exception in the course of processing.
*/
public class InvokeException extends RuntimeException {
- public InvokeException(String message) {
+
+ private static final long serialVersionUID = -9143832230352429639L;
+
+ public InvokeException(String message) {
super(message);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/InvokeTimeoutException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/InvokeTimeoutException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/InvokeTimeoutException.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/InvokeTimeoutException.java Thu Jan 5 07:00:02 2006
@@ -27,7 +27,10 @@
* The key in the table is <code>JMSConstants.INTERACT_TIMEOUT_TIME</code>
*/
public class InvokeTimeoutException extends InvokeException {
- public InvokeTimeoutException(String message) {
+
+ private static final long serialVersionUID = -7542703412906905731L;
+
+ public InvokeTimeoutException(String message) {
super(message);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSConnectorManager.java Thu Jan 5 07:00:02 2006
@@ -294,7 +294,6 @@
* Todo: max size, cleanup stale connections
*/
public class ShareableObjectPool {
- private int m_numElements = 0;
// maps object to ref count wrapper
private java.util.HashMap m_elements;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSSender.java Thu Jan 5 07:00:02 2006
@@ -47,7 +47,10 @@
* This is meant to be used on a SOAP Client to call a SOAP server.
*/
public class JMSSender extends AbstractHandler implements TransportSender {
- protected static Log log = LogFactory.getLog(JMSSender.class.getName());
+
+ private static final long serialVersionUID = -3883554138407525394L;
+
+ protected static Log log = LogFactory.getLog(JMSSender.class.getName());
static {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapter.java Thu Jan 5 07:00:02 2006
@@ -78,7 +78,6 @@
* or connection factory
*/
public void setupMessageContext(MessageContext context, JMSURLHelper jmsurl) {
- Object tmp = null;
String jmsurlDestination = null;
if (jmsurl != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JMSVendorAdapterFactory.java Thu Jan 5 07:00:02 2006
@@ -28,7 +28,6 @@
*/
public class JMSVendorAdapterFactory {
private static HashMap s_adapters = new HashMap();
- private static Loader loader = new Loader();
private final static String VENDOR_PKG = "org.apache.axis2.transport.jms";
public static final JMSVendorAdapter getJMSVendorAdapter() throws Exception {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSWorker.java Thu Jan 5 07:00:02 2006
@@ -83,7 +83,6 @@
builder = TransportUtils.selectBuilderForMIME(msgContext, in, contentType);
envelope = (SOAPEnvelope) builder.getDocumentElement();
} else {
- Reader reader = new InputStreamReader(in);
XMLStreamReader xmlreader;
// Figure out the char set encoding and create the reader
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalResponder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalResponder.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalResponder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalResponder.java Thu Jan 5 07:00:02 2006
@@ -28,7 +28,9 @@
* LocalResponder
*/
public class LocalResponder extends AbstractTransportSender {
- LocalTransportSender sender;
+
+ private static final long serialVersionUID = 4383137590664240383L;
+ LocalTransportSender sender;
public LocalResponder(LocalTransportSender sender) {
this.sender = sender;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java Thu Jan 5 07:00:02 2006
@@ -29,7 +29,9 @@
import java.io.OutputStream;
public class LocalTransportSender extends AbstractTransportSender {
- private ByteArrayOutputStream out;
+
+ private static final long serialVersionUID = -5245866514826025561L;
+ private ByteArrayOutputStream out;
private ByteArrayOutputStream response;
public LocalTransportSender() {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EmailReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EmailReceiver.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EmailReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EmailReceiver.java Thu Jan 5 07:00:02 2006
@@ -107,7 +107,6 @@
inbox.open(Folder.READ_WRITE);
Message[] msgs = inbox.getMessages();
- int numMessages = msgs.length;
if (msgs.length == 0) {
return null;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java Thu Jan 5 07:00:02 2006
@@ -31,7 +31,9 @@
import java.io.OutputStream;
public class MailTransportSender extends AbstractTransportSender {
- private String smtpPort = "25";
+
+ private static final long serialVersionUID = -2858556361961169381L;
+ private String smtpPort = "25";
private ByteArrayOutputStream byteArrayOutputStream;
private String host;
private String password;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java Thu Jan 5 07:00:02 2006
@@ -47,10 +47,8 @@
public class MailWorker implements Runnable {
protected static Log log = LogFactory.getLog(MailWorker.class.getName());
- private String contentType = "text/xml";
private ConfigurationContext configContext = null;
private Properties prop = new Properties();
- private Session session = Session.getDefaultInstance(prop, null);
private MimeMessage mimeMessage;
/**
@@ -107,6 +105,7 @@
+ ((emailSubject != null)
? emailSubject
: ""));
+ //TODO: FixME: There's nothing happening here ???
} else {
throw new AxisFault(Messages.getMessage("noRecep4Email"));
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailAddress.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailAddress.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailAddress.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailAddress.java Thu Jan 5 07:00:02 2006
@@ -7,7 +7,10 @@
* of the Addresses.
*/
public class MailAddress extends Address {
- String mailAddy = null;
+
+ private static final long serialVersionUID = 3033256355495000819L;
+
+ String mailAddy = null;
public MailAddress(String mAddy) {
this.mailAddy = mAddy;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java Thu Jan 5 07:00:02 2006
@@ -87,7 +87,7 @@
}
try {
- MailServer ms = new MailServer(popPort, smtpPost);
+ new MailServer(popPort, smtpPost);
} catch (AxisFault e) {
log.info(e.getMessage());
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java Thu Jan 5 07:00:02 2006
@@ -11,7 +11,6 @@
public class POP3Server extends Thread {
protected static Log log = LogFactory.getLog(POP3Server.class.getName());
private Storage st = null;
- private boolean running = false;
private ServerSocket serverSocket;
public POP3Server(Storage st, int port) throws AxisFault {
@@ -19,7 +18,6 @@
try {
synchronized (this) {
- running = true;
serverSocket = new ServerSocket(port);
log.info("Server started on port " + port);
}
@@ -44,7 +42,6 @@
public void stopServer() throws AxisFault {
try {
synchronized (this) {
- running = false;
serverSocket.close();
}
} catch (IOException e) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Worker.java Thu Jan 5 07:00:02 2006
@@ -45,8 +45,6 @@
}
private void processInput(String input, PrintWriter printWriter) {
- int listLen = (MailSrvConstants.LIST + " ").length();
- byte[] CR_LF = new byte[]{0x0D, 0x0A};
byte[] CR_LF_DOT_CR_LF = new byte[]{0x0D, 0x0A, '.', 0x0D, 0x0A};
String user = "";
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPWorker.java Thu Jan 5 07:00:02 2006
@@ -93,7 +93,6 @@
}
private String processInput(String input) {
- byte[] CR_LF = new byte[]{0x0D, 0x0A};
if (input == null) {
return MailSrvConstants.COMMAND_UNKNOWN;
@@ -143,7 +142,6 @@
if (input.startsWith("HELO")) {
return MailSrvConstants.HELO_REPLY;
} else if (input.startsWith("RCPT")) {
- String domain = MailSrvConstants.SERVER_DOMAIN;
int start = input.indexOf("<") + 1;
int end;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/Storage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/Storage.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/Storage.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/Storage.java Thu Jan 5 07:00:02 2006
@@ -22,7 +22,6 @@
import java.util.Hashtable;
public class Storage {
- private ArrayList mails = new ArrayList();
private Hashtable users = new Hashtable();
public Storage() {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java Thu Jan 5 07:00:02 2006
@@ -80,7 +80,7 @@
Parameter param = transprtIn.getParameter(PARAM_PORT);
if (param != null) {
- int port = Integer.parseInt((String) param.getValue());
+ this.port = Integer.parseInt((String) param.getValue());
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java Thu Jan 5 07:00:02 2006
@@ -17,14 +17,6 @@
package org.apache.axis2.transport.tcp;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.AbstractTransportSender;
-import org.apache.axis2.util.URL;
-
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
@@ -33,13 +25,21 @@
import java.net.Socket;
import java.net.SocketAddress;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.transport.AbstractTransportSender;
+import org.apache.axis2.util.URL;
+
public class TCPTransportSender extends AbstractTransportSender {
- /**
+ private static final long serialVersionUID = -6780125098288186598L;
+
+ /**
* Field out
*/
protected Writer out;
- private ByteArrayOutputStream outputStream;
/**
* Field socket
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java Thu Jan 5 07:00:02 2006
@@ -35,7 +35,6 @@
public class ThreadPool implements ThreadFactory {
protected static Log log = LogFactory.getLog(ThreadPool.class.getName());
protected static long SLEEP_INTERVAL = 1000;
- private static int MAX_THREAD_COUNT = 10;
private static boolean shutDown;
protected ThreadPoolExecutor executor;
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/ModuleHandler1.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/ModuleHandler1.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/ModuleHandler1.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/ModuleHandler1.java Thu Jan 5 07:00:02 2006
@@ -25,7 +25,8 @@
*/
public class ModuleHandler1 extends AbstractHandler implements Handler {
- private Log log = LogFactory.getLog(getClass());
+ private static final long serialVersionUID = 8180024686236178934L;
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
public ModuleHandler1() {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java Thu Jan 5 07:00:02 2006
@@ -26,7 +26,10 @@
import javax.xml.namespace.QName;
public class SpeakingHandler extends AbstractHandler implements Handler {
- private Log log = LogFactory.getLog(getClass());
+
+ private static final long serialVersionUID = -7115915636830140164L;
+
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java Thu Jan 5 07:00:02 2006
@@ -103,7 +103,9 @@
public void testHandlers() throws AxisFault {
Handler handler = new AbstractHandler() {
- public void invoke(MessageContext msgContext) {
+ private static final long serialVersionUID = 196289132377245632L;
+
+ public void invoke(MessageContext msgContext) {
}
};
handler.init(new HandlerDescription());
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java Thu Jan 5 07:00:02 2006
@@ -26,7 +26,8 @@
import javax.xml.namespace.QName;
public class SpeakingHandler extends AbstractHandler implements Handler {
- private Log log = LogFactory.getLog(getClass());
+ private static final long serialVersionUID = 1981398896004153611L;
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java Thu Jan 5 07:00:02 2006
@@ -26,7 +26,8 @@
import javax.xml.namespace.QName;
public class SpeakingHandler1 extends AbstractHandler implements Handler {
- private Log log = LogFactory.getLog(getClass());
+ private static final long serialVersionUID = -9147014780463234096L;
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java Thu Jan 5 07:00:02 2006
@@ -24,7 +24,6 @@
public class SpeakingProvider implements MessageReceiver {
private Log log = LogFactory.getLog(getClass());
- private String message;
public SpeakingProvider() {
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java Thu Jan 5 07:00:02 2006
@@ -148,7 +148,8 @@
}
public class TempHandler extends AbstractHandler {
- private Integer index;
+ private static final long serialVersionUID = 6201231320871883424L;
+ private Integer index;
private boolean pause = false;
public TempHandler(int index, boolean pause) {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/handlers/Handler2.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/handlers/Handler2.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/handlers/Handler2.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/handlers/Handler2.java Thu Jan 5 07:00:02 2006
@@ -25,7 +25,8 @@
*/
public class Handler2 extends AbstractHandler implements Handler {
- private Log log = LogFactory.getLog(getClass());
+ private static final long serialVersionUID = 972538148763607921L;
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
public Handler2() {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java Thu Jan 5 07:00:02 2006
@@ -28,13 +28,10 @@
public class PhaseRuleHandlers extends AbstractHandler implements Handler {
- private Log log = LogFactory.getLog(getClass());
- private String message;
+ private static final long serialVersionUID = 2941436920684525811L;
+
+ private Log log = LogFactory.getLog(getClass());
private QName name;
-
- public PhaseRuleHandlers() {
- this.message = "inside service 2";
- }
public void invoke(MessageContext msgContext) throws AxisFault {
log.info("I am " + name + " Handler Running :)");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/phaserule/PreDispatchPhaseRuleTest.java Thu Jan 5 07:00:02 2006
@@ -41,7 +41,6 @@
axisSytem = new AxisConfiguration();
ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
- Handler han = null;
PhaseHolder ph = new PhaseHolder(inPhase);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/registry/Handler3.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/registry/Handler3.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/registry/Handler3.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/registry/Handler3.java Thu Jan 5 07:00:02 2006
@@ -26,7 +26,8 @@
*/
public class Handler3 extends AbstractHandler implements Handler {
- private Log log = LogFactory.getLog(getClass());
+ private static final long serialVersionUID = 5364844101018794296L;
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
public Handler3() {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/sample/handlers/LoggingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/sample/handlers/LoggingHandler.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/sample/handlers/LoggingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/sample/handlers/LoggingHandler.java Thu Jan 5 07:00:02 2006
@@ -24,7 +24,9 @@
public class LoggingHandler extends AbstractHandler {
- private Log log = LogFactory.getLog(getClass());
+ private static final long serialVersionUID = 7656851260678664746L;
+
+ private Log log = LogFactory.getLog(getClass());
public void invoke(MessageContext msgContext) throws AxisFault {
log.info("Incoming message From " + msgContext.getTo().getAddress());
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/HTTPTransportHeaderParsingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/HTTPTransportHeaderParsingTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/HTTPTransportHeaderParsingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/HTTPTransportHeaderParsingTest.java Thu Jan 5 07:00:02 2006
@@ -95,7 +95,7 @@
InputStream reader = new ByteArrayInputStream(message.getBytes());
HTTPTransportReceiver receiver = new HTTPTransportReceiver();
BufferedInputStream br = new BufferedInputStream(reader);
- Map map = receiver.parseTheHeaders(br, false);
+ receiver.parseTheHeaders(br, false);
fail("test must failed as \n\n is missing");
} catch (AxisFault e) {
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java Thu Jan 5 07:00:02 2006
@@ -26,12 +26,10 @@
import javax.xml.namespace.QName;
public class HTTPTransportUtilTest extends TestCase {
- private HTTPTransportUtils httpTransportUtils;
private SOAPFactory factory;
protected void setUp() throws Exception {
super.setUp();
- httpTransportUtils = new HTTPTransportUtils();
factory = OMAbstractFactory.getSOAP11Factory();
}
Modified: webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java (original)
+++ webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java Thu Jan 5 07:00:02 2006
@@ -32,7 +32,7 @@
//TODO Handle docType stuff
DocumentImpl doc = new DocumentImpl();
- ElementImpl elem = new ElementImpl(doc,DOMUtil.getLocalName(qualifiedName),new NamespaceImpl(namespaceURI, DOMUtil.getPrefix(qualifiedName)));
+ new ElementImpl(doc,DOMUtil.getLocalName(qualifiedName),new NamespaceImpl(namespaceURI, DOMUtil.getPrefix(qualifiedName)));
return doc;
}
Modified: webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/OMDOMException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/OMDOMException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/OMDOMException.java (original)
+++ webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/OMDOMException.java Thu Jan 5 07:00:02 2006
@@ -21,6 +21,8 @@
*/
public class OMDOMException extends OMException {
+ private static final long serialVersionUID = 8763119035210190906L;
+
public OMDOMException() {
super();
}
Modified: webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/factory/DOMSOAPFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/factory/DOMSOAPFactory.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/factory/DOMSOAPFactory.java (original)
+++ webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/soap/impl/dom/factory/DOMSOAPFactory.java Thu Jan 5 07:00:02 2006
@@ -191,14 +191,14 @@
SOAPFault fault = createSOAPFault(defaultEnvelope.getBody());
SOAPFaultCode faultCode = createSOAPFaultCode(fault);
- SOAPFaultValue value = createSOAPFaultValue(faultCode);
+ createSOAPFaultValue(faultCode);
SOAPFaultReason reason = createSOAPFaultReason(fault);
- SOAPFaultText faultText = createSOAPFaultText(reason);
+ createSOAPFaultText(reason);
- SOAPFaultNode faultNode = createSOAPFaultNode(fault);
- SOAPFaultRole faultRole = createSOAPFaultRole(fault);
- SOAPFaultDetail faultDetail = createSOAPFaultDetail(fault);
+ createSOAPFaultNode(fault);
+ createSOAPFaultRole(fault);
+ createSOAPFaultDetail(fault);
return defaultEnvelope;
}
Modified: webservices/axis2/trunk/java/modules/doom/test/org/apache/axis2/om/impl/dom/OMTestUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/doom/test/org/apache/axis2/om/impl/dom/OMTestUtils.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/doom/test/org/apache/axis2/om/impl/dom/OMTestUtils.java (original)
+++ webservices/axis2/trunk/java/modules/doom/test/org/apache/axis2/om/impl/dom/OMTestUtils.java Thu Jan 5 07:00:02 2006
@@ -85,8 +85,6 @@
NamedNodeMap map = ele.getAttributes();
Iterator attIterator = omele.getAllAttributes();
OMAttribute omattribute;
- Attr domAttribute;
- String DOMAttrName;
while (attIterator != null && attIterator.hasNext() && map == null) {
omattribute = (OMAttribute) attIterator.next();
Node node = map.getNamedItemNS(
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults1ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults1ClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults1ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults1ClientUtil.java Thu Jan 5 07:00:02 2006
@@ -35,8 +35,8 @@
SOAP11Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
method.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", soapEnvNS);
- OMNamespace xsiNs = method.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
- OMNamespace ns2 = method.declareNamespace("http://soapinterop.org/types","ns2");
+ method.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
+ method.declareNamespace("http://soapinterop.org/types","ns2");
method.declareNamespace("http://schemas.xmlsoap.org/wsdl/","wsdl");
OMElement value = fac.createOMElement("whichFault", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults2ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults2ClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults2ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults2ClientUtil.java Thu Jan 5 07:00:02 2006
@@ -35,8 +35,8 @@
SOAP11Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
method.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", soapEnvNS);
- OMNamespace xsiNs = method.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
- OMNamespace ns2 = method.declareNamespace("http://soapinterop.org/types","ns2");
+ method.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
+ method.declareNamespace("http://soapinterop.org/types","ns2");
method.declareNamespace("http://schemas.xmlsoap.org/wsdl/","wsdl");
OMElement value = fac.createOMElement("whichFault", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults3Clientutil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults3Clientutil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults3Clientutil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/sun/round4/simple/util/EchoMultipleFaults3Clientutil.java Thu Jan 5 07:00:02 2006
@@ -34,8 +34,8 @@
SOAP11Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
method.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", soapEnvNS);
- OMNamespace xsiNs = method.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
- OMNamespace ns2 = method.declareNamespace("http://soapinterop.org/types","ns2");
+ method.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
+ method.declareNamespace("http://soapinterop.org/types","ns2");
method.declareNamespace("http://schemas.xmlsoap.org/wsdl/","wsdl");
OMElement value = fac.createOMElement("whichFault", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/WhiteMesaIneterop.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/WhiteMesaIneterop.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/WhiteMesaIneterop.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/WhiteMesaIneterop.java Thu Jan 5 07:00:02 2006
@@ -16,44 +16,79 @@
package test.interop.whitemesa;
-import junit.framework.TestCase;
+import java.io.InputStream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
+import org.custommonkey.xmlunit.XMLTestCase;
+
import test.interop.util.XMLComparatorInterop;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.InputStream;
-public class WhiteMesaIneterop extends TestCase {
+public class WhiteMesaIneterop extends XMLTestCase {
+
+ protected void compareXML(SOAPEnvelope retEnv, String filePath)
+ throws AxisFault {
+
+ try {
+ if (retEnv != null) {
+ SOAPBody body = retEnv.getBody();
+ if (!body.hasFault()) {
+ InputStream stream = Thread.currentThread()
+ .getContextClassLoader().getResourceAsStream(
+ filePath);
+
+ XMLStreamReader parser = XMLInputFactory.newInstance()
+ .createXMLStreamReader(stream);
+ OMXMLParserWrapper builder = new StAXSOAPModelBuilder(
+ parser, null);
+ SOAPEnvelope refEnv = (SOAPEnvelope) builder
+ .getDocumentElement();
+ String refXML = refEnv.toString();
+ String retXML = retEnv.toString();
+ assertXMLEqual(refXML, retXML);
+ }
+ }
+ } catch (Exception e) {
+ throw new AxisFault(e);
+ }
+
+ }
+
+ protected boolean compare(SOAPEnvelope retEnv, String filePath)
+ throws AxisFault {
+ boolean ok;
+ try {
+ if (retEnv != null) {
+ SOAPBody body = retEnv.getBody();
+ if (!body.hasFault()) {
+
+ InputStream stream = Thread.currentThread()
+ .getContextClassLoader().getResourceAsStream(
+ filePath);
+
+ XMLStreamReader parser = XMLInputFactory.newInstance()
+ .createXMLStreamReader(stream);
+ OMXMLParserWrapper builder = new StAXSOAPModelBuilder(
+ parser, null);
+ SOAPEnvelope refEnv = (SOAPEnvelope) builder
+ .getDocumentElement();
+ XMLComparatorInterop comparator = new XMLComparatorInterop();
+ ok = comparator.compare(retEnv, refEnv);
+ } else
+ return false;
+ } else
+ return false;
+
+ } catch (Exception e) {
+ throw new AxisFault(e);
+ }
+ return ok;
+ }
- protected boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
- boolean ok;
- try {
- if (retEnv != null) {
- SOAPBody body = retEnv.getBody();
- if (!body.hasFault()) {
- //OMElement firstChild = (OMElement) body.getFirstElement();
-
- InputStream stream = Thread.currentThread().getContextClassLoader()
- .getResourceAsStream(filePath);
-
- XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
- OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
- SOAPEnvelope refEnv = (SOAPEnvelope) builder.getDocumentElement();
- //OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
- XMLComparatorInterop comparator = new XMLComparatorInterop();
- ok = comparator.compare(retEnv, refEnv);
- } else
- return false;
- } else
- return false;
-
- } catch (Exception e) {
- throw new AxisFault(e);
- }
- return ok;
- }
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedArrayUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedArrayUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoSimpleTypesAsStructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoSimpleTypesAsStructUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoSimpleTypesAsStructUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoSimpleTypesAsStructUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcVoidUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcVoidUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcVoidUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcVoidUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/R2MSaxms2DStringArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/R2MSaxms2DStringArrayUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/R2MSaxms2DStringArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/R2MSaxms2DStringArrayUtil.java Thu Jan 5 07:00:02 2006
@@ -18,8 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java Thu Jan 5 07:00:02 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoVoidClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoVoidClientUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoVoidClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoVoidClientUtil.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,6 @@
package test.interop.whitemesa.round2.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12VoidUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12VoidUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12VoidUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12VoidUtil.java Thu Jan 5 07:00:02 2006
@@ -42,7 +42,7 @@
reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap12/","soap12");
SOAPHeader header = omfactory.createSOAPHeader(reqEnv);
- OMNamespace hns = reqEnv.declareNamespace("http://soapinterop.org/echoheader/", "hns"); //xmlns:m0="http://soapinterop.org/echoheader/
+ reqEnv.declareNamespace("http://soapinterop.org/echoheader/", "hns"); //xmlns:m0="http://soapinterop.org/echoheader/
SOAPHeaderBlock block2 = header.addHeaderBlock("echoMeStructRequest", ns1);
block2.addAttribute("xsi:type", "hns:echoMeStructRequest", null);
Modified: webservices/axis2/trunk/java/modules/saaj/src/javax/xml/namespace/QName.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/javax/xml/namespace/QName.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/javax/xml/namespace/QName.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/javax/xml/namespace/QName.java Thu Jan 5 07:00:02 2006
@@ -33,7 +33,9 @@
*/
public class QName implements Serializable {
- /**
+ private static final long serialVersionUID = -6756054858541526837L;
+
+ /**
* Comment/shared empty <code>String</code>.
*/
private static final String emptyString = "".intern();
Modified: webservices/axis2/trunk/java/modules/saaj/src/javax/xml/soap/SOAPException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/javax/xml/soap/SOAPException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/javax/xml/soap/SOAPException.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/javax/xml/soap/SOAPException.java Thu Jan 5 07:00:02 2006
@@ -33,7 +33,9 @@
*/
public class SOAPException extends Exception {
- /**
+ private static final long serialVersionUID = 5083961510786058130L;
+
+ /**
* Constructs a <CODE>SOAPException</CODE> object with no
* reason or embedded <CODE>Throwable</CODE> object.
*/
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java Thu Jan 5 07:00:02 2006
@@ -15,16 +15,6 @@
*/
package org.apache.axis2.saaj;
-import org.apache.axis2.om.OMOutputFormat;
-import org.apache.axis2.transport.http.HTTPConstants;
-
-import javax.xml.soap.AttachmentPart;
-import javax.xml.soap.MimeHeader;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -34,6 +24,16 @@
import java.util.Iterator;
import java.util.Map;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+
+import org.apache.axis2.om.OMOutputFormat;
+import org.apache.axis2.transport.http.HTTPConstants;
+
public class SOAPMessageImpl extends SOAPMessage {
private SOAPPart soapPart;
@@ -361,20 +361,6 @@
*/
public SOAPBody getSOAPBody() throws SOAPException {
return this.soapPart.getEnvelope().getBody();
- }
-
- /**
- * Retrieve the MIME Header names by providing the {@link javax.xml.soap.MimeHeaders} Object
- *
- * @param headers The {@link javax.xml.soap.MimeHeaders} Object
- * @return MIME Header names corresponding to the <code>headers</code>
- */
- private String[] getMimeHeaderNames(final javax.xml.soap.MimeHeaders headers) {
- Collection mimeHeaderNames = new ArrayList();
- for (Iterator iterator = headers.getAllHeaders(); iterator.hasNext();) {
- mimeHeaderNames.add(((MimeHeader) iterator.next()).getName());
- }
- return (String[]) mimeHeaderNames.toArray(new String[0]);
}
/**
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SessionUtils2.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SessionUtils2.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SessionUtils2.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SessionUtils2.java Thu Jan 5 07:00:02 2006
@@ -40,11 +40,6 @@
protected static String randomClass = "java.security.SecureRandom";
/**
- * Host name/ip.
- */
- private static String thisHost = null;
-
- /**
* Generate and return a new session identifier.
*
* @return a new session id
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java Thu Jan 5 07:00:02 2006
@@ -59,7 +59,7 @@
SOAPElement el = header.addHeaderElement(envelope.createName("field4", NS_PREFIX, NS_URI));
SOAPElement el2 = el.addChildElement("field4b", NS_PREFIX);
- SOAPElement el3 = el2.addTextNode("field4value");
+ el2.addTextNode("field4value");
el = body.addBodyElement(envelope.createName("bodyfield3", NS_PREFIX, NS_URI));
el2 = el.addChildElement("bodyfield3a", NS_PREFIX);
@@ -94,9 +94,9 @@
if (content instanceof String) {
assertEquals(testText, (String) content);
} else if (content instanceof FileInputStream) {
-
+ //TODO : Complete this
// try to write to a File and check whether it is ok
- final FileInputStream fis = (FileInputStream) content;
+ // final FileInputStream fis = (FileInputStream) content;
/*File file = new File("output-file.jpg");
file.createNewFile();
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java Thu Jan 5 07:00:02 2006
@@ -1,18 +1,17 @@
package org.apache.axis2.saaj;
-import junit.framework.TestCase;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
import javax.xml.soap.SOAPMessage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+
+import junit.framework.TestCase;
public class AttachmentTest extends TestCase {
@@ -21,8 +20,6 @@
}
public void testStringAttachment() throws Exception {
- SOAPConnectionFactory scFactory = SOAPConnectionFactory.newInstance();
- SOAPConnection con = scFactory.createConnection();
MessageFactory factory = MessageFactory.newInstance();
SOAPMessage message = factory.createMessage();
@@ -52,8 +49,6 @@
}
public void testMultipleAttachments() throws Exception {
- SOAPConnectionFactory scFactory = SOAPConnectionFactory.newInstance();
- SOAPConnection con = scFactory.createConnection();
MessageFactory factory = MessageFactory.newInstance();
SOAPMessage msg = factory.createMessage();
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/EnvelopeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/EnvelopeTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/EnvelopeTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/EnvelopeTest.java Thu Jan 5 07:00:02 2006
@@ -1,14 +1,13 @@
package org.apache.axis2.saaj;
-import junit.framework.TestCase;
+import java.io.ByteArrayInputStream;
+import java.util.Iterator;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.Name;
import javax.xml.soap.Node;
import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPFault;
@@ -17,8 +16,8 @@
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.soap.Text;
-import java.io.ByteArrayInputStream;
-import java.util.Iterator;
+
+import junit.framework.TestCase;
public class EnvelopeTest extends TestCase {
@@ -81,9 +80,6 @@
"<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
"<env:Body><echo><arg0>Hello</arg0></echo></env:Body>" +
"</env:Envelope>";
-
- SOAPConnectionFactory scFactory = SOAPConnectionFactory.newInstance();
- SOAPConnection con = scFactory.createConnection();
MessageFactory factory = MessageFactory.newInstance();
SOAPMessage message =
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/HeadersTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/HeadersTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/HeadersTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/HeadersTest.java Thu Jan 5 07:00:02 2006
@@ -22,11 +22,6 @@
public class HeadersTest extends TestCase {
- private final String actor = "ACTOR#1";
- private final String localName = "Local1";
- private final String namespace = "http://ws.apache.org";
- private final String prefix = "P1";
-
public HeadersTest(String name) {
super(name);
}
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java Thu Jan 5 07:00:02 2006
@@ -86,9 +86,8 @@
int count = 0;
while (it.hasNext()) {
- SOAPElement el = (SOAPElement) it.next();
+ it.next();
count++;
-// Name name = el.getElementName();
}
assertEquals(2,count);
}
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java Thu Jan 5 07:00:02 2006
@@ -152,51 +152,4 @@
assertTrue(xml.indexOf("Hello") != -1);
}
- public void testSOAPFaultSaveChanges() throws Exception {
- MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPMessage msg = msgFactory.createMessage();
- SOAPEnvelope envelope = msg.getSOAPPart().getEnvelope();
- SOAPBody body = envelope.getBody();
- SOAPFault fault = body.addFault();
-
- fault.setFaultCode("Client");
- fault.setFaultString("Message does not have necessary info");
- fault.setFaultActor("http://gizmos.com/order");
-
- Detail detail = fault.addDetail();
-
- Name entryName = envelope.createName("order", "PO", "http://gizmos.com/orders/");
- DetailEntry entry = detail.addDetailEntry(entryName);
- entry.addTextNode("quantity element does not have a value");
-
- Name entryName2 = envelope.createName("confirmation", "PO", "http://gizmos.com/confirm");
- DetailEntry entry2 = detail.addDetailEntry(entryName2);
- entry2.addTextNode("Incomplete address: no zip code");
-
- msg.saveChanges();
-
- // Now retrieve the SOAPFault object and its contents
- //after checking to see that there is one
-
- assertTrue(body.hasFault());
-
- fault = body.getFault();
- String code = fault.getFaultCode();
- String string = fault.getFaultString();
- String actor = fault.getFaultActor();
-
- assertEquals("Client", code);
- assertEquals("Message does not have necessary info", string);
- assertEquals("http://gizmos.com/order", actor);
-
-
- detail = fault.getDetail();
- if (detail != null) {
- java.util.Iterator it = detail.getDetailEntries();
- while (it.hasNext()) {
- entry = (DetailEntry) it.next();
- String value = entry.getValue();
- }
- }
- }
}
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Thu Jan 5 07:00:02 2006
@@ -1,8 +1,8 @@
package org.apache.axis2.saaj.integration;
-import junit.framework.TestCase;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.description.AxisService;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
@@ -19,13 +19,12 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-public class IntegrationTest extends TestCase {
+import junit.framework.TestCase;
- private AxisService service;
+import org.apache.axis2.addressing.EndpointReference;
+
+public class IntegrationTest extends TestCase {
public static final EndpointReference TARGET_EPR =
new EndpointReference("http://127.0.0.1:" +
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java Thu Jan 5 07:00:02 2006
@@ -15,7 +15,12 @@
*/
package org.apache.axis2.saaj.integration;
+import java.io.File;
+
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
@@ -26,9 +31,6 @@
import org.apache.axis2.description.ModuleDescription;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import javax.xml.namespace.QName;
-import java.io.File;
-
/**
*
*/
@@ -38,8 +40,6 @@
private static SimpleHTTPServer receiver;
public static final int TESTING_PORT = 5555;
-
- private static final String FAILURE_MESSAGE = "Intentional Failure";
public static synchronized void deployService(AxisService service) throws AxisFault {
receiver.getConfigurationContext().getAxisConfiguration().addService(service);
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WriterException.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,9 @@
public class WriterException extends Exception{
- public WriterException() {
+ private static final long serialVersionUID = -2818699850289804197L;
+
+ public WriterException() {
}
public WriterException(String message) {
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLProcessingException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLProcessingException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLProcessingException.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLProcessingException.java Thu Jan 5 07:00:02 2006
@@ -17,7 +17,10 @@
package org.apache.wsdl.impl;
public class WSDLProcessingException extends RuntimeException {
- /**
+
+ private static final long serialVersionUID = -1781504826722368464L;
+
+ /**
* Constructor WSDLProcessingException
*
* @param message
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java Thu Jan 5 07:00:02 2006
@@ -272,7 +272,6 @@
*/
public Part getPart(String blobContentID) {
Part bodyPart;
- boolean attachmentFound = false;
if (bodyPartsMap.containsKey(blobContentID)) {
bodyPart = (Part) bodyPartsMap.get(blobContentID);
return bodyPart;