Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 28519 invoked from network); 15 Mar 2007 22:11:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Mar 2007 22:11:28 -0000 Received: (qmail 94264 invoked by uid 500); 15 Mar 2007 22:11:35 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 94221 invoked by uid 500); 15 Mar 2007 22:11:35 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 94212 invoked by uid 99); 15 Mar 2007 22:11:35 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2007 15:11:35 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2007 15:11:26 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EB6EA1A9838; Thu, 15 Mar 2007 15:11:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r518778 - in /incubator/cxf/trunk/tools2: javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/ wsdlto/misc/src/test/java/org/apache/cxf/tools/common/ wsdlto/misc/src/t... Date: Thu, 15 Mar 2007 22:11:04 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070315221104.EB6EA1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Mar 15 15:11:03 2007 New Revision: 518778 URL: http://svn.apache.org/viewvc?view=rev&rev=518778 Log: Fix more "spaces in the build path" issues. Modified: incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java Modified: incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java (original) +++ incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java Thu Mar 15 15:11:03 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; @@ -371,8 +372,8 @@ } } - private String getLocation(String wsdlFile) { - return JavaToWSDLProcessorTest.class.getResource(wsdlFile).getFile(); + private String getLocation(String wsdlFile) throws URISyntaxException { + return new File(JavaToWSDLProcessorTest.class.getResource(wsdlFile).toURI()).getAbsolutePath(); } } Modified: incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java (original) +++ incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java Thu Mar 15 15:11:03 2007 @@ -41,7 +41,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); env.put(FrontEndProfile.class, PluginLoader.getInstance().getFrontEndProfile("jaxws")); Modified: incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties (original) +++ incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties Thu Mar 15 15:11:03 2007 @@ -42,7 +42,7 @@ FAIL_TO_CREATE_SOAPBINDING = Fail to create soapbinding FAIL_TO_CREATE_XMLBINDING = Fail to create xml binding FAIL_TO_CREATE_SOAPADDRESS = Fail to create soap address - +FAIL_TO_OPEN_XSD_FILE = Failed to open XSD file {0} SKIP_OVERLOADED_OPERATION=Skipping overloaded operation: {0} NO_INPUT_MESSAGE=Problem outputting method for {0} as no input message was found for input named {1} FAIL_TO_GET_WSDL = Can not get WSDL location from {0} Modified: incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java Thu Mar 15 15:11:03 2007 @@ -99,7 +99,7 @@ try { in = new FileInputStream(xsdUrl); } catch (IOException ioe) { - Message msg = new Message("FAIL_TO_OPEN_XSD_FILE", LOG); + Message msg = new Message("FAIL_TO_OPEN_XSD_FILE", LOG, xsdUrl); throw new ToolException(msg, ioe); } if (in == null) { Modified: incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java Thu Mar 15 15:11:03 2007 @@ -37,7 +37,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); } Modified: incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java Thu Mar 15 15:11:03 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; @@ -294,7 +295,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().toString(); } } Modified: incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java Thu Mar 15 15:11:03 2007 @@ -487,8 +487,8 @@ } } - private String getLocation(String wsdlFile) { - return WSDLToSoapProcessorTest.class.getResource(wsdlFile).getFile(); + private String getLocation(String wsdlFile) throws Exception { + return WSDLToSoapProcessorTest.class.getResource(wsdlFile).toURI().toString(); } } Modified: incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java Thu Mar 15 15:11:03 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; @@ -125,8 +126,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().toString(); } } Modified: incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java?view=diff&rev=518778&r1=518777&r2=518778 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java Thu Mar 15 15:11:03 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; @@ -40,7 +41,8 @@ XSDToWSDL.main(args); File outputFile = new File(output, "Invoice_xsd.wsdl"); - assertTrue("New wsdl file is not generated", outputFile.exists()); + assertTrue("New wsdl file is not generated: " + outputFile.getAbsolutePath(), + outputFile.exists()); FileReader fileReader = new FileReader(outputFile); char[] chars = new char[100]; int size = 0; @@ -90,8 +92,8 @@ } - private String getLocation(String wsdlFile) { - return XSDToWSDLProcessorTest.class.getResource(wsdlFile).getFile(); + private String getLocation(String wsdlFile) throws URISyntaxException { + return new File(XSDToWSDLProcessorTest.class.getResource(wsdlFile).toURI()).getAbsolutePath(); } }