Author: dkulp Date: Wed Nov 4 18:11:02 2009 New Revision: 832825 URL: http://svn.apache.org/viewvc?rev=832825&view=rev Log: Merged revisions 831918 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r831918 | dkulp | 2009-11-02 10:24:18 -0500 (Mon, 02 Nov 2009) | 9 lines Merged revisions 831878 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r831878 | ffang | 2009-11-02 07:36:32 -0500 (Mon, 02 Nov 2009) | 1 line [CXF-2515]catalog.cat in some modules is incorrect ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/build-resources/catalog.cat cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/build-resources/catalog.cat cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/build-resources/catalog.cat Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/build-resources/catalog.cat URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/build-resources/catalog.cat?rev=832825&r1=832824&r2=832825&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/build-resources/catalog.cat (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/build-resources/catalog.cat Wed Nov 4 18:11:02 2009 @@ -18,5 +18,6 @@ -- +SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"; "../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd" SYSTEM "http://schemas.xmlsoap.org/wsdl/"; "../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd" Modified: cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/build-resources/catalog.cat URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/build-resources/catalog.cat?rev=832825&r1=832824&r2=832825&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/build-resources/catalog.cat (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/xml/src/main/build-resources/catalog.cat Wed Nov 4 18:11:02 2009 @@ -18,4 +18,5 @@ -- +SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"; "../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd" SYSTEM "http://schemas.xmlsoap.org/wsdl/"; "../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd" Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/build-resources/catalog.cat URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/build-resources/catalog.cat?rev=832825&r1=832824&r2=832825&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/build-resources/catalog.cat (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/build-resources/catalog.cat Wed Nov 4 18:11:02 2009 @@ -18,5 +18,6 @@ -- +SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"; "../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd" SYSTEM "http://schemas.xmlsoap.org/wsdl/"; "../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
