From 303d9032149731620b6f80db69b8a502e360066b Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Thu, 20 Mar 2008 17:33:31 +0000 Subject: [PATCH] Merging back changes from 1.5.0-rc2 (11239:11254) --- .../main/resources/archetype-resources/pom.xml | 4 ++-- readme.txt | 18 +++++++++--------- samples/airline/client/jms/build.xml | 4 ++-- samples/airline/client/spring-ws/build.xml | 4 ++-- samples/echo/client/spring-ws/build.xml | 2 +- samples/pox/client/spring-ws/build.xml | 2 +- samples/stockquote/client/spring-ws/build.xml | 2 +- src/docbkx/tutorial.xml | 4 ++-- src/site/apt/downloads/releases.apt | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml index 408f7703..6684f023 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.0-rc1 + 1.5.0-rc2 org.springframework.ws spring-ws-core - 1.5.0-rc1 + 1.5.0-rc2 diff --git a/readme.txt b/readme.txt index 0ba7925a..3997012a 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -SPRING WEB SERVICES 1.5.0 Release Candidate 1 (March 2008) +SPRING WEB SERVICES 1.5.0 Release Candidate 2 (March 2008) ------------------------------- http://www.springframework.org/spring-ws http://forum.springframework.org/forumdisplay.php?f=39 @@ -37,40 +37,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.0-rc1.jar +* spring-oxm-1.5.0-rc2.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.0-rc1.jar +* spring-oxm-tiger-1.5.0-rc2.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.0-rc1.jar +* spring-ws-core-1.5.0-rc2.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.0-rc1.jar +* spring-ws-core-tiger-1.5.0-rc2.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.0-rc1.jar +* spring-ws-support-1.5.0-rc2.jar - Contents: The Spring-WS Support - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core [JMS, JavaMail] -* spring-ws-security-1.5.0-rc1.jar +* spring-ws-security-1.5.0-rc2.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.0-rc1.jar +* spring-xml-1.5.0-rc2.jar - Contents: Spring XML utility framework - Dependencies: Commons Logging, spring-beans, spring-core [StAX, Xalan, Jaxen] -* spring-ws-1.5.0.jar +* spring-ws-1.5.0-rc2.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 51bb6ddc..b490e6cf 100644 --- a/samples/airline/client/jms/build.xml +++ b/samples/airline/client/jms/build.xml @@ -24,7 +24,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml index 512e9562..22f374b3 100644 --- a/samples/airline/client/spring-ws/build.xml +++ b/samples/airline/client/spring-ws/build.xml @@ -20,8 +20,8 @@ - - + + diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml index d4556740..288366a5 100644 --- a/samples/echo/client/spring-ws/build.xml +++ b/samples/echo/client/spring-ws/build.xml @@ -12,7 +12,7 @@ - + diff --git a/samples/pox/client/spring-ws/build.xml b/samples/pox/client/spring-ws/build.xml index 1bad0023..6d840eaf 100644 --- a/samples/pox/client/spring-ws/build.xml +++ b/samples/pox/client/spring-ws/build.xml @@ -12,7 +12,7 @@ - + diff --git a/samples/stockquote/client/spring-ws/build.xml b/samples/stockquote/client/spring-ws/build.xml index 15620853..bcead84d 100644 --- a/samples/stockquote/client/spring-ws/build.xml +++ b/samples/stockquote/client/spring-ws/build.xml @@ -12,7 +12,7 @@ - + diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml index fdeba317..b2dab958 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.0-rc1 \ + -DarchetypeVersion=1.5.0-rc2 \ -DgroupId=com.mycompany.hr \ -DartifactId=holidayService @@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint { org.springframework.ws spring-ws-core - 1.5.0-rc1 + 1.5.0-rc2 jdom diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt index 0e4cd071..b60be736 100644 --- a/src/site/apt/downloads/releases.apt +++ b/src/site/apt/downloads/releases.apt @@ -10,9 +10,9 @@ Downloads * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=563313}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.0.3/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=47787}Announcement}} - * <> + * <> - * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=582822}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.0-rc1/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=50896}Announcement}} + * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=585804}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.0-rc2/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=51444}Announcement}} * <>