Backported changes from 1.5 M2 into trunk (10189:10199)

2008-02-11 00:00:27 +00:00
parent 73b3664064
commit a1105c8981
11 changed files with 55 additions and 26 deletions
--- 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.5.0-m1</version>
+            <version>1.5.0-m2</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.ws</groupId>
            <artifactId>spring-ws-core</artifactId>
-            <version>1.5.0-m1</version>
+            <version>1.5.0-m2</version>
        </dependency>
    </dependencies>
 </project>
--- a/pom.xml
+++ b/pom.xml
@@ -649,4 +649,33 @@
            </plugin>
        </plugins>
    </reporting>
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+            <version>3.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <scope>test</scope>
+            <version>1.1</version>
+        </dependency>
+    </dependencies>
 </project>
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 1.5.0 Milestone 1 (December 2007)
+SPRING WEB SERVICES 1.5.0 Milestone 2 (February 2007)
 -------------------------------
 http://www.springframework.org/spring-ws
 http://forum.springframework.org/forumdisplay.php?f=39
@@ -37,35 +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.5.0-m1.jar
+* spring-oxm-1.5.0-m2.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.5.0-m1.jar
+* spring-oxm-tiger-1.5.0-m2.jar
 - Contents: The Spring Object/XML Mapping framework for Java 5
 - Dependencies: Commons Logging, spring-beans, spring-core, JAXB 2

-* spring-ws-core-1.5.0-m1.jar
+* spring-ws-core-1.5.0-m2.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, WSDL4J]

-* spring-ws-core-tiger-1.5.0-m1.jar
+* spring-ws-core-tiger-1.5.0-m2.jar
 - Contents: The Spring-WS Core for Java 5
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core

-* spring-ws-support-1.5.0-m1.jar
+* spring-ws-support-1.5.0-m2.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
+* spring-ws-security-1.5.0-m2.jar
 - Contents: Spring-WS Security integration
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-ws-core
-                [Log4J, xmlsdig, xmlsec, XWS-security, Acegi, WSS4j]
+                [Log4J, xmlsdig, xmlsec, XWS-security, Acegi, WSS4J]

-* spring-xml-1.5.0-m1.jar
+* spring-xml-1.5.0-m2.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                [StAX, Xalan, Jaxen]
--- a/samples/airline/client/jms/build.xml
+++ b/samples/airline/client/jms/build.xml
@@ -24,7 +24,7 @@
            <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.0-m1"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.0-m2"/>
        </artifact:dependencies>

        <artifact:dependencies pathId="runtime.classpath">
@@ -32,8 +32,8 @@
            <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.0-m1"/>
-            <dependency groupId="org.springframework" artifactId="spring-jms" version="2.0.7"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-support" version="1.5.0-m2"/>
+            <dependency groupId="org.springframework" artifactId="spring-jms" version="2.5.1"/>
        </artifact:dependencies>

    </target>
--- a/samples/airline/client/spring-ws/build.xml
+++ b/samples/airline/client/spring-ws/build.xml
@@ -20,8 +20,8 @@
        <artifact:dependencies pathId="classpath">
            <remoteRepository refid="main"/>
            <remoteRepository refid="java.net"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.0-m2-SNAPSHOT"/>
-            <dependency groupId="org.springframework.ws" artifactId="spring-ws-security" version="1.5.0-m2-SNAPSHOT"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.0-m2"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-security" version="1.5.0-m2"/>
            <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="xmlbeans" artifactId="xbean" version="2.2.0"/>
--- 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.5.0-m1"/>
+            <dependency groupId="org.springframework.ws" artifactId="spring-ws-core" version="1.5.0-m2"/>
            <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>
--- a/security/src/test/resources/private.jks
+++ b/security/src/test/resources/private.jks
--- a/src/assembly/with-dependencies.xml
+++ b/src/assembly/with-dependencies.xml
@@ -78,7 +78,7 @@
                <include>**/Makefile</include>
                <include>mtom/**/spring-ws-logo.png</include>
                <include>maven-ant-tasks-*.jar</include>
-                <include>ant-dotnet-*.jar</include>
+                <include>**/ant-dotnet-*.jar</include>
                <includes>**/*.exe</includes>
            </includes>
            <excludes>
--- 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.5.0-m1 \
+  -DarchetypeVersion=1.5.0-m2 \
  -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.5.0-m1</version>
+        <version>1.5.0-m2</version>
    </dependency>
    <dependency>
        <groupId>jdom</groupId>
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -6,14 +6,14 @@ Downloads

 * Get the latest Spring Web Services releases here

-	* <<Spring-WS 1.0.2 is the current production release>>
+	* <<Spring-WS 1.0.3 is the current production release>>

-		* {{{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}}
+	* {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=563313}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.0.3/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=47787}Announcement}}
 		
-	* <<Spring-WS 1.5.0 Milestone 1 is the current development preview>>
+	* <<Spring-WS 1.5.0 Milestone 2 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}}
+		* {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=575397}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.0-m2/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=49690}Announcement}}
 	
-	* <<Spring-WS 1.5.0 Milestone 2 is the upcoming development release>>
+	* <<Spring-WS 1.5.0 Release Candidate 1 is the upcoming development release>>

 		* {{{snapshots.html}Download nightly snapshots}}
--- a/src/site/apt/downloads/snapshots.apt
+++ b/src/site/apt/downloads/snapshots.apt
@@ -23,7 +23,7 @@ Snapshot Builds
 <dependency>
    <groupId>org.springframework.ws</groupId>
    <artifactId>spring-ws-core</artifactId>
-    <version>1.5.0-m2-SNAPSHOT</version>
+    <version>1.5.0-rc1-SNAPSHOT</version>
 </dependency>
 +---------------