[maven-release-plugin] copy for tag spring-ws-1.0.2

Author: poutsma

oxm-tiger/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java

@@ -209,7 +209,13 @@ private boolean supportsInternal(Class<?> clazz, boolean checkForXmlRootElement)
                 return false;
             }
             String packageName = className.substring(0, lastDotIndex);
-            return getContextPath().startsWith(packageName);
+            String[] contextPaths = StringUtils.tokenizeToStringArray(getContextPath(), ":");
+            for (int i = 0; i < contextPaths.length; i++) {
+                if (contextPaths[i].equals(packageName)) {
+                    return true;
+                }
+            }
+            return false;
         }
         else if (!ObjectUtils.isEmpty(classesToBeBound)) {
             return Arrays.asList(classesToBeBound).contains(clazz);

oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java

@@ -194,7 +194,23 @@ public void testMarshalSaxResult() throws Exception {
         verify(handlerMock);
     }
 
-    public void testSupports() throws Exception {
+    public void testSupportsContextPath() throws Exception {
+        Method createFlights = ObjectFactory.class.getDeclaredMethod("createFlights");
+        assertTrue("Jaxb2Marshaller does not support Flights",
+                marshaller.supports(createFlights.getGenericReturnType()));
+        Method createFlight = ObjectFactory.class.getDeclaredMethod("createFlight", FlightType.class);
+        assertTrue("Jaxb2Marshaller does not support JAXBElement<FlightsType>",
+                marshaller.supports(createFlight.getGenericReturnType()));
+        assertFalse("Jaxb2Marshaller supports non-parameterized JAXBElement", marshaller.supports(JAXBElement.class));
+        JAXBElement<Jaxb2MarshallerTest> testElement =
+                new JAXBElement<Jaxb2MarshallerTest>(new QName("something"), Jaxb2MarshallerTest.class, null, this);
+        assertFalse("Jaxb2Marshaller supports wrong JAXBElement", marshaller.supports(testElement.getClass()));
+    }
+
+    public void testSupportsClassesToBeBound() throws Exception {
+        marshaller = new Jaxb2Marshaller();
+        marshaller.setClassesToBeBound(new Class[]{Flights.class, FlightType.class});
+        marshaller.afterPropertiesSet();
         Method createFlights = ObjectFactory.class.getDeclaredMethod("createFlights");
         assertTrue("Jaxb2Marshaller does not support Flights",
                 marshaller.supports(createFlights.getGenericReturnType()));

oxm/src/main/java/org/springframework/oxm/jaxb/AbstractJaxbMarshaller.java

@@ -28,6 +28,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.oxm.XmlMappingException;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Abstract base class for implementations of the <code>Marshaller</code> and <code>Unmarshaller</code> interfaces that
@@ -64,9 +66,19 @@ protected String getContextPath() {
 
     /** Sets the JAXB Context path. */
     public void setContextPath(String contextPath) {
+        Assert.notNull(contextPath, "'contextPath' must not be null");
         this.contextPath = contextPath;
     }
 
+    /**
+     * Sets multiple JAXB Context paths. The given array of context paths is converted to a colon-delimited string, as
+     * supported by JAXB.
+     */
+    public void setContextPaths(String[] contextPaths) {
+        Assert.notEmpty(contextPaths, "'contextPaths' must not be empty");
+        this.contextPath = StringUtils.arrayToDelimitedString(contextPaths, ":");
+    }
+
     /**
      * Sets the JAXB <code>Marshaller</code> properties. These properties will be set on the underlying JAXB
      * <code>Marshaller</code>, and allow for features such as indentation.

oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java

@@ -22,7 +22,7 @@
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 
-import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -38,7 +38,7 @@
  * @see #setValidating(boolean)
  * @since 1.0.0
  */
-public class Jaxb1Marshaller extends AbstractJaxbMarshaller implements InitializingBean {
+public class Jaxb1Marshaller extends AbstractJaxbMarshaller {
 
     private boolean validating = false;
 
@@ -48,7 +48,26 @@ public void setValidating(boolean validating) {
     }
 
     public boolean supports(Class clazz) {
-        return Element.class.isAssignableFrom(clazz);
+        if (!Element.class.isAssignableFrom(clazz)) {
+            return false;
+        }
+        if (StringUtils.hasLength(getContextPath())) {
+            String className = ClassUtils.getQualifiedName(clazz);
+            int lastDotIndex = className.lastIndexOf('.');
+            if (lastDotIndex == -1) {
+                return false;
+            }
+            String packageName = className.substring(0, lastDotIndex);
+            String[] contextPaths = StringUtils.tokenizeToStringArray(getContextPath(), ":");
+            for (int i = 0; i < contextPaths.length; i++) {
+                if (contextPaths[i].equals(packageName)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return false;
+
     }
 
     protected final JAXBContext createJaxbContext() throws JAXBException {

oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1MarshallerTest.java

@@ -31,7 +31,7 @@ public class Jaxb1MarshallerTest extends AbstractJaxbMarshallerTestCase {
 
     protected final Marshaller createMarshaller() throws Exception {
         Jaxb1Marshaller marshaller = new Jaxb1Marshaller();
-        marshaller.setContextPath(CONTEXT_PATH);
+        marshaller.setContextPaths(new String[]{CONTEXT_PATH});
         marshaller.afterPropertiesSet();
         return marshaller;
     }

xml/pom.xml

@@ -0,0 +1,84 @@
+<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>
+        <version>1.0.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-xml</artifactId>
+    <packaging>jar</packaging>
+    <name>Spring XML</name>
+    <description>Various XML support classes for Spring Web Services</description>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <stylesheetfile>${basedir}/../src/main/javadoc/javadoc.css</stylesheetfile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+    <dependencies>
+        <!-- XML handling dependencies -->
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jdom</groupId>
+                    <artifactId>jdom</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xom</groupId>
+                    <artifactId>xom</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xmlParserAPIs</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>1.2_Java1.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

xml/src/main/java/org/springframework/xml/JaxpVersion.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.xml;
+
+import org.springframework.util.ClassUtils;
+
+/**
+ * Helper class used to find the current version of JAXP. We cannot depend on the Java version, since JAXP can be
+ * upgraded independently of the Java version.
+ * <p/>
+ * Only distinguishes between JAXP 1.0, 1.1, 1.3, and 1.4, since JAXP 1.2 was a maintenance release with no new
+ * classes.
+ *
+ * @author Arjen Poutsma
+ * @since 1.0.0
+ */
+public abstract class JaxpVersion {
+
+    public static final int JAXP_10 = 0;
+
+    public static final int JAXP_11 = 1;
+
+    public static final int JAXP_13 = 3;
+
+    public static final int JAXP_14 = 4;
+
+    private static final String JAXP_11_CLASS_NAME = "javax.xml.transform.Transformer";
+
+    private static final String JAXP_13_CLASS_NAME = "javax.xml.xpath.XPath";
+
+    private static final String JAXP_14_CLASS_NAME = "javax.xml.transform.stax.StAXSource";
+
+    private static int jaxpVersion = JAXP_10;
+
+    static {
+        try {
+            ClassUtils.forName(JAXP_14_CLASS_NAME);
+            jaxpVersion = JAXP_14;
+        }
+        catch (ClassNotFoundException ex1) {
+            try {
+                ClassUtils.forName(JAXP_13_CLASS_NAME);
+                jaxpVersion = JAXP_13;
+            }
+            catch (ClassNotFoundException ex2) {
+                try {
+                    ClassUtils.forName(JAXP_11_CLASS_NAME);
+                    jaxpVersion = JAXP_11;
+                }
+                catch (ClassNotFoundException ex3) {
+                    // default to JAXP 1.0
+                }
+            }
+        }
+    }
+
+    /**
+     * Gets the JAXP version. This means we can do things like if <code>(getJaxpVersion() < JAXP_13)</code>.
+     *
+     * @return a code comparable to the JAXP_XX codes in this class
+     * @see #JAXP_10
+     * @see #JAXP_11
+     * @see #JAXP_13
+     * @see #JAXP_14
+     */
+    public static int getJaxpVersion() {
+        return jaxpVersion;
+    }
+}

xml/src/main/java/org/springframework/xml/XmlException.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.xml;
+
+import org.springframework.core.NestedRuntimeException;
+
+/**
+ * Root of the hierarchy of XML exception.
+ *
+ * @author Arjen Poutsma
+ * @since 1.0.0
+ */
+public abstract class XmlException extends NestedRuntimeException {
+
+    /**
+     * Constructs a new instance of the <code>XmlException</code> with the specific detail message.
+     *
+     * @param message the detail message
+     */
+    protected XmlException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new instance of the <code>XmlException</code> with the specific detail message and exception.
+     *
+     * @param message   the detail message
+     * @param throwable the wrapped exception
+     */
+    protected XmlException(String message, Throwable throwable) {
+        super(message, throwable);
+    }
+}