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 2007/06/21 04:38:57 UTC
svn commit: r549330 - in
/webservices/axis2/trunk/java/modules/integration/test/org:
apache/axis2/engine/ apache/axis2/engine/util/profiling/
apache/axis2/groovy/ apache/axis2/integration/ apache/axis2/jms/
apache/axis2/mail/ apache/axis2/mtom/ apache/...
Author: dims
Date: Wed Jun 20 19:38:56 2007
New Revision: 549330
URL: http://svn.apache.org/viewvc?view=rev&rev=549330
Log:
Change from relative path to absolute path so that the tests can run with both m1 and m2
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleASyncTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleSyncTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileCacheTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/tempuri/BaseDataTypesTest.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java Wed Jun 20 19:38:56 2007
@@ -32,6 +32,7 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -49,7 +50,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(CharactersetEncodingTest.class),
- Constants.TESTING_PATH + "chunking-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "chunking-enabledRepository"));
}
protected void setUp() throws Exception {
@@ -84,7 +85,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- Constants.TESTING_PATH + "chunking-enabledRepository", null);
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "chunking-enabledRepository"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java Wed Jun 20 19:38:56 2007
@@ -94,7 +94,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- Constants.TESTING_PATH + "commons-http-enabledRepository", null);
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "commons-http-enabledRepository"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
@@ -122,7 +122,7 @@
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- Constants.TESTING_PATH + "commons-http-enabledRepository", null);
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "commons-http-enabledRepository"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java Wed Jun 20 19:38:56 2007
@@ -35,7 +35,7 @@
public class EchoRawXMLChunkedTest extends UtilServerBasedTestCase implements TestConstants {
- private static final String CLIENT_HOME = Constants.TESTING_PATH + "chunking-enabledRepository";
+ private static final String CLIENT_HOME = TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "chunking-enabledRepository");
public EchoRawXMLChunkedTest() {
super(EchoRawXMLChunkedTest.class.getName());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleASyncTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleASyncTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleASyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleASyncTest.java Wed Jun 20 19:38:56 2007
@@ -85,8 +85,8 @@
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo",
- "target/test-resources/integrationRepo/conf/axis2.xml");
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"),
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo/conf/axis2.xml"));
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setAction("urn:echoOMElement");
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleSyncTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleSyncTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleSyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleSyncTest.java Wed Jun 20 19:38:56 2007
@@ -81,6 +81,7 @@
options.setTo(targetEPR);
options.setCallTransportCleanup(true);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
+ options.setTimeOutInMilliSeconds(50000);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
ServiceClient sender = new ServiceClient(configContext, null);
@@ -104,8 +105,8 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo",
- "target/test-resources/integrationRepo/conf/axis2.xml");
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"),
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo/conf/axis2.xml"));
ServiceClient sender = new ServiceClient(configContext, null);
options.setAction(Constants.AXIS2_NAMESPACE_URI + "/" + operationName.getLocalPart());
options.setAction("urn:echoOMElement");
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java Wed Jun 20 19:38:56 2007
@@ -100,7 +100,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java Wed Jun 20 19:38:56 2007
@@ -37,6 +37,7 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.stream.XMLStreamException;
@@ -149,7 +150,7 @@
private SOAPEnvelope getResponse(SOAPEnvelope inEnvelope) throws AxisFault {
ConfigurationContext confctx = ConfigurationContextFactory.
- createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",
+ createConfigurationContextFromFileSystem(TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"),
null);
ServiceClient client = new ServiceClient(confctx, null);
Options options = new Options();
@@ -167,7 +168,7 @@
}
public File getTestResourceFile(String relativePath) {
- return new File(testResourceDir, relativePath);
+ return new File(TestingUtils.prefixBaseDirectory(testResourceDir), relativePath);
}
protected void tearDown() throws Exception {
@@ -177,7 +178,7 @@
try {
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
OMElement payload = getOMElement(FaultHandler.ERR_HANDLING_WITH_AXIS_FAULT);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java Wed Jun 20 19:38:56 2007
@@ -57,7 +57,7 @@
public void testOneWay() throws Exception {
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- Constants.TESTING_PATH + "integrationRepo/", null);
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "integrationRepo/"), null);
ServiceClient sender = new ServiceClient(configContext, null);
Options op = new Options();
// op.setTo(new EndpointReference(
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java Wed Jun 20 19:38:56 2007
@@ -71,7 +71,7 @@
public void testOneWay() throws Exception {
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- Constants.TESTING_PATH + "integrationRepo/", null);
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "integrationRepo/"), null);
ServiceClient sender = new ServiceClient(configContext, null);
Options op = new Options();
op.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java Wed Jun 20 19:38:56 2007
@@ -43,7 +43,7 @@
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java Wed Jun 20 19:38:56 2007
@@ -32,6 +32,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -59,7 +60,7 @@
}
public static Test suite() {
- return getTestSetup2(new TestSuite(GroovyServiceTest.class), "target/groovyRepo");
+ return getTestSetup2(new TestSuite(GroovyServiceTest.class), TestingUtils.prefixBaseDirectory("target/groovyRepo"));
}
public void testServiceExists() throws Exception {
@@ -84,7 +85,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
OMElement result = sender.sendReceive(payload);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/TestingUtils.java Wed Jun 20 19:38:56 2007
@@ -22,6 +22,9 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
+import java.io.File;
+import java.io.IOException;
+
public class TestingUtils {
public static OMElement createDummyOMElement() {
OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -53,4 +56,13 @@
TestCase.assertEquals(textValue, "Isaac Asimov, The Foundation Trilogy");
}
+ public static String prefixBaseDirectory(String path) {
+ String baseDir;
+ try {
+ baseDir = new File(System.getProperty("basedir", ".")).getCanonicalPath();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return baseDir + "/" + path;
+ }
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Wed Jun 20 19:38:56 2007
@@ -65,7 +65,7 @@
}
public static synchronized void start() throws Exception {
- start(org.apache.axis2.Constants.TESTING_REPOSITORY);
+ start(TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY));
}
@@ -141,7 +141,7 @@
public static ConfigurationContext getNewConfigurationContext(
String repository, String axis2xml) throws Exception {
- File file = new File(repository);
+ File file = new File(TestingUtils.prefixBaseDirectory(repository));
if (!file.exists()) {
throw new Exception("repository directory "
+ file.getAbsolutePath() + " does not exists");
@@ -180,7 +180,7 @@
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory
.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
AxisModule axisModule = DeploymentEngine.buildModule(file,
configContext.getAxisConfiguration());
configContext.getAxisConfiguration().addModule(axisModule);
@@ -200,7 +200,7 @@
}
private static File getAddressingMARFile() {
- File dir = new File(org.apache.axis2.Constants.TESTING_REPOSITORY + "/modules");
+ File dir = new File(TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY + "/modules"));
File[] files = dir.listFiles(new AddressingFilter());
TestCase.assertTrue(files.length == 1);
File file = files[0];
@@ -214,8 +214,8 @@
ConfigurationContext configContext =
ConfigurationContextFactory .createConfigurationContextFromFileSystem(
- Constants.TESTING_PATH +"/integrationRepo",
- Constants.TESTING_PATH + "/integrationRepo/conf/axis2.xml");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH +"/integrationRepo"),
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "/integrationRepo/conf/axis2.xml"));
AxisModule axisModule = DeploymentEngine.buildModule(file,
configContext.getAxisConfiguration());
configContext.getAxisConfiguration().addModule(axisModule);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java Wed Jun 20 19:38:56 2007
@@ -57,7 +57,7 @@
public static synchronized void start() throws Exception {
// start JMS Listener
- File file = new File(REPOSITORY_JMS);
+ File file = new File(TestingUtils.prefixBaseDirectory(REPOSITORY_JMS));
System.out.println(file.getAbsoluteFile());
if (!file.exists()) {
throw new Exception("Repository directory does not exist");
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java Wed Jun 20 19:38:56 2007
@@ -17,6 +17,7 @@
package org.apache.axis2.integration;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
@@ -58,7 +59,7 @@
// start tcp server
- File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY);
+ File file = new File(TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY));
System.out.println(file.getAbsoluteFile());
if (!file.exists()) {
throw new Exception("Repository directory does not exist");
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java Wed Jun 20 19:38:56 2007
@@ -44,6 +44,7 @@
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilsJMSServer;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.transport.jms.JMSConstants;
import org.apache.axis2.util.Utils;
import org.apache.axis2.wsdl.WSDLConstants;
@@ -182,7 +183,7 @@
public void testEchoXMLCompleteSync() throws Exception {
ConfigurationContext configContext = UtilServer.createClientConfigurationContext(
- "target/test-resources/jms-enabled-client-repository");
+ TestingUtils.prefixBaseDirectory("target/test-resources/jms-enabled-client-repository"));
OMElement payload = createPayload();
@@ -205,8 +206,8 @@
public void testEchoXMLSyncMC() throws Exception {
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- Constants.TESTING_REPOSITORY,
- Constants.TESTING_REPOSITORY + "/conf/axis2.xml");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY),
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY + "/conf/axis2.xml"));
AxisOperation opdesc = new OutInAxisOperation(new QName("echoOMElement"));
Options options = new Options();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java Wed Jun 20 19:38:56 2007
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.transport.mail.Constants;
@@ -53,7 +54,7 @@
public static ConfigurationContext createServerConfigurationContext() throws Exception {
if (SERVER_CONFIG_CONTEXT == null) {
- File file = new File(MAIL_TRANSPORT_SERVER_ENABLED_REPO_PATH);
+ File file = new File(TestingUtils.prefixBaseDirectory(MAIL_TRANSPORT_SERVER_ENABLED_REPO_PATH));
TestCase.assertTrue(
"Mail repository directory " + file.getAbsolutePath() + " does not exsist",
file.exists());
@@ -67,7 +68,7 @@
public static ConfigurationContext createClientConfigurationContext() throws Exception {
if (CLIENT_CONFIG_CONTEXT == null) {
- File file = new File(MAIL_TRANSPORT_CLIENT_ENABLED_REPO_PATH);
+ File file = new File(TestingUtils.prefixBaseDirectory(MAIL_TRANSPORT_CLIENT_ENABLED_REPO_PATH));
TestCase.assertTrue(
"Mail repository directory " + file.getAbsolutePath() + " does not exsist",
file.exists());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java Wed Jun 20 19:38:56 2007
@@ -36,6 +36,7 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
import javax.activation.DataHandler;
@@ -46,7 +47,7 @@
implements TestConstants {
private OMElement data;
- private String fileName = "test-resources/mtom/test.jpg";
+ private String fileName = TestingUtils.prefixBaseDirectory("test-resources/mtom/test.jpg");
public EchoRawMTOMCommonsChunkingTest() {
super(EchoRawMTOMCommonsChunkingTest.class.getName());
@@ -58,7 +59,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawMTOMCommonsChunkingTest.class),
- Constants.TESTING_PATH + "MTOM-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
}
protected void setUp() throws Exception {
@@ -102,7 +103,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- Constants.TESTING_PATH + "commons-http-enabledRepository", null);
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "commons-http-enabledRepository"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Wed Jun 20 19:38:56 2007
@@ -25,6 +25,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.httpclient.HttpClient;
@@ -56,7 +57,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawMTOMFaultReportTest.class),
- Constants.TESTING_PATH + "MTOM-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
}
@@ -104,7 +105,7 @@
httppost.getParams().setParameter(HttpMethodParams.RETRY_HANDLER,
myretryhandler);
httppost.setRequestEntity(new InputStreamRequestEntity(
- new FileInputStream("test-resources/mtom/wmtom.bin")));
+ new FileInputStream(TestingUtils.prefixBaseDirectory("test-resources/mtom/wmtom.bin"))));
httppost.setRequestHeader("Content-Type",
"multipart/related; boundary=--MIMEBoundary258DE2D105298B756D; type=\"application/xop+xml\"; start=\"<0....@apache.org>\"; start-info=\"application/soap+xml\"");
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java Wed Jun 20 19:38:56 2007
@@ -22,6 +22,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
import javax.xml.namespace.QName;
@@ -44,7 +45,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawMTOMFileCacheLoadTest.class),
- Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository"));
}
protected void setUp() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java Wed Jun 20 19:38:56 2007
@@ -22,6 +22,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
public class EchoRawMTOMFileCacheTest extends EchoRawMTOMTest {
@@ -39,7 +40,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawMTOMFileCacheTest.class),
- Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository"));
}
protected void setUp() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java Wed Jun 20 19:38:56 2007
@@ -36,6 +36,7 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -65,7 +66,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawMTOMLoadTest.class),
- Constants.TESTING_PATH + "MTOM-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
}
protected void setUp() throws Exception {
@@ -113,7 +114,7 @@
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
OMElement result = sender.sendReceive(payload);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java Wed Jun 20 19:38:56 2007
@@ -37,6 +37,7 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
import javax.activation.DataHandler;
@@ -66,7 +67,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawMTOMStreamingTest.class),
- Constants.TESTING_PATH + "MTOM-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
}
protected void setUp() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Wed Jun 20 19:38:56 2007
@@ -41,6 +41,7 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -72,7 +73,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawMTOMTest.class),
- Constants.TESTING_PATH + "MTOM-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
}
protected void setUp() throws Exception {
@@ -93,7 +94,7 @@
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
OMElement rpcWrapEle = fac.createOMElement("echoOMElement", omNs);
OMElement data = fac.createOMElement("data", omNs);
- FileDataSource fileDataSource = new FileDataSource("test-resources/mtom/test.jpg");
+ FileDataSource fileDataSource = new FileDataSource(TestingUtils.prefixBaseDirectory("test-resources/mtom/test.jpg"));
expectedDH = new DataHandler(fileDataSource);
expectedTextData = new OMTextImpl(expectedDH, true, fac);
data.addChild(expectedTextData);
@@ -128,7 +129,7 @@
};
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
options.setAction(Constants.AXIS2_NAMESPACE_URI + "/" + operationName.getLocalPart());
sender.setOptions(options);
@@ -155,7 +156,7 @@
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
options.setAction(Constants.AXIS2_NAMESPACE_URI + "/" + operationName.getLocalPart());
@@ -185,7 +186,7 @@
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.engageModule(new QName("addressing"));
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java Wed Jun 20 19:38:56 2007
@@ -41,6 +41,7 @@
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -124,7 +125,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(clientOptions);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java Wed Jun 20 19:38:56 2007
@@ -43,6 +43,7 @@
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.util.Utils;
@@ -81,7 +82,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(MessageSaveAndRestoreWithMTOMTest.class),
- Constants.TESTING_PATH + "MTOM-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
}
protected void setUp() throws Exception {
@@ -135,7 +136,7 @@
options.setTimeOutInMilliSeconds(50000);
ConfigurationContext configurationContext = ConfigurationContextFactory
- .createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",
+ .createConfigurationContextFromFileSystem(TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"),
null);
ServiceClient sender = new ServiceClient(configurationContext, null);
@@ -159,7 +160,7 @@
OMElement rpcWrapperElement = omFactory.createOMElement("echoOMElement", omNamespace);
OMElement data = omFactory.createOMElement("data", omNamespace);
- FileDataSource fileDataSource = new FileDataSource("test-resources/mtom/test.jpg");
+ FileDataSource fileDataSource = new FileDataSource(TestingUtils.prefixBaseDirectory("test-resources/mtom/test.jpg"));
DataHandler expectedDataHandler = new DataHandler(fileDataSource);
expectedTextData = new OMTextImpl(expectedDataHandler, true, omFactory);
data.addChild(expectedTextData);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileCacheTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileCacheTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileCacheTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileCacheTest.java Wed Jun 20 19:38:56 2007
@@ -21,6 +21,7 @@
import org.apache.axis2.Constants;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
public class EchoRawSwAFileCacheTest extends EchoRawSwATest {
@@ -38,7 +39,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawSwAFileCacheTest.class),
- Constants.TESTING_PATH + "SwA-fileCache-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "SwA-fileCache-enabledRepository"));
}
protected void setUp() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwAFileInputTest.java Wed Jun 20 19:38:56 2007
@@ -25,6 +25,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
@@ -53,7 +54,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawSwAFileInputTest.class),
- Constants.TESTING_PATH + "MTOM-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
}
protected void setUp() throws Exception {
@@ -78,7 +79,7 @@
Socket socket = new Socket("127.0.0.1", 5555);
OutputStream outStream = socket.getOutputStream();
socket.getInputStream();
- InputStream requestMsgInStream = new FileInputStream("test-resources/swa/swainput.bin");
+ InputStream requestMsgInStream = new FileInputStream(TestingUtils.prefixBaseDirectory("test-resources/swa/swainput.bin"));
int data;
while ((data = requestMsgInStream.read()) != -1) {
outStream.write(data);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java Wed Jun 20 19:38:56 2007
@@ -37,6 +37,7 @@
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.util.Utils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
@@ -64,7 +65,7 @@
public static Test suite() {
return getTestSetup2(new TestSuite(EchoRawSwATest.class),
- Constants.TESTING_PATH + "SwA-enabledRepository");
+ TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "SwA-enabledRepository"));
}
protected void setUp() throws Exception {
@@ -107,7 +108,7 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
@@ -115,7 +116,7 @@
MessageContext mc = new MessageContext();
mc.setEnvelope(createEnvelope());
- FileDataSource fileDataSource = new FileDataSource("test-resources/mtom/test.jpg");
+ FileDataSource fileDataSource = new FileDataSource(TestingUtils.prefixBaseDirectory("test-resources/mtom/test.jpg"));
DataHandler dataHandler = new DataHandler(fileDataSource);
mc.addAttachment("FirstAttachment", dataHandler);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java Wed Jun 20 19:38:56 2007
@@ -39,6 +39,7 @@
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.TestingUtils;
import org.apache.axis2.mail.UtilsMailServer;
import org.apache.axis2.transport.mail.Constants;
import org.apache.axis2.transport.mail.server.MailServer;
@@ -100,8 +101,8 @@
Utils.createSimpleService(serviceName,
Echo.class.getName(),
operationName);
- UtilServer.start(org.apache.axis2.Constants.TESTING_PATH +
- "mail-transport-server-enabledRepository");
+ UtilServer.start(TestingUtils.prefixBaseDirectory(org.apache.axis2.Constants.TESTING_PATH +
+ "mail-transport-server-enabledRepository"));
UtilServer.deployService(service);
mailServer =
new MailServer(Constants.POP_SERVER_PORT,
Modified: webservices/axis2/trunk/java/modules/integration/test/org/tempuri/BaseDataTypesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/tempuri/BaseDataTypesTest.java?view=diff&rev=549330&r1=549329&r2=549330
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/tempuri/BaseDataTypesTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/tempuri/BaseDataTypesTest.java Wed Jun 20 19:38:56 2007
@@ -1,6 +1,7 @@
package org.tempuri;
import org.apache.ws.java2wsdl.Java2WSDLBuilder;
+import org.apache.axis2.integration.TestingUtils;
import org.custommonkey.xmlunit.XMLTestCase;
import org.custommonkey.xmlunit.XMLUnit;
import org.custommonkey.xmlunit.Diff;
@@ -28,7 +29,7 @@
public class BaseDataTypesTest extends XMLTestCase {
- private String wsdlLocation = System.getProperty("basedir", ".") + "/" + "test-resources/BaseDataTypes.wsdl";
+ private String wsdlLocation = TestingUtils.prefixBaseDirectory("test-resources/BaseDataTypes.wsdl");
public void test1() throws Exception {
XMLUnit.setIgnoreWhitespace(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org