You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2008/03/05 04:52:01 UTC
svn commit: r633761 [2/4] - in
/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache:
axis2/jaxws/anytype/ axis2/jaxws/anytype/sei/ axis2/jaxws/anytype/tests/
axis2/jaxws/catalog/ axis2/jaxws/client/ axis2/jaxws/client/dispatch/
axis2...
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java Tue Mar 4 19:51:32 2008
@@ -18,57 +18,37 @@
*/
package org.apache.axis2.jaxws.polymorphic.shape.tests;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.wsdl.WSDLException;
-import javax.xml.ws.BindingProvider;
-
-import junit.framework.TestCase;
-
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.polymorphic.shape.sei.PolymorphicShapePortType;
import org.apache.axis2.jaxws.polymorphic.shape.sei.PolymorphicShapeService;
import org.apache.axis2.jaxws.util.WSDL4JWrapper;
import org.apache.axis2.jaxws.util.WSDLWrapper;
import org.apache.axis2.jaxws.wsdl.SchemaReaderException;
import org.apache.axis2.jaxws.wsdl.impl.SchemaReaderImpl;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.log4j.BasicConfigurator;
import org.test.shape.Shape;
import org.test.shape.Square;
import org.test.shape.threed.ThreeDSquare;
-public class PolymorphicTests extends TestCase {
+import javax.wsdl.WSDLException;
+import javax.xml.ws.BindingProvider;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.Iterator;
+import java.util.Set;
+
+public class PolymorphicTests extends AbstractTestCase {
String axisEndpoint = "http://localhost:6060/axis2/services/PolymorphicShapeService.PolymorphicShapePort";
- public PolymorphicTests() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(PolymorphicTests.class));
}
public void testFormalAndActualTypeInDifferentPackages(){
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AttachmentUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AttachmentUtil.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AttachmentUtil.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AttachmentUtil.java Tue Mar 4 19:51:32 2008
@@ -18,13 +18,6 @@
*/
package org.apache.axis2.jaxws.provider;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Iterator;
-
import javax.imageio.IIOImage;
import javax.imageio.ImageWriter;
import javax.imageio.stream.ImageOutputStream;
@@ -38,6 +31,12 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Iterator;
/**
* This will serve as a helper class for attachments utility methods. All methods
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/DataSourceImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/DataSourceImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/DataSourceImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/DataSourceImpl.java Tue Mar 4 19:51:32 2008
@@ -18,14 +18,13 @@
*/
package org.apache.axis2.jaxws.provider;
+import javax.activation.DataSource;
import java.awt.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-
-import javax.activation.DataSource;
/**
* An impl class for javax.activation.DataSource interface.
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/JAXBProviderTests.java Tue Mar 4 19:51:32 2008
@@ -18,8 +18,14 @@
*/
package org.apache.axis2.jaxws.provider;
-import java.awt.*;
-import java.io.File;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axiom.attachments.ByteArrayDataSource;
+import org.apache.axis2.jaxws.TestLogger;
+import org.test.mtom.ImageDepot;
+import org.test.mtom.ObjectFactory;
+import org.test.mtom.SendImage;
+import org.test.mtom.SendImageResponse;
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -30,16 +36,8 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
-
-import org.apache.axiom.attachments.ByteArrayDataSource;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.log4j.BasicConfigurator;
-import org.test.mtom.ImageDepot;
-import org.test.mtom.ObjectFactory;
-import org.test.mtom.SendImage;
-import org.test.mtom.SendImageResponse;
+import java.awt.*;
+import java.io.File;
/**
* The intended purpose of this testcase is to test the MTOM functions in Axis2.
@@ -68,36 +66,25 @@
private QName serviceName = new QName("http://ws.apache.org/axis2", "JAXBProviderService");
DataSource stringDS, imageDS;
- public JAXBProviderTests(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
-
+ public JAXBProviderTests() {
+ super();
//Create a DataSource from a String
String string = "Sending a JAXB generated string object to Source Provider endpoint";
stringDS = new ByteArrayDataSource(string.getBytes(),"text/plain");
-
- //Create a DataSource from an image
- File file = new File(imageResourceDir+File.separator+"test.jpg");
- ImageInputStream fiis = new FileImageInputStream(file);
- Image image = ImageIO.read(fiis);
- imageDS = new DataSourceImpl("image/jpeg","test.jpg",image);
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
-
- }
- static {
- BasicConfigurator.configure();
+ try {
+ //Create a DataSource from an image
+ File file = new File(imageResourceDir + File.separator + "test.jpg");
+ ImageInputStream fiis = new FileImageInputStream(file);
+ Image image = ImageIO.read(fiis);
+ imageDS = new DataSourceImpl("image/jpeg", "test.jpg", image);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(JAXBProviderTests.class));
}
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/ProviderTestCase.java Tue Mar 4 19:51:32 2008
@@ -18,33 +18,19 @@
*/
package org.apache.axis2.jaxws.provider;
-import java.io.File;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
import javax.xml.namespace.QName;
+import java.io.File;
-import junit.framework.TestCase;
-
-public abstract class ProviderTestCase extends TestCase {
+public abstract class ProviderTestCase extends AbstractTestCase {
public QName portName = new QName("http://ws.apache.org/axis2", "SimpleProviderServiceSOAP11port0");
public String providerResourceDir = "test-resources"+File.separator+"provider";
public String imageResourceDir = "test-resources"+File.separator+"image";
public String basedir = null;
- protected void setUp() throws Exception {
- super.setUp();
- //StartServer startServer = new StartServer("server1");
- //startServer.testStartServer();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- //StopServer stopServer = new StopServer("server1");
- //stopServer.testStopServer();
- }
-
- public ProviderTestCase(String name) {
- super(name);
+ public ProviderTestCase() {
if(basedir == null){
basedir = new File(System.getProperty("basedir",".")).getAbsolutePath();
}
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SOAPFaultProviderTests.java Tue Mar 4 19:51:32 2008
@@ -18,23 +18,20 @@
*/
package org.apache.axis2.jaxws.provider;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.soap.SOAPBinding;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.log4j.BasicConfigurator;
-
-import junit.framework.TestCase;
-
/**
*
*/
-public class SOAPFaultProviderTests extends TestCase {
+public class SOAPFaultProviderTests extends AbstractTestCase {
public QName portName =
new QName("http://ws.apache.org/axis2", "SimpleProviderServiceSOAP11port0");
private QName serviceName = new QName("http://ws.apache.org/axis2", "StringProviderService");
@@ -54,24 +51,8 @@
+ "</soap:Fault>";
- public SOAPFaultProviderTests(String name) {
- super(name);
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(SOAPFaultProviderTests.class));
}
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderChecker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderChecker.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderChecker.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderChecker.java Tue Mar 4 19:51:32 2008
@@ -24,8 +24,6 @@
import org.apache.axis2.context.MessageContext;
import javax.xml.namespace.QName;
-
-import java.util.HashMap;
import java.util.Iterator;
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageMUProviderTests.java Tue Mar 4 19:51:32 2008
@@ -17,24 +17,21 @@
package org.apache.axis2.jaxws.provider;
-import javax.xml.ws.Service;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+
import javax.xml.namespace.QName;
-import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.ws.BindingProvider;
import javax.xml.soap.SOAPMessage;
-
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.log4j.BasicConfigurator;
-
-import junit.framework.TestCase;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
/**
* Tests Dispatch<SOAPMessage> client and a Provider<SOAPMessage> service
* with mustUnderstand attribute header.
*/
-public class SoapMessageMUProviderTests extends TestCase {
+public class SoapMessageMUProviderTests extends AbstractTestCase {
public static final QName serviceName =
new QName("http://ws.apache.org/axis2", "SoapMessageMUProviderService");
public static final QName portName =
@@ -45,24 +42,8 @@
public static final String bindingID = SOAPBinding.SOAP11HTTP_BINDING;
public static final Service.Mode mode = Service.Mode.MESSAGE;
- public SoapMessageMUProviderTests(String name) {
- super(name);
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(SoapMessageMUProviderTests.class));
}
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java Tue Mar 4 19:51:32 2008
@@ -19,8 +19,10 @@
package org.apache.axis2.jaxws.provider;
-import java.io.ByteArrayInputStream;
-import java.util.Iterator;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.provider.soapmsg.SoapMessageProvider;
import javax.xml.namespace.QName;
import javax.xml.soap.AttachmentPart;
@@ -33,18 +35,11 @@
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.Binding;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.soap.SOAPFaultException;
-
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.axis2.jaxws.provider.soapmsg.SoapMessageProvider;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.log4j.BasicConfigurator;
+import java.io.ByteArrayInputStream;
+import java.util.Iterator;
/**
* Tests Dispatch<SOAPMessage> client and a Provider<SOAPMessage> service.
@@ -88,24 +83,8 @@
SoapMessageProvider.XML_WSE_REQUEST +
"</invoke_str></ns2:invokeOp>";
- public SoapMessageProviderTests(String name) {
- super(name);
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(SoapMessageProviderTests.class));
}
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SourceMessageProviderTests.java Tue Mar 4 19:51:32 2008
@@ -18,20 +18,18 @@
*/
package org.apache.axis2.jaxws.provider;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.log4j.BasicConfigurator;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
public class SourceMessageProviderTests extends ProviderTestCase {
@@ -39,24 +37,12 @@
private QName serviceName = new QName("http://ws.apache.org/axis2", "SourceMessageProviderService");
private String xmlDir = "xml";
- static {
- BasicConfigurator.configure();
- }
-
- public SourceMessageProviderTests(String name) {
- super(name);
+ public SourceMessageProviderTests() {
+ super();
}
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(SourceMessageProviderTests.class));
}
public void testProviderSource(){
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/SourceProviderTests.java Tue Mar 4 19:51:32 2008
@@ -18,16 +18,9 @@
*/
package org.apache.axis2.jaxws.provider;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.log4j.BasicConfigurator;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPFault;
@@ -41,6 +34,11 @@
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.soap.SOAPFaultException;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
public class SourceProviderTests extends ProviderTestCase {
@@ -48,25 +46,12 @@
private QName serviceName = new QName("http://ws.apache.org/axis2", "SourceProviderService");
private String xmlDir = "xml";
-
- public SourceProviderTests(String name) {
- super(name);
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
+ public SourceProviderTests() {
+ super();
}
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(SourceProviderTests.class));
}
private Dispatch<Source> getDispatch() {
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/StringMessageProviderTests.java Tue Mar 4 19:51:32 2008
@@ -18,10 +18,9 @@
*/
package org.apache.axis2.jaxws.provider;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.log4j.BasicConfigurator;
import javax.xml.namespace.QName;
import javax.xml.ws.Dispatch;
@@ -33,24 +32,8 @@
String xmlString = "<test>test input</test>";
private QName serviceName = new QName("http://ws.apache.org/axis2", "StringMessageProviderService");
- static {
- BasicConfigurator.configure();
- }
-
- public StringMessageProviderTests(String name) {
- super(name);
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(StringMessageProviderTests.class));
}
public void testProviderString() throws Exception {
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/StringProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/StringProviderTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/StringProviderTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/StringProviderTests.java Tue Mar 4 19:51:32 2008
@@ -18,10 +18,9 @@
*/
package org.apache.axis2.jaxws.provider;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.log4j.BasicConfigurator;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPFault;
@@ -36,24 +35,8 @@
String xmlString = "<invoke>test input</invoke>";
private QName serviceName = new QName("http://ws.apache.org/axis2", "StringProviderService");
- public StringProviderTests(String name) {
- super(name);
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(StringProviderTests.class));
}
private Dispatch<String> getDispatch() {
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/jaxb/JAXBProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/jaxb/JAXBProvider.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/jaxb/JAXBProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/jaxb/JAXBProvider.java Tue Mar 4 19:51:32 2008
@@ -18,8 +18,10 @@
*/
package org.apache.axis2.jaxws.provider.jaxb;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import org.apache.axis2.jaxws.TestLogger;
+import org.test.mtom.ObjectFactory;
+import org.test.mtom.SendImage;
+import org.test.mtom.SendImageResponse;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
@@ -30,11 +32,8 @@
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.http.HTTPBinding;
-
-import org.test.mtom.ObjectFactory;
-import org.test.mtom.SendImage;
-import org.test.mtom.SendImageResponse;
-import org.apache.axis2.jaxws.TestLogger;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
/**
* A JAXWS Source Provider implementation
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java Tue Mar 4 19:51:32 2008
@@ -20,11 +20,6 @@
import org.apache.axis2.jaxws.TestLogger;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.Iterator;
-
import javax.xml.namespace.QName;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.Detail;
@@ -37,7 +32,6 @@
import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.OutputKeys;
import javax.xml.transform.Result;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
@@ -51,6 +45,9 @@
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.soap.SOAPFaultException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
@WebServiceProvider(serviceName="SoapMessageProviderService",
targetNamespace="http://soapmsg.provider.jaxws.axis2.apache.org",
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/soapmsgmu/SoapMessageMUProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/soapmsgmu/SoapMessageMUProvider.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/soapmsgmu/SoapMessageMUProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/soapmsgmu/SoapMessageMUProvider.java Tue Mar 4 19:51:32 2008
@@ -16,15 +16,15 @@
*/
package org.apache.axis2.jaxws.provider.soapmsgmu;
+import org.apache.axis2.jaxws.provider.AttachmentUtil;
+
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.BindingType;
import javax.xml.ws.Provider;
-import javax.xml.ws.ServiceMode;
import javax.xml.ws.Service;
+import javax.xml.ws.ServiceMode;
import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.BindingType;
import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.soap.SOAPMessage;
-
-import org.apache.axis2.jaxws.provider.AttachmentUtil;
/**
* This class provides the server side implementation for JAX-WS Provider<MESSAGE>
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/source/SourceProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/source/SourceProvider.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/source/SourceProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/source/SourceProvider.java Tue Mar 4 19:51:32 2008
@@ -20,10 +20,6 @@
import org.apache.axis2.jaxws.TestLogger;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
-
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
@@ -33,11 +29,14 @@
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.BindingType;
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.BindingType;
import javax.xml.ws.http.HTTPBinding;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
@WebServiceProvider(serviceName="SourceProviderService")
@BindingType(HTTPBinding.HTTP_BINDING)
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/sourcemsg/SourceMessageProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/sourcemsg/SourceMessageProvider.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/sourcemsg/SourceMessageProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/sourcemsg/SourceMessageProvider.java Tue Mar 4 19:51:32 2008
@@ -18,9 +18,7 @@
*/
package org.apache.axis2.jaxws.provider.sourcemsg;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
+import org.apache.axis2.jaxws.TestLogger;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
@@ -32,8 +30,9 @@
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.axis2.jaxws.TestLogger;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
@WebServiceProvider(serviceName="SourceMessageProviderService")
@BindingType(HTTPBinding.HTTP_BINDING)
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java Tue Mar 4 19:51:32 2008
@@ -18,13 +18,13 @@
*/
package org.apache.axis2.jaxws.provider.string;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.BindingType;
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.axis2.jaxws.TestLogger;
@WebServiceProvider(serviceName="StringProviderService")
@BindingType(HTTPBinding.HTTP_BINDING)
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/stringmsg/StringMessageProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/stringmsg/StringMessageProvider.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/stringmsg/StringMessageProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/stringmsg/StringMessageProvider.java Tue Mar 4 19:51:32 2008
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.jaxws.provider.stringmsg;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.BindingType;
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.axis2.jaxws.TestLogger;
@WebServiceProvider(serviceName="StringMessageProviderService")
@BindingType(HTTPBinding.HTTP_BINDING)
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java Tue Mar 4 19:51:32 2008
@@ -18,13 +18,12 @@
*/
package org.apache.axis2.jaxws.proxy;
-import java.util.concurrent.ExecutionException;
+import org.apache.axis2.jaxws.TestLogger;
+import org.test.proxy.doclitwrapped.ReturnType;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
-
-import org.test.proxy.doclitwrapped.ReturnType;
-import org.apache.axis2.jaxws.TestLogger;
+import java.util.concurrent.ExecutionException;
/**
*
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java Tue Mar 4 19:51:32 2008
@@ -18,29 +18,23 @@
*/
package org.apache.axis2.jaxws.proxy;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Marshaller;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
-import junit.framework.TestCase;
-
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.log4j.BasicConfigurator;
-
-public class GorillaDLWProxyTests extends TestCase {
+public class GorillaDLWProxyTests extends AbstractTestCase {
private QName serviceName = new QName(
"http://org.apache.axis2.jaxws.proxy.gorilla_dlw", "GorillaService");
@@ -49,25 +43,8 @@
"GorillaPort");
private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl";
- public GorillaDLWProxyTests() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(GorillaDLWProxyTests.class));
}
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java Tue Mar 4 19:51:32 2008
@@ -18,66 +18,37 @@
*/
package org.apache.axis2.jaxws.proxy;
-import java.io.File;
-import java.net.URL;
-import java.util.concurrent.Future;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-
-import junit.framework.TestCase;
-
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.DocLitnonWrappedProxy;
import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.ProxyDocLitUnwrappedService;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.log4j.BasicConfigurator;
import org.test.proxy.doclitnonwrapped.Invoke;
import org.test.proxy.doclitnonwrapped.ObjectFactory;
import org.test.proxy.doclitnonwrapped.ReturnType;
+import javax.xml.namespace.QName;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import java.io.File;
+import java.net.URL;
+import java.util.concurrent.Future;
+
/**
* This test cases will use proxy NON wrapped wsdl to invoke methods
* on a deployed Server Endpoint.
*/
-public class ProxyNonWrappedTests extends TestCase {
+public class ProxyNonWrappedTests extends AbstractTestCase {
QName serviceName = new QName("http://doclitnonwrapped.proxy.test.org", "ProxyDocLitUnwrappedService");
private String axisEndpoint = "http://localhost:6060/axis2/services/ProxyDocLitUnwrappedService.DocLitnonWrappedImplPort";
private QName portName = new QName("http://org.apache.axis2.proxy.doclitwrapped", "ProxyDocLitWrappedPort");
private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test-resources/wsdl/ProxyDocLitnonWrapped.wsdl";
- /**
- * @param arg0
- */
- public ProxyNonWrappedTests(String arg0) {
- super(arg0);
- // TODO Auto-generated constructor stub
- }
-
-
- public ProxyNonWrappedTests() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(ProxyNonWrappedTests.class));
}
public void testInvoke(){
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java Tue Mar 4 19:51:32 2008
@@ -18,27 +18,24 @@
*/
package org.apache.axis2.jaxws.proxy;
-import java.io.File;
-import java.net.URL;
-import java.util.concurrent.Future;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.DocLitWrappedProxy;
+import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.ProxyDocLitWrappedService;
+import org.test.proxy.doclitwrapped.ReturnType;
import javax.xml.namespace.QName;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Response;
import javax.xml.ws.Service;
+import java.io.File;
+import java.net.URL;
+import java.util.concurrent.Future;
-import junit.framework.TestCase;
-
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.DocLitWrappedProxy;
-import org.apache.axis2.jaxws.proxy.doclitwrapped.sei.ProxyDocLitWrappedService;
-import org.apache.log4j.BasicConfigurator;
-import org.test.proxy.doclitwrapped.ReturnType;
-
-public class ProxyTests extends TestCase {
+public class ProxyTests extends AbstractTestCase {
private QName serviceName = new QName(
"http://doclitwrapped.proxy.test.org", "ProxyDocLitWrappedService");
private String axisEndpoint = "http://localhost:6060/axis2/services/ProxyDocLitWrappedService.DocLitWrappedProxyImplPort";
@@ -47,24 +44,8 @@
private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl";
private boolean runningOnAxis = true;
- static {
- BasicConfigurator.configure();
- }
-
- public ProxyTests(String name) {
- super(name);
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(ProxyTests.class));
}
public void testMultipleServiceCalls(){
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java Tue Mar 4 19:51:32 2008
@@ -18,12 +18,11 @@
*/
package org.apache.axis2.jaxws.proxy;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.provider.DataSourceImpl;
import org.apache.axis2.jaxws.proxy.rpclitswa.sei.RPCLitSWA;
-import org.apache.log4j.BasicConfigurator;
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -35,15 +34,12 @@
import javax.xml.ws.Dispatch;
import javax.xml.ws.Holder;
import javax.xml.ws.Service;
-
-import java.awt.Image;
+import java.awt.*;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-import junit.framework.TestCase;
-
-public class RPCLitSWAProxyTests extends TestCase {
+public class RPCLitSWAProxyTests extends AbstractTestCase {
private QName serviceName = new QName(
"http://org/apache/axis2/jaxws/proxy/rpclitswa", "RPCLitSWAService");
@@ -53,36 +49,26 @@
private String wsdlLocation = System.getProperty("basedir",".")+"/"+
"test/org/apache/axis2/jaxws/proxy/rpclitswa/META-INF/RPCLitSWA.wsdl";
- private DataSource imageDS;
-
- public RPCLitSWAProxyTests() {
- super();
- // TODO Auto-generated constructor stub
- }
-
static {
- BasicConfigurator.configure();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
- }
-
- public void setUp() throws Exception {
String imageResourceDir =
System.getProperty("basedir", ".") + "/" + "test-resources" + File.separator
+ "image";
//Create a DataSource from an image
File file = new File(imageResourceDir + File.separator + "test.jpg");
- ImageInputStream fiis = new FileImageInputStream(file);
- Image image = ImageIO.read(fiis);
- imageDS = new DataSourceImpl("image/jpeg", "test.jpg", image);
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
+ ImageInputStream fiis = null;
+ try {
+ fiis = new FileImageInputStream(file);
+ Image image = ImageIO.read(fiis);
+ imageDS = new DataSourceImpl("image/jpeg", "test.jpg", image);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ private static DataSource imageDS;
+
+ public static Test suite() {
+ return getTestSetup(new TestSuite(RPCLitSWAProxyTests.class));
}
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java Tue Mar 4 19:51:32 2008
@@ -18,14 +18,16 @@
*/
package org.apache.axis2.jaxws.proxy;
-import java.io.File;
-import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.net.URL;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.proxy.rpclit.RPCLitImpl;
+import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCFault;
+import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCLit;
+import org.test.proxy.rpclit.ComplexAll;
+import org.test.proxy.rpclit.Enum;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Marshaller;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -33,20 +35,12 @@
import javax.xml.ws.Holder;
import javax.xml.ws.Service;
import javax.xml.ws.WebServiceException;
+import java.io.File;
+import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
-import junit.framework.TestCase;
-
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.axis2.jaxws.proxy.rpclit.RPCLitImpl;
-import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCFault;
-import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCLit;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.log4j.BasicConfigurator;
-import org.test.proxy.rpclit.ComplexAll;
-import org.test.proxy.rpclit.Enum;
-
-public class RPCProxyTests extends TestCase {
+public class RPCProxyTests extends AbstractTestCase {
private QName serviceName = new QName(
"http://org.apache.axis2.jaxws.proxy.rpclit", "RPCLitService");
@@ -55,25 +49,8 @@
"RPCLit");
private String wsdlLocation = System.getProperty("basedir",".")+"/"+"test/org/apache/axis2/jaxws/proxy/rpclit/META-INF/RPCLit.wsdl";
- public RPCProxyTests() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(RPCProxyTests.class));
}
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/SOAP12ProxyTests.java Tue Mar 4 19:51:32 2008
@@ -18,51 +18,31 @@
*/
package org.apache.axis2.jaxws.proxy;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.framework.AbstractTestCase;
+import org.apache.axis2.jaxws.proxy.soap12.Echo;
+import org.apache.axis2.jaxws.proxy.soap12.SOAP12EchoService;
+
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.WebServiceException;
-import junit.framework.TestCase;
-
-import org.apache.axis2.jaxws.framework.StartServer;
-import org.apache.axis2.jaxws.framework.StopServer;
-import org.apache.axis2.jaxws.proxy.soap12.Echo;
-import org.apache.axis2.jaxws.proxy.soap12.SOAP12EchoService;
-import org.apache.axis2.jaxws.TestLogger;
-import org.apache.log4j.BasicConfigurator;
-
/**
* A suite of tests to test dynamic proxy clients sending SOAP 1.2
* requests. The endpoint can accept different keys to determine
* what it should send back.
*/
-public class SOAP12ProxyTests extends TestCase {
+public class SOAP12ProxyTests extends AbstractTestCase {
private static final String SEND_SOAP11_RESPONSE = "RESPONSE-SOAP11";
private static final String SEND_SOAP12_RESPONSE = "RESPONSE-SOAP12";
String axisEndpoint = "http://localhost:6060/axis2/services/SOAP12EchoService.EchoPort";
-
- public SOAP12ProxyTests(String name) {
- super(name);
- }
-
- static {
- BasicConfigurator.configure();
- }
-
- public void setUp() {
- TestLogger.logger.debug("Starting the server for: " +this.getClass().getName());
- StartServer startServer = new StartServer("server1");
- startServer.testStartServer();
- }
-
- public void tearDown() {
- TestLogger.logger.debug("Stopping the server for: " +this.getClass().getName());
- StopServer stopServer = new StopServer("server1");
- stopServer.testStopServer();
+ public static Test suite() {
+ return getTestSetup(new TestSuite(SOAP12ProxyTests.class));
}
-
/**
* Send a SOAP 1.2 request and expect a SOAP 1.2 response.
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java Tue Mar 4 19:51:32 2008
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.jaxws.proxy.doclitnonwrapped;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.BindingType;
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.axis2.jaxws.TestLogger;
@WebServiceProvider(serviceName="ProxyDocLitUnwrappedService")
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/DocLitnonWrappedProxy.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/DocLitnonWrappedProxy.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/DocLitnonWrappedProxy.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/DocLitnonWrappedProxy.java Tue Mar 4 19:51:32 2008
@@ -19,7 +19,8 @@
*/
package org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei;
-import java.util.concurrent.Future;
+import org.test.proxy.doclitnonwrapped.Invoke;
+import org.test.proxy.doclitnonwrapped.ReturnType;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -29,9 +30,7 @@
import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
-
-import org.test.proxy.doclitnonwrapped.Invoke;
-import org.test.proxy.doclitnonwrapped.ReturnType;
+import java.util.concurrent.Future;
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/ProxyDocLitUnwrappedService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/ProxyDocLitUnwrappedService.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/ProxyDocLitUnwrappedService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/ProxyDocLitUnwrappedService.java Tue Mar 4 19:51:32 2008
@@ -19,13 +19,12 @@
*/
package org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
* This class was generated by the JAXWS SI.
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java Tue Mar 4 19:51:32 2008
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.jaxws.proxy.doclitwrapped;
+import org.apache.axis2.jaxws.TestLogger;
+
import javax.xml.ws.BindingType;
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.axis2.jaxws.TestLogger;
@WebServiceProvider(serviceName="ProxyDocLitWrappedService")
@BindingType(HTTPBinding.HTTP_BINDING)
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/DocLitWrappedProxy.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/DocLitWrappedProxy.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/DocLitWrappedProxy.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/DocLitWrappedProxy.java Tue Mar 4 19:51:32 2008
@@ -19,7 +19,10 @@
*/
package org.apache.axis2.jaxws.proxy.doclitwrapped.sei;
-import java.util.concurrent.Future;
+import org.test.proxy.doclitwrapped.FinOpResponse;
+import org.test.proxy.doclitwrapped.FinancialOperation;
+import org.test.proxy.doclitwrapped.ReturnType;
+import org.test.proxy.doclitwrapped.TwoWayHolder;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -32,11 +35,7 @@
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.Response;
import javax.xml.ws.ResponseWrapper;
-
-import org.test.proxy.doclitwrapped.FinOpResponse;
-import org.test.proxy.doclitwrapped.FinancialOperation;
-import org.test.proxy.doclitwrapped.ReturnType;
-import org.test.proxy.doclitwrapped.TwoWayHolder;
+import java.util.concurrent.Future;
/**
* This class was generated by the JAXWS SI.
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/ProxyDocLitWrappedService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/ProxyDocLitWrappedService.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/ProxyDocLitWrappedService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/ProxyDocLitWrappedService.java Tue Mar 4 19:51:32 2008
@@ -19,14 +19,13 @@
*/
package org.apache.axis2.jaxws.proxy.doclitwrapped.sei;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/GorillaProxyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/GorillaProxyImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/GorillaProxyImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/GorillaProxyImpl.java Tue Mar 4 19:51:32 2008
@@ -18,14 +18,13 @@
*/
package org.apache.axis2.jaxws.proxy.gorilla_dlw;
-import java.util.List;
-
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
-
import org.apache.axis2.jaxws.proxy.gorilla_dlw.data.Fruit;
import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.AssertFault;
import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface;
+
+import javax.jws.WebService;
+import javax.xml.ws.Holder;
+import java.util.List;
/**
* Tests more complicated Document/Literal Wrapped scenarios
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/GorillaInterface.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/GorillaInterface.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/GorillaInterface.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/GorillaInterface.java Tue Mar 4 19:51:32 2008
@@ -19,7 +19,7 @@
*/
package org.apache.axis2.jaxws.proxy.gorilla_dlw.sei;
-import java.util.List;
+import org.apache.axis2.jaxws.proxy.gorilla_dlw.data.Fruit;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -29,8 +29,7 @@
import javax.xml.ws.Holder;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
-
-import org.apache.axis2.jaxws.proxy.gorilla_dlw.data.Fruit;
+import java.util.List;
/**
* This class was generated by the JAXWS SI.
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/GorillaService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/GorillaService.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/GorillaService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/gorilla_dlw/sei/GorillaService.java Tue Mar 4 19:51:32 2008
@@ -19,13 +19,12 @@
*/
package org.apache.axis2.jaxws.proxy.gorilla_dlw.sei;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
* This class was generated by the JAXWS SI.
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/RPCLitImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/RPCLitImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/RPCLitImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/RPCLitImpl.java Tue Mar 4 19:51:32 2008
@@ -18,21 +18,19 @@
*/
package org.apache.axis2.jaxws.proxy.rpclit;
-import java.math.BigInteger;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCFault;
+import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCLit;
+import org.test.proxy.rpclit.ComplexAll;
+import org.test.proxy.rpclit.Enum;
import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlList;
import javax.xml.datatype.DatatypeConstants;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
-
-import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCFault;
-import org.apache.axis2.jaxws.proxy.rpclit.sei.RPCLit;
-import org.apache.axis2.jaxws.TestLogger;
-import org.test.proxy.rpclit.ComplexAll;
-import org.test.proxy.rpclit.Enum;
+import java.math.BigInteger;
/**
*
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLit.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLit.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLit.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLit.java Tue Mar 4 19:51:32 2008
@@ -19,22 +19,21 @@
*/
package org.apache.axis2.jaxws.proxy.rpclit.sei;
-import java.math.BigInteger;
+import org.test.proxy.rpclit.ComplexAll;
+import org.test.proxy.rpclit.Enum;
import javax.jws.WebMethod;
import javax.jws.WebParam;
+import javax.jws.WebParam.Mode;
import javax.jws.WebResult;
import javax.jws.WebService;
-import javax.jws.WebParam.Mode;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
import javax.xml.bind.annotation.XmlList;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
-
-import org.test.proxy.rpclit.ComplexAll;
-import org.test.proxy.rpclit.Enum;
+import java.math.BigInteger;
/**
* This class was generated by the JAXWS SI.
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLitService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLitService.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLitService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclit/sei/RPCLitService.java Tue Mar 4 19:51:32 2008
@@ -19,13 +19,12 @@
*/
package org.apache.axis2.jaxws.proxy.rpclit.sei;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
* This class was generated by the JAXWS SI.
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclitswa/RPCLitSWAImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclitswa/RPCLitSWAImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclitswa/RPCLitSWAImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclitswa/RPCLitSWAImpl.java Tue Mar 4 19:51:32 2008
@@ -16,11 +16,11 @@
*/
package org.apache.axis2.jaxws.proxy.rpclitswa;
+import org.apache.axis2.jaxws.proxy.rpclitswa.sei.RPCLitSWA;
+
import javax.activation.DataHandler;
import javax.jws.WebService;
import javax.xml.ws.Holder;
-
-import org.apache.axis2.jaxws.proxy.rpclitswa.sei.RPCLitSWA;
@WebService(targetNamespace="http://org/apache/axis2/jaxws/proxy/rpclitswa",
serviceName="RPCLitSWAService",
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclitswa/sei/RPCLitSWAService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclitswa/sei/RPCLitSWAService.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclitswa/sei/RPCLitSWAService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/rpclitswa/sei/RPCLitSWAService.java Tue Mar 4 19:51:32 2008
@@ -1,11 +1,11 @@
package org.apache.axis2.jaxws.proxy.rpclitswa.sei;
-import java.net.MalformedURLException;
-import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java Tue Mar 4 19:51:32 2008
@@ -18,14 +18,13 @@
*/
package org.apache.axis2.jaxws.proxy.soap12;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
@WebServiceClient(name = "SOAP12EchoService",
targetNamespace = "http://jaxws.axis2.apache.org/proxy/soap12",
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/server/SOAP12EchoImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/server/SOAP12EchoImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/server/SOAP12EchoImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/server/SOAP12EchoImpl.java Tue Mar 4 19:51:32 2008
@@ -27,9 +27,6 @@
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.soap.SOAPBinding;
-
@WebServiceProvider(targetNamespace="http://jaxws.axis2.apache.org/proxy/soap12",
serviceName="SOAP12EchoService",
wsdlLocation="META-INF/SOAP12Echo.wsdl",
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/resourceinjection/ResourceInjectionPortTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/resourceinjection/ResourceInjectionPortTypeImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/resourceinjection/ResourceInjectionPortTypeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/resourceinjection/ResourceInjectionPortTypeImpl.java Tue Mar 4 19:51:32 2008
@@ -18,15 +18,15 @@
*/
package org.apache.axis2.jaxws.resourceinjection;
+import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.resourceinjection.sei.ResourceInjectionPortType;
+
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
-
-import org.apache.axis2.jaxws.resourceinjection.sei.ResourceInjectionPortType;
-import org.apache.axis2.jaxws.TestLogger;
@WebService(serviceName="ResourceInjectionService",
endpointInterface="org.apache.axis2.jaxws.resourceinjection.sei.ResourceInjectionPortType")
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/resourceinjection/sei/ResourceInjectionService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/resourceinjection/sei/ResourceInjectionService.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/resourceinjection/sei/ResourceInjectionService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/resourceinjection/sei/ResourceInjectionService.java Tue Mar 4 19:51:32 2008
@@ -19,14 +19,13 @@
*/
package org.apache.axis2.jaxws.resourceinjection.sei;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
@WebServiceClient(name = "ResourceInjectionService", targetNamespace = "http://resourceinjection.sample.test.org", wsdlLocation = "resourceinjection.wsdl")
public class ResourceInjectionService
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/PortTypeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/PortTypeImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/PortTypeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/PortTypeImpl.java Tue Mar 4 19:51:32 2008
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.jaxws.rpclit.enumtype;
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
-
-import org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType;
import org.apache.axis2.jaxws.TestLogger;
+import org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType;
import org.test.rpclit.schema.ElementString;
+
+import javax.jws.WebService;
+import javax.xml.ws.Holder;
@WebService(serviceName="RPCLitEnumService",
endpointInterface="org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType")
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/PortType.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/PortType.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/PortType.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/PortType.java Tue Mar 4 19:51:32 2008
@@ -18,6 +18,8 @@
*/
package org.apache.axis2.jaxws.rpclit.enumtype.sei;
+import org.test.rpclit.schema.ElementString;
+
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebParam.Mode;
@@ -25,7 +27,6 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
import javax.xml.ws.Holder;
-import org.test.rpclit.schema.ElementString;
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java Tue Mar 4 19:51:32 2008
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.jaxws.rpclit.enumtype.sei;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/tests/RPCLitEnumTests.java Tue Mar 4 19:51:32 2008
@@ -19,16 +19,14 @@
package org.apache.axis2.jaxws.rpclit.enumtype.tests;
-
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-
+import junit.framework.TestCase;
+import org.apache.axis2.jaxws.TestLogger;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.PortType;
import org.apache.axis2.jaxws.rpclit.enumtype.sei.Service;
-import org.apache.axis2.jaxws.TestLogger;
import org.test.rpclit.schema.ElementString;
-import junit.framework.TestCase;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Holder;
public class RPCLitEnumTests extends TestCase {
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImpl.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/EchoImpl.java Tue Mar 4 19:51:32 2008
@@ -18,9 +18,9 @@
*/
package org.apache.axis2.jaxws.rpclit.stringarray;
-import javax.jws.WebService;
-
import org.test.rpclit.stringarray.StringArray;
+
+import javax.jws.WebService;
@WebService(serviceName="RPCLitStringArrayService",
endpointInterface="org.apache.axis2.jaxws.rpclit.stringarray.sei.Echo")
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/Echo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/Echo.java?rev=633761&r1=633760&r2=633761&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/Echo.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/Echo.java Tue Mar 4 19:51:32 2008
@@ -19,13 +19,14 @@
*/
package org.apache.axis2.jaxws.rpclit.stringarray.sei;
+import org.test.rpclit.stringarray.StringArray;
+
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
-import org.test.rpclit.stringarray.StringArray;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org