Released SWS 2.0 M1

changelog.txt

@@ -3,6 +3,21 @@ SPRING WEB SERVICES CHANGELOG
 http://www.springframework.org/spring-ws
 
 
+Changes in version 2.0 Milestone 1
+------------------------
+
+** Bug
+    * [SWS-501] - Maven dependency for oxm 1.5.5.A non-existent version of Spring
+
+** Refactoring
+    * [SWS-567] - Refactor to use OXM from Spring 3
+
+** Task
+    * [SWS-451] - Update spring-ws Maven POM to use correct Spring artifactId values
+    * [SWS-597] - Merge core and core-tiger modules
+    * [SWS-598] - Drop OXM modules in favor of Spring 3.0
+    * [SWS-599] - Change API to use Java 5+
+
 Changes in version 1.5.9
 ------------------------
 

core/template.mf

@@ -1,6 +1,7 @@
 Bundle-SymbolicName: org.springframework.ws
 Bundle-Name: Spring Web Services Core
 Bundle-Vendor: SpringSource
+Bundle-Version: ${osgi.version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  javax.activation.*;version="[1.1.0, 2.0.0)",
@@ -18,16 +19,16 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.dom4j.*;version="[1.6.1, 2.0.0)";resolution:=optional,
  org.jdom.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[3.0.1, 4.0.0)",
- org.springframework.beans.*;version="[3.0.1, 4.0.0)",
- org.springframework.context.*;version="[3.0.1, 4.0.0)",
- org.springframework.core.*;version="[3.0.1, 4.0.0)",
- org.springframework.oxm.*;version="[3.0.1, 4.0.0)",
- org.springframework.util.*;version="[3.0.1, 4.0.0)",
- org.springframework.stereotype.*;version="[3.0.1, 4.0.0)",
- org.springframework.validation.*;version="[3.0.1, 4.0.0)",
- org.springframework.web.*;version="[3.0.1, 4.0.0)",
- org.springframework.xml.*;version="[${version}, ${version}]",
+ org.springframework.aop.*;version=${spring.framework.osgi.range},
+ org.springframework.beans.*;version=${spring.framework.osgi.range},
+ org.springframework.context.*;version=${spring.framework.osgi.range},
+ org.springframework.core.*;version=${spring.framework.osgi.range},
+ org.springframework.oxm.*;version=${spring.framework.osgi.range},
+ org.springframework.util.*;version=${spring.framework.osgi.range},
+ org.springframework.stereotype.*;version=${spring.framework.osgi.range},
+ org.springframework.validation.*;version=${spring.framework.osgi.range},
+ org.springframework.web.*;version=${spring.framework.osgi.range},
+ org.springframework.xml.*;version=${osgi.range},
  org.w3c.dom.*;version="0",
  org.xml.sax.*;version="0"
 Ignored-Existing-Headers: 

notes.txt

@@ -1,9 +1,16 @@
 Dear Spring community,
 
-I'm pleased to announce that Spring Web Services 1.5.9 has been released!
+I'm pleased to announce that Spring Web Services 2.0 Milestone 1 has been
+released!
 
-This is the latest bug fix and enhancement release in the Spring-WS 1.5
-series. It fixes all bugs reported since 1.5.8 and introduces various
-enhancements throughout the framework. Please see the changelog for details.
+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:
+
+- Usage of Spring's OXM
+- Java 5 API (including generics, varargs, etc)
+
+Please see the changelog for details.
+
+Spring Web Services 2.0 is due in the second quarter of 2010.
 
 For more information, see http://static.springframework.org/spring-ws/site/

parent/pom.xml

@@ -28,7 +28,10 @@
         <url>https://fisheye.springframework.org/browse/spring-ws/tags/spring-ws-2.0.0-M1</url>
     </scm>
     <properties>
+        <osgi.version>2.0.0.M1</osgi.version>
+        <osgi.range>"${osgi.version:[=.=.=, =.=.+1)}"</osgi.range>
         <spring.framework.version>3.0.1.RELEASE</spring.framework.version>
+        <spring.framework.osgi.range>"[3.0.1, 4.0.0)"</spring.framework.osgi.range>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <pluginRepositories>

pom.xml

@@ -79,7 +79,7 @@
         </snapshotRepository>
         <site>
             <id>static.springframework.org</id>
-            <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/sites/1.5</url>
+            <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/sites/2.0</url>
         </site>
     </distributionManagement>
     <scm>
@@ -566,7 +566,7 @@
             <plugin>
                 <groupId>com.agilejava.docbkx</groupId>
                 <artifactId>docbkx-maven-plugin</artifactId>
-                <version>2.0.9</version>
+                <version>2.0.6</version>
                 <executions>
                     <execution>
                         <goals>

readme.txt

@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 1.5.9 (Januari 2010)
+SPRING WEB SERVICES 2.0 M1 (March 2010)
 -------------------------------
 http://www.springframework.org/spring-ws
 http://forum.springframework.org/forumdisplay.php?f=39
@@ -9,12 +9,9 @@ Spring Web Services (Spring-WS) is a product of the Spring community focused on
 Spring-WS aims to facilitate contract-first SOAP service development, allowing for the creation of flexible web services
 using one of the many ways to manipulate XML payloads.
 
-Spring-WS consists of two major modules: a flexible Object/XML Mapping abstraction with support for JAXB 1 and 2,
-XMLBeans, Castor, JiBX and XStream; and a Web service framework that resembles Spring MVC.
-
 2. RELEASE INFO
 
-Spring-WS requires J2SE 1.4 or higher and J2EE 1.4 or higher.  J2SE 1.6 is required for building.
+Spring-WS requires J2SE 1.5 or higher and J2EE 1.4 or higher.  J2SE 1.6 is required for building.
 
 Release contents:
 
@@ -39,40 +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-oxm-1.5.9.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.9.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.9.jar
+* spring-ws-core-2.0.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, WSDL4J]
 
