You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/12/20 18:37:33 UTC
svn commit: r728319 - in
/servicemix/components/bindings/servicemix-cxf-bc/trunk: ./
src/main/java/org/apache/servicemix/cxfbc/ src/test/resources/META-INF/
src/test/resources/org/apache/servicemix/cxfbc/ws/security/
Author: ffang
Date: Sat Dec 20 09:37:32 2008
New Revision: 728319
URL: http://svn.apache.org/viewvc?rev=728319&view=rev
Log:
[SM-1744]ensure OASISCatalogManager is loaded before getting wsdl definition
Added:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/jax-ws-catalog.xml (with props)
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world_base.wsdl
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml?rev=728319&r1=728318&r2=728319&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml Sat Dec 20 09:37:32 2008
@@ -503,6 +503,7 @@
<extraargs>
<extraarg>-verbose</extraarg>
</extraargs>
+ <catalog>${basedir}/src/test/resources/META-INF/jax-ws-catalog.xml</catalog>
<extraargs>
<extraarg>-sn</extraarg>
<extraarg>HelloWorldService</extraarg>
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java?rev=728319&r1=728318&r2=728319&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java Sat Dec 20 09:37:32 2008
@@ -59,6 +59,7 @@
import org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapPreProtocolOutInterceptor;
import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.continuations.Continuation;
import org.apache.cxf.continuations.ContinuationProvider;
import org.apache.cxf.continuations.SuspendedInvocationException;
@@ -506,6 +507,8 @@
} else {
description = DomUtil.parse(wsdl.getInputStream());
try {
+ //ensure the jax-ws-catalog is loaded
+ OASISCatalogManager.getCatalogManager(getBus()).loadContextCatalogs();
// use wsdl manager to parse wsdl or get cached
// definition
definition = getBus().getExtension(WSDLManager.class)
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java?rev=728319&r1=728318&r2=728319&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java Sat Dec 20 09:37:32 2008
@@ -58,6 +58,7 @@
import org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor;
import org.apache.cxf.binding.soap.interceptor.SoapPreProtocolOutInterceptor;
import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.ClientImpl;
import org.apache.cxf.endpoint.Endpoint;
@@ -396,6 +397,8 @@
WSDLReader reader = wsdlFactory.newWSDLReader();
reader.setFeature(Constants.FEATURE_VERBOSE, false);
try {
+ //ensure the jax-ws-catalog is loaded
+ OASISCatalogManager.getCatalogManager(getBus()).loadContextCatalogs();
// use wsdl manager to parse wsdl or get cached definition
definition = getBus().getExtension(WSDLManager.class)
.getDefinition(wsdl.getURL());
Added: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/jax-ws-catalog.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/jax-ws-catalog.xml?rev=728319&view=auto
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/jax-ws-catalog.xml (added)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/jax-ws-catalog.xml Sat Dec 20 09:37:32 2008
@@ -0,0 +1,7 @@
+<!DOCTYPE catalog
+PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"
+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+ <rewriteURI uriStartString="http://apache.org/hello_world_soap_http/types" rewritePrefix="../org/apache/servicemix/cxfbc/ws/security/"/>
+</catalog>
Propchange: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/META-INF/jax-ws-catalog.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world_base.wsdl
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world_base.wsdl?rev=728319&r1=728318&r2=728319&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world_base.wsdl (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world_base.wsdl Sat Dec 20 09:37:32 2008
@@ -26,7 +26,7 @@
targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
<xsd:schema>
- <xsd:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="base.xsd"/>
+ <xsd:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="http://apache.org/hello_world_soap_http/types/base.xsd"/>
</xsd:schema>
</wsdl:types>
<wsdl:message name="sayHiRequest">