Author: poutsma

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

@@ -13,14 +13,14 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.springframework.ws</groupId>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
-            <version>2.0.0-M1</version>
+            <version>3.0.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
-            <version>2.0.0-M1</version>
+            <version>2.0.0-M2</version>
         </dependency>
     </dependencies>
 </project>

changelog.txt

@@ -3,6 +3,27 @@ SPRING WEB SERVICES CHANGELOG
 http://www.springframework.org/spring-ws
 
 
+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
 ------------------------
 

notes.txt

@@ -1,16 +1,58 @@
 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 2 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 second milestone release in the 2.0 release cycle. The most
+important new feature in this release is the ability to use arbitrary parameter
+types in @Endpoint methods (similar to @Controller methods in Spring-MVC).  The
+big improvement to the 1.5 @Endpoint model is that you can mix and match
+parameters, and are not as limited in the return types.  This
+means, for instance, that you can have the following @Endpoint method:
 
-- Usage of Spring's OXM
-- Java 5 API (including generics, varargs, etc)
+@PayloadRoot(localPart = "myRequest", namespace = "http://example.com")
+@ResponsePayload
+public MyJaxb2Response handleMyRequest(@RequestPayload org.w3c.dom.Element myElement, 
+                                       SoapHeader requestHeader,
+                                       MessageContext messageContext) {
 
-Please see the changelog for details.
+    // do something interesting here
+}
 
-Spring Web Services 2.0 is due in the second quarter of 2010.
+Currently supported parameters/return types include:
+- DOM Elements (W3C DOM by default; JDOM, dom4j, XOM are enabled automatically
+  if present on the classpath)
+- Types supported by an OXM Marshaller (requires an explicitely configured
+  marshaller)
+- JAXB2 types, if JAXB2 is found on the classpath (this means you no longer
+  have to configure a Jaxb2Marshaller explicitly) 
+- javax.xml.transform.Source and subtypes
+
+For the above parameters/return types, you will have to use
+@RequestPayload/@ResponsePayload, as shown in the sample above.
+
+Supported parameters (not return types) include:
+- MessageContext
+- StAX readers
+- SoapHeader, SoapBody, SoapEvelope (of the request message)
+- @XPathParam parameters. Note that you can now use the @Namespace and
+  @Namespaces annotations to specify any namespaces used in your XPath
+  expressions, and no longer need to set them up in XML application contexts.
+  For instance:
+
+@Namespaces(@Namespace(prefix = "tns", uri = "http://springframework.org/spring-ws"))
+public void myEndpointMethod(@XPathParam("/tns:root")String s) {
+}
+
+These namespace annotations can be present on the method, class, or package
+level (i.e. package-info.java).
+
+In addition to the above, Spring-WS 2.0 M2 includes:
+- Support for Spring Security 3.0
+- XMPP transport
+
+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/

readme.txt

@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 2.0 M1 (March 2010)
+SPRING WEB SERVICES 2.0 M2 (May 2010)
 -------------------------------
 http://www.springframework.org/spring-ws
 http://forum.springframework.org/forumdisplay.php?f=39
@@ -36,27 +36,27 @@ 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-ws-core-2.0.0-M1.jar
+* spring-ws-core-2.0.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-support-2.0.0-M1.jar
+* spring-ws-support-2.0.0-M2.jar
 - Contents: The Spring-WS Support
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
                 [JMS, JavaMail]
 
-* spring-ws-security-2.0.0-M1.jar
+* spring-ws-security-2.0.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]
 
-* spring-xml-2.0.0-M1.jar
+* spring-xml-2.0.0-M2.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [StAX, Xalan, Jaxen]
 
-* spring-ws-2.0.0-M1.jar
+* spring-ws-2.0.0-M2.jar
 - Contents: Convenient al-in-one jar containing all of the jars described above
 
 

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-M2-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-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>2.0.0-M1</version>
+        <version>2.0.0-M2</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 M2 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-m2/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=85421}Announcement}}
 
 
 	* <<Spring-WS 1.5.9 is the current production release (JDK 1.4+)>>