-* spring-ws-core-tiger-1.5.9.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.9.jar
+* spring-ws-support-2.0.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.9.jar
+* spring-ws-security-2.0.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, WSS4J]
 
-* spring-xml-1.5.9.jar
+* spring-xml-2.0.0-M1.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                 [StAX, Xalan, Jaxen]
 
-* spring-ws-1.5.9.jar
+* spring-ws-2.0.0-M1.jar
 - Contents: Convenient al-in-one jar containing all of the jars described above
 
 

security/template.mf

@@ -1,6 +1,7 @@
 Bundle-SymbolicName: org.springframework.ws.soap.security
 Bundle-Name: Spring Web Services SOAP Security
 Bundle-Vendor: SpringSource
+Bundle-Version: ${osgi.version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  com.sun.xml.wss.*;version="0",
@@ -12,12 +13,12 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.ws.security.*;version="[1.5.8, 2.0.0)";resolution:=optional,
  org.apache.xml.security.*;version="[1.0.5.D2, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.1, 4.0.0)",
- org.springframework.core.*;version="[3.0.1, 4.0.0)",
- org.springframework.dao.*;version="[3.0.1, 4.0.0)",
- org.springframework.security.*;version="[3.0.0.A, 4.0.0)",
- org.springframework.util.*;version="[3.0.1, 4.0.0)",
- org.springframework.ws.*;version="[${version}, ${version}]",
+ org.springframework.beans.*;version=${spring.framework.osgi.range},
+ org.springframework.core.*;version=${spring.framework.osgi.range},
+ org.springframework.dao.*;version=${spring.framework.osgi.range},
+ org.springframework.security.*;version="[2.0.0, 3.0.0)",
+ org.springframework.util.*;version=${spring.framework.osgi.range},
+ org.springframework.ws.*;version=${osgi.range},
  org.w3c.dom.*;version="0"
 Ignored-Existing-Headers:
  Bnd-LastModified,

src/main/resources/META-INF/spring.handlers

@@ -1,2 +1 @@
-http\://www.springframework.org/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler
 http\://www.springframework.org/schema/web-services=org.springframework.ws.config.WebServicesNamespaceHandler

src/main/resources/META-INF/spring.schemas

@@ -1,2 +1 @@
-http\://www.springframework.org/schema/oxm/spring-oxm-1.5.xsd=/org/springframework/oxm/config/spring-oxm-1.5.xsd
 http\://www.springframework.org/schema/web-services/web-services-1.5.xsd=/org/springframework/ws/config/web-services-1.5.xsd

src/site/apt/downloads/releases.apt

@@ -6,14 +6,16 @@ Downloads
 
 * Get the latest Spring Web Services releases here
 
+	* <<Spring-WS 2.0.0 M1 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}}
+
+
 	* <<Spring-WS 1.5.9 is the current production release (JDK 1.4+)>>
 
 		* {{{http://www.springsource.com/download/community?project=Spring%20Web%20Services}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.9/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=83900}Announcement}}
 
-	* <<Spring-WS 1.0.4 is the previous production release (JDK 1.3)>>
-
-		* {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=590453}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.0.4/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=52246}Announcement}}
 
