[jboss-cvs] JBossAS SVN: r97031 - in projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test: java/org/jboss/test/osgi/jbossxb/apitest and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-11-26 09:54:08 -0500 (Thu, 26 Nov 2009)
New Revision: 97031

Modified:
   projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/BasicXMLBindingTestCase.java
   projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/apitest/UnmarshallerTestCase.java
   projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/simple/booking.xml
Log:
Fix schema location registration

Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/BasicXMLBindingTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/BasicXMLBindingTestCase.java	2009-11-26 14:42:11 UTC (rev 97030)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/BasicXMLBindingTestCase.java	2009-11-26 14:54:08 UTC (rev 97031)
@@ -102,7 +102,7 @@
       URL xmlurl = bundle.getEntry("booking.xml");
       assertNotNull("booking.xml available", xmlurl);
       
-      unmarshaller.registerSchemaLocation(CourseBooking.NAMESPACE_XML_SIMPLE, xsdurl.toExternalForm());
+      unmarshaller.registerSchemaLocation("http://org.jboss.test.osgi.jbossxb.simple/booking.xsd", xsdurl.toExternalForm());
       unmarshaller.addClassBinding(CourseBooking.NAMESPACE_XML_SIMPLE, CourseBooking.class);
       
       CourseBooking booking = (CourseBooking)unmarshaller.unmarshal(xmlurl.toExternalForm());

Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/apitest/UnmarshallerTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/apitest/UnmarshallerTestCase.java	2009-11-26 14:42:11 UTC (rev 97030)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/java/org/jboss/test/osgi/jbossxb/apitest/UnmarshallerTestCase.java	2009-11-26 14:54:08 UTC (rev 97031)
@@ -58,7 +58,7 @@
       assertNotNull("booking.xml available", xmlurl);
       
       JBossEntityResolver entityResolver = new JBossEntityResolver();
-      entityResolver.registerLocalEntity(CourseBooking.NAMESPACE_XML_SIMPLE, xsdurl.toExternalForm());
+      entityResolver.registerLocalEntity("http://org.jboss.test.osgi.jbossxb.simple/booking.xsd", xsdurl.toExternalForm());
       unmarshaller.setEntityResolver(entityResolver);
       
       DefaultSchemaResolver schemaBindingResolver = new DefaultSchemaResolver();

Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/simple/booking.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/simple/booking.xml	2009-11-26 14:42:11 UTC (rev 97030)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/simple/booking.xml	2009-11-26 14:54:08 UTC (rev 97031)
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<course-booking xmlns="http://org.jboss.test.osgi.jbossxb.simple" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<course-booking xmlns="http://org.jboss.test.osgi.jbossxb.simple" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://org.jboss.test.osgi.jbossxb.simple http://org.jboss.test.osgi.jbossxb.simple/booking.xsd"
+  courseReference="Course100" courseDate="2009-11-26" invoiceReference="Ref100" totalPrice="100">
   <company name="ACME Consulting">
     <address>10 Coyote Avenue, Arizona, USA</address>
     <contact name="Duke" email="duke at acme.com" telephone="1234567890" />