Changes for 2.0.0-M3

Author: poutsma

archetype/src/main/resources/archetype-resources/pom.xml

@@ -15,12 +15,12 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-oxm</artifactId>
-            <version>2.0.0-M1</version>
+            <version>2.0.0-M3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
-            <version>2.0.0-M1</version>
+            <version>2.0.0-M3</version>
         </dependency>
     </dependencies>
 </project>

changelog.txt

@@ -3,8 +3,42 @@ SPRING WEB SERVICES CHANGELOG
 http://www.springframework.org/spring-ws
 
 
+Changes in version 2.0 Milestone 3
+----------------------------------
+
+** Sub-task
+    * [SWS-631] - Create Client-Side testing framework
+
+** Improvement
+    * [SWS-610] - Incompatibility with WS-I requirement R2750
+
+** Task
+    * [SWS-620] - Add the Spring-OXM jar to the "with dependencies" distribution
+    * [SWS-624] - Documentation- explain that WSDL generation should better not be used in production
+
+Changes in version 2.0 Milestone 2
+----------------------------------
+
+** Bug
+    * [SWS-613] - Jaxp13XPathTemplate uses thread-unsafe XPathFactory as field
+
+** Improvement
+    * [SWS-538] - Add support for XWSS 3.1
+
+** New Feature
+    * [SWS-193] - XwsSecurityInterceptor  : funtionality for skipping the validate of a SOAP message when there are no WSSE headers in SOAP envelope.
+    * [SWS-349] - Support @PayloadRoot annotation on methods with DOM, JDOM, DOM4J and XOM type method signatures
+    * [SWS-351] - Arbitrary parameter injection for @Endpoints
+    * [SWS-428] - XMPP support
+    * [SWS-540] - Adding XML declaration to a response
+
+** Task
+    * [SWS-559] - Upgrade Spring Security to 3.0.2
+    * [SWS-603] - Drop OXM chapter from ref docs
+    * [SWS-604] - Upgrade XSD schemas
+
 Changes in version 2.0 Milestone 1
-------------------------
+----------------------------------
 
 ** Bug
     * [SWS-501] - Maven dependency for oxm 1.5.5.A non-existent version of Spring

notes.txt

@@ -1,16 +1,64 @@
 Dear Spring community,
 
-I'm pleased to announce that Spring Web Services 2.0 Milestone 1 has been
+I'm pleased to announce that Spring Web Services 2.0 Milestone 3 has been
 released!
 
-This is the first milestone release in the 2.0 release cycle. It does not
-introduce any new features (yet), but does add the following:
+This is the third milestone release in the 2.0 release cycle. The most
+important new feature in this release is inclusion of a client-side 
+Web service testing framework. This testing framework is very similar to 
+EasyMock 2, offering a 'fluent' API for all you testing needs! 
+For example:
 
-- Usage of Spring's OXM
-- Java 5 API (including generics, varargs, etc)
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.xml.transform.StringSource;
+import static org.springframework.ws.mock.client.WebServiceMock.*;
 
-Please see the changelog for details.
 
-Spring Web Services 2.0 is due in the second quarter of 2010.
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("applicationContext.xml")
+public class IntegrationTest {
+
+  // AirlineClient extends WebServiceGatewaySupport, and is configured in applicationContext.xml
+  @Autowired
+  private MyWebServiceClient client;
+
+  @Before
+  public void setUpMocks() throws Exception {
+    mockWebServiceTemplate(client.getWebServiceTemplate());
+  }
+
+  @Test
+  public void getCustomerCount() throws Exception {
+    Source requestPayload =
+      new StringSource("<customerCountRequest xmlns='http://springframework.org/spring-ws/test' />";
+    Source responsePayload = new StringSource("<customerCountResponse xmlns='http://springframework.org/spring-wstest'>" +
+      "<customerCount>10</customerCount>" +
+      "</customerCountResponse>");
+
+    expect(payload(requestPayload)).andRespond(withPayload(responsePayload));
+
+    // client.getCustomerCount() uses the WebServiceTemplate
+    int customerCount = client.getCustomerCount();
+    assertEquals(10, response.getCustomerCount());
+
+    verifyConnections();
+  }
+}
+
+The WebServiceMock API has a lot more features than I can describe here, 
+I suggest you try out the new testing module today! Please leave feedback
+through JIRA or on the forums.
+
+Many thanks to Lukáš Křečan for helping out with this testing framework. It 
+would not have been possible without him.
+
+Please see the changelog for more details.
+
+Spring Web Services 2.0 is due in the third quarter of 2010.
 
 For more information, see http://static.springframework.org/spring-ws/site/

parent/pom.xml

@@ -9,8 +9,9 @@
     <distributionManagement>
         <downloadUrl>http://static.springframework.org/spring-ws/site/downloads/releases.html</downloadUrl>
         <repository>
-            <id>local</id>
-            <url>file:///Users/arjen/Projects/Spring/repos/repo</url>
+            <id>spring-milestone</id>
+            <name>Spring Milestone Repository</name>
+            <url>s3://maven.springframework.org/milestone</url>
         </repository>
         <snapshotRepository>
             <id>spring-snapshot</id>

sandbox/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
-        <version>2.0.0-M1-SNAPSHOT</version>
+        <version>2.0.0-M3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-ws-sandbox</artifactId>

src/docbkx/tutorial.xml

@@ -474,7 +474,7 @@
         </para>
 <screen>mvn archetype:create -DarchetypeGroupId=org.springframework.ws \
   -DarchetypeArtifactId=spring-ws-archetype \
-  -DarchetypeVersion=2.0.0-M1 \
+  -DarchetypeVersion=2.0.0-M3 \
   -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>2.0.0-M1</version>
+        <version>2.0.0-M3</version>
     </dependency>
     <dependency>
         <groupId>jdom</groupId>

src/site/apt/downloads/releases.apt

@@ -6,9 +6,9 @@ Downloads
 
 * Get the latest Spring Web Services releases here
 
-	* <<Spring-WS 2.0.0 M1 is the current development release (JDK 1.5+)>>
+	* <<Spring-WS 2.0.0 M3 is the current development release (JDK 1.5+)>>
 
-	* {{{http://www.springsource.com/download/community?project=Spring%20Web%20Services}Download}} | {{{http://static.springframework.org/spring-ws/docs/2.0.0-m1/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=85421}Announcement}}
+	* {{{http://www.springsource.com/download/community?project=Spring%20Web%20Services}Download}} | {{{http://static.springframework.org/spring-ws/docs/2.0.0-m3/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=311787}Announcement}}
 
 
 	* <<Spring-WS 1.5.9 is the current production release (JDK 1.4+)>>

src/site/apt/downloads/snapshots.apt

@@ -23,7 +23,7 @@ Snapshot Builds
 <dependency>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws-core</artifactId>
-    <version>2.0.0-M2-SNAPSHOT</version>
+    <version>2.0.0-M3-SNAPSHOT</version>
 </dependency>
 +---------------