Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 40770 invoked from network); 26 Jul 2007 17:58:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Jul 2007 17:58:44 -0000 Received: (qmail 72649 invoked by uid 500); 26 Jul 2007 17:58:42 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 72306 invoked by uid 500); 26 Jul 2007 17:58:40 -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 72253 invoked by uid 99); 26 Jul 2007 17:58:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2007 10:58:40 -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, 26 Jul 2007 10:58:33 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 03D0E1A9820; Thu, 26 Jul 2007 10:58:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r559909 [3/7] - in /incubator/cxf/trunk: benchmark/performance/soap_http_doc_lit/bin/ common/common/src/main/java/org/apache/cxf/configuration/spring/ common/common/src/main/java/org/apache/cxf/helpers/ rt/databinding/aegis/src/test/java/or... Date: Thu, 26 Jul 2007 17:57:59 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070726175813.03D0E1A9820@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl Thu Jul 26 10:57:46 2007 @@ -1,54 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl Thu Jul 26 10:57:46 2007 @@ -1,142 +1,142 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl Thu Jul 26 10:57:46 2007 @@ -1,109 +1,109 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl Thu Jul 26 10:57:46 2007 @@ -1,54 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl Thu Jul 26 10:57:46 2007 @@ -1,133 +1,133 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl Thu Jul 26 10:57:46 2007 @@ -1,154 +1,154 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java (original) +++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java Thu Jul 26 10:57:46 2007 @@ -1,73 +1,73 @@ -/** - * 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. - */ -package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion; - -import java.util.HashMap; -import java.util.Map; -import javax.xml.xpath.XPathConstants; - -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; - -import org.apache.cxf.helpers.MapNamespaceContext; -import org.apache.cxf.helpers.XPathUtils; -import org.apache.cxf.tools.common.ToolConstants; - -public final class CustomNodeSelector { - private static final Map BINDING_NS_MAP = new HashMap(); - - private MapNamespaceContext context = new MapNamespaceContext(); - - static { - BINDING_NS_MAP.put("jaxws", ToolConstants.NS_JAXWS_BINDINGS); - BINDING_NS_MAP.put("jaxb", ToolConstants.NS_JAXB_BINDINGS); - BINDING_NS_MAP.put("wsdl", ToolConstants.WSDL_NAMESPACE_URI); - BINDING_NS_MAP.put("xsd", ToolConstants.SCHEMA_URI); - } - - public CustomNodeSelector() { - context.addNamespaces(BINDING_NS_MAP); - } - - public MapNamespaceContext getNamespaceContext() { - return context; - } - - public void addNamespaces(final Node targetNode) { - NamedNodeMap attributes = targetNode.getAttributes(); - for (int i = 0; i < attributes.getLength(); i++) { - Node a = attributes.item(i); - String prefix = a.getLocalName(); - String ns = a.getNodeValue(); - if (prefix != null - && !context.getUsedNamespaces().containsKey(prefix) - && targetNode.lookupPrefix(ns) != null) { - context.addNamespace(prefix, ns); - } - } - } - - public Node queryNode(final Node target, final String expression) { - XPathUtils xpath = new XPathUtils(context); - - Node node = (Node) xpath.getValue(expression, target, XPathConstants.NODE); - - return node; - } +/** + * 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. + */ +package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion; + +import java.util.HashMap; +import java.util.Map; +import javax.xml.xpath.XPathConstants; + +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +import org.apache.cxf.helpers.MapNamespaceContext; +import org.apache.cxf.helpers.XPathUtils; +import org.apache.cxf.tools.common.ToolConstants; + +public final class CustomNodeSelector { + private static final Map BINDING_NS_MAP = new HashMap(); + + private MapNamespaceContext context = new MapNamespaceContext(); + + static { + BINDING_NS_MAP.put("jaxws", ToolConstants.NS_JAXWS_BINDINGS); + BINDING_NS_MAP.put("jaxb", ToolConstants.NS_JAXB_BINDINGS); + BINDING_NS_MAP.put("wsdl", ToolConstants.WSDL_NAMESPACE_URI); + BINDING_NS_MAP.put("xsd", ToolConstants.SCHEMA_URI); + } + + public CustomNodeSelector() { + context.addNamespaces(BINDING_NS_MAP); + } + + public MapNamespaceContext getNamespaceContext() { + return context; + } + + public void addNamespaces(final Node targetNode) { + NamedNodeMap attributes = targetNode.getAttributes(); + for (int i = 0; i < attributes.getLength(); i++) { + Node a = attributes.item(i); + String prefix = a.getLocalName(); + String ns = a.getNodeValue(); + if (prefix != null + && !context.getUsedNamespaces().containsKey(prefix) + && targetNode.lookupPrefix(ns) != null) { + context.addNamespace(prefix, ns); + } + } + } + + public Node queryNode(final Node target, final String expression) { + XPathUtils xpath = new XPathUtils(context); + + Node node = (Node) xpath.getValue(expression, target, XPathConstants.NODE); + + return node; + } } Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml (original) +++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml Thu Jul 26 10:57:46 2007 @@ -1,22 +1,22 @@ - - - - - + + + + + Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java?view=diff&rev=559909&r1=559908&r2=559909 ============================================================================== --- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java (original) +++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java Thu Jul 26 10:57:46 2007 @@ -1,54 +1,54 @@ -/** - * 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. - */ - -package org.apache.cxf.tools.wsdlto.frontend.jaxws; - -import java.net.URL; - -import org.xml.sax.InputSource; - -import org.apache.cxf.catalog.OASISCatalogManager; -import org.apache.cxf.resource.ExtendedURIResolver; -import org.apache.xml.resolver.Catalog; -import org.junit.Assert; -import org.junit.Test; - -public class CatalogTest extends Assert { - @Test - public void testCatalog() throws Exception { - OASISCatalogManager catalogManager = new OASISCatalogManager(); - - URL jaxwscatalog = getClass().getResource("/META-INF/jax-ws-catalog.xml"); - assertNotNull(jaxwscatalog); - - catalogManager.loadCatalog(jaxwscatalog); - - Catalog catalogResolver = catalogManager.getCatalog(); - assertNotNull(catalogResolver); - - String xsd = "http://www.w3.org/2005/08/addressing/ws-addr.xsd"; - String resolvedSchemaLocation = catalogResolver.resolveSystem(xsd); - assertEquals("classpath:/schemas/wsdl/ws-addr.xsd", resolvedSchemaLocation); - - ExtendedURIResolver resolver = new ExtendedURIResolver(); - InputSource in = resolver.resolve(resolvedSchemaLocation, null); - assertTrue(in.getSystemId().indexOf("common") != -1); - assertTrue(in.getSystemId().indexOf("/schemas/wsdl/ws-addr.xsd") != -1); - } +/** + * 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. + */ + +package org.apache.cxf.tools.wsdlto.frontend.jaxws; + +import java.net.URL; + +import org.xml.sax.InputSource; + +import org.apache.cxf.catalog.OASISCatalogManager; +import org.apache.cxf.resource.ExtendedURIResolver; +import org.apache.xml.resolver.Catalog; +import org.junit.Assert; +import org.junit.Test; + +public class CatalogTest extends Assert { + @Test + public void testCatalog() throws Exception { + OASISCatalogManager catalogManager = new OASISCatalogManager(); + + URL jaxwscatalog = getClass().getResource("/META-INF/jax-ws-catalog.xml"); + assertNotNull(jaxwscatalog); + + catalogManager.loadCatalog(jaxwscatalog); + + Catalog catalogResolver = catalogManager.getCatalog(); + assertNotNull(catalogResolver); + + String xsd = "http://www.w3.org/2005/08/addressing/ws-addr.xsd"; + String resolvedSchemaLocation = catalogResolver.resolveSystem(xsd); + assertEquals("classpath:/schemas/wsdl/ws-addr.xsd", resolvedSchemaLocation); + + ExtendedURIResolver resolver = new ExtendedURIResolver(); + InputSource in = resolver.resolve(resolvedSchemaLocation, null); + assertTrue(in.getSystemId().indexOf("common") != -1); + assertTrue(in.getSystemId().indexOf("/schemas/wsdl/ws-addr.xsd") != -1); + } } Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date