Author: dkulp
Date: Mon Jun 16 13:12:27 2008
New Revision: 668283
URL: http://svn.apache.org/viewvc?rev=668283&view=rev
Log:
Get build working if path has spaces in it
Get tests passing if path has spaces in it
Get build working if offline
Get tests passing if offline
Added:
cxf/trunk/systests/src/test/resources/META-INF/
cxf/trunk/systests/src/test/resources/META-INF/jax-ws-catalog.xml (with
props)
cxf/trunk/tools/corba/src/test/resources/META-INF/
cxf/trunk/tools/corba/src/test/resources/META-INF/jax-ws-catalog.xml
(with props)
cxf/trunk/tools/javato/ws/src/test/resources/META-INF/
cxf/trunk/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
(with props)
Modified:
cxf/trunk/rt/bindings/jbi/pom.xml
cxf/trunk/rt/bindings/jbi/src/main/build-resources/catalog.cat
cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/trunk/rt/transports/jbi/src/main/build-resources/catalog.cat
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
Modified: cxf/trunk/rt/bindings/jbi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/pom.xml?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ cxf/trunk/rt/bindings/jbi/pom.xml Mon Jun 16 13:12:27 2008
@@ -95,7 +95,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/jbi.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/jbi.xjb</bindingFile>
-
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Modified: cxf/trunk/rt/bindings/jbi/src/main/build-resources/catalog.cat
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/src/main/build-resources/catalog.cat?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/src/main/build-resources/catalog.cat (original)
+++ cxf/trunk/rt/bindings/jbi/src/main/build-resources/catalog.cat Mon Jun 16
13:12:27 2008
@@ -17,5 +17,5 @@
under the License.
--
-
+SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
Mon Jun 16 13:12:27 2008
@@ -23,6 +23,7 @@
import org.xml.sax.InputSource;
+import org.apache.cxf.Bus;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.resource.ExtendedURIResolver;
import org.apache.ws.commons.schema.XmlSchemaException;
@@ -37,6 +38,9 @@
private ExtendedURIResolver resolver;
private Catalog catalogResolver;
+ public CatalogXmlSchemaURIResolver(Bus bus) {
+ this(OASISCatalogManager.getCatalogManager(bus));
+ }
public CatalogXmlSchemaURIResolver(OASISCatalogManager catalogManager) {
this.resolver = new ExtendedURIResolver();
this.catalogResolver = catalogManager.getCatalog();
Modified:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Mon Jun 16 13:12:27 2008
@@ -53,6 +53,7 @@
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactoryManager;
+import org.apache.cxf.catalog.CatalogXmlSchemaURIResolver;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
@@ -320,6 +321,7 @@
}
ServiceInfo serviceInfo = new ServiceInfo();
SchemaCollection col = serviceInfo.getXmlSchemaCollection();
+ col.getXmlSchemaCollection().setSchemaResolver(new
CatalogXmlSchemaURIResolver(this.getBus()));
col.getExtReg().registerSerializer(MimeAttribute.class, new
MimeSerializer());
ServiceImpl service = new ServiceImpl(serviceInfo);
Modified: cxf/trunk/rt/transports/jbi/src/main/build-resources/catalog.cat
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/src/main/build-resources/catalog.cat?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/src/main/build-resources/catalog.cat (original)
+++ cxf/trunk/rt/transports/jbi/src/main/build-resources/catalog.cat Mon Jun 16
13:12:27 2008
@@ -17,5 +17,5 @@
under the License.
--
-
+SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
Mon Jun 16 13:12:27 2008
@@ -20,6 +20,7 @@
package org.apache.cxf.systest.http;
+import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
@@ -124,12 +125,12 @@
try {
//System.setProperty("javax.net.debug", "all");
String keystore =
- Server.class.getResource("resources/Morpit.jks").getFile();
+ new
File(Server.class.getResource("resources/Morpit.jks").toURI()).getAbsolutePath();
//System.out.println("Keystore: " + keystore);
KeyManager[] kmgrs = getKeyManagers(getKeyStore("JKS", keystore,
"password"), "password");
String truststore =
- Server.class.getResource("resources/Truststore.jks").getFile();
+ new
File(Server.class.getResource("resources/Truststore.jks").toURI()).getAbsolutePath();
//System.out.println("Truststore: " + truststore);
TrustManager[] tmgrs = getTrustManagers(getKeyStore("JKS",
truststore, "password"));
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Mon Jun 16 13:12:27 2008
@@ -177,8 +177,7 @@
String endpointAddress =
"http://localhost:9080/bookstore/books";;
- String inputFile =
getClass().getResource("resources/add_book.txt").getFile();
- File input = new File(inputFile);
+ File input = new
File(getClass().getResource("resources/add_book.txt").toURI());
PostMethod post = new PostMethod(endpointAddress);
post.setRequestHeader("Content-Type", "application/xml");
RequestEntity entity = new FileRequestEntity(input, "text/xml;
charset=ISO-8859-1");
@@ -202,8 +201,7 @@
public void testUpdateBook() throws Exception {
String endpointAddress = "http://localhost:9080/bookstore/books";;
- String inputFile =
getClass().getResource("resources/update_book.txt").getFile();
- File input = new File(inputFile);
+ File input = new
File(getClass().getResource("resources/update_book.txt").toURI());
PutMethod put = new PutMethod(endpointAddress);
RequestEntity entity = new FileRequestEntity(input, "text/xml;
charset=ISO-8859-1");
put.setRequestEntity(entity);
@@ -231,8 +229,7 @@
assertEquals(getStringFromInputStream(expected),
getStringFromInputStream(in));
// Roll back changes:
- String inputFile1 =
getClass().getResource("resources/expected_get_book123.txt").getFile();
- File input1 = new File(inputFile1);
+ File input1 = new
File(getClass().getResource("resources/expected_get_book123.txt").toURI());
PutMethod put1 = new PutMethod(endpointAddress);
RequestEntity entity1 = new FileRequestEntity(input1, "text/xml;
charset=ISO-8859-1");
put1.setRequestEntity(entity1);
@@ -252,8 +249,7 @@
public void testUpdateBookWithDom() throws Exception {
String endpointAddress =
"http://localhost:9080/bookstore/bookswithdom";;
- String inputFile =
getClass().getResource("resources/update_book.txt").getFile();
- File input = new File(inputFile);
+ File input = new
File(getClass().getResource("resources/update_book.txt").toURI());
PutMethod put = new PutMethod(endpointAddress);
RequestEntity entity = new FileRequestEntity(input, "text/xml;
charset=ISO-8859-1");
put.setRequestEntity(entity);
@@ -278,8 +274,7 @@
public void testUpdateBookWithJSON() throws Exception {
String endpointAddress =
"http://localhost:9080/bookstore/bookswithjson";;
- String inputFile =
getClass().getResource("resources/update_book_json.txt").getFile();
- File input = new File(inputFile);
+ File input = new
File(getClass().getResource("resources/update_book_json.txt").toURI());
PutMethod put = new PutMethod(endpointAddress);
RequestEntity entity = new FileRequestEntity(input, "application/json;
charset=ISO-8859-1");
put.setRequestEntity(entity);
@@ -307,8 +302,7 @@
assertEquals(getStringFromInputStream(expected),
getStringFromInputStream(in));
// Roll back changes:
- String inputFile1 =
getClass().getResource("resources/expected_get_book123.txt").getFile();
- File input1 = new File(inputFile1);
+ File input1 = new
File(getClass().getResource("resources/expected_get_book123.txt").toURI());
PutMethod put1 = new PutMethod(endpointAddress);
RequestEntity entity1 = new FileRequestEntity(input1, "text/xml;
charset=ISO-8859-1");
put1.setRequestEntity(entity1);
@@ -329,8 +323,7 @@
String endpointAddress =
"http://localhost:9080/bookstore/books";;
- String inputFile =
getClass().getResource("resources/update_book_not_exist.txt").getFile();
- File input = new File(inputFile);
+ File input = new
File(getClass().getResource("resources/update_book_not_exist.txt").toURI());
PutMethod post = new PutMethod(endpointAddress);
RequestEntity entity = new FileRequestEntity(input, "text/xml;
charset=ISO-8859-1");
post.setRequestEntity(entity);
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
Mon Jun 16 13:12:27 2008
@@ -19,6 +19,7 @@
package org.apache.cxf.systest.jaxrs;
+import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
@@ -76,7 +77,7 @@
//httpurlconnection.setRequestProperty("Content-Length",
String.valueOf(is.available()));
OutputStream outputstream = httpUrlConnection.getOutputStream();
- String inputFile =
getClass().getResource("resources/add_book.txt").getFile();
+ File inputFile = new
File(getClass().getResource("resources/add_book.txt").toURI());
byte[] tmp = new byte[4096];
int i = 0;
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
Mon Jun 16 13:12:27 2008
@@ -19,6 +19,7 @@
package org.apache.cxf.systest.jaxrs;
+import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
@@ -79,7 +80,7 @@
//httpurlconnection.setRequestProperty("Content-Length",
String.valueOf(is.available()));
OutputStream outputstream = httpUrlConnection.getOutputStream();
- String inputFile =
getClass().getResource("resources/singleValPostBody.txt").getFile();
+ File inputFile = new
File(getClass().getResource("resources/singleValPostBody.txt").toURI());
byte[] tmp = new byte[4096];
int i = 0;
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
Mon Jun 16 13:12:27 2008
@@ -21,6 +21,7 @@
import java.io.InputStream;
import java.net.URL;
+import java.util.Enumeration;
import javax.wsdl.WSDLException;
import javax.wsdl.factory.WSDLFactory;
@@ -114,15 +115,19 @@
}
// update catalog dynamically now
- URL jaxwscatalog =
- getClass().getResource("/META-INF/jax-ws-catalog.xml");
+ Enumeration<URL> jaxwscatalog =
+
getClass().getClassLoader().getResources("META-INF/jax-ws-catalog.xml");
assertNotNull(jaxwscatalog);
- catalog.loadCatalog(jaxwscatalog);
+ while (jaxwscatalog.hasMoreElements()) {
+ URL url = jaxwscatalog.nextElement();
+ catalog.loadCatalog(url);
+ }
SOAPService service = new SOAPService(wsdl, serviceName);
Greeter greeter = service.getPort(portName, Greeter.class);
assertNotNull(greeter);
+ bus.shutdown(true);
}
@Test
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestClientServerBookTest.java
Mon Jun 16 13:12:27 2008
@@ -166,8 +166,7 @@
String endpointAddress =
"http://localhost:9080/json/books";;
- String inputFile =
getClass().getResource("resources/add_book_json.txt").getFile();
- File input = new File(inputFile);
+ File input = new
File(getClass().getResource("resources/add_book_json.txt").toURI());
PostMethod post = new PostMethod(endpointAddress);
RequestEntity entity = new FileRequestEntity(input, "text/plain;
charset=ISO-8859-1");
post.setRequestEntity(entity);
Added: cxf/trunk/systests/src/test/resources/META-INF/jax-ws-catalog.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/META-INF/jax-ws-catalog.xml?rev=668283&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/resources/META-INF/jax-ws-catalog.xml (added)
+++ cxf/trunk/systests/src/test/resources/META-INF/jax-ws-catalog.xml Mon Jun
16 13:12:27 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+ <rewriteSystem systemIdStartString="http://www.w3.org/2006/03/addressing";
rewritePrefix="classpath:/schemas/wsdl"/>
+ <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing";
rewritePrefix="classpath:/schemas/wsdl"/>
+</catalog>
Propchange: cxf/trunk/systests/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/systests/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
(original)
+++
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
Mon Jun 16 13:12:27 2008
@@ -167,10 +167,10 @@
// test "-s base64Binary" and "-s hexBinary" options
public void doTestSequenceOctetMappingOption(String encoding) throws
Exception {
- File input = new
File(getClass().getResource("/idl/sequence_octet.idl").getFile());
+ File input = new
File(getClass().getResource("/idl/sequence_octet.idl").toURI());
File actual = new File(output, "sequence_octet.wsdl");
File expected = new File(getClass().getResource("/idl/expected_"
- + encoding +
"_sequence_octet.wsdl").getFile());
+ + encoding +
"_sequence_octet.wsdl").toURI());
String[] args = new String[] {"-s", encoding,
"-o", output.toString(),
@@ -200,10 +200,10 @@
// test "-x <schema-namespace>"
public void testSchemaNamespace() throws Exception {
- File input = new
File(getClass().getResource("/idl/HelloWorld.idl").getFile());
+ File input = new
File(getClass().getResource("/idl/HelloWorld.idl").toURI());
File actual = new File(output, "HelloWorld.wsdl");
File expected =
- new
File(getClass().getResource("/idl/expected_HelloWorld_schema_namespace.wsdl").getFile());
+ new
File(getClass().getResource("/idl/expected_HelloWorld_schema_namespace.wsdl").toURI());
String[] args = new String[] {"-x",
"http://cxf.apache.org/foobar/schema";,
"-o", output.toString(),
@@ -216,10 +216,10 @@
// test "-f <corba-address-file>"
public void testCorbaAddressFile() throws Exception {
- File input = new
File(getClass().getResource("/idl/HelloWorld.idl").getFile());
+ File input = new
File(getClass().getResource("/idl/HelloWorld.idl").toURI());
File actual = new File(output, "HelloWorld.wsdl");
File expected =
- new
File(getClass().getResource("/idl/expected_HelloWorld_corba_address_file.wsdl").getFile());
+ new
File(getClass().getResource("/idl/expected_HelloWorld_corba_address_file.wsdl").toURI());
// create temporary file containing ior
File addressFile = new File(output, "HelloWorld.idl");
@@ -247,10 +247,10 @@
// test "-t <corba-type-map target-namespace>"
public void testCorbaTypeMapTargetNamespace() throws Exception {
- File input = new
File(getClass().getResource("/idl/sequence_octet.idl").getFile());
+ File input = new
File(getClass().getResource("/idl/sequence_octet.idl").toURI());
File actual = new File(output, "sequence_octet.wsdl");
File expected =
- new
File(getClass().getResource("/idl/expected_sequence_octet_corba_typemap_tns.wsdl").getFile());
+ new
File(getClass().getResource("/idl/expected_sequence_octet_corba_typemap_tns.wsdl").toURI());
String[] args = new String[] {"-t",
"http://cxf.apache.org/foobar/typemap";,
"-o", output.toString(),
@@ -263,9 +263,9 @@
// test "-b Treat bounded strings as unbounded."
public void testTreatBoundedStringsAsUnbounded() throws Exception {
- File input = new
File(getClass().getResource("/idl/String.idl").getFile());
+ File input = new
File(getClass().getResource("/idl/String.idl").toURI());
File actual = new File(output, "String.wsdl");
- File expected = new
File(getClass().getResource("/idl/expected_String_unbounded.wsdl").getFile());
+ File expected = new
File(getClass().getResource("/idl/expected_String_unbounded.wsdl").toURI());
String[] args = new String[] {"-b",
"-o", output.toString(),
@@ -278,9 +278,9 @@
// test "-b Treat bounded strings as unbounded."
public void testTreatBoundedAnonStringsAsUnbounded() throws Exception {
- File input = new
File(getClass().getResource("/idl/Anonstring.idl").getFile());
+ File input = new
File(getClass().getResource("/idl/Anonstring.idl").toURI());
File actual = new File(output, "Anonstring.wsdl");
- File expected = new
File(getClass().getResource("/idl/expected_Anonstring_unbounded.wsdl").getFile());
+ File expected = new
File(getClass().getResource("/idl/expected_Anonstring_unbounded.wsdl").toURI());
String[] args = new String[] {"-b",
"-o", output.toString(),
@@ -292,9 +292,9 @@
}
public void testExceptionsWithSchemasInDifferentNS() throws Exception {
- File input = new
File(getClass().getResource("/idl/Exception.idl").getFile());
+ File input = new
File(getClass().getResource("/idl/Exception.idl").toURI());
File actual = new File(output, "Exception.wsdl");
- File expected = new
File(getClass().getResource("/idl/expected_Exception_DiffNS.wsdl").getFile());
+ File expected = new
File(getClass().getResource("/idl/expected_Exception_DiffNS.wsdl").toURI());
String[] args = new String[] {"-x",
"http://cxf.apache.org/bindings/corba/idl/Exception/types";,
"-o", output.toString(),
@@ -306,10 +306,10 @@
}
public void testOutputWSDLFileName() throws Exception {
- File input = new
File(getClass().getResource("/idl/HelloWorld.idl").getFile());
+ File input = new
File(getClass().getResource("/idl/HelloWorld.idl").toURI());
File actual = new File(output, "ArtixHelloWorld.wsdl");
File expected =
- new
File(getClass().getResource("/idl/expected_HelloWorld.wsdl").getFile());
+ new
File(getClass().getResource("/idl/expected_HelloWorld.wsdl").toURI());
String[] args = new String[] {"-ow", "ArtixHelloWorld.wsdl",
"-o", output.toString(),
Modified:
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
(original)
+++
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
Mon Jun 16 13:12:27 2008
@@ -98,8 +98,9 @@
final String location = "B.idl";
// uses <> notation for include
final URL orig = findTestResource(location);
- final File dir = new File(orig.getPath().substring(0,
- orig.getPath().indexOf(location)));
+ final File origFile = new File(orig.toURI());
+ final File dir = new File(origFile.getAbsolutePath()
+ .substring(0,
origFile.getAbsolutePath().indexOf(location)));
final DefaultIncludeResolver includeResolver = new
DefaultIncludeResolver(dir);
final DefineState defineState = new DefineState(new HashMap<String,
String>());
Modified:
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
(original)
+++
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
Mon Jun 16 13:12:27 2008
@@ -63,7 +63,7 @@
URL idl = getClass().getResource(sourceIdlFilename);
ProcessorEnvironment env = new ProcessorEnvironment();
Map<String, Object> cfg = new HashMap<String, Object>();
- cfg.put(ToolCorbaConstants.CFG_IDLFILE, idl.getFile());
+ cfg.put(ToolCorbaConstants.CFG_IDLFILE, new
File(idl.toURI()).getAbsolutePath());
env.setParameters(cfg);
IDLToWSDLProcessor processor = new IDLToWSDLProcessor();
processor.setEnvironment(env);
@@ -310,7 +310,7 @@
URL idl = getClass().getResource(idlFilename);
ProcessorEnvironment env = new ProcessorEnvironment();
Map<String, Object> cfg = new HashMap<String, Object>();
- cfg.put(ToolCorbaConstants.CFG_IDLFILE, idl.getFile());
+ cfg.put(ToolCorbaConstants.CFG_IDLFILE, new
File(idl.toURI()).getAbsolutePath());
if (logicalName != null) {
cfg.put(ToolCorbaConstants.CFG_LOGICAL, logicalName);
}
@@ -495,7 +495,7 @@
URL idl = getClass().getResource(sourceIdlFilename);
ProcessorEnvironment env = new ProcessorEnvironment();
Map<String, Object> cfg = new HashMap<String, Object>();
- cfg.put(ToolCorbaConstants.CFG_IDLFILE, idl.getFile());
+ cfg.put(ToolCorbaConstants.CFG_IDLFILE, new
File(idl.toURI()).getAbsolutePath());
cfg.put(ToolCorbaConstants.CFG_WSDL_ENCODING, "UTF-16");
env.setParameters(cfg);
IDLToWSDLProcessor processor = new IDLToWSDLProcessor();
Modified:
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
(original)
+++
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
Mon Jun 16 13:12:27 2008
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.corba.processors;
import java.io.File;
+import java.net.URI;
import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
@@ -675,8 +676,8 @@
public void testSetCorbaAddressFile() throws Exception {
try {
- String fileName =
getClass().getResource("/wsdl/datetime.wsdl").toString();
- generator.setWsdlFile(fileName);
+ URI fileName =
getClass().getResource("/wsdl/datetime.wsdl").toURI();
+ generator.setWsdlFile(new File(fileName).getAbsolutePath());
generator.addInterfaceName("BasePortType");
Definition model = generator.generateCORBABinding();
@@ -689,7 +690,7 @@
assertEquals("file:./Base.ref", address);
URL idl = getClass().getResource("/wsdl/addressfile.txt");
- String filename = idl.getFile();
+ String filename = new File(idl.toURI()).getAbsolutePath();
generator.setAddressFile(filename);
model = generator.generateCORBABinding();
service = model.getService(name);
Modified:
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
(original)
+++
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
Mon Jun 16 13:12:27 2008
@@ -27,6 +27,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
+import java.net.URI;
import org.apache.cxf.tools.corba.processors.wsdl.WSDLToIDLAction;
import org.junit.After;
@@ -727,8 +728,8 @@
public void testCorbaRecursiveStructs() throws Exception {
try {
- String fileName =
getClass().getResource("/idlgen/recursivestruct.wsdl").toString();
- idlgen.setWsdlFile(fileName);
+ URI fileName =
getClass().getResource("/idlgen/recursivestruct.wsdl").toURI();
+ idlgen.setWsdlFile(new File(fileName).getAbsolutePath());
idlgen.setBindingName("TestInterfaceCORBABinding");
idlgen.setOutputFile("recursivestruct.idl");
@@ -749,8 +750,8 @@
public void testCoraRecursiveUnion() throws Exception {
try {
- String fileName =
getClass().getResource("/idlgen/recursiveunion.wsdl").toString();
- idlgen.setWsdlFile(fileName);
+ URI fileName =
getClass().getResource("/idlgen/recursiveunion.wsdl").toURI();
+ idlgen.setWsdlFile(new File(fileName).getAbsolutePath());
idlgen.setBindingName("TestInterfaceCORBABinding");
idlgen.setOutputFile("recursiveunion.idl");
Added: cxf/trunk/tools/corba/src/test/resources/META-INF/jax-ws-catalog.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/META-INF/jax-ws-catalog.xml?rev=668283&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/META-INF/jax-ws-catalog.xml (added)
+++ cxf/trunk/tools/corba/src/test/resources/META-INF/jax-ws-catalog.xml Mon
Jun 16 13:12:27 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+ <rewriteSystem systemIdStartString="http://www.w3.org/2006/03/addressing";
rewritePrefix="classpath:/schemas/wsdl"/>
+ <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing";
rewritePrefix="classpath:/schemas/wsdl"/>
+</catalog>
Propchange: cxf/trunk/tools/corba/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/tools/corba/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/tools/corba/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
(original)
+++
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
Mon Jun 16 13:12:27 2008
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.java2wsdl.generator.wsdl11;
import java.io.File;
+import java.net.URI;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
@@ -74,24 +75,24 @@
}
@Test
- public void testGenerateEmbedStyle() {
+ public void testGenerateEmbedStyle() throws Exception {
gen.setWSDLName("date_embed");
gen.setServiceModel(getServiceInfo(EchoDate.class));
assertEquals(Date.class, gen.getDateType());
- String expectedFile =
getClass().getResource("expected/date_embed.xml").getFile();
+ URI expectedFile =
getClass().getResource("expected/date_embed.xml").toURI();
assertFileEquals(new File(expectedFile), gen.generate(output));
gen.setWSDLName("calendar_embed");
gen.setServiceModel(getServiceInfo(EchoCalendar.class));
assertEquals(Calendar.class, gen.getDateType());
- expectedFile =
getClass().getResource("expected/calendar_embed.xml").getFile();
+ expectedFile =
getClass().getResource("expected/calendar_embed.xml").toURI();
assertFileEquals(new File(expectedFile), gen.generate(output));
}
@Test
- public void testGenerateExternalStyle() {
+ public void testGenerateExternalStyle() throws Exception {
gen.setAllowImports(true);
gen.addSchemaFiles(Arrays.asList(new String[]{"hello_schema1.xsd",
"hello_schema2.xsd"}));
@@ -99,14 +100,14 @@
gen.setServiceModel(getServiceInfo(EchoDate.class));
assertEquals(Date.class, gen.getDateType());
- String expectedFile =
getClass().getResource("expected/date.xjb").getFile();
+ URI expectedFile = getClass().getResource("expected/date.xjb").toURI();
assertFileEquals(new File(expectedFile), gen.generate(output));
gen.setWSDLName("calendar_external");
gen.setServiceModel(getServiceInfo(EchoCalendar.class));
assertEquals(Calendar.class, gen.getDateType());
- expectedFile =
getClass().getResource("expected/calendar.xjb").getFile();
+ expectedFile = getClass().getResource("expected/calendar.xjb").toURI();
assertFileEquals(new File(expectedFile), gen.generate(output));
}
}
\ No newline at end of file
Modified:
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
(original)
+++
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
Mon Jun 16 13:12:27 2008
@@ -21,6 +21,7 @@
import java.io.File;
import java.lang.reflect.Method;
+import java.net.URI;
import java.util.HashSet;
import java.util.Set;
@@ -69,7 +70,7 @@
File faultBeanClass = new File(output, pkgBase +
"/DBServiceFaultBean.java");
assertTrue(faultBeanClass.exists());
- String expectedFile =
getClass().getResource("expected/DBServiceFaultBean.java.source").getFile();
+ URI expectedFile =
getClass().getResource("expected/DBServiceFaultBean.java.source").toURI();
assertFileEquals(new File(expectedFile), faultBeanClass);
}
@@ -88,7 +89,7 @@
File faultBeanClass = new File(output, pkgBase + "/FaultDetail.java");
assertTrue(faultBeanClass.exists());
- String expectedFile =
getClass().getResource("expected/FaultDetail.java.source").getFile();
+ URI expectedFile =
getClass().getResource("expected/FaultDetail.java.source").toURI();
assertFileEquals(new File(expectedFile), faultBeanClass);
}
Modified:
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
(original)
+++
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Mon Jun 16 13:12:27 2008
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.java2wsdl.processor;
import java.io.File;
+import java.net.URI;
import javax.wsdl.Definition;
import javax.wsdl.Port;
@@ -96,7 +97,7 @@
processor.setEnvironment(env);
processor.process();
- String expectedFile =
getClass().getResource("expected/calculator.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/calculator.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), new File(output,
"calculator.wsdl"));
}
@@ -125,7 +126,7 @@
processor.setEnvironment(env);
processor.process();
- String expectedFile =
getClass().getResource("expected/hello_soap12.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/hello_soap12.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), new File(output,
"hello_soap12.wsdl"));
}
@@ -192,7 +193,7 @@
processor.setEnvironment(env);
processor.process();
- String expectedFile =
getClass().getResource("expected/db.wsdl").getFile();
+ URI expectedFile = getClass().getResource("expected/db.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), new File(output, "db.wsdl"));
}
@@ -216,7 +217,7 @@
processor.setEnvironment(env);
processor.process();
- String expectedFile =
getClass().getResource("expected/my_hello_soap12.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/my_hello_soap12.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), new File(output,
"my_hello_soap12.wsdl"));
}
@Test
@@ -311,7 +312,7 @@
File wsdlFile = new File(output, "rpc-hello.wsdl");
assertTrue("Generate Wsdl Fail", wsdlFile.exists());
- String expectedFile =
getClass().getResource("expected/rpc-hello-expected.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/rpc-hello-expected.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), new File(output,
"rpc-hello.wsdl"));
}
@@ -325,7 +326,7 @@
File wsdlFile = new File(output, "xml-bare.wsdl");
assertTrue("Generate Wsdl Fail", wsdlFile.exists());
- String expectedFile =
getClass().getResource("expected/xml-bare-expected.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/xml-bare-expected.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), new File(output,
"/xml-bare.wsdl"));
}
@@ -341,7 +342,7 @@
File wsdlFile = new File(output, "fault.wsdl");
assertTrue("Generate Wsdl Fail", wsdlFile.exists());
- String expectedFile =
getClass().getResource("expected/hello_world_fault_expected.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/hello_world_fault_expected.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), new File(output,
"/fault.wsdl"));
}
@@ -384,7 +385,7 @@
File bindingFile = new File(output, "echo_date.xjb");
assertTrue(bindingFile.exists());
- String expectedFile =
getClass().getResource("expected/echo_date.xjb").getFile();
+ URI expectedFile =
getClass().getResource("expected/echo_date.xjb").toURI();
assertWsdlEquals(new File(expectedFile), bindingFile);
}
@@ -400,7 +401,7 @@
File bindingFile = new File(output, "echo_calendar.xjb");
assertTrue(bindingFile.exists());
- String expectedFile =
getClass().getResource("expected/echo_calendar.xjb").getFile();
+ URI expectedFile =
getClass().getResource("expected/echo_calendar.xjb").toURI();
assertWsdlEquals(new File(expectedFile), bindingFile);
}
@@ -420,7 +421,7 @@
File wsdlFile = new File(output, "list_test.wsdl");
assertTrue("Generate Wsdl Fail", wsdlFile.exists());
- String expectedFile =
getClass().getResource("expected/list_expected.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/list_expected.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), new File(output,
"/list_test.wsdl"));
}
@@ -440,7 +441,7 @@
File wsdlFile = new File(output, "send_image.wsdl");
assertTrue("Generate Wsdl Fail", wsdlFile.exists());
- String expectedFile =
getClass().getResource("expected/expected_send_image.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/expected_send_image.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), wsdlFile);
}
@@ -458,7 +459,7 @@
File wsdlFile = new File(output, "send_image2.wsdl");
assertTrue("Generate Wsdl Fail", wsdlFile.exists());
- String expectedFile =
getClass().getResource("expected/expected_send_image2.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/expected_send_image2.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), wsdlFile);
}
@@ -475,7 +476,7 @@
}
File wsdlFile = new File(output, "add_numbers.wsdl");
assertTrue("Generate Wsdl Fail", wsdlFile.exists());
- String expectedFile =
getClass().getResource("expected/add_numbers_expected.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/add_numbers_expected.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), wsdlFile);
}
Modified:
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
(original)
+++
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java
Mon Jun 16 13:12:27 2008
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.java2wsdl.processor.internal.jaxws;
import java.io.File;
+import java.net.URI;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxb.JAXBDataBinding;
@@ -54,7 +55,7 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile =
getClass().getResource("expected/stock_noanno_bare.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/stock_noanno_bare.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), output);
}
@@ -69,7 +70,7 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile =
getClass().getResource("expected/stock_noanno_wrapped.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/stock_noanno_wrapped.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), output);
}
@@ -88,7 +89,7 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile =
getClass().getResource("expected/stock_noanno_rpc.wsdl").getFile();
+ URI expectedFile =
getClass().getResource("expected/stock_noanno_rpc.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), output);
}
Modified:
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?rev=668283&r1=668282&r2=668283&view=diff
==============================================================================
---
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
(original)
+++
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
Mon Jun 16 13:12:27 2008
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.FileInputStream;
+import java.net.URI;
import java.util.Collection;
import javax.xml.namespace.QName;
@@ -80,8 +81,8 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile = this.getClass()
-
.getResource("expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl").getFile();
+ URI expectedFile = this.getClass()
+
.getResource("expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), output);
}
@@ -96,8 +97,8 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile = this.getClass()
-
.getResource("expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl").getFile();
+ URI expectedFile = this.getClass()
+
.getResource("expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), output);
}
@@ -113,8 +114,8 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile =
this.getClass().getResource("expected/expected_hello_world_doc_lit.wsdl")
- .getFile();
+ URI expectedFile =
this.getClass().getResource("expected/expected_hello_world_doc_lit.wsdl")
+ .toURI();
assertWsdlEquals(new File(expectedFile), output);
//assertFileEquals(expectedFile, output.getAbsolutePath());
}
@@ -130,8 +131,8 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile =
this.getClass().getResource("expected/expected_doc_lit_wrapped_localName.wsdl")
- .getFile();
+ URI expectedFile =
this.getClass().getResource("expected/expected_doc_lit_wrapped_localName.wsdl")
+ .toURI();
assertWsdlEquals(new File(expectedFile), output);
}
@@ -146,8 +147,8 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile = this.getClass()
-
.getResource("expected/expected_doc_lit_wrapped_no_webparam.wsdl").getFile();
+ URI expectedFile = this.getClass()
+
.getResource("expected/expected_doc_lit_wrapped_no_webparam.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), output);
}
@@ -162,7 +163,7 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile =
this.getClass().getResource("expected/expected_holder.wsdl").getFile();
+ URI expectedFile =
this.getClass().getResource("expected/expected_holder.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), output);
}
@@ -176,8 +177,8 @@
generator.generate(output);
assertTrue(output.exists());
- String expectedFile =
this.getClass().getResource("expected/expected_hello_world_async.wsdl")
- .getFile();
+ URI expectedFile =
this.getClass().getResource("expected/expected_hello_world_async.wsdl")
+ .toURI();
assertWsdlEquals(new File(expectedFile), output);
}
@@ -194,7 +195,7 @@
generator.generate(file);
assertTrue(output.exists());
- String expectedFile =
this.getClass().getResource("expected/expected_rpc_lit.wsdl").getFile();
+ URI expectedFile =
this.getClass().getResource("expected/expected_rpc_lit.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), file);
}
@@ -252,7 +253,7 @@
generator.generate(file);
assertTrue(file.exists());
- String expectedFile =
this.getClass().getResource("expected/soap_header.wsdl").getFile();
+ URI expectedFile =
this.getClass().getResource("expected/soap_header.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), file);
}
@@ -291,8 +292,8 @@
String s = IOUtils.toString(new FileInputStream(output));
assertTrue(s.indexOf("EchoPort") != -1);
- String expectedFile = this.getClass()
- .getResource("expected/expected_rpclist_no_sei.wsdl").getFile();
+ URI expectedFile = this.getClass()
+ .getResource("expected/expected_rpclist_no_sei.wsdl").toURI();
assertWsdlEquals(new File(expectedFile), output);
}
Added: cxf/trunk/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml?rev=668283&view=auto
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
(added)
+++ cxf/trunk/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
Mon Jun 16 13:12:27 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+ <rewriteSystem systemIdStartString="http://www.w3.org/2006/03/addressing";
rewritePrefix="classpath:/schemas/wsdl"/>
+</catalog>
Propchange:
cxf/trunk/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/trunk/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
