From 2869978a3055348eb8fa5922f8f6585717c1d177 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 25 Jan 2007 20:05:40 +0000
Subject: [PATCH] ported r6021 from m3

---
 doc/pom.xml                             |  3 +-
 full-assembly.sh                        |  2 +-
 pom.xml                                 |  6 ++++
 readme.txt                              | 28 ++++++++++--------
 samples/airline/client/jaxws/build.xml  |  5 ++++
 samples/echo/client/saaj/build.xml      |  5 ++++
 samples/echo/client/spring-ws/build.xml |  3 +-
 src/assembly/docs.xml                   |  1 +
 src/assembly/full.xml                   | 39 +++++++++----------------
 9 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/doc/pom.xml b/doc/pom.xml
index 45d5abba..9c1bcf6a 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>1.0-m3-SNAPSHOT</version>
+        <version>1.0-m4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-doc</artifactId>
@@ -20,7 +20,6 @@
             <plugin>
                 <groupId>com.agilejava.docbkx</groupId>
                 <artifactId>docbkx-maven-plugin</artifactId>
-                <version>2.0.2</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/full-assembly.sh b/full-assembly.sh
index 8429c981..0f546b05 100755
--- a/full-assembly.sh
+++ b/full-assembly.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-mvn clean install assembly:assembly -D descriptor=src/assembly/full.xml
+mvn -Pdoc -Ddescriptor=src/assembly/full.xml clean install javadoc:javadoc assembly:assembly
diff --git a/pom.xml b/pom.xml
index 224fb4eb..dbfe6fec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,12 @@
                 <module>samples</module>
             </modules>
         </profile>
+        <profile>
+            <id>doc</id>
+            <modules>
+                <module>doc</module>
+            </modules>
+        </profile>
     </profiles>
     <properties>
         <spring.version>2.0.2</spring.version>
diff --git a/readme.txt b/readme.txt
index 0813decd..7e3cbdd3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 1.0-M2 (September 2006)
+SPRING WEB SERVICES 1.0-M3 (Januari 2007)
 -------------------------------
 http://www.springframework.org/spring-ws
 http://forum.springframework.org/forumdisplay.php?f=39
@@ -14,7 +14,7 @@ XMLBeans, Castor, JiBX and XStream; and a Web service framework that resembles S
 
 2. RELEASE INFO
 
-Spring-WS requires J2SE 1.4 and J2EE 1.4.  J2SE 1.5 is required for building.
+Spring-WS requires J2SE 1.4 and J2EE 1.4.  J2SE 1.5 is required for building. J2SE 1.6 is not yet supported.
 
 Release contents:
 
