diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index a874da95..8404c20c 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -20,6 +20,16 @@
             </plugin>
         </plugins>
     </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <stylesheetfile>${basedir}/../src/main/javadoc/javadoc.css</stylesheetfile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html b/core-tiger/src/main/javadoc/org/springframework/ws/server/endpoint/annotation/package.html
similarity index 100%
rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html
rename to core-tiger/src/main/javadoc/org/springframework/ws/server/endpoint/annotation/package.html
diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html b/core-tiger/src/main/javadoc/org/springframework/ws/soap/server/endpoint/annotation/package.html
similarity index 100%
rename from core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html
rename to core-tiger/src/main/javadoc/org/springframework/ws/soap/server/endpoint/annotation/package.html
diff --git a/core/pom.xml b/core/pom.xml
index 885b6669..7f79a786 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -12,6 +12,16 @@
     <packaging>jar</packaging>
     <name>Spring WS Core</name>
     <description>Spring Web Services Core package.</description>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <stylesheetfile>${basedir}/../src/main/javadoc/javadoc.css</stylesheetfile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
diff --git a/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
index db0c73e1..8efcedae 100644
--- a/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
+++ b/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
@@ -56,11 +56,43 @@ import org.springframework.ws.transport.support.DefaultStrategiesHelper;
  * receiving {@link WebServiceMessage} instances.
  * <p/>
  * Code using this class need only implement callback interfaces, provide {@link Source} objects to read data from, or
