You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/07/21 01:29:47 UTC

svn commit: r1148979 - in /cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl: jaxbBinding.xml jaxbBindingWithSchemaLoc.xml schemas/book.xsd

Author: sergeyb
Date: Wed Jul 20 23:29:46 2011
New Revision: 1148979

URL: http://svn.apache.org/viewvc?rev=1148979&view=rev
Log:
Fixing wadltojava test failures

Modified:
    cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml
    cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml
    cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd

Modified: cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml?rev=1148979&r1=1148978&r2=1148979&view=diff
==============================================================================
--- cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml (original)
+++ cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBinding.xml Wed Jul 20 23:29:46 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/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml?rev=1148979&r1=1148978&r2=1148979&view=diff
==============================================================================
--- cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml (original)
+++ cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/jaxbBindingWithSchemaLoc.xml Wed Jul 20 23:29:46 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/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd?rev=1148979&r1=1148978&r2=1148979&view=diff
==============================================================================
--- cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd (original)
+++ cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/schemas/book.xsd Wed Jul 20 23:29:46 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"/>