-	* <<Spring-WS 1.5.10 is the upcoming production release>>
+	* <<Spring-WS 2.0.0 M2 is the upcoming production release>>
 
 		* {{{snapshots.html}Download nightly snapshots}}

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.10-SNAPSHOT</version>
+    <version>2.0.0-M2-SNAPSHOT</version>
 </dependency>
 +---------------
 
 	Additionally, there are
-    {{{http://static.springframework.org/spring-ws/downloads/1.5-snapshot-download.php}zips}}
+    {{{http://static.springframework.org/spring-ws/downloads/2.0-snapshot-download.php}zips}}
     available which contain all jars.

support/template.mf

@@ -1,8 +1,9 @@
 Bundle-SymbolicName: org.springframework.ws.support
 Bundle-Name: Spring Web Services Support
 Bundle-Vendor: SpringSource
+Bundle-Version: ${osgi.version}
 Bundle-ManifestVersion: 2
-Fragment-Host: org.springframework.ws;bundle-version="[${version}, ${version}]"
+Fragment-Host: org.springframework.ws;bundle-version=${osgi.range}
 Import-Template: 
  com.sun.net.httpserver.*;version="0";resolution:=optional,
  com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
@@ -14,18 +15,16 @@ Import-Template:
  javax.net.ssl.*;version="0",
  javax.xml.transform.*;version="0",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[3.0.1, 4.0.0)",
- org.springframework.context.*;version="[3.0.1, 4.0.0)",
- org.springframework.core.*;version="[3.0.1, 4.0.0)",
- org.springframework.ejb.*;version="[3.0.1, 4.0.0)",
- org.springframework.jms.*;version="[3.0.1, 4.0.0)",
- org.springframework.jndi.*;version="[3.0.1, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.1, 4.0.0)",
- org.springframework.util.*;version="[3.0.1, 4.0.0)",
- org.springframework.ws.*;version="[${version}, ${version}]",
- org.springframework.xml.*;version="[${version}, ${version}]"
-Excluded-Imports:
- org.springframework.ws.transport.*
+ org.springframework.beans.*;version=${spring.framework.osgi.range},
+ org.springframework.context.*;version=${spring.framework.osgi.range},
+ org.springframework.core.*;version=${spring.framework.osgi.range},
+ org.springframework.ejb.*;version=${spring.framework.osgi.range},
+ org.springframework.jms.*;version=${spring.framework.osgi.range},
+ org.springframework.jndi.*;version=${spring.framework.osgi.range},
+ org.springframework.scheduling.*;version=${spring.framework.osgi.range},
+ org.springframework.util.*;version=${spring.framework.osgi.range},
+ org.springframework.ws.*;version=${osgi.range},
+ org.springframework.xml.*;version=${osgi.range}
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,

xml/template.mf

@@ -2,6 +2,7 @@ Manifest-Version: 1.0
 Bundle-SymbolicName: org.springframework.ws.xml
 Bundle-Name: Spring XML
 Bundle-Vendor: SpringSource
+Bundle-Version: ${osgi.version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  javax.xml.namespace.*;version="0",
@@ -14,10 +15,10 @@ Import-Template:
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.apache.ws.commons.schema.*;version="[1.3.2, 2.0.0)";resolution:=optional,
  org.jaxen.*;version="[1.1.1, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.1, 4.0.0)",
- org.springframework.core.*;version="[3.0.1, 4.0.0)",
- org.springframework.context.*;version="[3.0.1, 4.0.0)",
- org.springframework.util.*;version="[3.0.1, 4.0.0)",
+ org.springframework.beans.*;version=${spring.framework.osgi.range},
+ org.springframework.core.*;version=${spring.framework.osgi.range},
+ org.springframework.context.*;version=${spring.framework.osgi.range},
+ org.springframework.util.*;version=${spring.framework.osgi.range},
  org.w3c.dom.*;version="0",
  org.xml.sax.*;version="0"
 Ignored-Existing-Headers: