From 6ff4a22928948c1f8889a3190c99f1dfcf940e3d Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Sat, 8 Mar 2008 23:14:48 +0000 Subject: [PATCH] Backported changes from 1.5.0 RC1 release (r10932:r10938) --- .../resources/archetype-resources/pom.xml | 4 ++-- pom.xml | 10 ++++++++-- readme.txt | 19 +++++++++++-------- 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 +- sandbox/pom.xml | 2 +- src/docbkx/tutorial.xml | 4 ++-- src/site/apt/downloads/releases.apt | 6 +++--- src/site/apt/downloads/snapshots.apt | 2 +- 12 files changed, 35 insertions(+), 26 deletions(-) diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml index 3bc3bf01..408f7703 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-m2 + 1.5.0-rc1 org.springframework.ws spring-ws-core - 1.5.0-m2 + 1.5.0-rc1 diff --git a/pom.xml b/pom.xml index 56c4ef55..da5a7ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -254,6 +254,12 @@ 3.2.3 ${project.build.directory}/dependency/stax/ + + org.apache.ws.commons.schema + XmlSchema + 1.3.2 + ${project.build.directory}/dependency/ws-commons/ + @@ -356,13 +362,13 @@ org.apache.ws.commons.axiom axiom-api 1.2.5 - ${project.build.directory}/dependency/axiom/ + ${project.build.directory}/dependency/ws-commons/ org.apache.ws.commons.axiom axiom-impl 1.2.5 - ${project.build.directory}/dependency/axiom/ + ${project.build.directory}/dependency/ws-commons/ wsdl4j diff --git a/readme.txt b/readme.txt index dc8c25c1..0ba7925a 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -SPRING WEB SERVICES 1.5.0 Milestone 2 (February 2007) +SPRING WEB SERVICES 1.5.0 Release Candidate 1 (March 2008) ------------------------------- http://www.springframework.org/spring-ws http://forum.springframework.org/forumdisplay.php?f=39 @@ -37,39 +37,42 @@ 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-m2.jar +* spring-oxm-1.5.0-rc1.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-m2.jar +* spring-oxm-tiger-1.5.0-rc1.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-m2.jar +* spring-ws-core-1.5.0-rc1.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-m2.jar +* spring-ws-core-tiger-1.5.0-rc1.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-m2.jar +* spring-ws-support-1.5.0-rc1.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-m2.jar +* spring-ws-security-1.5.0-rc1.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-m2.jar +* spring-xml-1.5.0-rc1.jar - Contents: Spring XML utility framework - Dependencies: Commons Logging, spring-beans, spring-core [StAX, Xalan, Jaxen] +* spring-ws-1.5.0.jar +- Contents: Convenient al-in-one jar containing all of the jars described above + 4. WHERE TO START diff --git a/samples/airline/client/jms/build.xml b/samples/airline/client/jms/build.xml index 44c87966..51bb6ddc 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 223037c0..512e9562 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 cc6a425d..d4556740 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 f1fa3e27..1bad0023 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 8723ed15..15620853 100644 --- a/samples/stockquote/client/spring-ws/build.xml +++ b/samples/stockquote/client/spring-ws/build.xml @@ -12,7 +12,7 @@ - + diff --git a/sandbox/pom.xml b/sandbox/pom.xml index 3ae491c4..35e259a1 100644 --- a/sandbox/pom.xml +++ b/sandbox/pom.xml @@ -3,7 +3,7 @@ spring-ws-parent org.springframework.ws - 1.5.0-rc1-SNAPSHOT + 1.5.0-rc1 4.0.0 spring-ws-sandbox diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml index 08ce6afd..fdeba317 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-m2 \ + -DarchetypeVersion=1.5.0-rc1 \ -DgroupId=com.mycompany.hr \ -DartifactId=holidayService @@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint { org.springframework.ws spring-ws-core - 1.5.0-m2 + 1.5.0-rc1 jdom diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt index 55d4dadd..0e4cd071 100644 --- a/src/site/apt/downloads/releases.apt +++ b/src/site/apt/downloads/releases.apt @@ -10,10 +10,10 @@ 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=575397}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.0-m2/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=49690}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}} - * <> + * <> * {{{snapshots.html}Download nightly snapshots}} diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt index cd6ef4f7..0749f9bc 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.0-rc1-SNAPSHOT + 1.5.0-SNAPSHOT +---------------