From 58708fb83a8f1c0ff757a84c22c8df9908fa6a6d Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Sat, 14 Apr 2007 10:33:34 +0000 Subject: [PATCH] Using JAXB: 2.1.3 --- oxm-tiger/build-maven2.xml | 2 +- oxm-tiger/pom.xml | 14 +- oxm/pom.xml | 20 +- pom.xml | 2 - .../xml/validation/SchemaLoaderUtilsTest.java | 5 +- .../xml/validation/encoding.xsd | 504 ++++++++++++++++++ .../xml/validation/envelope.xsd | 96 ++++ 7 files changed, 620 insertions(+), 23 deletions(-) create mode 100644 xml/src/test/resources/org/springframework/xml/validation/encoding.xsd create mode 100644 xml/src/test/resources/org/springframework/xml/validation/envelope.xsd diff --git a/oxm-tiger/build-maven2.xml b/oxm-tiger/build-maven2.xml index 0f2ad4da..a0b2861c 100644 --- a/oxm-tiger/build-maven2.xml +++ b/oxm-tiger/build-maven2.xml @@ -19,7 +19,7 @@ - diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml index eb0ce711..a885bab0 100644 --- a/oxm-tiger/pom.xml +++ b/oxm-tiger/pom.xml @@ -8,6 +8,14 @@ 4.0.0 spring-oxm-tiger Spring O/X Mapping - Java 5 + + + maven-repository.dev.java.net + Java.net Repository for Maven + https://maven-repository.dev.java.net/nonav/repository + legacy + + @@ -83,18 +91,18 @@ javax.xml.bind jaxb-api true - 2.0 + 2.1 com.sun.xml.bind jaxb-impl - 2.0.3 + 2.1.3 test com.sun.xml.bind jaxb-xjc - 2.0.3 + 2.1.3 test diff --git a/oxm/pom.xml b/oxm/pom.xml index d58a5db9..1914b604 100644 --- a/oxm/pom.xml +++ b/oxm/pom.xml @@ -16,7 +16,11 @@ jibx JiBX Maven Repository http://jibx.sourceforge.net/maven2/ - default + + + maven2-repository.dev.java.net + Java.net Repository for Maven2 + https://maven2-repository.dev.java.net/nonav/repository @@ -160,22 +164,10 @@ 1.0.6 test - - com.sun.xml.bind - jaxb-libs - 1.0.6 - test - com.sun.xml.bind jaxb-xjc - 1.0.6 - test - - - com.sun.msv.datatype.xsd - xsdlib - 20060615 + 1.0.7 test diff --git a/pom.xml b/pom.xml index 644c271c..118812fd 100644 --- a/pom.xml +++ b/pom.xml @@ -606,7 +606,5 @@ log4j test - - diff --git a/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java b/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java index c25fc6ff..1312524c 100644 --- a/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java +++ b/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java @@ -22,7 +22,6 @@ import javax.xml.validation.Schema; import junit.framework.TestCase; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import org.springframework.core.io.UrlResource; public class SchemaLoaderUtilsTest extends TestCase { @@ -55,8 +54,8 @@ public class SchemaLoaderUtilsTest extends TestCase { } public void testLoadMultipleSchemas() throws Exception { - Resource envelope = new UrlResource("http://schemas.xmlsoap.org/soap/envelope/"); - Resource encoding = new UrlResource("http://schemas.xmlsoap.org/soap/encoding/"); + Resource envelope = new ClassPathResource("envelope.xsd", getClass()); + Resource encoding = new ClassPathResource("encoding.xsd", getClass()); Schema schema = SchemaLoaderUtils.loadSchema(new Resource[]{envelope, encoding}, XMLConstants.W3C_XML_SCHEMA_NS_URI); assertNotNull("No schema returned", schema); diff --git a/xml/src/test/resources/org/springframework/xml/validation/encoding.xsd b/xml/src/test/resources/org/springframework/xml/validation/encoding.xsd new file mode 100644 index 00000000..db2fc5ee --- /dev/null +++ b/xml/src/test/resources/org/springframework/xml/validation/encoding.xsd @@ -0,0 +1,504 @@ + + + + + + + + 'root' can be used to distinguish serialization roots from other + elements that are present in a serialization but are not roots of + a serialized value graph + + + + + + + + + + + + + Attributes common to all elements that function as accessors or + represent independent (multi-ref) values. The href attribute is + intended to be used in a manner like CONREF. That is, the element + content should be empty iff the href attribute appears + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 'Array' is a complex type for accessors identified by position + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/src/test/resources/org/springframework/xml/validation/envelope.xsd b/xml/src/test/resources/org/springframework/xml/validation/envelope.xsd new file mode 100644 index 00000000..39e3867f --- /dev/null +++ b/xml/src/test/resources/org/springframework/xml/validation/envelope.xsd @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prose in the spec does not specify that attributes are allowed on the Body element + + + + + + + + + + + + + + + + + + + + 'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing + element. For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern + described in SOAP specification + + + + + + + + + + + + + + + Fault reporting structure + + + + + + + + + + + + + + + + + + + + + + + +