@@ -35,29 +35,33 @@ Spring-WS is released under the terms of the Apache Software License (see licens
 3. DISTRIBUTION JAR FILES
 
 The following distinct jar files are included in the distribution. This list specifies the respective contents and
-third-party dependencies. Libraries in [brackets] are optional, i.e. just necessary for certain functionality.
+third-party dependencies. Libraries in [brackets] are optional, i.e. just necessary for certain functionality. For an 
+exact list of Spring-WS project dependencies see the respective Maven2 pom.xml files.
 
-* spring-oxm-1.0-m2.jar
+* spring-oxm-1.0-m3.jar
 - Contents: The Spring Object/XML Mapping framework
 - Dependencies: Commons Logging, spring-beans, spring-core
-                [Log4J, JAXB, Castor, XMLBeans, StAX, JiBX, XStream]
+                [Log4J, JAXB 1, Castor, XMLBeans, StAX, JiBX, XStream]
 
-* spring-ws-core-1.0-m2.jar
+* spring-oxm-1.0-m3.jar
+- Contents: The Spring Object/XML Mapping framework for Java 5
+- Dependencies: Commons Logging, spring-beans, spring-core, JAXB 2
+
+* spring-ws-core-1.0-m3.jar
 - Contents: The Spring-WS Core
-- Dependencies: Commons Logging, spring-beans, spring-core, spring-context
-                [Log4J, spring-oxm, spring-web, spring-webmvc, SAAJ, JDOM, StAX, Servlet API, JAF, Axiom, DOM4J, XOM]
+- Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-oxm
+                [Log4J, spring-web, spring-webmvc, SAAJ, JDOM, StAX, Servlet API, JAF, Axiom, DOM4J, XOM]
 
-* spring-ws-security-1.0-m2.jar
+* spring-ws-security-1.0-m3.jar
 - Contents: Spring-WS Security integration
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-ws-core
                 [Log4J, xmlsdig, xmlsec, XWS-security, Acegi]
 
-* spring-xml-1.0-m2.jar
+* spring-xml-1.0-m3.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [StAX, Xalan, Jaxen]
 
-For an exact list of Spring-WS project dependencies see the respective pom.xml files.
 
 4. WHERE TO START
 
@@ -66,7 +70,7 @@ This distribution contains documentation and two sample applications illustratin
 A great way to get started is to review and run the sample applications, supplementing with reference manual
 material as needed. You will require Maven 2, which can be downloaded from http://maven.apache.org/, for building
 Spring-WS. To build deployable .war files for all samples, simply access the "samples" directory and
-execute the "mvn package" command.
+execute the "mvn package" command, or run "mvn jetty:run" to run the samples directly in a Jetty 6 Web container.
 
 More information on deploying Spring-WS sample applications can be found at:
 	samples/readme.txt
diff --git a/samples/airline/client/jaxws/build.xml b/samples/airline/client/jaxws/build.xml
index 2ffc5d21..e7a8023f 100644
--- a/samples/airline/client/jaxws/build.xml
+++ b/samples/airline/client/jaxws/build.xml
@@ -15,9 +15,12 @@
 
         <artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository"
                                    layout="legacy"/>
+        <artifact:remoteRepository id="spring-ext"
+            url="https://svn.sourceforge.net/svnroot/springframework/repos/repo-ext/"/>
 
         <artifact:dependencies pathId="generate.classpath">
             <remoteRepository refid="java.net"/>
+            <remoteRepository refid="spring-ext"/>
             <dependency groupId="com.sun.xml.ws" artifactId="jaxws-tools" version="EA3"/>
             <dependency groupId="com.sun.xml.bind" artifactId="jaxb-xjc" version="2.1-EA2"/>
             <dependency groupId="com.sun.xml.stream.buffer" artifactId="streambuffer" version="0.3"/>
@@ -28,11 +31,13 @@
 
         <artifact:dependencies pathId="compile.classpath">
             <remoteRepository refid="java.net"/>
+            <remoteRepository refid="spring-ext"/>
             <dependency groupId="javax.xml.ws" artifactId="jaxws-api" version="2.1-SNAPSHOT"/>
         </artifact:dependencies>
 
         <artifact:dependencies pathId="runtime.classpath">
             <remoteRepository refid="java.net"/>
+            <remoteRepository refid="spring-ext"/>
             <dependency groupId="com.sun.xml.ws" artifactId="jaxws-rt" version="EA3"/>
             <dependency groupId="com.sun.xml.bind" artifactId="jaxb-impl" version="2.1-EA2"/>
             <dependency groupId="com.sun.xml.bind" artifactId="jaxb-xjc" version="2.1-EA2"/>
diff --git a/samples/echo/client/saaj/build.xml b/samples/echo/client/saaj/build.xml
index 777cc079..4e7bac57 100644
--- a/samples/echo/client/saaj/build.xml
+++ b/samples/echo/client/saaj/build.xml
@@ -14,13 +14,18 @@
         <artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository"
                                    layout="legacy"/>
 
+        <artifact:remoteRepository id="spring-ext"
+            url="https://svn.sourceforge.net/svnroot/springframework/repos/repo-ext/"/>
+
         <artifact:dependencies pathId="compile.classpath">
             <remoteRepository refid="java.net" />
+            <remoteRepository refid="spring-ext" />
             <dependency groupId="javax.xml.soap" artifactId="saaj-api" version="1.3"/>
         </artifact:dependencies>
 
         <artifact:dependencies pathId="runtime.classpath">
             <remoteRepository refid="java.net" />
+            <remoteRepository refid="spring-ext" />
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
         </artifact:dependencies>
 
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
index f984d82f..7c335ba6 100644
--- a/samples/echo/client/spring-ws/build.xml
+++ b/samples/echo/client/spring-ws/build.xml
@@ -12,8 +12,7 @@
         </typedef>
 
         <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws." artifactId="spring-ws-core" version="1.0-m3-SNAPSHOT"/>
-            <dependency groupId="org.springframework.ws." artifactId="spring-oxm" version="1.0-m3-SNAPSHOT"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0-m4-SNAPSHOT"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
             <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.0.1"/>
         </artifact:dependencies>
diff --git a/src/assembly/docs.xml b/src/assembly/docs.xml
index 7b0b181d..aca8cad4 100644
--- a/src/assembly/docs.xml
+++ b/src/assembly/docs.xml
@@ -8,5 +8,6 @@
                 <include>changelog.txt</include>
             </includes>
         </fileSet>
+        <lineEnding>dos</lineEnding>
     </fileSets>
 </component>
\ No newline at end of file
diff --git a/src/assembly/full.xml b/src/assembly/full.xml
index 662c15b5..e41af0bc 100644
--- a/src/assembly/full.xml
+++ b/src/assembly/full.xml
@@ -20,55 +20,44 @@
             <binaries>
                 <unpack>false</unpack>
             </binaries>
+            <sources>
+                <outputDirectory>modules/${artifactId}</outputDirectory>
+            </sources>
         </moduleSet>
     </moduleSets>
     <fileSets>
+        <!-- Documentation -->
         <fileSet>
              <directory>target/site/apidocs</directory>
              <outputDirectory>docs/api</outputDirectory>
        </fileSet>
+        <fileSet>
+             <directory>doc/target/docbkx</directory>
+             <outputDirectory>docs/reference</outputDirectory>
+             <excludes>
+                 <exclude>**/*.fo</exclude>
+            </excludes>             
+       </fileSet>
+       <!-- Samples -->
        <fileSet>
             <directory>samples</directory>
             <outputDirectory>samples</outputDirectory>
             <includes>
-                <include>readme.txt</include>
+                <include>**/readme.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>
         </fileSet>
         <fileSet>
             <directory>samples</directory>
             <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>pom.xml</include>
-                <include>echo/**</include>
-                <include>airline/**</include>
-            </includes>
             <excludes>
                 <exclude>**/target/**</exclude>
                 <exclude>**/target</exclude>
                 <exclude>**/*.iml</exclude>
                 <exclude>**/META-INF/*</exclude>
                 <exclude>**/*.log</exclude>
+                <exclude>**/readme.txt</exclude>
             </excludes>
         </fileSet>
-<!--
-        <fileSet>
-            <directory>..</directory>
-            <outputDirectory>/modules</outputDirectory>
-            <includes>
-                <include>spring-xml/**/*</include>
-                <include>spring-oxm/**/*</include>
-                <include>spring-oxm-tiger/**/*</include>
-                <include>spring-ws-core/**/*</include>
-                <include>spring-ws-security/**/*</include>
-            </includes>
-            <excludes>
-                <exclude>**/docs/**</exclude>
-                <exclude>**/target/**</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/*.iml</exclude>
-            </excludes>
-        </fileSet>
--->
     </fileSets>
 </assembly>