Author: dkulp Date: Fri Feb 17 15:47:27 2012 New Revision: 1245623 URL: http://svn.apache.org/viewvc?rev=1245623&view=rev Log: Merged revisions 1245586 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1245586 | dkulp | 2012-02-17 09:53:57 -0500 (Fri, 17 Feb 2012) | 9 lines Merged revisions 1245364 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1245364 | dsosnoski | 2012-02-17 05:05:28 -0500 (Fri, 17 Feb 2012) | 1 line Fix tests for offline build ........ ........ Added: cxf/branches/2.3.x-fixes/common/schemas/src/main/resources/schemas/wsdl/swaref.xsd (with props) Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Added: cxf/branches/2.3.x-fixes/common/schemas/src/main/resources/schemas/wsdl/swaref.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/common/schemas/src/main/resources/schemas/wsdl/swaref.xsd?rev=1245623&view=auto ============================================================================== --- cxf/branches/2.3.x-fixes/common/schemas/src/main/resources/schemas/wsdl/swaref.xsd (added) +++ cxf/branches/2.3.x-fixes/common/schemas/src/main/resources/schemas/wsdl/swaref.xsd Fri Feb 17 15:47:27 2012 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<xsd:schema targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema";> + <xsd:simpleType name="swaRef"> + <xsd:restriction base="xsd:anyURI" /> + </xsd:simpleType> +</xsd:schema> \ No newline at end of file Propchange: cxf/branches/2.3.x-fixes/common/schemas/src/main/resources/schemas/wsdl/swaref.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/branches/2.3.x-fixes/common/schemas/src/main/resources/schemas/wsdl/swaref.xsd ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/branches/2.3.x-fixes/common/schemas/src/main/resources/schemas/wsdl/swaref.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml?rev=1245623&r1=1245622&r2=1245623&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml (original) +++ cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/META-INF/jax-ws-catalog.xml Fri Feb 17 15:47:27 2012 @@ -19,4 +19,5 @@ --> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <rewriteSystem systemIdStartString="http://www.w3.org/2006/03/addressing"; rewritePrefix="classpath:/schemas/wsdl"/> + <rewriteSystem systemIdStartString="http://ws-i.org/profiles/basic/1.1"; rewritePrefix="classpath:/schemas/wsdl"/> </catalog>
