diff --git a/org.springframework.oxm/build.xml b/org.springframework.oxm/build.xml index b9fa08de3e..1130b80132 100644 --- a/org.springframework.oxm/build.xml +++ b/org.springframework.oxm/build.xml @@ -40,7 +40,7 @@ - + JAXB with Springs O/X Mapping + * support + * + */ +package org.springframework.oxm.jaxb; diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/package.html b/org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/package.html deleted file mode 100644 index 7b398a83ea..0000000000 --- a/org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/package.html +++ /dev/null @@ -1,6 +0,0 @@ - - -Package providing integration of JAXB with Springs O/X Mapping -support. - - diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java index 7a262afacb..c715f7ee91 100644 --- a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java +++ b/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java @@ -38,12 +38,15 @@ import org.springframework.core.io.Resource; import org.springframework.oxm.AbstractMarshallerTests; import org.springframework.oxm.Marshaller; import org.springframework.oxm.XmlMappingException; +import org.springframework.oxm.jaxb.test.FlightType; +import org.springframework.oxm.jaxb.test.Flights; +import org.springframework.oxm.jaxb.test.ObjectFactory; import org.springframework.oxm.mime.MimeContainer; import org.springframework.util.FileCopyUtils; public class Jaxb2MarshallerTests extends AbstractMarshallerTests { - private static final String CONTEXT_PATH = "org.springframework.oxm.jaxb"; + private static final String CONTEXT_PATH = "org.springframework.oxm.jaxb.test"; private Jaxb2Marshaller marshaller; diff --git a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java index a0468483e0..95482cbe68 100644 --- a/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java +++ b/org.springframework.oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java @@ -33,6 +33,8 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.oxm.AbstractUnmarshallerTests; import org.springframework.oxm.Unmarshaller; +import org.springframework.oxm.jaxb.test.FlightType; +import org.springframework.oxm.jaxb.test.Flights; import org.springframework.oxm.mime.MimeContainer; import org.springframework.util.xml.StaxUtils; @@ -46,7 +48,7 @@ public class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests { @Override public Unmarshaller createUnmarshaller() throws Exception { unmarshaller = new Jaxb2Marshaller(); - unmarshaller.setContextPath("org.springframework.oxm.jaxb"); + unmarshaller.setContextPath("org.springframework.oxm.jaxb.test"); unmarshaller.setSchema(new ClassPathResource("org/springframework/oxm/flight.xsd")); unmarshaller.afterPropertiesSet(); return unmarshaller; diff --git a/org.springframework.oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml b/org.springframework.oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml index 7488626982..e977871622 100644 --- a/org.springframework.oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml +++ b/org.springframework.oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml @@ -14,10 +14,10 @@ - + - - + +