You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/07/14 11:25:37 UTC
[cxf] branch master updated: Changing Catalog files to use XML
format
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 3b11ad4 Changing Catalog files to use XML format
3b11ad4 is described below
commit 3b11ad447a8d2f296f9ae59a87c93ab8706a2588
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jul 14 12:25:04 2020 +0100
Changing Catalog files to use XML format
---
core/src/main/build-resources/catalog.cat | 18 ++++++++-----
.../corba/src/main/build-resources/catalog.cat | 14 ++++++----
.../xml/src/main/build-resources/catalog.cat | 13 +++++++---
.../src/main/build-resources/catalog.cat | 22 +++++++++++-----
.../src/main/build-resources/catalog.cat | 13 +++++++---
.../src/main/build-resources/catalog.cat | 22 +++++++++++-----
.../http/src/main/build-resources/catalog.cat | 22 +++++++++++-----
.../jms/src/main/build-resources/catalog.cat | 16 ++++++++----
rt/ws/addr/src/main/build-resources/catalog.cat | 10 +++++---
.../src/main/resources/schemas/catalog.cat | 22 +++++++++++-----
rt/ws/policy/src/main/build-resources/catalog.cat | 30 ++++++++++++++--------
rt/ws/rm/src/main/build-resources/catalog.cat | 28 ++++++++++++--------
.../main/resources/schemas/catalog-fragment.cat | 14 ++++++----
.../src/main/resources/schemas/catalog.cat | 21 ++++++++++-----
rt/wsdl/src/test/build-resources/catalog.cat | 11 +++++---
15 files changed, 184 insertions(+), 92 deletions(-)
diff --git a/core/src/main/build-resources/catalog.cat b/core/src/main/build-resources/catalog.cat
index 50f4021..4ffb165 100644
--- a/core/src/main/build-resources/catalog.cat
+++ b/core/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,10 +16,13 @@
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/" "../resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" "../resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/parameterized-types.xsd" "../resources/schemas/configuration/parameterized-types.xsd"
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"
+ uri="../resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"
+ uri="../resources/schemas/configuration/parameterized-types.xsd"/>
+</catalog>
diff --git a/rt/bindings/corba/src/main/build-resources/catalog.cat b/rt/bindings/corba/src/main/build-resources/catalog.cat
index 41c1127..a3ffc98 100644
--- a/rt/bindings/corba/src/main/build-resources/catalog.cat
+++ b/rt/bindings/corba/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,9 +16,12 @@
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/2003-02-11.xsd" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://schemas.xmlsoap.org/wsdl/" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+</catalog>
diff --git a/rt/bindings/xml/src/main/build-resources/catalog.cat b/rt/bindings/xml/src/main/build-resources/catalog.cat
index 0f5c6f2..6a6c616 100644
--- a/rt/bindings/xml/src/main/build-resources/catalog.cat
+++ b/rt/bindings/xml/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,8 +16,12 @@
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/2003-02-11.xsd" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://schemas.xmlsoap.org/wsdl/" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+</catalog>
diff --git a/rt/transports/http-jetty/src/main/build-resources/catalog.cat b/rt/transports/http-jetty/src/main/build-resources/catalog.cat
index 3db4072..3fb0fab 100644
--- a/rt/transports/http-jetty/src/main/build-resources/catalog.cat
+++ b/rt/transports/http-jetty/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,11 +16,18 @@
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/" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/security.xsd" "../../../../../../core/src/main/resources/schemas/configuration/security.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/parameterized-types.xsd" "../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"
-SYSTEM "http://cxf.apache.org/schemas/wsdl/http-conf.xsd" "../../../../../../rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/http-jetty.xsd" "schemas/configuration/http-jetty.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/security.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/configuration/security.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/wsdl/http-conf.xsd"
+ uri="../../../../../../rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/http-jetty.xsd"
+ uri="schemas/configuration/http-jetty.xsd"/>
+</catalog>
diff --git a/rt/transports/http-netty/netty-server/src/main/build-resources/catalog.cat b/rt/transports/http-netty/netty-server/src/main/build-resources/catalog.cat
index cf3c10b..7859d1e 100644
--- a/rt/transports/http-netty/netty-server/src/main/build-resources/catalog.cat
+++ b/rt/transports/http-netty/netty-server/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,8 +16,12 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---
+-->
-SYSTEM "http://cxf.apache.org/schemas/configuration/parameterized-types.xsd" "../../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/security.xsd" "../../../../../../../core/src/main/resources/schemas/configuration/security.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"
+ uri="../../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/security.xsd"
+ uri="../../../../../../../core/src/main/resources/schemas/configuration/security.xsd"/>
+</catalog>
diff --git a/rt/transports/http-undertow/src/main/build-resources/catalog.cat b/rt/transports/http-undertow/src/main/build-resources/catalog.cat
index 6d5bd2a..5707e94 100644
--- a/rt/transports/http-undertow/src/main/build-resources/catalog.cat
+++ b/rt/transports/http-undertow/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,11 +16,18 @@
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/" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/security.xsd" "../../../../../../core/src/main/resources/schemas/configuration/security.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/parameterized-types.xsd" "../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"
-SYSTEM "http://cxf.apache.org/schemas/wsdl/http-conf.xsd" "../../../../../../rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/http-undertow.xsd" "schemas/configuration/http-undertow.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/security.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/configuration/security.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/wsdl/http-conf.xsd"
+ uri="../../../../../../rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/http-undertow.xsd"
+ uri="schemas/configuration/http-undertow.xsd"/>
+</catalog>
diff --git a/rt/transports/http/src/main/build-resources/catalog.cat b/rt/transports/http/src/main/build-resources/catalog.cat
index 31169b4..273250c 100644
--- a/rt/transports/http/src/main/build-resources/catalog.cat
+++ b/rt/transports/http/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,11 +16,18 @@
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/" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/parameterized-types.xsd" "../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/security.xsd" "../../../../../../core/src/core/resources/schemas/configuration/security.xsd"
-SYSTEM "http://cxf.apache.org/schemas/wsdl/http-conf.xsd" "schemas/wsdl/http-conf.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/security.xsd"
+ uri="../../../../../../core/src/core/resources/schemas/configuration/security.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/wsdl/http-conf.xsd"
+ uri="schemas/wsdl/http-conf.xsd"/>
+</catalog>
diff --git a/rt/transports/jms/src/main/build-resources/catalog.cat b/rt/transports/jms/src/main/build-resources/catalog.cat
index 97e8e1f..e468563 100644
--- a/rt/transports/jms/src/main/build-resources/catalog.cat
+++ b/rt/transports/jms/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,11 +16,16 @@
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/2003-02-11.xsd" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://schemas.xmlsoap.org/wsdl/" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
-SYSTEM "http://cxf.apache.org/schemas/configuration/parameterized-types.xsd" "../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+ <system systemId="http://cxf.apache.org/schemas/configuration/parameterized-types.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/configuration/parameterized-types.xsd"/>
+</catalog>
diff --git a/rt/ws/addr/src/main/build-resources/catalog.cat b/rt/ws/addr/src/main/build-resources/catalog.cat
index f1a53be..9482ea8 100644
--- a/rt/ws/addr/src/main/build-resources/catalog.cat
+++ b/rt/ws/addr/src/main/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,7 +16,10 @@
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/" "../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+</catalog>
diff --git a/rt/ws/eventing/src/main/resources/schemas/catalog.cat b/rt/ws/eventing/src/main/resources/schemas/catalog.cat
index fd6f866..c9d0090 100644
--- a/rt/ws/eventing/src/main/resources/schemas/catalog.cat
+++ b/rt/ws/eventing/src/main/resources/schemas/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,11 +16,18 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---
+-->
-SYSTEM "http://www.w3.org/2011/03/ws-evt" "eventing.xsd"
-SYSTEM "http://www.w3.org/2011/03/ws-evd" "eventdescriptions.xsd"
-SYSTEM "http://www.w3.org/2005/08/addressing" "ws-addr.xsd"
-SYSTEM "http://www.w3.org/2006/03/addressing/ws-addr.xsd" "ws-addr.xsd"
-SYSTEM "http://www.w3.org/2001/xml.xsd" "xml.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://www.w3.org/2011/03/ws-evt"
+ uri="eventing.xsd"/>
+ <system systemId="http://www.w3.org/2011/03/ws-evd"
+ uri="eventdescriptions.xsd"/>
+ <system systemId="http://www.w3.org/2005/08/addressing"
+ uri="ws-addr.xsd"/>
+ <system systemId="http://www.w3.org/2006/03/addressing/ws-addr.xsd"
+ uri="ws-addr.xsd"/>
+ <system systemId="http://www.w3.org/2001/xml.xsd"
+ uri="xml.xsd"/>
+</catalog>
diff --git a/rt/ws/policy/src/main/build-resources/catalog.cat b/rt/ws/policy/src/main/build-resources/catalog.cat
index e4c9512..bff672e 100644
--- a/rt/ws/policy/src/main/build-resources/catalog.cat
+++ b/rt/ws/policy/src/main/build-resources/catalog.cat
@@ -1,5 +1,5 @@
-
---
+<?xml version="1.0"?>
+<!--
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
@@ -16,12 +16,22 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---
+-->
+
-SYSTEM "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" "../../../src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-SYSTEM "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" "../../../src/main/resources/schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-SYSTEM "http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/ws-securitypolicy-1.2.xsd" "../../../src/main/resources/schemas/ws-securitypolicy-1.2.xsd"
-SYSTEM "http://www.w3.org/2006/03/addressing/ws-addr.xsd" "../../../../../../core/src/main/resources/schemas/wsdl/ws-addr.xsd"
-SYSTEM "http://www.w3.org/2001/xml.xsd" "../../../src/main/resources/schemas/xml.xsd"
-SYSTEM "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd" "../../../src/main/resources/schemas/xmldsig-core-schema.xsd"
-PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "../../../src/main/resources/schemas/XMLSchema.dtd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+ uri="../../../src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+ <system systemId="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ uri="../../../src/main/resources/schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+ <system systemId="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/ws-securitypolicy-1.2.xsd"
+ uri="../../../src/main/resources/schemas/ws-securitypolicy-1.2.xsd"/>
+ <system systemId="http://www.w3.org/2006/03/addressing/ws-addr.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/ws-addr.xsd"/>
+ <system systemId="http://www.w3.org/2001/xml.xsd"
+ uri="../../../src/main/resources/schemas/xml.xsd"/>
+ <system systemId="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"
+ uri="../../../src/main/resources/schemas/xmldsig-core-schema.xsd"/>
+ <public publicId="-//W3C//DTD XMLSchema 200102//EN"
+ uri="../../../src/main/resources/schemas/XMLSchema.dtd"/>
+</catalog>
diff --git a/rt/ws/rm/src/main/build-resources/catalog.cat b/rt/ws/rm/src/main/build-resources/catalog.cat
index 9ac8f34..5e6a01e 100644
--- a/rt/ws/rm/src/main/build-resources/catalog.cat
+++ b/rt/ws/rm/src/main/build-resources/catalog.cat
@@ -1,5 +1,5 @@
-
---
+<?xml version="1.0"?>
+<!--
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
@@ -16,14 +16,20 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---
-
-
-SYSTEM "http://schemas.xmlsoap.org/ws/2004/08/addressing" "../../../../../../core/src/main/resources/schemas/wsdl/addressing.xsd"
-SYSTEM "http://www.w3.org/2006/03/addressing/ws-addr.xsd" "../../../../../../core/src/main/resources/schemas/wsdl/ws-addr.xsd"
+-->
-SYSTEM "http://docs.oasis-open.org/ws-rx/wsrm/200702" "../resources/schemas/wsdl/wsrm-1.1.xsd"
-SYSTEM "http://docs.oasis-open.org/ws-rx/wsmc/200702" "../resources/schemas/wsdl/wsmc-1.1.xsd"
-SYSTEM "http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd" "../resources/schemas/configuration/wsrm-policy.xsd"
-SYSTEM "http://docs.oasis-open.org/ws-rx/wsrmp/200702" "../resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/addressing.xsd"/>
+ <system systemId="http://www.w3.org/2006/03/addressing/ws-addr.xsd"
+ uri="../../../../../../core/src/main/resources/schemas/wsdl/ws-addr.xsd"/>
+ <system systemId="http://docs.oasis-open.org/ws-rx/wsrm/200702"
+ uri="../resources/schemas/wsdl/wsrm-1.1.xsd"/>
+ <system systemId="http://docs.oasis-open.org/ws-rx/wsmc/200702"
+ uri="../resources/schemas/wsdl/wsmc-1.1.xsd"/>
+ <system systemId="http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd"
+ uri="../resources/schemas/configuration/wsrm-policy.xsd"/>
+ <system systemId="http://docs.oasis-open.org/ws-rx/wsrmp/200702"
+ uri="../resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd"/>
+</catalog>
diff --git a/rt/ws/transfer/src/main/resources/schemas/catalog-fragment.cat b/rt/ws/transfer/src/main/resources/schemas/catalog-fragment.cat
index 6eb029c..099d347 100644
--- a/rt/ws/transfer/src/main/resources/schemas/catalog-fragment.cat
+++ b/rt/ws/transfer/src/main/resources/schemas/catalog-fragment.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -6,16 +7,19 @@
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://www.w3.org/2011/03/ws-fra" "fragment.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://www.w3.org/2011/03/ws-fra"
+ uri="fragment.xsd"/>
+</catalog>
diff --git a/rt/ws/transfer/src/main/resources/schemas/catalog.cat b/rt/ws/transfer/src/main/resources/schemas/catalog.cat
index 22bc651..cc6fb38 100644
--- a/rt/ws/transfer/src/main/resources/schemas/catalog.cat
+++ b/rt/ws/transfer/src/main/resources/schemas/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -6,18 +7,24 @@
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://www.w3.org/2011/03/ws-tra" "transfer.xsd"
-SYSTEM "http://www.w3.org/2005/08/addressing" "ws-addr.xsd"
-SYSTEM "http://www.w3.org/2006/03/addressing/ws-addr.xsd" "ws-addr.xsd"
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://www.w3.org/2011/03/ws-tra"
+ uri="transfer.xsd"/>
+ <system systemId="http://www.w3.org/2005/08/addressing"
+ uri="ws-addr.xsd"/>
+ <system systemId="http://www.w3.org/2006/03/addressing/ws-addr.xsd"
+ uri="ws-addr.xsd"/>
+</catalog>
diff --git a/rt/wsdl/src/test/build-resources/catalog.cat b/rt/wsdl/src/test/build-resources/catalog.cat
index 49e8c44..5c02455 100644
--- a/rt/wsdl/src/test/build-resources/catalog.cat
+++ b/rt/wsdl/src/test/build-resources/catalog.cat
@@ -1,4 +1,5 @@
---
+<?xml version="1.0"?>
+<!--
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
@@ -15,6 +16,10 @@
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/" "../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://schemas.xmlsoap.org/wsdl/"
+ uri="../../../../../core/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+</catalog>