SWS-603 - Drop OXM chapter from ref docs

Author: poutsma

src/docbkx/client.xml

@@ -7,7 +7,7 @@
         <title>Introduction</title>
         <para>
             Spring-WS provides a client-side Web service API that allows for consistent, XML-driven access to
-            Web services. It also caters for the use of <link linkend="oxm">marshallers and unmarshallers</link>
+            Web services. It also caters for the use of marshallers and unmarshallers
             so that your service tier code can deal exclusively with Java objects.
         </para>
         <para>
@@ -284,7 +284,9 @@ public class WebServiceClient {
                 <classname>WebServiceTemplate</classname> class delegates the conversion of the request object
                 to XML to a <interfacename>Marshaller</interfacename>, and the conversion of the response
                 XML to an object to an <interfacename>Unmarshaller</interfacename>. (For more information
-                about marshalling and unmarshaller, refer to <xref linkend="oxm"/>.) By using the
+                about marshalling and unmarshaller, refer to
+                <ulink url="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/oxm.html">the Spring documentation</ulink>.)
+                By using the
                 marshallers, your application code can focus on the business object that is being sent or
                 received and not be concerned with the details of how it is represented as XML. In order to
                 use the marshalling functionality, you have to set a marshaller and unmarshaller with the

src/docbkx/index.xml

@@ -59,16 +59,14 @@
                 to both client- and server-side WS, a chapter devoted to the specifics
                 of <link linkend="server">writing server-side Web services</link>,
                 a chapter about using Web services on
-                <link linkend="client">the client-side</link>, and chapters on using
-                <link linkend="security">WS-Security</link> and
-                <link linkend="oxm">Object/XML mapping</link>.
+                <link linkend="client">the client-side</link>, and a chapters on using
+                <link linkend="security">WS-Security</link>.
             </para>
         </partintro>
         <xi:include href="common.xml"/>
         <xi:include href="server.xml"/>
         <xi:include href="client.xml"/>
         <xi:include href="security.xml"/>
-        <xi:include href="oxm.xml"/>
     </part>
     <part id="resources">
         <title>Other Resources</title>

src/docbkx/oxm.xml

@@ -16,11 +16,10 @@
         on this XML, and not on Java.
     </para>
     <para>
-        Spring Web Services focusses on creating these document-driven Web services.
+        Spring Web Services focuses on creating these document-driven Web services.
         Spring Web Services facilitates contract-first SOAP service development, allowing for the creation of
         flexible web services using one of the many ways to manipulate XML payloads. 
-        Spring-WS provides a powerful <link linkend="server">message dispatching framework</link>, various <link
-        linkend="oxm">XML marshalling</link> techniques that can be used outside a Web service environment, a <link
+        Spring-WS provides a powerful <link linkend="server">message dispatching framework</link>, a <link
         linkend="security">WS-Security</link> solution that integrates with your existing application security
         solution, and a <link linkend="client">Client-side API</link> that follows the familiar Spring template pattern.
     </para>

src/docbkx/preface.xml

@@ -24,7 +24,7 @@
            Spring-WS's XML handling is extremely flexible. An endpoint can choose from
            a large amount of XML handling libraries supported by Spring-WS, including the DOM family (W3C DOM, JDOM,
            dom4j, and XOM), SAX or StAX for faster performance, XPath to extract information from the message, or even
-           <link linkend="oxm">marshalling techniques</link> (JAXB, Castor, XMLBeans, JiBX, or XStream) to convert
+           marshalling techniques (JAXB, Castor, XMLBeans, JiBX, or XStream) to convert
            the XML to objects and vice-versa.
         </para>
     </section>
@@ -314,18 +314,6 @@
                 the dispatcher servlet does not load the default adapters, and is unable to handle standard Spring-MVC
                 <interfacename>Controllers</interfacename>. Therefore, we add the
                 <classname>SimpleControllerHandlerAdapter</classname> at the end.
-                <footnote>
-                    <para>
-                        By default, the Spring MVC <classname>DispatcherServlet</classname> configures the following
-                        handler adapters in version 2.5:
-                        <itemizedlist>
-                            <listitem><para><classname>org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter</classname></para></listitem>
-                            <listitem><para><classname>org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter</classname></para></listitem>
-                            <listitem><para><classname>org.springframework.web.servlet.mvc.throwaway.ThrowawayControllerHandlerAdapter</classname></para></listitem>
-                            <listitem><para><classname>org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter</classname></para></listitem>
-                        </itemizedlist>
-                    </para>
-                </footnote>
             </para>
             <para>
                 In a similar fashion, you can wire up a <classname>WsdlDefinitionHandlerAdapter</classname> to make sure
