Author: andreasmyth
Date: Fri Jun 1 05:43:17 2007
New Revision: 543475
URL: http://svn.apache.org/viewvc?view=rev&rev=543475
Log:
Referenced wsdl, http, security and http-conf and jms schemas with their
correct URIs in schemaLocation attributes
(for third party artifacts that is wherever these are published, for cxf
artifacts that is composed of http://cxf.apache.org/ + their relative path in
the resp. module's resources directory, which should be schemas or a
subdirectory thereof).
Fixed problem with Spring being unable to resolve system ids that do not end
with ".xsd" by using a BusEntityResolver instead (it extends
DelegatingEntityResolver but tries the PluggableSchemaResolver for such system
ids as a fallback).
No namespaces were changed so the above changes should have no impact on
existing cfg files or other schemas.
Added:
incubator/cxf/trunk/api/src/main/resources/catalog.cat (with props)
incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/
incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas
incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat (with
props)
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat (with
props)
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
(with props)
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java
(with props)
incubator/cxf/trunk/rt/transports/http/src/main/resources/catalog.cat
(with props)
incubator/cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat
(with props)
Removed:
incubator/cxf/trunk/common/schemas/src/main/resources/schemas/configuration/std-types.xsd
Modified:
incubator/cxf/trunk/api/pom.xml
incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xjb
incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xsd
incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xsd
incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb
incubator/cxf/trunk/rt/bindings/jbi/pom.xml
incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
incubator/cxf/trunk/rt/bindings/xml/pom.xml
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
incubator/cxf/trunk/rt/transports/http-jetty/pom.xml
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
incubator/cxf/trunk/rt/transports/http/pom.xml
incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
incubator/cxf/trunk/rt/transports/jms/pom.xml
incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
Modified: incubator/cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/pom.xml?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/api/pom.xml (original)
+++ incubator/cxf/trunk/api/pom.xml Fri Jun 1 05:43:17 2007
@@ -155,6 +155,7 @@
<xsdOption>
<xsd>${basedir}/target/schemas/schemas/wsdl/http.xsd</xsd>
<bindingFile>${basedir}/target/schemas/schemas/wsdl/wsdl.xjb</bindingFile>
+
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
<dependencies>
<dependency>${basedir}/target/schemas/schemas/wsdl/wsdl.xsd</dependency>
</dependencies>
@@ -172,9 +173,6 @@
<bindingFile>${basedir}/target/schemas/schemas/wsdl/addressing.xjb</bindingFile>
</xsdOption>
<xsdOption>
-
<xsd>${basedir}/target/schemas/schemas/configuration/std-types.xsd</xsd>
- </xsdOption>
- <xsdOption>
<xsd>${basedir}/target/schemas/schemas/configuration/security.xsd</xsd>
<bindingFile>${basedir}/target/schemas/schemas/configuration/security.xjb</bindingFile>
</xsdOption>
@@ -194,6 +192,7 @@
<xsdOption>
<xsd>${basedir}/src/test/resources/schemas/wsdl/test-conf.xsd</xsd>
<bindingFile>${basedir}/src/test/resources/schemas/wsdl/test-conf.xjb</bindingFile>
+
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/test/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Added: incubator/cxf/trunk/api/src/main/resources/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/resources/catalog.cat?view=auto&rev=543475
==============================================================================
--- incubator/cxf/trunk/api/src/main/resources/catalog.cat (added)
+++ incubator/cxf/trunk/api/src/main/resources/catalog.cat Fri Jun 1 05:43:17
2007
@@ -0,0 +1,22 @@
+--
+ 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.
+--
+
+
+SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../target/schemas/schemas/wsdl/wsdl.xsd"
+
Propchange: incubator/cxf/trunk/api/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/api/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xjb?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xjb
(original)
+++ incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xjb Fri
Jun 1 05:43:17 2007
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings
schemaLocation="../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings
schemaLocation="../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified: incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xsd?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xsd
(original)
+++ incubator/cxf/trunk/api/src/test/resources/schemas/wsdl/test-conf.xsd Fri
Jun 1 05:43:17 2007
@@ -24,7 +24,7 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
<xs:complexType name="TestPolicyType">
<xs:annotation>
Added:
incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas?view=auto&rev=543475
==============================================================================
---
incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas
(added)
+++
incubator/cxf/trunk/common/schemas/src/main/resources/META-INF/spring.schemas
Fri Jun 1 05:43:17 2007
@@ -0,0 +1,6 @@
+http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
+http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
+
+http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
+
Modified:
incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xsd?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xsd
(original)
+++ incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xsd
Fri Jun 1 05:43:17 2007
@@ -35,7 +35,7 @@
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
targetNamespace="http://schemas.xmlsoap.org/wsdl/http/";>
- <import namespace = "http://schemas.xmlsoap.org/wsdl/";
schemaLocation="wsdl.xsd"/>
+ <import namespace = "http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
<element name="address" type="http:addressType"/>
Modified:
incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb
(original)
+++ incubator/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb
Fri Jun 1 05:43:17 2007
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="wsdl.xsd" node="/xs:schema">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="wsdl.xsd" node="/xs:schema/xs:[EMAIL
PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified: incubator/cxf/trunk/rt/bindings/jbi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/pom.xml?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/pom.xml Fri Jun 1 05:43:17 2007
@@ -101,6 +101,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/resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Added: incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat?view=auto&rev=543475
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat (added)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat Fri Jun
1 05:43:17 2007
@@ -0,0 +1,21 @@
+--
+ 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.
+--
+
+
+SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
Propchange: incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
(original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
Fri Jun 1 05:43:17 2007
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified:
incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
(original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
Fri Jun 1 05:43:17 2007
@@ -24,8 +24,7 @@
elementFormDefault="qualified"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
-
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
/>
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"; />
<xs:complexType name="JBIFormatBinding">
<xs:complexContent>
Modified: incubator/cxf/trunk/rt/bindings/xml/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/pom.xml?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/xml/pom.xml Fri Jun 1 05:43:17 2007
@@ -97,6 +97,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xjb</bindingFile>
+
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Added: incubator/cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat?view=auto&rev=543475
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat (added)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat Fri Jun
1 05:43:17 2007
@@ -0,0 +1,21 @@
+--
+ 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.
+--
+
+
+SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
Propchange: incubator/cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
(original)
+++
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
Fri Jun 1 05:43:17 2007
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified:
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
(original)
+++
incubator/cxf/trunk/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
Fri Jun 1 05:43:17 2007
@@ -24,8 +24,7 @@
elementFormDefault="qualified"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
-
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
/>
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"; />
<xs:complexType name="XMLBindingMessageFormat">
<xs:complexContent>
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
Fri Jun 1 05:43:17 2007
@@ -33,7 +33,9 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.Configurer;
+import org.springframework.beans.factory.xml.BeansDtdResolver;
import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
+import org.springframework.beans.factory.xml.PluggableSchemaResolver;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -74,7 +76,7 @@
cfgFileURL = url;
includeDefaults = include;
refresh();
- }
+ }
@Override
protected Resource[] getConfigResources() {
@@ -169,6 +171,15 @@
if (null != mode) {
reader.setValidationModeName(mode);
}
- reader.setNamespaceAware(true);
+ reader.setNamespaceAware(true);
+
+ setEntityResolvers(reader);
}
+
+ void setEntityResolvers(XmlBeanDefinitionReader reader) {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ reader.setEntityResolver(new BusEntityResolver(new BeansDtdResolver(),
+ new PluggableSchemaResolver(cl)));
+ }
+
}
Added:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java?view=auto&rev=543475
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
(added)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
Fri Jun 1 05:43:17 2007
@@ -0,0 +1,62 @@
+/**
+ * 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.bus.spring;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import org.apache.cxf.common.logging.LogUtils;
+import org.springframework.beans.factory.xml.DelegatingEntityResolver;
+
+/**
+ *
+ */
+public class BusEntityResolver extends DelegatingEntityResolver {
+
+ private static final Logger LOG =
LogUtils.getL7dLogger(BusEntityResolver.class);
+
+ private EntityResolver dtdResolver;
+ private EntityResolver schemaResolver;
+
+ public BusEntityResolver(EntityResolver dr, EntityResolver sr) {
+ super(dr, sr);
+ dtdResolver = dr;
+ schemaResolver = sr;
+ }
+
+ @Override
+ public InputSource resolveEntity(String publicId, String systemId) throws
SAXException, IOException {
+ InputSource source = super.resolveEntity(publicId, systemId);
+ if (null == source && null != systemId) {
+ // try the schema and dtd resolver in turn, ignoring the suffix in
publicId
+ LOG.log(Level.FINE, "Attempting to resolve systemId {0}",
systemId);
+ source = schemaResolver.resolveEntity(publicId, systemId);
+ if (null == source) {
+ source = dtdResolver.resolveEntity(publicId, systemId);
+ }
+ }
+ return source;
+ }
+}
Propchange:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java?view=auto&rev=543475
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java
(added)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java
Fri Jun 1 05:43:17 2007
@@ -0,0 +1,49 @@
+/**
+ * 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.test;
+
+import org.apache.cxf.bus.spring.BusEntityResolver;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.xml.BeansDtdResolver;
+import org.springframework.beans.factory.xml.PluggableSchemaResolver;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ *
+ */
+public class TestApplicationContext extends ClassPathXmlApplicationContext {
+
+ public TestApplicationContext(String resource) throws BeansException {
+ super(resource);
+ }
+
+ public TestApplicationContext(String[] resources) throws BeansException {
+ super(resources);
+ }
+
+ @Override
+ protected void initBeanDefinitionReader(XmlBeanDefinitionReader reader) {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ reader.setEntityResolver(new BusEntityResolver(new BeansDtdResolver(),
+ new PluggableSchemaResolver(cl)));
+ }
+
+}
Propchange:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/pom.xml?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/pom.xml Fri Jun 1 05:43:17
2007
@@ -74,6 +74,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-schemas</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.3</version>
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
(original)
+++
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
Fri Jun 1 05:43:17 2007
@@ -25,6 +25,7 @@
import org.apache.cxf.configuration.spring.ConfigurerImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.test.TestApplicationContext;
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.Destination;
@@ -33,7 +34,6 @@
import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
import org.junit.Assert;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class ApplicationContextTest extends Assert {
@Test
@@ -44,8 +44,8 @@
String s4 = getClass()
.getResource("/org/apache/cxf/transport/http_jetty/spring/beans.xml").toString();
- ClassPathXmlApplicationContext ctx = new
ClassPathXmlApplicationContext(
- new String[] {s1, s2, s3, s4}, false);
+ TestApplicationContext ctx = new TestApplicationContext(
+ new String[] {s1, s2, s3, s4});
ctx.refresh();
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
(original)
+++
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
Fri Jun 1 05:43:17 2007
@@ -22,9 +22,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:h="http://cxf.apache.org/transports/http/configuration";
xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schema/transports/http.xsd
-http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
-
+http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/wsdl/http-conf.xsd";
+>
+
<h:destination id="{urn:test:ns}Foo.http-destination">
<h:server ContentEncoding="foobar"/>
</h:destination>
Modified: incubator/cxf/trunk/rt/transports/http/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/pom.xml?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http/pom.xml Fri Jun 1 05:43:17 2007
@@ -91,13 +91,15 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/http-conf.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/http-conf.xjb</bindingFile>
+
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
- </xsdOption>
+ </xsdOption>
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/configuration/http-listener.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/http-conf.xjb</bindingFile>
+
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
<extension>true</extension>
<extensionArgs>
<extensionArg>-Xdv</extensionArg>
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas
Fri Jun 1 05:43:17 2007
@@ -1,3 +1 @@
-http\://cxf.apache.org/schema/transports/http.xsd=schemas/wsdl/http-conf.xsd
-http\://cxf.apache.org/../../../../../../common/schemas/src/main/resources/schemas/configuration/security.xsd=schemas/configuration/security.xsd
-http\://cxf.apache.org/../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd=schemas/wsdl/wsdl.xsd
\ No newline at end of file
+http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd
Added: incubator/cxf/trunk/rt/transports/http/src/main/resources/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/catalog.cat?view=auto&rev=543475
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/catalog.cat
(added)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/catalog.cat Fri
Jun 1 05:43:17 2007
@@ -0,0 +1,23 @@
+--
+ 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.
+--
+
+
+SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
+SYSTEM "http://cxf.apache.org/schemas/configuration/security.xsd";
"../../../../../../common/schemas/src/main/resources/schemas/configuration/security.xsd"
+SYSTEM "http://cxf.apache.org/schemas/wsdl/http-conf.xsd";
"schemas/wsdl/http-conf.xsd"
Propchange:
incubator/cxf/trunk/rt/transports/http/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/transports/http/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
Fri Jun 1 05:43:17 2007
@@ -28,8 +28,8 @@
attributeFormDefault="unqualified"
jaxb:version="2.0">
- <xs:import namespace="http://cxf.apache.org/transports/http/configuration";
schemaLocation="../wsdl/http-conf.xsd"/>
- <xs:import namespace="http://cxf.apache.org/configuration/security";
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/configuration/security.xsd"/>
+ <xs:import namespace="http://cxf.apache.org/configuration/security";
schemaLocation="http://cxf.apache.org/schemas/configuration/security.xsd"/>
+ <xs:import namespace="http://cxf.apache.org/transports/http/configuration";
schemaLocation="http://cxf.apache.org/schemas/wsdl/http-conf.xsd"/>
<xs:element name="listener" type="http-conf:HTTPListenerPolicy"/>
<xs:element name="sslServer" type="sec:SSLServerPolicy"/>
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
Fri Jun 1 05:43:17 2007
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Fri Jun 1 05:43:17 2007
@@ -24,15 +24,15 @@
xmlns:http-conf="http://cxf.apache.org/transports/http/configuration";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:sec="http://cxf.apache.org/configuration/security";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";
elementFormDefault="qualified"
attributeFormDefault="unqualified"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"/>
- <xs:import namespace="http://cxf.apache.org/configuration/security";
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/configuration/security.xsd"/>
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
+ <xs:import namespace="http://cxf.apache.org/configuration/security";
schemaLocation="http://cxf.apache.org/schemas/configuration/security.xsd"/>
<xs:element name="server" type="http-conf:HTTPServerPolicy"/>
<xs:element name="authorization" type="sec:AuthorizationPolicy"/>
Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Fri Jun 1 05:43:17 2007
@@ -121,6 +121,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xjb</bindingFile>
+
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Modified:
incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas
(original)
+++
incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas
Fri Jun 1 05:43:17 2007
@@ -1,3 +1 @@
-http\://cxf.apache.org/transport/jms.xsd=schemas/wsdl/jms.xsd
-http\://cxf.apache.org/../../../../../../common/schemas/src/main/resources/schemas/configuration/security.xsd=schemas/configuration/security.xsd
-http\://cxf.apache.org/../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd=schemas/wsdl/wsdl.xsd
\ No newline at end of file
+http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd
Added: incubator/cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat?view=auto&rev=543475
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat Fri
Jun 1 05:43:17 2007
@@ -0,0 +1,22 @@
+--
+ 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.
+--
+
+
+SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
+
Propchange: incubator/cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
(original)
+++
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
Fri Jun 1 05:43:17 2007
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
<jaxb:bindings schemaLocation="jms.xsd" node="/xs:schema">
Modified:
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
---
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
(original)
+++
incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
Fri Jun 1 05:43:17 2007
@@ -24,8 +24,7 @@
targetNamespace="http://cxf.apache.org/transports/jms";
elementFormDefault="qualified" jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
-
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
<!-- Spring elements -->
<xs:element name="conduit" type="jms:ConduitType"/>
Modified:
incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd?view=diff&rev=543475&r1=543474&r2=543475
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
(original)
+++ incubator/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
Fri Jun 1 05:43:17 2007
@@ -24,8 +24,7 @@
elementFormDefault="qualified"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
-
schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
/>
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"; />
<xs:complexType name="JBIFormatBinding">
<xs:complexContent>
