Backported changes from 1.5.0 M1 release into trunk

poutsma · poutsma · commit 3a83b1275fd5 · 2007-12-08T04:21:30.000Z
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-oxm</artifactId>
-            <version>1.0.2</version>
+            <version>1.5.0-m1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
-            <version>1.0.2</version>
+            <version>1.5.0-m1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -9,7 +9,7 @@
     <distributionManagement>
         <downloadUrl>http://static.springframework.org/spring-ws/site/downloads/releases.html</downloadUrl>
         <repository>
-            <id>spring-snapshot</id>
+            <id>spring-milestone</id>
             <name>Spring Milestone Repository</name>
             <url>s3://maven.springframework.org/milestone</url>
         </repository>
@@ -20,7 +20,7 @@
         </snapshotRepository>
         <site>
             <id>static.springframework.org</id>
-            <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/site</url>
+            <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/sites/1.5</url>
         </site>
     </distributionManagement>
     <scm>
diff --git a/pom.xml b/pom.xml
@@ -63,7 +63,7 @@
     <distributionManagement>
         <downloadUrl>http://static.springframework.org/spring-ws/site/downloads/releases.html</downloadUrl>
         <repository>
-            <id>spring-snapshot</id>
+            <id>spring-milestone</id>
             <name>Spring Milestone Repository</name>
             <url>s3://maven.springframework.org/milestone</url>
         </repository>
diff --git a/readme.txt b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 1.0.2 (November 2007)
+SPRING WEB SERVICES 1.5.0 Milestone 1 (December 2007)
 -------------------------------
 http://www.springframework.org/spring-ws
 http://forum.springframework.org/forumdisplay.php?f=39
@@ -37,30 +37,35 @@ The following distinct jar files are included in the distribution. This list spe
 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.2.jar
+* spring-oxm-1.5.0-m1.jar
 - Contents: The Spring Object/XML Mapping framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [Log4J, JAXB 1, Castor, XMLBeans, StAX, JiBX, XStream]
 
-* spring-oxm-tiger-1.0.2.jar
+* spring-oxm-tiger-1.5.0-m1.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.2.jar
+* spring-ws-core-1.5.0-m1.jar
 - Contents: The Spring-WS Core
 - 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-core-tiger-1.0.2.jar
+* spring-ws-core-tiger-1.5.0-m1.jar
 - Contents: The Spring-WS Core for Java 5
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
 
-* spring-ws-security-1.0.2.jar
+* spring-ws-support-1.5.0-m1.jar
+- Contents: The Spring-WS Support
+- Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
+                [JMS, JavaMail]
+
+* spring-ws-security-1.5.0-m1.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.2.jar
+* spring-xml-1.5.0-m1.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [StAX, Xalan, Jaxen]
diff --git a/samples/airline/client/jms/build.xml b/samples/airline/client/jms/build.xml
@@ -24,15 +24,15 @@
             <remoteRepository refid="spring-ext"/>
             <dependency groupId="javax.xml.soap" artifactId="saaj-api" version="1.3"/>
             <dependency groupId="org.apache.activemq" artifactId="activemq-core" version="4.1.1"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5-m1-SNAPSHOT"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.0-m1"/>
         </artifact:dependencies>
 
         <artifact:dependencies pathId="runtime.classpath">
             <remoteRepository refid="main"/>
             <remoteRepository refid="java.net"/>
             <remoteRepository refid="spring-ext"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-support" version="1.5-m1-SNAPSHOT"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-support" version="1.5.0-m1"/>
             <dependency groupId="org.springframework" artifactId="spring-jms" version="2.0.7"/>
         </artifact:dependencies>
 
diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml
@@ -20,7 +20,7 @@
         <artifact:dependencies pathId="classpath">
             <remoteRepository refid="main"/>
             <remoteRepository refid="java.net"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0.2"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.0-m1"/>
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
             <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.0.1"/>
             <dependency groupId="commons-httpclient" artifactId="commons-httpclient" version="3.0.1"/>
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
@@ -12,7 +12,7 @@
         </typedef>
 
         <artifact:dependencies pathId="classpath">
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.0.2"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.0-m1"/>
             <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/samples/pom.xml b/samples/pom.xml
