You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/03/06 17:41:00 UTC
svn commit: r515198 - in /incubator/cxf/trunk:
api/src/test/java/org/apache/cxf/wsdl/
common/common/src/test/java/org/apache/cxf/common/commands/
integration/jbi/src/test/java/org/apache/cxf/jbi/se/
rt/bindings/soap/src/test/java/org/apache/cxf/binding...
Author: dkulp
Date: Tue Mar 6 08:40:58 2007
New Revision: 515198
URL: http://svn.apache.org/viewvc?view=rev&rev=515198
Log:
Fix issues with spaces in development and .m2/repository paths
Modified:
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java
incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ResultBufferedCommandTest.java
incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java
incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslListenerFactoryTest.java
incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/WSDLToJavaTest.java
incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java
incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java
incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java
incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java
incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java
Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java Tue Mar 6 08:40:58 2007
@@ -82,7 +82,7 @@
"org.apache.cxf.abc.test.NewServiceType", Thread.currentThread()
.getContextClassLoader());
- String file = this.getClass().getResource("/wsdl/test_ext.wsdl").getFile();
+ String file = this.getClass().getResource("/wsdl/test_ext.wsdl").toURI().toString();
wsdlReader.setExtensionRegistry(registry);
@@ -116,7 +116,7 @@
"org.apache.cxf.abc.test.NewServiceType", Thread.currentThread()
.getContextClassLoader());
- String file = this.getClass().getResource("/wsdl/test_ext.wsdl").getFile();
+ String file = this.getClass().getResource("/wsdl/test_ext.wsdl").toURI().toString();
wsdlReader.setExtensionRegistry(registry);
Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java (original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ForkedCommandTest.java Tue Mar 6 08:40:58 2007
@@ -118,7 +118,7 @@
public void testTimeout() throws Exception {
URL url = TestCommand.class.getResource("TestCommand.class");
- File file = new File(url.getFile());
+ File file = new File(url.toURI());
file = file.getParentFile();
file = new File(file, "../../../../..");
String[] cmd = new String[] {
Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ResultBufferedCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ResultBufferedCommandTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ResultBufferedCommandTest.java (original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/commands/ResultBufferedCommandTest.java Tue Mar 6 08:40:58 2007
@@ -21,7 +21,6 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -33,9 +32,9 @@
private static final String ERR = "Please contact your administrator.";
- public void testStreamsEmpty() throws IOException {
+ public void testStreamsEmpty() throws Exception {
URL url = TestCommand.class.getResource("TestCommand.class");
- File file = new File(url.getFile());
+ File file = new File(url.toURI());
file = file.getParentFile();
file = new File(file, "../../../../..");
String[] cmd = new String[] {
@@ -62,9 +61,9 @@
is.close();
}
- public void testStreamsNotEmpty() throws IOException {
+ public void testStreamsNotEmpty() throws Exception {
URL url = TestCommand.class.getResource("TestCommand.class");
- File file = new File(url.getFile());
+ File file = new File(url.toURI());
file = file.getParentFile();
file = new File(file, "../../../../..");
String[] cmd = new String[] {
Modified: incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java (original)
+++ incubator/cxf/trunk/integration/jbi/src/test/java/org/apache/cxf/jbi/se/CXFServiceUnitTest.java Tue Mar 6 08:40:58 2007
@@ -57,7 +57,7 @@
public void setUp() throws Exception {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- absCsuPath = getClass().getResource(ROOT_PATH).getFile();
+ absCsuPath = getClass().getResource(ROOT_PATH).toURI().getPath();
System.setProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME,
getClass().getResource(CXF_CONFIG).toString());
Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java Tue Mar 6 08:40:58 2007
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -44,13 +45,13 @@
}
public static XopType createXopObject(Class<?> clazz)
- throws IOException {
+ throws IOException, URISyntaxException {
XopType xopObj = new XopType();
xopObj.setName("hello world");
URL url1 = clazz.getResource("my.wav");
- File file = new File(url1.getFile());
+ File file = new File(url1.toURI().getPath());
FileInputStream fi = new FileInputStream(file);
byte[] buffer = new byte[(int) file.length()];
fi.read(buffer);
Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Tue Mar 6 08:40:58 2007
@@ -376,11 +376,11 @@
if (schemaImport == null) {
fail("Can't find import element");
}
- String filePath = this.getClass().getResource("./s1/s2/s4/schema4.xsd").getFile();
+ String filePath = this.getClass().getResource("./s1/s2/s4/schema4.xsd").toURI().getPath();
String importPath = schemaImport.getAttributeNode("schemaLocation").getValue();
if (!new URI(URLEncoder.encode(importPath, "utf-8")).isAbsolute()) {
schemaImport.getAttributeNode("schemaLocation").setNodeValue("file:" + filePath);
- String fileStr = this.getClass().getResource("./s1/s2/schema2.xsd").getFile();
+ String fileStr = this.getClass().getResource("./s1/s2/schema2.xsd").toURI().getPath();
fileStr = URLDecoder.decode(fileStr, "utf-8");
File file = new File(fileStr);
if (file.exists()) {
Modified: incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java Tue Mar 6 08:40:58 2007
@@ -73,7 +73,7 @@
public void create() throws Exception {
BusFactory.setDefaultBus(bus);
- String jsFileString = getClass().getResource(js).getFile();
+ String jsFileString = getClass().getResource(js).toURI().getPath();
jsFileString = URLDecoder.decode(jsFileString, "UTF-8");
File file = new File(jsFileString);
providerFactory.createAndPublish(file, address, isBaseAddr);
Modified: incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java Tue Mar 6 08:40:58 2007
@@ -58,7 +58,7 @@
dpMock.publish();
dpMock.publish();
EasyMock.replay(dpMock);
- File f = new File(getClass().getResource("msg.js").getFile());
+ File f = new File(getClass().getResource("msg.js").toURI().getPath());
ph.createAndPublish(f);
EasyMock.verify(dpMock);
}
@@ -66,7 +66,7 @@
public void testBadJSFile() throws Exception {
EasyMock.replay(dpMock);
final String fname = "broken.js";
- File f = new File(getClass().getResource(fname).getFile());
+ File f = new File(getClass().getResource(fname).toURI().getPath());
try {
ph.createAndPublish(f);
fail("expected exception did not occur");
@@ -79,7 +79,7 @@
public void testEmptyJSFile() throws Exception {
EasyMock.replay(dpMock);
final String fname = "empty.js";
- File f = new File(getClass().getResource(fname).getFile());
+ File f = new File(getClass().getResource(fname).toURI().getPath());
try {
ph.createAndPublish(f);
fail("expected exception did not occur");
@@ -109,7 +109,7 @@
public void testIllegalServiceMode() throws Exception {
EasyMock.replay(dpMock);
final String fname = "illegal1.js";
- File f = new File(getClass().getResource(fname).getFile());
+ File f = new File(getClass().getResource(fname).toURI().getPath());
try {
ph.createAndPublish(f);
fail("expected exception did not occur");
@@ -124,7 +124,7 @@
public void testIllegalServiceModeType() throws Exception {
EasyMock.replay(dpMock);
final String fname = "illegal2.js";
- File f = new File(getClass().getResource(fname).getFile());
+ File f = new File(getClass().getResource(fname).toURI().getPath());
try {
ph.createAndPublish(f);
fail("expected exception did not occur");
@@ -141,7 +141,7 @@
EasyMock.expectLastCall()
.andThrow(new AbstractDOMProvider.JSDOMProviderException(AbstractDOMProvider.NO_EP_ADDR));
EasyMock.replay(dpMock);
- File f = new File(getClass().getResource("msg.js").getFile());
+ File f = new File(getClass().getResource("msg.js").toURI().getPath());
try {
ph.createAndPublish(f);
fail("expected exception did not occur");
Modified: incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java Tue Mar 6 08:40:58 2007
@@ -37,7 +37,7 @@
protected void setUp() throws Exception {
super.setUp();
phMock = EasyMock.createMock(ProviderFactory.class);
- emptyFile = getClass().getResource("empty/empty.js").getFile();
+ emptyFile = getClass().getResource("empty/empty.js").toURI().getPath();
}
private ServerApp createServerApp() {
@@ -206,11 +206,11 @@
assertTrue(dir != null);
EasyMock.checkOrder(phMock, false);
phMock.createAndPublish(new File(emptyFile), epAddr, true);
- String file = getClass().getResource("empty/empty2.jsx").getFile();
+ String file = getClass().getResource("empty/empty2.jsx").toURI().getPath();
phMock.createAndPublish(new File(file), epAddr, true);
- file = getClass().getResource("empty/empty3.js").getFile();
+ file = getClass().getResource("empty/empty3.js").toURI().getPath();
phMock.createAndPublish(new File(file), epAddr, true);
- file = getClass().getResource("empty/empty4.jsx").getFile();
+ file = getClass().getResource("empty/empty4.jsx").toURI().getPath();
phMock.createAndPublish(new File(file), epAddr, true);
EasyMock.replay(phMock);
ServerApp app = createServerApp();
Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java Tue Mar 6 08:40:58 2007
@@ -19,6 +19,7 @@
package org.apache.cxf.transport.https;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Properties;
@@ -572,9 +573,9 @@
return factory;
}
- protected static String getPath(String fileName) {
+ protected static String getPath(String fileName) throws URISyntaxException {
URL keystoreURL = HttpsURLConnectionFactoryTest.class.getResource(".");
- String str = keystoreURL.getFile();
+ String str = keystoreURL.toURI().getPath();
str += DROP_BACK_SRC_DIR + fileName;
return str;
}
Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslListenerFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslListenerFactoryTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslListenerFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslListenerFactoryTest.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.transport.https;
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Properties;
@@ -130,7 +131,7 @@
}
*/
- public void testSetAllData() {
+ public void testSetAllData() throws Exception {
String keyStoreStr = getPath("resources/defaultkeystore");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -190,7 +191,7 @@
+ "CertValidator"));
}
- public void testSetAllDataExceptKeystoreAndTrustStore() {
+ public void testSetAllDataExceptKeystoreAndTrustStore() throws Exception {
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(null);
sslServerPolicy.setKeystoreType("JKS");
@@ -254,7 +255,7 @@
+ "CertValidator"));
}
- public void testConfiguredCipherSuites() {
+ public void testConfiguredCipherSuites() throws Exception {
String keyStoreStr = getPath("resources/defaultkeystore");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -295,7 +296,7 @@
}
- public void testDefaultedCipherSuiteFilters() {
+ public void testDefaultedCipherSuiteFilters() throws Exception {
String keyStoreStr = getPath("resources/defaultkeystore");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -338,7 +339,7 @@
handler.checkLogContainsString("The enabled cipher suites have been filtered down to"));
}
- public void testNonDefaultedCipherSuiteFilters() {
+ public void testNonDefaultedCipherSuiteFilters() throws Exception {
String keyStoreStr = getPath("resources/defaultkeystore");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -391,7 +392,7 @@
handler.checkLogContainsString("The enabled cipher suites have been filtered down to"));
}
- public void testAllValidDataJKS() {
+ public void testAllValidDataJKS() throws Exception {
String keyStoreStr = getPath("resources/defaultkeystore");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -409,7 +410,7 @@
factory.decorate(sslListener);
}
- public void testAllValidDataPKCS12() {
+ public void testAllValidDataPKCS12() throws Exception {
String keyStoreStr = getPath("resources/celtix.p12");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -427,7 +428,7 @@
factory.decorate(sslListener);
}
- public void testAllElementsHaveSetupMethod() {
+ public void testAllElementsHaveSetupMethod() throws Exception {
SSLServerPolicy policy = new SSLServerPolicy();
TestLogHandler handler = new TestLogHandler();
JettySslListenerFactory factory = createFactory(policy,
@@ -465,9 +466,9 @@
System.setProperty("user.home", oldHome);
}
- protected static String getPath(String fileName) {
+ protected static String getPath(String fileName) throws URISyntaxException {
URL keystoreURL = JettySslListenerFactoryTest.class.getResource(".");
- String str = keystoreURL.getFile();
+ String str = keystoreURL.toURI().getPath();
str += HttpsURLConnectionFactoryTest.DROP_BACK_SRC_DIR + fileName;
return str;
}
Modified: incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java Tue Mar 6 08:40:58 2007
@@ -19,6 +19,7 @@
package org.apache.cxf.transport.https;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Properties;
@@ -457,9 +458,9 @@
return factory;
}
- protected static String getPath(String fileName) {
+ protected static String getPath(String fileName) throws URISyntaxException {
URL keystoreURL = HttpsURLConnectionFactoryTest.class.getResource(".");
- String str = keystoreURL.getFile();
+ String str = keystoreURL.toURI().getPath();
str += DROP_BACK_SRC_DIR + fileName;
return str;
}
Modified: incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.transport.https;
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Properties;
@@ -123,7 +124,7 @@
}
*/
- public void testSetAllData() {
+ public void testSetAllData() throws Exception {
String keyStoreStr = getPath("resources/defaultkeystore");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -188,7 +189,7 @@
+ "CertValidator"));
}
- public void testSetAllDataExceptKeystoreAndTrustStore() {
+ public void testSetAllDataExceptKeystoreAndTrustStore() throws Exception {
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(null);
sslServerPolicy.setKeystoreType("JKS");
@@ -245,7 +246,7 @@
+ "CertValidator"));
}
- public void testAllValidDataJKS() {
+ public void testAllValidDataJKS() throws Exception {
String keyStoreStr = getPath("resources/defaultkeystore");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -263,7 +264,7 @@
factory.decorate(sslConnector);
}
- public void testAllValidDataPKCS12() {
+ public void testAllValidDataPKCS12() throws Exception {
String keyStoreStr = getPath("resources/celtix.p12");
SSLServerPolicy sslServerPolicy = new SSLServerPolicy();
sslServerPolicy.setKeystore(keyStoreStr);
@@ -281,7 +282,7 @@
factory.decorate(sslConnector);
}
- public void testAllElementsHaveSetupMethod() {
+ public void testAllElementsHaveSetupMethod() throws Exception {
SSLServerPolicy policy = new SSLServerPolicy();
TestLogHandler handler = new TestLogHandler();
JettySslConnectorFactory factory = createFactory(policy,
@@ -319,9 +320,9 @@
System.setProperty("user.home", oldHome);
}
- protected static String getPath(String fileName) {
+ protected static String getPath(String fileName) throws URISyntaxException {
URL keystoreURL = JettySslConnectorFactoryTest.class.getResource(".");
- String str = keystoreURL.getFile();
+ String str = keystoreURL.toURI().getPath();
str += HttpsURLConnectionFactoryTest.DROP_BACK_SRC_DIR + fileName;
return str;
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/js/Server.java Tue Mar 6 08:40:58 2007
@@ -31,10 +31,10 @@
try {
ProviderFactory pf = new ProviderFactory();
- String f = getClass().getResource("resources/hello_world.js").getFile();
+ String f = getClass().getResource("resources/hello_world.js").toURI().getPath();
f = URLDecoder.decode(f, "UTF-8");
pf.createAndPublish(new File(f), "http://localhost:9000/SoapContext/SoapPort", false);
- f = getClass().getResource("resources/hello_world.jsx").getFile();
+ f = getClass().getResource("resources/hello_world.jsx").toURI().getPath();
f = URLDecoder.decode(f, "UTF-8");
pf.createAndPublish(new File(f), "http://localhost:9100", false);
} catch (Exception ex) {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Tue Mar 6 08:40:58 2007
@@ -26,6 +26,7 @@
import java.io.InputStream;
import java.io.PrintStream;
import java.lang.reflect.Constructor;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -176,7 +177,14 @@
serverLaunchFailed = true;
}
} else {
- List<String> cmd = getCommand();
+ List<String> cmd;
+ try {
+ cmd = getCommand();
+ } catch (URISyntaxException e1) {
+ IOException ex = new IOException();
+ ex.initCause(e1);
+ throw ex;
+ }
if (debug) {
System.err.print("CMD: ");
@@ -302,7 +310,7 @@
}
}
- private List<String> getCommand() {
+ private List<String> getCommand() throws URISyntaxException {
List<String> cmd = new ArrayList<String>();
cmd.add(javaExe);
@@ -322,7 +330,7 @@
URLClassLoader urlloader = (URLClassLoader)loader;
for (URL url : urlloader.getURLs()) {
classpath.append(File.pathSeparatorChar);
- classpath.append(url.getFile());
+ classpath.append(url.toURI().getPath());
}
}
cmd.add(classpath.toString());
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java Tue Mar 6 08:40:58 2007
@@ -21,6 +21,7 @@
import java.io.File;
import java.lang.reflect.Method;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -49,14 +50,14 @@
return dir.delete();
}
- public static String getClassPath(ClassLoader loader) {
+ public static String getClassPath(ClassLoader loader) throws URISyntaxException {
StringBuffer classPath = new StringBuffer();
if (loader instanceof URLClassLoader) {
URLClassLoader urlLoader = (URLClassLoader)loader;
for (URL url : urlLoader.getURLs()) {
String file = url.getFile();
if (file.indexOf("junit") == -1) {
- classPath.append(url.getFile());
+ classPath.append(url.toURI().getPort());
classPath.append(System.getProperty("path.separator"));
}
}
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java Tue Mar 6 08:40:58 2007
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -57,7 +58,12 @@
if (!classpathSetted) {
argList.add("-extdirs");
- argList.add(getClass().getClassLoader().getResource(".").getFile() + "../lib/");
+ try {
+ argList.add(getClass().getClassLoader().getResource(".").toURI().getPath()
+ + "../lib/");
+ } catch (URISyntaxException e) {
+ throw new ToolException(e);
+ }
} else {
argList.add("-classpath");
argList.add(javaClasspath);
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java Tue Mar 6 08:40:58 2007
@@ -22,6 +22,7 @@
import java.io.File;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
@@ -92,7 +93,11 @@
URLClassLoader urlloader = (URLClassLoader)loader;
for (URL url : urlloader.getURLs()) {
classpath.append(File.pathSeparatorChar);
- classpath.append(url.getFile());
+ try {
+ classpath.append(new File(url.toURI()).getAbsolutePath());
+ } catch (URISyntaxException e) {
+ classpath.append(url.getPath());
+ }
}
}
return classpath.toString();
Modified: incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java Tue Mar 6 08:40:58 2007
@@ -22,6 +22,7 @@
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -348,8 +349,8 @@
}
}
- private String getLocation(String wsdlFile) {
- return JavaToWSDLProcessorTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return JavaToWSDLProcessorTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java (original)
+++ incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.java2wsdl.processor;
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Locale;
@@ -37,7 +38,7 @@
public void setUp() throws Exception {
URL url = ProcessorTestBase.class.getResource(".");
- output = new File(url.getFile());
+ output = new File(url.toURI());
output = new File(output, "/resources");
mkDir(output);
}
@@ -123,13 +124,13 @@
return osName.indexOf("windows") > -1;
}
- protected String getClassPath() {
+ protected String getClassPath() throws URISyntaxException {
ClassLoader loader = getClass().getClassLoader();
StringBuffer classPath = new StringBuffer();
if (loader instanceof URLClassLoader) {
URLClassLoader urlLoader = (URLClassLoader)loader;
for (URL url : urlLoader.getURLs()) {
- File file = new File(url.getFile());
+ File file = new File(url.toURI());
String filename = file.getAbsolutePath();
if (filename.indexOf("junit") == -1) {
classPath.append(filename);
Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.common;
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Locale;
@@ -37,7 +38,7 @@
public void setUp() throws Exception {
URL url = ProcessorTestBase.class.getResource(".");
- output = new File(url.getFile());
+ output = new File(url.toURI());
output = new File(output, "/resources");
mkDir(output);
}
@@ -123,13 +124,13 @@
return osName.indexOf("windows") > -1;
}
- protected String getClassPath() {
+ protected String getClassPath() throws URISyntaxException {
ClassLoader loader = getClass().getClassLoader();
StringBuffer classPath = new StringBuffer();
if (loader instanceof URLClassLoader) {
URLClassLoader urlLoader = (URLClassLoader)loader;
for (URL url : urlLoader.getURLs()) {
- File file = new File(url.getFile());
+ File file = new File(url.toURI());
String filename = file.getAbsolutePath();
if (filename.indexOf("junit") == -1) {
classPath.append(filename);
Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.misc.processor;
import java.io.File;
+import java.net.URISyntaxException;
import java.util.Iterator;
import javax.wsdl.Service;
@@ -293,7 +294,7 @@
}
}
- private String getLocation(String wsdlFile) {
- return WSDLToServiceProcessorTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return WSDLToServiceProcessorTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.misc.processor;
import java.io.File;
+import java.net.URISyntaxException;
import java.util.*;
import javax.wsdl.Binding;
@@ -487,8 +488,8 @@
}
}
- private String getLocation(String wsdlFile) {
- return WSDLToSoapProcessorTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return WSDLToSoapProcessorTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.misc.processor;
import java.io.File;
+import java.net.URISyntaxException;
import java.util.Iterator;
import javax.wsdl.Binding;
@@ -124,8 +125,8 @@
}
}
- private String getLocation(String wsdlFile) {
- return WSDLToXMLProcessorTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return WSDLToXMLProcessorTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java Tue Mar 6 08:40:58 2007
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.FileReader;
+import java.net.URISyntaxException;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
@@ -90,8 +91,8 @@
}
- private String getLocation(String wsdlFile) {
- return XSDToWSDLProcessorTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return XSDToWSDLProcessorTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java (original)
+++ incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Tue Mar 6 08:40:58 2007
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.validator;
import java.io.File;
-import java.io.IOException;
import java.net.URL;
import java.util.Enumeration;
@@ -141,16 +140,16 @@
}
- private String getLocation(String wsdlFile) throws IOException {
+ private String getLocation(String wsdlFile) throws Exception {
Enumeration<URL> e = WSDLValidationTest.class.getClassLoader().getResources(wsdlFile);
while (e.hasMoreElements()) {
URL u = e.nextElement();
- File f = new File(u.getFile());
+ File f = new File(u.toURI());
if (f.exists() && f.isDirectory()) {
return f.toString();
}
}
- return WSDLValidationTest.class.getResource(wsdlFile).getFile();
+ return new File(WSDLValidationTest.class.getResource(wsdlFile).toURI()).getAbsolutePath();
}
}
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.common;
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Locale;
@@ -37,7 +38,7 @@
public void setUp() throws Exception {
URL url = ProcessorTestBase.class.getResource(".");
- output = new File(url.getFile());
+ output = new File(url.toURI());
output = new File(output, "/resources");
mkDir(output);
}
@@ -123,13 +124,13 @@
return osName.indexOf("windows") > -1;
}
- protected String getClassPath() {
+ protected String getClassPath() throws URISyntaxException {
ClassLoader loader = getClass().getClassLoader();
StringBuffer classPath = new StringBuffer();
if (loader instanceof URLClassLoader) {
URLClassLoader urlLoader = (URLClassLoader)loader;
for (URL url : urlLoader.getURLs()) {
- File file = new File(url.getFile());
+ File file = new File(url.toURI());
String filename = file.getAbsolutePath();
if (filename.indexOf("junit") == -1) {
classPath.append(filename);
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/WSDLToJavaTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/WSDLToJavaTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/WSDLToJavaTest.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/WSDLToJavaTest.java Tue Mar 6 08:40:58 2007
@@ -80,7 +80,8 @@
}
public void testWSDLToJava() throws Exception {
- String[] args = new String[]{"-ant", "-V", "-d", output.getCanonicalPath(), wsdlLocation.getFile()};
+ String[] args = new String[]{"-ant", "-V", "-d", output.getCanonicalPath(),
+ wsdlLocation.toURI().getPath()};
WSDLToJava.main(args);
assertNotNull(getStdOut());
}
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java Tue Mar 6 08:40:58 2007
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.FileReader;
+import java.net.URISyntaxException;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
@@ -65,7 +66,7 @@
}
- private String getLocation(String wsdlFile) {
- return WSDLTOJavaEOLStyleTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return WSDLTOJavaEOLStyleTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java Tue Mar 6 08:40:58 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.wsdl2java.processor;
import java.io.File;
+import java.net.URISyntaxException;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
@@ -107,8 +108,8 @@
}
- private String getLocation(String wsdlFile) {
- return WSDLToJavaClientServerTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return WSDLToJavaClientServerTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java Tue Mar 6 08:40:58 2007
@@ -21,6 +21,7 @@
import java.io.File;
import java.lang.reflect.Method;
+import java.net.URISyntaxException;
import java.net.URLClassLoader;
import javax.jws.WebParam;
@@ -93,7 +94,7 @@
assertEquals("testHeader5", webResultAnno.name());
}
- private String getLocation(String wsdlFile) {
- return WSDLToJavaExSoapHeaderTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return WSDLToJavaExSoapHeaderTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java Tue Mar 6 08:40:58 2007
@@ -175,7 +175,7 @@
}
private String getLocation(String wsdlFile) throws URISyntaxException {
- return WSDLToJavaMIMETest.class.getResource(wsdlFile).getFile();
+ return WSDLToJavaMIMETest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java Tue Mar 6 08:40:58 2007
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.net.URISyntaxException;
import java.net.URLClassLoader;
import javax.jws.HandlerChain;
@@ -943,7 +944,7 @@
}
- public void testBug305729() {
+ public void testBug305729() throws Exception {
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305729/hello_world.wsdl"));
processor.setEnvironment(env);
processor.process();
@@ -1175,8 +1176,8 @@
}
- private String getLocation(String wsdlFile) {
- return WSDLToJavaProcessorTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return WSDLToJavaProcessorTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java?view=diff&rev=515198&r1=515197&r2=515198
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java Tue Mar 6 08:40:58 2007
@@ -19,6 +19,8 @@
package org.apache.cxf.tools.wsdl2java.processor;
+import java.net.URISyntaxException;
+
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolException;
@@ -55,8 +57,8 @@
processor.process();
}
- private String getLocation(String wsdlFile) {
- return WSDLToJavaXMLFormatTest.class.getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return WSDLToJavaXMLFormatTest.class.getResource(wsdlFile).toURI().getPath();
}