Fixed SWS-133: CastorMarshaller ignoreExtraAttributes & Elements

Author: poutsma

oxm/build-maven2.xml

@@ -32,7 +32,7 @@
     </target>
 
     <target name="generate-test-castor" depends="generate-test-init" unless="skip">
-        <taskdef name="castor-srcgen" classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask"
+        <taskdef name="castor-srcgen" classname="org.castor.anttask.CastorCodeGenTask"
                  classpathref="maven.test.classpath"/>
         <castor-srcgen types="j2" warnings="false" file="${schema}" todir="${generate.target.directory}"
                        package="org.springframework.oxm.castor"/>

oxm/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>spring-ws</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -29,8 +30,8 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
-                                    <property name="maven.test.skip" value="${maven.test.skip}" />
-                                    <target name="generate-test-sources" />
+                                    <property name="maven.test.skip" value="${maven.test.skip}"/>
+                                    <target name="generate-test-sources"/>
                                 </ant>
                             </tasks>
                             <testSourceRoot>${project.build.directory}/generated-sources/test/java</testSourceRoot>
@@ -45,8 +46,8 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
-                                    <property name="maven.test.skip" value="${maven.test.skip}" />
-                                    <target name="test-compile" />
+                                    <property name="maven.test.skip" value="${maven.test.skip}"/>
+                                    <target name="test-compile"/>
                                 </ant>
                             </tasks>
                         </configuration>
@@ -55,6 +56,13 @@
                         </goals>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.castor</groupId>
+                        <artifactId>castor-codegen-anttask</artifactId>
+                        <version>1.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>

oxm/src/main/java/org/springframework/oxm/AbstractMarshaller.java

@@ -59,38 +59,11 @@
  */
 public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 
-    /**
-     * Logger available to subclasses.
-     */
+    /** Logger available to subclasses. */
     protected final Log logger = LogFactory.getLog(getClass());
 
-    private boolean validating = false;
-
-    private boolean namespaceAware = true;
-
     private DocumentBuilderFactory documentBuilderFactory;
 
-    /**
-     * Set whether or not the XML parser should be XML namespace aware. Default is <code>true</code>.
-     */
-    public void setNamespaceAware(boolean namespaceAware) {
-        this.namespaceAware = namespaceAware;
-    }
-
-    /**
-     * Set if the XML parser should validate the document. Default is <code>false</code>.
-     */
-    public void setValidating(boolean validating) {
-        this.validating = validating;
-    }
-
-    /**
-     * Returns whether the XML parser should validate the document. Default is <code>false</code>.
-     */
-    public boolean isValidating() {
-        return validating;
-    }
-
     /**
      * Marshals the object graph with the given root into the provided <code>javax.xml.transform.Result</code>.
      * <p/>
@@ -103,9 +76,9 @@ public boolean isValidating() {
      * @throws IOException              if an I/O exception occurs
      * @throws IllegalArgumentException if <code>result</code> if neither a <code>DOMResult</code>,
      *                                  <code>SAXResult</code>, <code>StreamResult</code>
-     * @see #marshalDomResult(Object, javax.xml.transform.dom.DOMResult)
-     * @see #marshalSaxResult(Object, javax.xml.transform.sax.SAXResult)
-     * @see #marshalStreamResult(Object, javax.xml.transform.stream.StreamResult)
+     * @see #marshalDomResult(Object,javax.xml.transform.dom.DOMResult)
+     * @see #marshalSaxResult(Object,javax.xml.transform.sax.SAXResult)
+     * @see #marshalStreamResult(Object,javax.xml.transform.stream.StreamResult)
      */
     public final void marshal(Object graph, Result result) throws XmlMappingException, IOException {
         if (result instanceof DOMResult) {
@@ -183,8 +156,8 @@ protected DocumentBuilder createDocumentBuilder(DocumentBuilderFactory factory)
      */
     protected DocumentBuilderFactory createDocumentBuilderFactory() throws ParserConfigurationException {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setValidating(validating);
-        factory.setNamespaceAware(namespaceAware);
+        factory.setValidating(false);
+        factory.setNamespaceAware(true);
         return factory;
     }
 
@@ -246,7 +219,7 @@ else if (staxResult.getXMLEventWriter() != null) {
      * @param graph     the root of the object graph to marshal
      * @param saxResult the <code>SAXResult</code>
      * @throws XmlMappingException if the given object cannot be marshalled to the result
-     * @see #marshalSaxHandlers(Object, org.xml.sax.ContentHandler, org.xml.sax.ext.LexicalHandler)
+     * @see #marshalSaxHandlers(Object,org.xml.sax.ContentHandler,org.xml.sax.ext.LexicalHandler)
      */
     protected void marshalSaxResult(Object graph, SAXResult saxResult) throws XmlMappingException {
         ContentHandler contentHandler = saxResult.getHandler();
@@ -340,7 +313,7 @@ else if (staxSource.getXMLEventReader() != null) {
      * @return the object graph
      * @throws XmlMappingException if the given source cannot be mapped to an object
      * @throws IOException         if an I/O Exception occurs
-     * @see #unmarshalSaxReader(org.xml.sax.XMLReader, org.xml.sax.InputSource)
+     * @see #unmarshalSaxReader(org.xml.sax.XMLReader,org.xml.sax.InputSource)
      */
     protected Object unmarshalSaxSource(SAXSource saxSource) throws XmlMappingException, IOException {
         if (saxSource.getXMLReader() == null) {