@@ -669,7 +657,7 @@ public class SampleEndpoint extends AbstractDomPayloadEndpoint {
                 Rather than handling XML directly using DOM, you can use marshalling to convert the payload of the XML
                 message into a Java Object. Spring Web Services offers the
                 <classname>AbstractMarshallingPayloadEndpoint</classname> for this purpose, which is built on the
-                marshalling abstraction described in <xref linkend="oxm"/>. The
+                Spring's OXM package. The
                 <classname>AbstractMarshallingPayloadEndpoint</classname> has two properties:
                 <property>marshaller</property> and <property>unmarshaller</property>, in which you can inject in the
                 constructor or by setters.
@@ -721,7 +709,9 @@ public class MarshallingOrderEndpoint extends AbstractMarshallingPayloadEndpoint
     ]]><lineannotation>&lt;!-- Other beans, such as the endpoint mapping --&gt;</lineannotation><![CDATA[
 </beans>]]></programlisting>
             <para>
-                In this sample, we configure a <link linkend="oxm-jaxb2">Jaxb2Marshaller</link> for the
+                In this sample, we configure a
+                <ulink url="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/oxm.html#oxm-jaxb2">Jaxb2Marshaller</ulink>
+                for the
                 <classname>OrderRequest</classname> and <classname>Order</classname> classes, and inject that
                 marshaller together with the
                 <classname>DefaultOrderService</classname> into our endpoint. This business service is not shown, but
@@ -756,7 +746,8 @@ public class MarshallingOrderEndpoint extends AbstractMarshallingPayloadEndpoint
     </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>]]></programlisting>
             <para>
-                Instead of JAXB 2, we could have used any of the other marshallers described in <xref linkend="oxm"/>.
+                Instead of JAXB 2, we could have used <ulink
+                url="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/oxm.html">any Spring OXM marshallers</ulink>.
                 The only thing that would change in the above example is the configuration of the
                 <literal>marshaller</literal> bean.
             </para>

src/docbkx/resources/images/spring-deps.png

@@ -620,7 +620,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint {
             </programlistingco>
             <para>
                  Using JDOM is just one of the options to handle the XML: other options include DOM, dom4j, XOM,
-                 SAX, and StAX, but also <link linkend="oxm">marshalling techniques</link> like JAXB, Castor, XMLBeans,
+                 SAX, and StAX, but also marshalling techniques like JAXB, Castor, XMLBeans,
                  JiBX, and XStream. We chose JDOM because it gives us access to the raw XML, and because it
                  is based on classes (not interfaces and factory methods as with W3C DOM and dom4j), which makes the
                  code less verbose. We use XPath because it is less fragile than marshalling technologies: we don't

src/docbkx/server.xml

@@ -79,9 +79,8 @@
     <section>
         <title>Runtime environment</title>
         <para>
-            Spring Web Services runs within a standard Java 1.3 Runtime Environment. It also supports Java 5.0,
-            although the Java types which are specific to this release are packaged in a separate modules with the 
-            suffix "tiger" in their JAR filename. Note that the security module also requires Java 5.
+            Spring Web Services requires a standard Java 1.5 Runtime Environment. Java 1.6 is also supported.
+            Spring-WS also requires Spring 3.0 or higher.
         </para>
         <para>
             Spring-WS consists of a number of modules, which are described in the remainder of this section.
@@ -96,7 +95,7 @@
             </listitem>
             <listitem>
                 <para>
-                    The Core package (<filename>spring-ws-core.jar</filename> and <filename>spring-ws-core-tiger.jar</filename>)
+                    The Core package (<filename>spring-ws-core.jar</filename>)
                     is the central part of the Spring's Web services functionality.
                     It provides the central <link linkend="web-service-messages">
                     <classname>WebServiceMessage</classname></link> and <link linkend="soap-message">
@@ -110,22 +109,14 @@
                     The <link linkend="security">Security</link> package (<filename>spring-ws-security.jar</filename>)
                     provides a WS-Security implementation that integrates
                     with the core Web service package. It allows you to add principal tokens, sign, and decrypt and encrypt SOAP
-                    messages. Addtionally, it allows you to leverage your existing Acegi security implementation for
+                    messages. Additionally, it allows you to leverage your existing Spring Security security implementation for
                     authentication and authorization.
                 </para>
             </listitem>
-            <listitem>
-                <para>
-                    The <link linkend="oxm">OXM</link> package (<filename>spring-oxm.jar</filename> and 
-                    <filename>spring-oxm-tiger.jar</filename>) provides integration for popular XML marshalling APIs, including
-                    JAXB 1 and 2. Using the OXM package means that you benefit from a unified exception hierarchy, and can wire
-                    up your favorite XML marshalling technology easily.
-                </para>
-            </listitem>
         </itemizedlist>
         <para>
             The following figure illustrates the Spring-WS modules and the dependencies between them. Arrows indicate 
-            dependencies, i.e. Spring-WS Core depends on Spring-XML and Spring-OXM.
+            dependencies, i.e. Spring-WS Core depends on Spring-XML and the OXM module found in Spring 3.
             <mediaobject>
                     <imageobject role="fo">
                         <imagedata fileref="src/docbkx/resources/images/spring-deps.png"