diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index d4a8edcc..75a4dac6 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -15,12 +15,12 @@
org.springframework.wsspring-oxm
- 1.5.3
+ 1.5.4org.springframework.wsspring-ws-core
- 1.5.3
+ 1.5.4
diff --git a/changelog.txt b/changelog.txt
index bae298cc..f1dc24b0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,35 @@ SPRING WEB SERVICES CHANGELOG
=============================
http://www.springframework.org/spring-ws
+Changes in version 1.5.4
+-------------------------
+** Bug
+ * [SWS-386] - DefaultWsdl11Definition.setFaultSuffix : responseSuffix overwritten
+ * [SWS-389] - problem with DomContentHandler
+ * [SWS-392] - AbstractMarshallingPayloadEndpoint and XStreamMarshaller produces malformed response body
+ * [SWS-393] - Incoming message with with UTF-8 BOM is failing
+ * [SWS-395] - Spring-WS support manifest has wrong version of spring xml import
+ * [SWS-396] - @Endpoint with method having any other annotation then @PayloadRoot is not mapped
+ * [SWS-401] - unable to use maven2 to use version above 1.0.4 due to missing jar: bouncycastle:bcprov-jdk15:jar:132
+ * [SWS-406] - Constructor in example for AbstractMarshallingPayloadEndpoint is wrong
+
+** Improvement
+ * [SWS-214] - Setting Basic Authentication preemptive through CommonsHttpMessageSender
+ * [SWS-224] - XStreamMarshaller is missing the call to omit fields from serialization process
+ * [SWS-372] - Missing support for interface/implementation separated JAXB classes in Jaxb2Marshaller
+ * [SWS-390] - Document OXM tags
+ * [SWS-394] - Update FAQ to reflect new SAAJ jar in WebLogic 10
+ * [SWS-397] - Add the possibility to WebServiceTemplate to extract the service URI from a WSDL
+ * [SWS-399] - Upgrade XStream dependency to 1.3
+ * [SWS-400] - Make AbstractLoggingInterceptor more extensible
+ * [SWS-404] - Do not transform request payload Sources when not necessary
+
+** New Feature
+ * [SWS-362] - WSDL generation issue when xsds import other xsds
+ * [SWS-391] - Client-side validation interceptor
+ * [SWS-398] - Add layer of indirection for obtaining WebServiceTemplate URIs
+ * [SWS-402] - Create utility for dealing with Source and Result objects
+
Changes in version 1.5.3
-------------------------
** Bug
diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java b/core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java
index bb3f6584..9b2bd18c 100644
--- a/core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java
+++ b/core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java
@@ -48,7 +48,7 @@ import org.springframework.ws.soap.addressing.server.annotation.Address;
* }
*
*
- * If set, the {@link @Address} annotation on the endpoint class should be equal to the {@link
+ * If set, the {@link Address} annotation on the endpoint class should be equal to the {@link
* org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getTo() destination} property of the
* incominging message.
*
diff --git a/notes.txt b/notes.txt
index 45bc998d..d288b316 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,14 +1,17 @@
Dear Spring community,
-I'm pleased to announce that Spring Web Services 1.5.3 has been released!
+I'm pleased to announce that Spring Web Services 1.5.4 has been released!
-This is the third bug fix and enhancement release in the Spring-WS 1.5 series.
-It fixes all bugs reported since 1.5.2 and introduces various enhancements
-throughout the framework:
+This is the fourth bug fix and enhancement release in the Spring-WS 1.5
+series. It fixes all bugs reported since 1.5.3 and introduces various
+enhancements throughout the framework:
-* Support for receiving SOAP messages on permanent JMS queues, and various
- other JMS transport bug fixes
-* Support for Soap with Attachments using Axiom
+* Client-side XSD validation in the WebServiceTemplate, which allows you to
+ make sure you conform to a provided schema.
+* Ability to point the WebServiceTemplate to a WSDL Resource, extracting the
+ location from it.
+* Major speed inprovements in the DOM-based endpoint base classes
+ (AbstractDomPayloadEndpoint, AbstractJdomPayloadEndpoint, etc.).
and more, including more documentation. Please see the changelog for details.
diff --git a/parent/pom.xml b/parent/pom.xml
index e8a44a50..1eab8b64 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -124,6 +124,13 @@
true
+
+
+
+ javadoc
+
+
+
diff --git a/pom.xml b/pom.xml
index 91c09b9e..c2b9a18c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -697,6 +697,13 @@
http://ws.apache.org/commons/XmlSchema/apidocs/
+
+
+
+ javadoc
+
+
+ maven-project-info-reports-plugin
diff --git a/readme.txt b/readme.txt
index 0174eb04..88e86ba3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 1.5.2 (May 2008)
+SPRING WEB SERVICES 1.5.4 (August 2008)
-------------------------------
http://www.springframework.org/spring-ws
http://forum.springframework.org/forumdisplay.php?f=39
@@ -39,40 +39,40 @@ 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.2.jar
+* spring-oxm-1.5.4.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.2.jar
+* spring-oxm-tiger-1.5.4.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.2.jar
+* spring-ws-core-1.5.4.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.2.jar
+* spring-ws-core-tiger-1.5.4.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.2.jar
+* spring-ws-support-1.5.4.jar
- Contents: The Spring-WS Support
- Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
[JMS, JavaMail]
-* spring-ws-security-1.5.2.jar
+* spring-ws-security-1.5.4.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.2.jar
+* spring-xml-1.5.4.jar
- Contents: Spring XML utility framework
- Dependencies: Commons Logging, spring-beans, spring-core
[StAX, Xalan, Jaxen]
-* spring-ws-1.5.2.jar
+* spring-ws-1.5.4.jar
- Contents: Convenient al-in-one jar containing all of the jars described above
diff --git a/samples/airline/client/jms/build.xml b/samples/airline/client/jms/build.xml
index c1724c34..7ece847b 100644
--- a/samples/airline/client/jms/build.xml
+++ b/samples/airline/client/jms/build.xml
@@ -23,7 +23,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml
index 64d6d668..a61bab68 100644
--- a/samples/airline/client/spring-ws/build.xml
+++ b/samples/airline/client/spring-ws/build.xml
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
index f662a30c..40f00417 100644
--- a/samples/echo/client/spring-ws/build.xml
+++ b/samples/echo/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/samples/pox/client/spring-ws/build.xml b/samples/pox/client/spring-ws/build.xml
index 969243c8..42659c50 100644
--- a/samples/pox/client/spring-ws/build.xml
+++ b/samples/pox/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/samples/stockquote/client/spring-ws/build.xml b/samples/stockquote/client/spring-ws/build.xml
index 783746a0..9a95204f 100644
--- a/samples/stockquote/client/spring-ws/build.xml
+++ b/samples/stockquote/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 79715205..5bbf3910 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -3,7 +3,7 @@
spring-ws-parentorg.springframework.ws
- 1.5.3
+ 1.5.44.0.0spring-ws-sandbox
diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml
index be913bea..1aca5525 100644
--- a/src/docbkx/tutorial.xml
+++ b/src/docbkx/tutorial.xml
@@ -474,7 +474,7 @@
mvn archetype:create -DarchetypeGroupId=org.springframework.ws \
-DarchetypeArtifactId=spring-ws-archetype \
- -DarchetypeVersion=1.5.3 \
+ -DarchetypeVersion=1.5.4 \
-DgroupId=com.mycompany.hr \
-DartifactId=holidayService
@@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint {
org.springframework.wsspring-ws-core
- 1.5.3
+ 1.5.4jdom
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index b2c8e3f9..72ba0c9b 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -6,15 +6,15 @@ Downloads
* Get the latest Spring Web Services releases here
- * <>
+ * <>
- * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=611368}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.3/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=56915}Announcement}}
+ * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=617117}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.4/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=58204}Announcement}}
* <>
* {{{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}}
- * <>
+ * <>
* {{{snapshots.html}Download nightly snapshots}}
diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt
index 9c47c1e9..d13d494e 100644
--- a/src/site/apt/downloads/snapshots.apt
+++ b/src/site/apt/downloads/snapshots.apt
@@ -23,7 +23,7 @@ Snapshot Builds
org.springframework.wsspring-ws-core
- 1.5.4-SNAPSHOT
+ 1.5.5-SNAPSHOT
+---------------