- * use the pluggable {@link Marshaller} support.
+ * use the pluggable {@link Marshaller} support. For invoking the {@link #marshalSendAndReceive marshalling methods},
+ * the {@link #setMarshaller(Marshaller) marshaller} and {@link #setUnmarshaller(Unmarshaller) unmarshaller} properties
+ * must be set.
  * <p/>
  * This template uses a {@link SoapFaultMessageResolver} to handle fault response messages. Another {@link
  * FaultMessageResolver} can be defined with with {@link #setFaultMessageResolver(FaultMessageResolver)
- * faultMessageResolver}  property. If this property is set to <code>null</code>, no fault resolving is performed.
+ * faultMessageResolver} property. If this property is set to <code>null</code>, no fault resolving is performed.
+ * <p/>
+ * This template uses the following algorithm for sending and receiving.
+ * <ol>
+ * <li>Call to {@link #createConnection(String) createConnection()}.</li>
+ * <li>Call to {@link WebServiceMessageFactory#createWebServiceMessage() createWebServiceMessage()} on the registered
+ *     message factory to create a request message.</li>
+ * <li>Invoke {@link WebServiceMessageCallback#doWithMessage(WebServiceMessage) doWithMessage()} on the request
+ *     callback, if any. This step stores content in the request message, based on <code>Source</code>, marshalling,
+ * etc.</li>
+ * <li>Call {@link WebServiceConnection#send(WebServiceMessage) send()} on the connection.</li>
+ * <li>Call {@link #hasError(WebServiceConnection, WebServiceMessage) hasError()} to check if the connection has an
+ *     error. For an HTTP transport, a status code other than <code>2xx</code> indicates an error. However, since a
+ *     status code of 500 can also indicate a SOAP fault, the template verifies whether the error is not a fault.</li>
+ * <ul>
+ *     <li>If the connection has an error, call the {@link #handleError handleError()} method, which by default throws a
+ *         {@link WebServiceTransportException}.</li>
+ *     <li>If the connection has no error, continue with the next step.
+ * </ul>
+ * <li>Invoke {@link WebServiceConnection#receive(WebServiceMessageFactory) receive} on the connection to read the
+ *     response message, if any.</li>
+ * <ul>
+ *     <li>If no response was received, return <code>null</code> or <code>false</code></li>
+ *     <li>Call {@link #hasFault(WebServiceConnection, WebServiceMessage) hasFault()} to determine whether the response
+ *         has a fault. If it has, call the {@link #handleFault handleFault()} method.</li>
+ *     <li>Otherwise, invoke {@link WebServiceMessageExtractor#extractData(WebServiceMessage) extractData()} on the
+ *         response extractor, or {@link WebServiceMessageCallback#doWithMessage(WebServiceMessage) doWithMessage} on
+ *         the response callback.</li>
+ * </ul>
+ * <li>Call to {@link WebServiceConnection#close() close} on the connection.</li>
+ * </ol>
  *
  * @author Arjen Poutsma
  */
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapMessageFactory.java b/core/src/main/java/org/springframework/ws/soap/SoapMessageFactory.java
index abc4a6dd..dbb1c24d 100644
--- a/core/src/main/java/org/springframework/ws/soap/SoapMessageFactory.java
+++ b/core/src/main/java/org/springframework/ws/soap/SoapMessageFactory.java
@@ -31,7 +31,7 @@ public interface SoapMessageFactory extends WebServiceMessageFactory {
     /**
      * Sets the SOAP Version used by this factory.
      *
-     * @return the version constant
+     * @param version the version constant
      * @see SoapVersion#SOAP_11
      * @see SoapVersion#SOAP_12
      */
diff --git a/core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java b/core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
index 687d693c..723b251a 100644
--- a/core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
+++ b/core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
@@ -42,7 +42,7 @@ public interface WebServiceMessageSender {
     WebServiceConnection createConnection(String uri) throws IOException;
 
     /**
-     * Does this {@link {@link WebServiceMessageSender}} support the supplied URI?
+     * Does this {@link WebServiceMessageSender} support the supplied URI?
      *
      * @param uri the URI to be checked
      * @return <code>true</code> if this <code>WebServiceMessageSender</code> supports the supplied URI
diff --git a/core/src/main/java/org/springframework/ws/client/core/package.html b/core/src/main/javadoc/org/springframework/ws/client/core/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/package.html
rename to core/src/main/javadoc/org/springframework/ws/client/core/package.html
diff --git a/core/src/main/java/org/springframework/ws/client/core/support/package.html b/core/src/main/javadoc/org/springframework/ws/client/core/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/support/package.html
rename to core/src/main/javadoc/org/springframework/ws/client/core/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/client/package.html b/core/src/main/javadoc/org/springframework/ws/client/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/package.html
rename to core/src/main/javadoc/org/springframework/ws/client/package.html
diff --git a/core/src/main/java/org/springframework/ws/client/support/package.html b/core/src/main/javadoc/org/springframework/ws/client/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/package.html
rename to core/src/main/javadoc/org/springframework/ws/client/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/context/package.html b/core/src/main/javadoc/org/springframework/ws/context/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/context/package.html
rename to core/src/main/javadoc/org/springframework/ws/context/package.html
diff --git a/core/src/main/java/org/springframework/ws/mime/package.html b/core/src/main/javadoc/org/springframework/ws/mime/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/mime/package.html
rename to core/src/main/javadoc/org/springframework/ws/mime/package.html
diff --git a/core/src/main/java/org/springframework/ws/package.html b/core/src/main/javadoc/org/springframework/ws/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/package.html
rename to core/src/main/javadoc/org/springframework/ws/package.html
diff --git a/core/src/main/java/org/springframework/ws/pox/dom/package.html b/core/src/main/javadoc/org/springframework/ws/pox/dom/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/dom/package.html
rename to core/src/main/javadoc/org/springframework/ws/pox/dom/package.html
diff --git a/core/src/main/java/org/springframework/ws/pox/package.html b/core/src/main/javadoc/org/springframework/ws/pox/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/package.html
rename to core/src/main/javadoc/org/springframework/ws/pox/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html b/core/src/main/javadoc/org/springframework/ws/server/endpoint/adapter/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html
rename to core/src/main/javadoc/org/springframework/ws/server/endpoint/adapter/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package.html b/core/src/main/javadoc/org/springframework/ws/server/endpoint/interceptor/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package.html
rename to core/src/main/javadoc/org/springframework/ws/server/endpoint/interceptor/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/package.html b/core/src/main/javadoc/org/springframework/ws/server/endpoint/mapping/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/package.html
rename to core/src/main/javadoc/org/springframework/ws/server/endpoint/mapping/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/package.html b/core/src/main/javadoc/org/springframework/ws/server/endpoint/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/package.html
rename to core/src/main/javadoc/org/springframework/ws/server/endpoint/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/support/package.html b/core/src/main/javadoc/org/springframework/ws/server/endpoint/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/support/package.html
rename to core/src/main/javadoc/org/springframework/ws/server/endpoint/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/package.html b/core/src/main/javadoc/org/springframework/ws/server/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/package.html
rename to core/src/main/javadoc/org/springframework/ws/server/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/package.html b/core/src/main/javadoc/org/springframework/ws/soap/axiom/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/axiom/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/support/package.html b/core/src/main/javadoc/org/springframework/ws/soap/axiom/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/support/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/axiom/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/client/core/package.html b/core/src/main/javadoc/org/springframework/ws/soap/client/core/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/client/core/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/client/core/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/client/package.html b/core/src/main/javadoc/org/springframework/ws/soap/client/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/client/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/client/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/package.html b/core/src/main/javadoc/org/springframework/ws/soap/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/package.html b/core/src/main/javadoc/org/springframework/ws/soap/saaj/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/saaj/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/support/package.html b/core/src/main/javadoc/org/springframework/ws/soap/saaj/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/support/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/saaj/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package.html b/core/src/main/javadoc/org/springframework/ws/soap/server/endpoint/interceptor/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/server/endpoint/interceptor/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html b/core/src/main/javadoc/org/springframework/ws/soap/server/endpoint/mapping/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/server/endpoint/mapping/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/package.html b/core/src/main/javadoc/org/springframework/ws/soap/server/endpoint/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/server/endpoint/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/package.html b/core/src/main/javadoc/org/springframework/ws/soap/server/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/server/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/soap11/package.html b/core/src/main/javadoc/org/springframework/ws/soap/soap11/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap11/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/soap11/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/soap12/package.html b/core/src/main/javadoc/org/springframework/ws/soap/soap12/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap12/package.html
rename to core/src/main/javadoc/org/springframework/ws/soap/soap12/package.html
diff --git a/core/src/main/java/org/springframework/ws/transport/context/package.html b/core/src/main/javadoc/org/springframework/ws/transport/context/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/context/package.html
rename to core/src/main/javadoc/org/springframework/ws/transport/context/package.html
diff --git a/core/src/main/java/org/springframework/ws/transport/http/package.html b/core/src/main/javadoc/org/springframework/ws/transport/http/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/package.html
rename to core/src/main/javadoc/org/springframework/ws/transport/http/package.html
diff --git a/core/src/main/java/org/springframework/ws/transport/package.html b/core/src/main/javadoc/org/springframework/ws/transport/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/package.html
rename to core/src/main/javadoc/org/springframework/ws/transport/package.html
diff --git a/core/src/main/java/org/springframework/ws/transport/support/package.html b/core/src/main/javadoc/org/springframework/ws/transport/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/support/package.html
rename to core/src/main/javadoc/org/springframework/ws/transport/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/wsdl/package.html b/core/src/main/javadoc/org/springframework/ws/wsdl/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/package.html
rename to core/src/main/javadoc/org/springframework/ws/wsdl/package.html
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/package.html b/core/src/main/javadoc/org/springframework/ws/wsdl/wsdl11/builder/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/package.html
rename to core/src/main/javadoc/org/springframework/ws/wsdl/wsdl11/builder/package.html
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/package.html b/core/src/main/javadoc/org/springframework/ws/wsdl/wsdl11/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/package.html
rename to core/src/main/javadoc/org/springframework/ws/wsdl/wsdl11/package.html
diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index 35c09872..8c9977b7 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -40,6 +40,16 @@
             </plugin>
         </plugins>
     </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <stylesheetfile>${basedir}/../src/main/javadoc/javadoc.css</stylesheetfile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index 23f0b5ed..b2b6387b 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -66,6 +66,16 @@
             </plugin>
         </plugins>
     </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <stylesheetfile>${basedir}/../src/main/javadoc/javadoc.css</stylesheetfile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
diff --git a/oxm/src/main/java/org/springframework/oxm/castor/package.html b/oxm/src/main/javadoc/org/springframework/oxm/castor/package.html
similarity index 100%
rename from oxm/src/main/java/org/springframework/oxm/castor/package.html
rename to oxm/src/main/javadoc/org/springframework/oxm/castor/package.html
diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/package.html b/oxm/src/main/javadoc/org/springframework/oxm/jaxb/package.html
similarity index 100%
rename from oxm/src/main/java/org/springframework/oxm/jaxb/package.html
rename to oxm/src/main/javadoc/org/springframework/oxm/jaxb/package.html
diff --git a/oxm/src/main/java/org/springframework/oxm/jibx/package.html b/oxm/src/main/javadoc/org/springframework/oxm/jibx/package.html
similarity index 100%
rename from oxm/src/main/java/org/springframework/oxm/jibx/package.html
rename to oxm/src/main/javadoc/org/springframework/oxm/jibx/package.html
diff --git a/oxm/src/main/java/org/springframework/oxm/mime/package.html b/oxm/src/main/javadoc/org/springframework/oxm/mime/package.html
similarity index 100%
rename from oxm/src/main/java/org/springframework/oxm/mime/package.html
rename to oxm/src/main/javadoc/org/springframework/oxm/mime/package.html
diff --git a/oxm/src/main/java/org/springframework/oxm/package.html b/oxm/src/main/javadoc/org/springframework/oxm/package.html
similarity index 100%
rename from oxm/src/main/java/org/springframework/oxm/package.html
rename to oxm/src/main/javadoc/org/springframework/oxm/package.html
diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/package.html b/oxm/src/main/javadoc/org/springframework/oxm/xmlbeans/package.html
similarity index 100%
rename from oxm/src/main/java/org/springframework/oxm/xmlbeans/package.html
rename to oxm/src/main/javadoc/org/springframework/oxm/xmlbeans/package.html
diff --git a/oxm/src/main/java/org/springframework/oxm/xstream/package.html b/oxm/src/main/javadoc/org/springframework/oxm/xstream/package.html
similarity index 100%
rename from oxm/src/main/java/org/springframework/oxm/xstream/package.html
rename to oxm/src/main/javadoc/org/springframework/oxm/xstream/package.html
diff --git a/pom.xml b/pom.xml
index b7ecf92d..036de70b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,10 @@
             <name>Kristoffer Moum</name>
         </contributor>
     </contributors>
+    <organization>
+        <name>The Spring Web Services Framework</name>
+        <url>http://www.springframework.org/spring-ws</url>
+    </organization>
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -281,6 +285,10 @@
                 <configuration>
                     <aggregate>true</aggregate>
                     <breakiterator>true</breakiterator>
+                    <header>Spring Web Services Framework</header>
+                    <source>1.5</source>
+                    <stylesheetfile>${basedir}/src/main/javadoc/javadoc.css</stylesheetfile>
+                    <overview>${basedir}/src/main/javadoc/overview.html</overview>
                     <groups>
                         <group>
                             <title>Spring-WS</title>
diff --git a/src/site/resources/css/javadoc.css b/src/main/javadoc/javadoc.css
similarity index 91%
rename from src/site/resources/css/javadoc.css
rename to src/main/javadoc/javadoc.css
index 98e5237c..1f009c4b 100644
--- a/src/site/resources/css/javadoc.css
+++ b/src/main/javadoc/javadoc.css
@@ -1,7 +1,7 @@
 /* Spring-specific Javadoc style sheet rules */
 
 #overviewBody {
-	
+
 }
 
 .code {
@@ -13,12 +13,12 @@
 /* Vanilla Javadoc style sheet rules */
 
 body {
-	font-family: Arial;
+	font-family: Helvetica, Arial, sans-serif;
 	background-color: white;
 	font-size: 10pt;
 }
 
-td { font-size: 10pt; font-family: Arial }/* Javadoc style sheet */
+td { font-size: 10pt; font-family: Helvetica, Arial, sans-serif }/* Javadoc style sheet */
 
 /* Define colors, fonts and other style attributes here to override the defaults */
 
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
new file mode 100644
index 00000000..a2d4e724
--- /dev/null
+++ b/src/main/javadoc/overview.html
@@ -0,0 +1,23 @@
+<html>
+<body>
+This document is the API specification for the Spring Web Services Framework
+<hr/>
+<div id="overviewBody">
+    <p>
+        For further API reference and developer documentation, see the
+        <a href="http://static.springframework.org/spring-ws/site/reference.html" target="_top">Spring
+            Web Services reference documentation</a>.
+        That documentation contains more detailed, developer-targeted
+        descriptions, with conceptual overviews, definitions of terms,
+        workarounds, and working code examples.
+    </p>
+
+    <p>
+        If you are interested in commercial training, consultancy, and
+        support for the Spring Web Services Framework,
+        <a href="http://www.interface21.com/" target="_top">Interface 21</a> provides
+        such commercial support.
+    </p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/pom.xml b/xml/pom.xml
index 319f747e..056cd265 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -10,6 +10,16 @@
     <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>
diff --git a/xml/src/main/java/org/springframework/xml/dom/package.html b/xml/src/main/javadoc/org/springframework/xml/dom/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/dom/package.html
rename to xml/src/main/javadoc/org/springframework/xml/dom/package.html
diff --git a/xml/src/main/java/org/springframework/xml/namespace/package.html b/xml/src/main/javadoc/org/springframework/xml/namespace/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/namespace/package.html
rename to xml/src/main/javadoc/org/springframework/xml/namespace/package.html
diff --git a/xml/src/main/java/org/springframework/xml/package.html b/xml/src/main/javadoc/org/springframework/xml/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/package.html
rename to xml/src/main/javadoc/org/springframework/xml/package.html
diff --git a/xml/src/main/java/org/springframework/xml/sax/package.html b/xml/src/main/javadoc/org/springframework/xml/sax/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/sax/package.html
rename to xml/src/main/javadoc/org/springframework/xml/sax/package.html
diff --git a/xml/src/main/java/org/springframework/xml/stream/package.html b/xml/src/main/javadoc/org/springframework/xml/stream/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/stream/package.html
rename to xml/src/main/javadoc/org/springframework/xml/stream/package.html
diff --git a/xml/src/main/java/org/springframework/xml/transform/package.html b/xml/src/main/javadoc/org/springframework/xml/transform/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/transform/package.html
rename to xml/src/main/javadoc/org/springframework/xml/transform/package.html
diff --git a/xml/src/main/java/org/springframework/xml/validation/package.html b/xml/src/main/javadoc/org/springframework/xml/validation/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/validation/package.html
rename to xml/src/main/javadoc/org/springframework/xml/validation/package.html
diff --git a/xml/src/main/java/org/springframework/xml/xpath/package.html b/xml/src/main/javadoc/org/springframework/xml/xpath/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/package.html
rename to xml/src/main/javadoc/org/springframework/xml/xpath/package.html