@@ -15,6 +15,13 @@
         <module>mtom</module>
         <module>airline</module>
     </modules>
+    <repositories>
+        <repository>
+            <id>spring-milestone</id>
+            <name>Spring Milestone Repository</name>
+            <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+        </repository>        
+    </repositories>
     <build>
         <plugins>
             <plugin>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>1.5-m1-SNAPSHOT</version>
+        <version>1.5.0-m2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-sandbox</artifactId>
diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
@@ -42,6 +42,14 @@
                     </dependencySet>
                 </dependencySets>
             </binaries>
+            <sources>
+                <fileSets>
+                    <fileSet>
+                        <directory>src/main/java</directory>
+                    </fileSet>
+                </fileSets>
+                <outputDirectoryMapping>dist/module-sources/${artifactId}</outputDirectoryMapping>
+            </sources>
         </moduleSet>
     </moduleSets>
     <files>
@@ -60,31 +68,6 @@
             <directory>target/site/reference</directory>
             <outputDirectory>docs/reference</outputDirectory>
         </fileSet>
-        <!-- Modules sources-->
-        <fileSet>
-            <outputDirectory>dist/module-sources</outputDirectory>
-            <includes>
-                <include>xml/**/*</include>
-                <include>oxm/**/*</include>
-                <include>oxm-tiger/**/*</include>
-                <include>core/**/*</include>
-                <include>core-tiger/**/*</include>
-                <include>support/**/*</include>
-                <include>security/**/*</include>
-                <include>archetype/**/*</include>
-                <include>pom.xml</include>
-            </includes>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/*.iml</exclude>
-                <exclude>**/*.ipr</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings</exclude>
-                <exclude>**/.settings/**</exclude>
-            </excludes>
-        </fileSet>
         <!-- Samples -->
         <fileSet>
             <directory>samples</directory>
diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml
@@ -474,7 +474,7 @@
         </para>
 <screen>mvn archetype:create -DarchetypeGroupId=org.springframework.ws \
   -DarchetypeArtifactId=spring-ws-archetype \
-  -DarchetypeVersion=1.0.2 \
+  -DarchetypeVersion=1.5.0-m1 \
   -DgroupId=com.mycompany.hr \
   -DartifactId=holidayService
 </screen>
@@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint {
     <dependency>
         <groupId>org.springframework.ws</groupId>
         <artifactId>spring-ws-core</artifactId>
-        <version>1.0.2</version>
+        <version>1.5.0-m1</version>
     </dependency>
     <dependency>
         <groupId>jdom</groupId>
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
@@ -10,7 +10,10 @@ Downloads
 
 		* {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=552258}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.0.2/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=45879}Announcement}}
 		
+	* <<Spring-WS 1.5.0 Milestone 1 is the current development preview>>
+
+		* {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=560091}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.0-m1/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=47217}Announcement}}
 	
-	* <<Spring-WS 1.5-M1 is the upcoming development release>>
+	* <<Spring-WS 1.5.0 Milestone 2 is the upcoming development release>>
 
 		* {{{snapshots.html}Download nightly snapshots}}
diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt
@@ -23,10 +23,10 @@ Snapshot Builds
 <dependency>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws-core</artifactId>
-    <version>1.5-m1-SNAPSHOT</version>
+    <version>1.5.0-m2-SNAPSHOT</version>
 </dependency>
 +---------------
 
 	Additionally, there are
-    {{{http://s3browse.com/explore/maven.springframework.org/snapshot/org/springframework/ws/spring-ws/1.5-m1-SNAPSHOT/}zips}}
-    available which contain all jars. Make sure to click 'Next >' a couple of times to get the most recent snapshots. 
+    {{{http://static.springframework.org/spring-ws/downloads/1.5-snapshot-download.php}zips}}
+    available which contain all jars.
