diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 7ef3d876..1841c1d9 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.ws
spring-oxm
- 1.5.1
+ 1.5.2
org.springframework.ws
spring-ws-core
- 1.5.1
+ 1.5.2
diff --git a/changelog.txt b/changelog.txt
new file mode 100644
index 00000000..9ae1401c
--- /dev/null
+++ b/changelog.txt
@@ -0,0 +1,194 @@
+SPRING WEB SERVICES CHANGELOG
+=============================
+http://www.springframework.org/spring-ws
+
+Changes in version 1.5.2
+-------------------------
+** Bug
+ * [SWS-345] - WSS4J interceptor creates creates invalid digest for SAAJ messages
+ * [SWS-353] - Schema inlining results in duplicate inlining of files referenced from multiple files
+ * [SWS-355] - mistakes in the Spring webservices online tutorial
+
+** Improvement
+ * [SWS-302] - Need to prevent parsing server-side responses and client-side requests into axiom trees if using axiom and payload caching is off
+ * [SWS-329] - SaajContentHandler shouldn't repeat namespace declarations
+ * [SWS-344] - Add @Endpoints support to AbstractEndpointExceptionResolver
+
+
+** Task
+ * [SWS-354] - Document AbstractValidatingMarshallingPayloadEndpoint and AbstractFaultCreatingValidatingMarshallingPayloadEndpoint
+
+Changes in version 1.5.1
+-------------------------
+** Bug
+ * [SWS-300] - SAAJ0539: Unable to get header stream in saveChanges
+ * [SWS-321] - Update artifact version in tutorial
+ * [SWS-323] - Fix xmlsec dependency
+ * [SWS-328] - Error creating signed message with WSS4J
+ * [SWS-330] - WebServiceTemplate hasFaut skips check for fault in response if the connection implements FaultAwareWebServiceConnection
+ * [SWS-333] - Transport streams not closed in WebServiceConnection
+ * [SWS-334] - Calls to lifecycleMonitor.notifyAll() in AbstractStandaloneMessageReceiver are superfluous
+ * [SWS-335] - SaajXmlReader NullPointerException / jboss / mac in interceptors
+ * [SWS-339] - XML namespace (http://www.w3.org/XML/1998/namespace) mapped to wrong prefix when building WSDL with inlined schemas
+ * [SWS-341] - Wss4jSecurityInterceptor and AcegiDigestPasswordValidationCallbackHandler do not correctly work together to update the Acegi security context.
+ * [SWS-342] - NPE in AbstractAnnotationMethodEndpointMapping on line 47 during postProcessAfterInitialization
+ * [SWS-345] - WSS4J interceptor creates creates invalid digest for SAAJ messages
+ * [SWS-347] - Error using AxiomSoapMessageFactory with comments in request
+
+** Improvement
+ * [SWS-287] - Spring Web Services does not seem to work with Castor 1.2
+ * [SWS-309] - Add namespaceMappings property to CastorMarshaller
+ * [SWS-319] - Document MessageTracing logging
+ * [SWS-320] - Add timeout properties to Client-side transport
+ * [SWS-324] - Make Import-package: javax.wsdl.extensions.soap12 in MANIFEST.MF optional
+ * [SWS-325] - Spring WS modules require spring modules 2.5.0
+ * [SWS-326] - Separate MessageTracing logger between sent and received messages
+ * [SWS-332] - Upgrade to Spring Security 2.0
+ * [SWS-336] - Fix Airline C# client build script
+ * [SWS-337] - WebServiceTemplate problem when invoking oneway style services with marshalSendAndReceive
+ * [SWS-338] - Inspect Content-Type in WebServiceTemplate
+ * [SWS-350] - Upgrade Airline sample to use Spring Security
+
+** New Feature
+ * [SWS-281] - add support for imported xsd in static wsdl as well as xsd's that import other xsd's
+ * [SWS-317] - Integrate spring OXM with Spring core JMS support / OXM MessageConverter
+ * [SWS-331] - Spring MVC View based on OXM marshaller
+ * [SWS-340] - Create new MessagesProvider that only includes elements with the given suffixes
+
+** Task
+ * [SWS-327] - Document Embedded HTTP Server transport
+
+Changes in version 1.5.0
+-------------------------
+
+** Bug
+ * [SWS-316] - Unresolvable dependency in parent pom
+
+Changes in version 1.5.0 RC2
+-------------------------
+
+** Sub-task
+ * [SWS-299] - WS-Addressing Documentation
+
+** Bug
+ * [SWS-307] - org.springframework.ws.soap.security.wss4j.callback.KeyStoreCallbackHandler uses tiger specific
+ classes
+ * [SWS-308] - WebServiceTemplate skips handling fault in response with checkConnectionForFault="false" when HTTP
+ status code is not 200 or 500
+
+** Improvement
+ * [SWS-179] - Create and use some wrapper around javax.xml.validation.Schema
+ * [SWS-304] - Support XsdSchema in AbstractValidatingInterceptor
+ * [SWS-306] - Document DefaultWsdl11Defintion and WSDL Provider model
+ * [SWS-310] - Add getters for ProviderBasedWsdl4jDefinition
+ * [SWS-311] - Create RequestMessage in JmsSenderConnection constructor
+ * [SWS-312] - Add FAQ entry for Websphere
+ * [SWS-313] - Rewrite Airline sample to use Spring 2.5 features
+ * [SWS-315] - Endpointsextending AbstractMarshallingPayloadEndpoint require a marshaller also for oneway style
+ service
+
+** New Feature
+ * [SWS-84] - WS-Addressing support
+
+Changes in version 1.5.0 RC1
+-------------------------
+
+** Sub-task
+ * [SWS-297] - Server-side support for WS-Addressing
+ * [SWS-298] - Client-side support for WS-Addressing
+
+** Bug
+ * [SWS-285] - Clear SecurityContext in Acegi Callbacks
+ * [SWS-286] - WSS4J AcegiDigestPasswordValidationCallbackHandler does not set Acegi SecurityContext
+ * [SWS-292] - Add documentation for SoapFaultAnnotationExceptionResolver
+ * [SWS-293] - Response should be cleared in case of exception in WS-Security securement
+ * [SWS-294] - WSS4J interceptor shouldn't verify that validationDecryptionCrypto != null
+ * [SWS-295] - WSS4J interceptor lacks a property to set WSHandlerConstants.ENC_KEY_NAME option
+ * [SWS-301] - The key used in Wss4j interceptor's Signature tests has expired
+ * [SWS-305] - CommonsXsdSchema has issues with schema prefixes
+
+** Improvement
+ * [SWS-249] - POX Sample
+ * [SWS-271] - Request to inline included XSD's in auto generated WSDL's
+ * [SWS-282] - Document Wss4jInterceptor
+ * [SWS-284] - WSS4J jars missing from the "with-dependencies" distribution
+ * [SWS-289] - Add diagnostic information to threadlocals
+ * [SWS-290] - Support Spring IDE in NamespaceHandlers
+ * [SWS-296] - Allow logger name to bet set in PayloadLoggingInterceptor & SoapEnvelopeLoggingInterceptor
+ * [SWS-303] - WS-Security documentation typo's
+
+** New Feature
+ * [SWS-252] - Create Spring Security handlers for WS-Security
+ * [SWS-259] - Support Java 6 HTTP server
+ * [SWS-281] - add support for imported xsd in static wsdl as well as xsd's that import other xsd's
+
+
+
+Changes in version 1.5.0 Milestone 2
+-------------------------
+
+** Bug
+ * [SWS-257] - Infinite loop in XsdBasedSoap11Wsdl4jDefinitionBuilder#buildMessages method
+ * [SWS-258] - getting error when trying to use IBM MQ JMS implementation as transport.
+ * [SWS-264] - XPathExpressionFactory should fallback to Jaxen if no JAXP 1.3 XPath implementation is available
+ * [SWS-265] - AbstractStaxXmlReader should support the required standard SAX features (namespace, namespace-prefixes...)
+ * [SWS-266] - AxiomContentHandler should empty the response body before adding the transformation result
+ * [SWS-267] - code bugs in Reference docs section 4.3.1
+ * [SWS-268] - cope typos in reference docs section 6.2.4 and 6.2.5
+ * [SWS-274] - Soap headers with whitespace cause java.lang.ClassCastException: com.sun.xml.messaging.saaj.soap.impl.TextImpl - Part II
+ * [SWS-275] - NAMESPACE_ERR: An attempt is made to create or change an object in a way which is incorrect with regard to namespaces.
+ * [SWS-276] - PayloadTransformingInterceptor has a typo in the example
+
+** Improvement
+ * [SWS-92] - JAXP 1.4 support
+ * [SWS-148] - WebServiceTemplte needs two more methods in order to easy enable ws security client support
+ * [SWS-231] - @Endpoint component scanning
+ * [SWS-243] - AxiomSoapHeaderElement has no convenient way to access child elements of the header element
+ * [SWS-246] - Better support for large Axiom attachments
+ * [SWS-251] - Improve OSGi manifest
+ * [SWS-253] - Tiger jars should not include non-tiger classes
+ * [SWS-255] - Support for javax.jms.TextMessage
+ * [SWS-261] - There are more default HandlerAdapters in Spring-MVC
+ * [SWS-262] - Endpoint annotation should be annotated as @Inherited
+ * [SWS-269] - OSGi bundleSymName
+ * [SWS-270] - Changes for WS XSD for tooling
+ * [SWS-272] - Add removeHeaderElement(QName) to SoapHeader
+ * [SWS-278] - Add traffic logging when response is fault
+
+** New Feature
+ * [SWS-143] - Client-side WS-Security support
+ * [SWS-194] - Add Interceptor functionality to WebServiceTemplate
+ * [SWS-207] - WSS4J-based WS-Security implementation
+ * [SWS-277] - URI-based routing
+ * [SWS-279] - AcegiUsernamePasswordCallbackHandler
+
+Changes in version 1.5.0 Milestone 1
+-------------------------
+
+** Bug
+ * [SWS-225] - Spring-WS doesn't send "Content-Transfer-Encoding: binary" with MTOM part and this creates interoperability issue with .NET 3.0
+ * [SWS-226] - Exception mapping corrupts the 'defaultFault' instance
+ * [SWS-227] - NPE when "mustUnderstand" attribute is in SOAP header and no Interceptors have been defined
+ * [SWS-229] - JibxMarshaller should support marshalling/unmarshalling of all mapped classes
+ * [SWS-230] - AxiomSoapMessageFactory throws NPE
+ * [SWS-232] - PayloadValidatingInterceptor refuses to validate correct message with a top-level attribute
+ * [SWS-238] - AbstractMethodEndpointMapping does not support JDK Proxies
+ * [SWS-239] - Marshalling with Castor and Axiom results in a XMLStreamException
+ * [SWS-241] - NullPointerException during processing message with empty body
+ * [SWS-244] - Soap headers with whitespace cause java.lang.ClassCastException: com.sun.xml.messaging.saaj.soap.impl.TextImpl
+ * [SWS-245] - SAXParseException when using HttpURLConnection
+ * [SWS-247] - Exception thrown when schemaPrefix is empty in XsdBasedSoap11Wsdl4jDefinitionBuilder
+ * [SWS-248] - DomPoxMessage not clearing DOM on setting the result
+
+** Improvement
+ * [SWS-223] - Use BeanClassLoader in Jaxb marshallers
+ * [SWS-233] - OSGi bundles
+ * [SWS-235] - XStreamMarshaller - support for custom HierarchicalStreamDriver
+ * [SWS-240] - spring-ws-with-dependencies distribution
+
+** New Feature
+ * [SWS-108] - JMS transport support
+ * [SWS-121] - Spring Namespace support
+ * [SWS-139] - Mail transport support
+ * [SWS-187] - SOAP 1.2 Compatible WSDL descriptor generation
+ * [SWS-228] - Support Spring 2.5
\ No newline at end of file
diff --git a/notes.txt b/notes.txt
new file mode 100644
index 00000000..ab2937d7
--- /dev/null
+++ b/notes.txt
@@ -0,0 +1,15 @@
+Dear Spring community,
+
+I'm pleased to announce that Spring Web Services 1.5.2 has been released!
+
+This is the second bug fix and enhancement release in the Spring-WS 1.5 series.
+It fixes all bugs reported since 1.5.1 and introduces various enhancements
+throughout the framework:
+
+* Fixed WS-Security signatures when using WSS4J in combination with SAAJ
+ messages (for real this time ;) )
+* Drastically improved performance of writing to Axiom Message payloads
+
+and more. Please see the changelog for details.
+
+For more information, see http://static.springframework.org/spring-ws/site/
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index fda5bed5..0174eb04 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 1.5.1 (May 2008)
+SPRING WEB SERVICES 1.5.2 (May 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.1.jar
+* spring-oxm-1.5.2.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.1.jar
+* spring-oxm-tiger-1.5.2.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.1.jar
+* spring-ws-core-1.5.2.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.1.jar
+* spring-ws-core-tiger-1.5.2.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.1.jar
+* spring-ws-support-1.5.2.jar
- Contents: The Spring-WS Support
- Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
[JMS, JavaMail]
-* spring-ws-security-1.5.1.jar
+* spring-ws-security-1.5.2.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.1.jar
+* spring-xml-1.5.2.jar
- Contents: Spring XML utility framework
- Dependencies: Commons Logging, spring-beans, spring-core
[StAX, Xalan, Jaxen]
-* spring-ws-1.5.1.jar
+* spring-ws-1.5.2.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 b992c1a0..a25fe4e0 100644
--- a/samples/airline/client/jms/build.xml
+++ b/samples/airline/client/jms/build.xml
@@ -1,5 +1,4 @@
-
@@ -24,7 +23,7 @@
-
+
@@ -32,7 +31,7 @@
-
+
diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml
index fb473fc7..7dac3ced 100644
--- a/samples/airline/client/spring-ws/build.xml
+++ b/samples/airline/client/spring-ws/build.xml
@@ -1,5 +1,4 @@
-
@@ -20,8 +19,8 @@
-
-
+
+
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
index cb8dc3cc..60fe7bc4 100644
--- a/samples/echo/client/spring-ws/build.xml
+++ b/samples/echo/client/spring-ws/build.xml
@@ -1,5 +1,4 @@
-
@@ -12,7 +11,7 @@
-
+
diff --git a/samples/pox/client/spring-ws/build.xml b/samples/pox/client/spring-ws/build.xml
index 9991dbaa..e1789e12 100644
--- a/samples/pox/client/spring-ws/build.xml
+++ b/samples/pox/client/spring-ws/build.xml
@@ -1,5 +1,4 @@
-
@@ -12,7 +11,7 @@
-
+
diff --git a/samples/stockquote/client/spring-ws/build.xml b/samples/stockquote/client/spring-ws/build.xml
index 62ed68ab..95e968af 100644
--- a/samples/stockquote/client/spring-ws/build.xml
+++ b/samples/stockquote/client/spring-ws/build.xml
@@ -1,5 +1,4 @@
-
@@ -12,7 +11,7 @@
-
+
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 40eec506..41d321ba 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -3,7 +3,7 @@
spring-ws-parent
org.springframework.ws
- 1.5.1
+ 1.5.2
4.0.0
spring-ws-sandbox
diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml
index fe4f9a9b..8fc534df 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.1 \
+ -DarchetypeVersion=1.5.2 \
-DgroupId=com.mycompany.hr \
-DartifactId=holidayService
@@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint {
org.springframework.ws
spring-ws-core
- 1.5.1
+ 1.5.2
jdom
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index bd49e9f3..0ae2c0c7 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -6,9 +6,9 @@ Downloads
* Get the latest Spring Web Services releases here
- * <>
+ * <>
- * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=596930}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.1/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=53701}Announcement}}
+ * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=600343}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.2/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=54476}Announcement}}
* <>
diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt
index 78d47be1..644a817f 100644
--- a/src/site/apt/downloads/snapshots.apt
+++ b/src/site/apt/downloads/snapshots.apt
@@ -23,7 +23,7 @@ Snapshot Builds
org.springframework.ws
spring-ws-core
- 1.5.2-SNAPSHOT
+ 1.5.3-SNAPSHOT
+---------------
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index 1decffbc..48cd61c3 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -10,7 +10,7 @@
features of Axis 1 and 2.
- < faq id="namespace_err">
+
I get NAMESPACE_ERR exceptions when using Spring-WS. What can I do about it?