cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1148980 - in /cxf/branches/2.4.x-fixes: ./ tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd
Date Wed, 20 Jul 2011 23:32:39 GMT
Author: sergeyb
Date: Wed Jul 20 23:32:39 2011
New Revision: 1148980

URL: http://svn.apache.org/viewvc?rev=1148980&view=rev
Log:
Merged revisions 1148979 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1148979 | sergeyb | 2011-07-21 00:29:46 +0100 (Thu, 21 Jul 2011) | 1 line
  
  Fixing wadltojava test failures
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml
    cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml
    cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 20 23:32:39 2011
@@ -1 +1 @@
-/cxf/trunk:1144977,1145682,1146773,1147504,1148067,1148077,1148235,1148257,1148281,1148955,1148962,1148972
+/cxf/trunk:1144977,1145682,1146773,1147504,1148067,1148077,1148235,1148257,1148281,1148955,1148962,1148972,1148979

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml?rev=1148980&r1=1148979&r2=1148980&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml Wed
Jul 20 23:32:39 2011
@@ -19,7 +19,7 @@
 <jaxb:bindings version="2.0"
 	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	node="//xs:complexType[@name='book2']/xs:sequence/xs:element[@name='id']">
+	node="//xs:complexType[@name='theBook2']/xs:sequence/xs:element[@name='id']">
 	<jaxb:property name="book2Id"/>
 </jaxb:bindings>
 

Modified: cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml?rev=1148980&r1=1148979&r2=1148980&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml
(original)
+++ cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml
Wed Jul 20 23:32:39 2011
@@ -20,7 +20,7 @@
 	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	schemaLocation="schemas/book.xsd"
-	node="//xs:complexType[@name='book2']/xs:sequence/xs:element[@name='id']">
+	node="//xs:complexType[@name='theBook2']/xs:sequence/xs:element[@name='id']">
 	<jaxb:property name="book2Id"/>
 </jaxb:bindings>
 

Modified: cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd?rev=1148980&r1=1148979&r2=1148980&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd (original)
+++ cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd Wed
Jul 20 23:32:39 2011
@@ -28,7 +28,7 @@
             <xs:element name="id" type="xs:int"/>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="book2">
+    <xs:complexType name="theBook2">
         <xs:sequence>
             <xs:element name="id" type="xs:int"/>
             <xs:element minOccurs="0" name="name" type="xs:string"/>



Mime
View raw message