cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r721241 - in /cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs: JAXRSClientServerSpringBookTest.java book.xsd
Date Thu, 27 Nov 2008 16:48:52 GMT
Author: sergeyb
Date: Thu Nov 27 08:48:52 2008
New Revision: 721241

URL: http://svn.apache.org/viewvc?rev=721241&view=rev
Log:
JAXRS : Fixing the test schema

Modified:
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/book.xsd

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=721241&r1=721240&r2=721241&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Thu Nov 27 08:48:52 2008
@@ -160,7 +160,8 @@
                 InputStream expected = getClass().getResourceAsStream(expectedResource);
                 assertEquals(getStringFromInputStream(expected), post.getResponseBodyAsString());
             } else {
-                assertTrue(post.getResponseBodyAsString().contains("JAXBException"));
+                assertTrue(post.getResponseBodyAsString()
+                               .contains("Cannot find the declaration of element"));
             }
         } finally {
             // Release current connection to the connection pool once you are done

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/book.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/book.xsd?rev=721241&r1=721240&r2=721241&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/book.xsd (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/book.xsd Thu Nov 27 08:48:52
2008
@@ -18,12 +18,13 @@
   under the License.
 -->
 
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.example.org/books" xmlns:tns="http://www.example.org/books" elementFormDefault="qualified">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.example.org/books" xmlns:tns="http://www.example.org/books" xmlns:bookids="http://www.example.org/books/id"
elementFormDefault="qualified">
+  <xs:import namespace="http://www.example.org/books/id"/>
   <element name="Book">
      <complexType>
        <sequence>
         <element name="name" type="xs:string"/>
-        <element name="id" type="xs:long"/>
+        <element name="id" type="bookids:bid"/>
        </sequence> 
      </complexType>
   </element>



Mime
View raw message