From a1105c898116ba079be0b070ddc8072ce3fd3097 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Mon, 11 Feb 2008 00:00:27 +0000 Subject: [PATCH] Backported changes from 1.5 M2 into trunk (10189:10199) --- .../resources/archetype-resources/pom.xml | 4 +-- pom.xml | 29 ++++++++++++++++++ readme.txt | 18 +++++------ samples/airline/client/jms/build.xml | 6 ++-- samples/airline/client/spring-ws/build.xml | 4 +-- samples/echo/client/spring-ws/build.xml | 2 +- security/src/test/resources/private.jks | Bin src/assembly/with-dependencies.xml | 2 +- src/docbkx/tutorial.xml | 4 +-- src/site/apt/downloads/releases.apt | 10 +++--- src/site/apt/downloads/snapshots.apt | 2 +- 11 files changed, 55 insertions(+), 26 deletions(-) mode change 100755 => 100644 security/src/test/resources/private.jks diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml index ed2c9b6b..3bc3bf01 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-m1 + 1.5.0-m2 org.springframework.ws spring-ws-core - 1.5.0-m1 + 1.5.0-m2 diff --git a/pom.xml b/pom.xml index f1e4db9a..f5318cd6 100644 --- a/pom.xml +++ b/pom.xml @@ -649,4 +649,33 @@ + + + commons-logging + commons-logging + 1.1.1 + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + junit + junit + test + 3.8.2 + + + xmlunit + xmlunit + test + 1.1 + + diff --git a/readme.txt b/readme.txt index 90c5857e..dc8c25c1 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -SPRING WEB SERVICES 1.5.0 Milestone 1 (December 2007) +SPRING WEB SERVICES 1.5.0 Milestone 2 (February 2007) ------------------------------- http://www.springframework.org/spring-ws http://forum.springframework.org/forumdisplay.php?f=39 @@ -37,35 +37,35 @@ 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-m1.jar +* spring-oxm-1.5.0-m2.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-m1.jar +* spring-oxm-tiger-1.5.0-m2.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-m1.jar +* spring-ws-core-1.5.0-m2.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-m1.jar +* spring-ws-core-tiger-1.5.0-m2.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-m1.jar +* spring-ws-support-1.5.0-m2.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-m1.jar +* spring-ws-security-1.5.0-m2.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] + [Log4J, xmlsdig, xmlsec, XWS-security, Acegi, WSS4J] -* spring-xml-1.5.0-m1.jar +* spring-xml-1.5.0-m2.jar - Contents: Spring XML utility framework - Dependencies: Commons Logging, spring-beans, spring-core [StAX, Xalan, Jaxen] diff --git a/samples/airline/client/jms/build.xml b/samples/airline/client/jms/build.xml index 35be8a0e..44c87966 100644 --- a/samples/airline/client/jms/build.xml +++ b/samples/airline/client/jms/build.xml @@ -24,7 +24,7 @@ - + @@ -32,8 +32,8 @@ - - + + diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml index 884e06e6..223037c0 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 ca953ae0..3a1c23f8 100644 --- a/samples/echo/client/spring-ws/build.xml +++ b/samples/echo/client/spring-ws/build.xml @@ -12,7 +12,7 @@ - + diff --git a/security/src/test/resources/private.jks b/security/src/test/resources/private.jks old mode 100755 new mode 100644 diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml index 36574250..bd9c65b7 100644 --- a/src/assembly/with-dependencies.xml +++ b/src/assembly/with-dependencies.xml @@ -78,7 +78,7 @@ **/Makefile mtom/**/spring-ws-logo.png maven-ant-tasks-*.jar - ant-dotnet-*.jar + **/ant-dotnet-*.jar **/*.exe diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml index 21d6dba5..478a1cce 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-m1 \ + -DarchetypeVersion=1.5.0-m2 \ -DgroupId=com.mycompany.hr \ -DartifactId=holidayService @@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint { org.springframework.ws spring-ws-core - 1.5.0-m1 + 1.5.0-m2 jdom diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt index e9d93e82..55d4dadd 100644 --- a/src/site/apt/downloads/releases.apt +++ b/src/site/apt/downloads/releases.apt @@ -6,14 +6,14 @@ Downloads * Get the latest Spring Web Services releases here - * <> + * <> - * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=552258}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.0.2/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=45879}Announcement}} + * {{{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=560091}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.0-m1/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=47217}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}} - * <> + * <> * {{{snapshots.html}Download nightly snapshots}} diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt index 4bc3ce55..cd6ef4f7 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-m2-SNAPSHOT + 1.5.0-rc1-SNAPSHOT +---------------