diff --git a/.gitignore b/.gitignore
index 167fa14c..e93237dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ atlassian-ide-plugin*.xml
.idea
+/build
+/spring-*/build
+.gradle
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..9b01cb0b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,78 @@
+# Spring Web Services
+Spring Web Services is a product of the Spring community focused on creating
+document-driven Web services. Spring Web Services aims to facilitate
+contract-first SOAP service development, allowing for the creation of flexible
+web services using one of the many ways to manipulate XML payloads.
+
+## Installation
+
+Releases of Spring Web Services are available for download from Maven Central,
+as well as our own repository, http://repo.springsource.org/release.
+
+For Maven users:
+
+
+ repository.spring.release
+ Spring GA Repository
+ http://repo.spring.io/release
+
+ ...
+
+ org.springframework.ws
+ spring-ws-core
+ 2.1.4
+
+
+## Snapshots
+
+Nightly snapshots of Spring Web Services are available for download from our
+snapshot repository, http://repo.springsource.org/snapshot.
+
+For Maven users:
+
+
+ repository.spring.snapshot
+ Spring Snapshot Repository
+ http://repo.spring.io/snapshot
+
+ ...
+
+ org.springframework.ws
+ spring-ws-core
+ 2.1.5.BUILD-SNAPSHOT
+
+
+## Building from Source
+
+Spring Web Services uses a [Gradle](http://gradle.org)-based build system. In
+the instructions below, [`./gradlew`](http://vimeo.com/34436402) is invoked
+from the root of the source tree and serves as a cross-platform, self-contained
+bootstrap mechanism for the build. The only prerequisites are
+[Git](http://help.github.com/set-up-git-redirect) and JDK 1.7+.
+
+### check out sources
+`git clone git://github.com/spring-projects/spring-ws.git`
+
+### compile and test, build all jars, distribution zips and docs
+`./gradlew build`
+
+### install all spring-\* jars into your local Maven cache
+`./gradlew install`
+
+... and discover more commands with `./gradlew tasks`. See also the [Gradle build and release FAQ](https://github.com/spring-projects/spring-framework/wiki/Gradle-build-and-release-FAQ).
+
+## Documentation
+
+See the current
+[Javadoc](http://static.springsource.org/spring-ws/docs/current/javadoc-api)
+and [reference
+docs](http://static.springsource.org/spring-ws/docs/current/spring-ws-reference
+).
+
+## Issue Tracking
+
+Spring Scala uses [JIRA](https://jira.springsource.org/browse/SWS) for issue tracking purposes
+
+## License
+
+Spring Web Services is [Apache 2.0 licensed](http://www.apache.org/licenses/LICENSE-2.0.html).
\ No newline at end of file
diff --git a/archetype/pom.xml b/archetype/pom.xml
deleted file mode 100644
index 08fd4952..00000000
--- a/archetype/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- spring-ws-parent
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../parent/pom.xml
-
- 4.0.0
- spring-ws-archetype
- jar
- Spring WS Archetype
- Spring Web Services Maven2 Archetype.
-
-
-
- src/main/resources
- false
-
-
- src/main/filtered-resources
- true
-
-
-
-
diff --git a/archetype/src/main/filtered-resources/archetype-resources/pom.xml b/archetype/src/main/filtered-resources/archetype-resources/pom.xml
deleted file mode 100644
index dd1240a7..00000000
--- a/archetype/src/main/filtered-resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
- 4.0.0
- \${groupId}
- \${artifactId}
- war
- \${version}
- \${artifactId} Spring-WS Application
- http://www.springframework.org/spring-ws
-
- \${artifactId}
-
-
- maven-compiler-plugin
-
- 1.5
- 1.5
-
-
-
- org.codehaus.mojo
- tomcat-maven-plugin
- 1.1
-
-
-
-
-
- org.springframework.ws
- spring-ws-core
- @project.version@
-
-
-
diff --git a/archetype/src/main/resources/META-INF/archetype.xml b/archetype/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index ccfd26a8..00000000
--- a/archetype/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
- spring-ws-archetype
-
- src/main/webapp/WEB-INF/web.xml
- src/main/webapp/WEB-INF/spring-ws-servlet.xml
-
-
\ No newline at end of file
diff --git a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/spring-ws-servlet.xml
deleted file mode 100644
index 703fd433..00000000
--- a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 1948bd49..00000000
--- a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Archetype Created Web Application
-
-
- spring-ws
- org.springframework.ws.transport.http.MessageDispatcherServlet
-
-
-
- spring-ws
- /*
-
-
-
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..9fe6d477
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,416 @@
+buildscript {
+ repositories {
+ maven { url 'http://repo.springsource.org/plugins-release' }
+ }
+ dependencies {
+ classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.4'
+ classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.2.7'
+ }
+}
+
+configure(allprojects) {
+ group = "org.springframework.ws"
+
+ ext.springVersion = "3.2.4.RELEASE"
+ ext.axiomVersion = "1.2.14"
+
+ apply plugin: "java"
+ apply plugin: "idea"
+ apply plugin: "eclipse"
+ apply plugin: "propdeps"
+
+/* [compileJava, compileTestJava]*.options*.compilerArgs = [
+ "-Xlint:serial",
+ "-Xlint:varargs",
+ "-Xlint:cast",
+ "-Xlint:classfile",
+ "-Xlint:dep-ann",
+ "-Xlint:divzero",
+ "-Xlint:empty",
+ "-Xlint:finally",
+ "-Xlint:overrides",
+ "-Xlint:path",
+ "-Xlint:processing",
+ "-Xlint:static",
+ "-Xlint:try",
+ "-Xlint:-options", // intentionally disabled
+ "-Xlint:-fallthrough", // intentionally disabled
+ "-Xlint:-rawtypes", // TODO enable and fix warnings
+ "-Xlint:-deprecation", // TODO enable and fix warnings
+ "-Xlint:-unchecked" // TODO enable and fix warnings
+ ]
+*/
+ compileJava {
+ sourceCompatibility=1.5
+ targetCompatibility=1.5
+ }
+
+ sourceSets.test.resources.srcDirs = ['src/test/resources', 'src/test/java']
+
+ test {
+ systemProperty("java.awt.headless", "true")
+ systemProperty("testGroups", project.properties.get("testGroups"))
+ scanForTestClasses = false
+ include '**/*Test.*'
+ exclude '**/*Abstract*.*'
+ }
+
+ repositories {
+ maven { url 'http://repo.spring.io/libs-release' }
+ }
+
+ dependencies {
+ compile("commons-logging:commons-logging:1.1.1")
+ compile("org.springframework:spring-core:$springVersion")
+
+ testCompile("junit:junit:4.10")
+ testCompile("org.easymock:easymock:3.1")
+ testCompile("xmlunit:xmlunit:1.1")
+ testRuntime("org.codehaus.woodstox:woodstox-core-asl:4.1.3")
+ }
+
+ ext.javadocLinks = [
+ "http://docs.oracle.com/javase/7/docs/api/",
+ "http://docs.oracle.com/javaee/6/api/",
+ "http://jackson.codehaus.org/1.9.12/javadoc/",
+ "http://fasterxml.github.com/jackson-core/javadoc/2.2.2/",
+ ] as String[]
+
+}
+
+configure(subprojects) { subproject ->
+
+ jar {
+ manifest.attributes["Created-By"] =
+ "${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})"
+ manifest.attributes["Implementation-Title"] = subproject.name
+ manifest.attributes["Implementation-Version"] = subproject.version
+
+ from("${rootProject.projectDir}/src/dist") {
+ include "license.txt"
+ include "notice.txt"
+ into "META-INF"
+ expand(copyright: new Date().format("yyyy"), version: project.version)
+ }
+ }
+
+ javadoc {
+ description = "Generates project-level javadoc for use in -javadoc jar"
+
+ options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
+ options.author = true
+ options.header = project.name
+ options.links(project.ext.javadocLinks)
+// options.addStringOption('Xdoclint:none', '-quiet')
+
+ // suppress warnings due to cross-module @see and @link references;
+ // note that global 'api' task does display all warnings.
+ logging.captureStandardError LogLevel.INFO
+ logging.captureStandardOutput LogLevel.INFO // suppress "## warnings" message
+ }
+
+ task sourcesJar(type: Jar, dependsOn:classes) {
+ classifier = "sources"
+ from sourceSets.main.allJava.srcDirs
+ include "**/*.java"
+ }
+
+ task javadocJar(type: Jar) {
+ classifier = "javadoc"
+ from javadoc
+ }
+
+ artifacts {
+ archives sourcesJar
+ archives javadocJar
+ }
+}
+
+project('spring-xml') {
+ description = "Spring XML"
+
+ dependencies {
+ // Spring
+ compile("org.springframework:spring-beans:$springVersion")
+ compile("org.springframework:spring-context:$springVersion")
+
+ //XML
+ optional("org.apache.ws.xmlschema:xmlschema-core:2.0.2")
+ optional("jaxen:jaxen:1.1.4")
+ }
+}
+
+project('spring-ws-core') {
+ description = 'Spring WS Core'
+ dependencies {
+ compile project(":spring-xml")
+
+ // Spring
+ compile("org.springframework:spring-aop:$springVersion")
+ compile("org.springframework:spring-beans:$springVersion")
+ compile("org.springframework:spring-oxm:$springVersion")
+ compile("org.springframework:spring-web:$springVersion")
+ compile("org.springframework:spring-webmvc:$springVersion")
+ testCompile("org.springframework:spring-test:$springVersion")
+
+ // XML
+ optional("org.jdom:jdom:2.0.1")
+ optional("dom4j:dom4j:1.6.1")
+ optional("xom:xom:1.2.5") {
+ exclude group: 'xml-apis', module: 'xml-apis'
+ exclude group: 'xerces', module: 'xercesImpl'
+ exclude group: 'xalan', module: 'xalan'
+ }
+ optional("org.apache.ws.xmlschema:xmlschema-core:2.0.2")
+
+ // SOAP
+ optional("org.apache.ws.commons.axiom:axiom-api:$axiomVersion")
+ optional("org.apache.ws.commons.axiom:axiom-impl:$axiomVersion") {
+ exclude group: 'org.codehaus.woodstox', module: 'wstx-asl'
+ }
+
+ // WSDL
+ optional("wsdl4j:wsdl4j:1.6.1")
+
+ // Transport
+ provided("javax.servlet:servlet-api:2.5")
+ optional("org.apache.httpcomponents:httpclient:4.2.5")
+ optional("commons-httpclient:commons-httpclient:3.1")
+ testCompile("org.mortbay.jetty:jetty:6.1.26")
+
+ testCompile("log4j:log4j:1.2.16")
+ testCompile("org.aspectj:aspectjrt:1.6.9")
+ testRuntime("org.aspectj:aspectjweaver:1.6.9")
+ }
+}
+
+project('spring-ws-support') {
+ description = 'Spring WS Support'
+ dependencies {
+ compile project(":spring-xml")
+ compile project(":spring-ws-core")
+
+ // Spring
+ compile("org.springframework:spring-beans:$springVersion")
+ compile("org.springframework:spring-jms:$springVersion")
+ testCompile("org.springframework:spring-test:$springVersion")
+
+ // Transport
+ provided("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
+ provided("org.apache.geronimo.specs:geronimo-ejb_2.1_spec:1.1")
+ provided("javax.mail:mail:1.4.5")
+ optional("jivesoftware:smack:3.1.0")
+ testCompile("commons-httpclient:commons-httpclient:3.1")
+ testRuntime("org.apache.activemq:activemq-core:4.1.2")
+ testCompile("org.jvnet.mock-javamail:mock-javamail:1.6")
+ }
+}
+
+project('spring-ws-security') {
+ description = 'Spring WS Security'
+ dependencies {
+ compile project(":spring-xml")
+ compile project(":spring-ws-core")
+
+ // Spring
+ compile("org.springframework:spring-beans:$springVersion")
+ compile("org.springframework:spring-tx:$springVersion")
+
+ // Spring Security
+ compile("org.springframework.security:spring-security-core:3.1.0.RELEASE")
+ optional("net.sf.ehcache:ehcache:2.6.3") {
+ exclude group: 'net.sf.ehcache', module: 'ehcache-terracotta'
+ }
+
+ // WS-Security
+ optional("com.sun.xml.wss:xws-security:3.0") {
+ exclude group: 'javax.xml.crypto', module: 'xmldsig'
+ }
+ optional("org.apache.ws.security:wss4j:1.6.5")
+
+ // SOAP
+ provided("com.sun.xml.messaging.saaj:saaj-impl:1.3.19")
+ optional("org.apache.ws.commons.axiom:axiom-api:$axiomVersion")
+ optional("org.apache.ws.commons.axiom:axiom-impl:$axiomVersion") {
+ exclude group: 'org.codehaus.woodstox', module: 'wstx-asl'
+ }
+
+ }
+}
+
+project('spring-ws-test') {
+ description = 'Spring WS Test'
+
+ dependencies {
+ compile project(":spring-ws-core")
+
+ compile("xmlunit:xmlunit:1.1")
+ testCompile("org.springframework:spring-test:$springVersion")
+ }
+
+
+}
+
+configure(rootProject) {
+ description = 'Spring Web Services'
+
+ apply plugin: 'docbook-reference'
+
+ reference {
+ sourceDir = file('src/reference/docbook')
+ pdfFilename = 'spring-ws-reference.pdf'
+ }
+
+ // don't publish the default jar for the root project
+ configurations.archives.artifacts.clear()
+
+ task api(type: Javadoc) {
+ group = 'Documentation'
+ description = 'Generates aggregated Javadoc API documentation.'
+ title = "${rootProject.description} ${version} API"
+ options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
+ options.author = true
+ options.header = rootProject.description
+ options.overview = 'src/api/overview.html'
+ options.splitIndex = true
+ options.links(
+ 'http://docs.jboss.org/jbossas/javadoc/4.0.5/connector'
+ )
+ source subprojects.collect { project ->
+ project.sourceSets.main.allJava
+ }
+ destinationDir = new File(buildDir, "api")
+ classpath = files(subprojects.collect { project ->
+ project.sourceSets.main.compileClasspath
+ })
+ maxMemory = '1024m'
+ }
+
+ task docsZip(type: Zip) {
+ group = 'Distribution'
+ baseName = 'spring-ws'
+ classifier = 'docs'
+ description = "Builds -${classifier} archive containing api and reference " +
+ "for deployment at http://static.springframework.org/spring-framework/docs."
+
+ from('src/dist') {
+ include 'changelog.txt'
+ }
+
+ from (api) {
+ into 'api'
+ }
+
+ from (reference) {
+ into 'reference'
+ }
+ }
+
+ task schemaZip(type: Zip) {
+ group = 'Distribution'
+ baseName = 'spring-ws'
+ classifier = 'schema'
+ description = "Builds -${classifier} archive containing all " +
+ "XSDs for deployment at http://springframework.org/schema."
+
+ subprojects.each { subproject ->
+ def Properties schemas = new Properties();
+
+ subproject.sourceSets.main.resources.find {
+ it.path.endsWith('META-INF/spring.schemas')
+ }?.withInputStream { schemas.load(it) }
+
+ for (def key : schemas.keySet()) {
+ def shortName = key.replaceAll(/http.*schema\/(.*)\/.*/, '$1')
+ assert shortName != key
+ File xsdFile = subproject.sourceSets.main.resources.find {
+ it.path.endsWith(schemas.get(key))
+ }
+ assert xsdFile != null
+ into (shortName) {
+ from xsdFile.path
+ }
+ }
+ }
+ }
+
+ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
+ group = 'Distribution'
+ baseName = 'spring-ws'
+ classifier = 'dist'
+ description = "Builds -${classifier} archive, containing all jars and docs, " +
+ "suitable for community download page."
+
+ ext.baseDir = "${baseName}-${project.version}";
+
+ from('src/dist') {
+ include 'readme.txt'
+ include 'license.txt'
+ include 'notice.txt'
+ into "${baseDir}"
+ expand(copyright: new Date().format('yyyy'), version: project.version)
+ }
+
+ from(zipTree(docsZip.archivePath)) {
+ into "${baseDir}/docs"
+ }
+
+ from(zipTree(schemaZip.archivePath)) {
+ into "${baseDir}/schema"
+ }
+
+ subprojects.each { subproject ->
+ into ("${baseDir}/libs") {
+ from subproject.jar
+ if (subproject.tasks.findByPath('sourcesJar')) {
+ from subproject.sourcesJar
+ }
+ if (subproject.tasks.findByPath('javadocJar')) {
+ from subproject.javadocJar
+ }
+ }
+ }
+ }
+
+ // Create an distribution that contains all dependencies (required and optional).
+ // Not published by default; only for use when building from source.
+ task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
+ group = 'Distribution'
+ baseName = 'spring-ws'
+ classifier = 'dist-with-deps'
+ description = "Builds -${classifier} archive, containing everything " +
+ "in the -${distZip.classifier} archive plus all runtime dependencies."
+
+ from zipTree(distZip.archivePath)
+
+ gradle.taskGraph.whenReady { taskGraph ->
+ if (taskGraph.hasTask(":${zipTask.name}")) {
+ def projectNames = rootProject.subprojects*.name
+ def artifacts = new HashSet()
+ subprojects.each { subproject ->
+ subproject.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each { artifact ->
+ def dependency = artifact.moduleVersion.id
+ if (!projectNames.contains(dependency.name)) {
+ artifacts << artifact.file
+ }
+ }
+ }
+
+ zipTask.from(artifacts) {
+ into "${distZip.baseDir}/deps"
+ }
+ }
+ }
+ }
+
+ artifacts {
+ archives docsZip
+ archives schemaZip
+ archives distZip
+ }
+
+ task wrapper(type: Wrapper) {
+ description = 'Generates gradlew[.bat] scripts'
+ gradleVersion = '1.8'
+ }
+}
diff --git a/changelog.txt b/changelog.txt
deleted file mode 100644
index fbf10430..00000000
--- a/changelog.txt
+++ /dev/null
@@ -1,331 +0,0 @@
-SPRING WEB SERVICES CHANGELOG
-=============================
-http://www.springframework.org/spring-ws
-
-Changes in version 2.1.4.RELEASE
---------------------------------
-
-** Bug
- * [SWS-831] - BspCompliant is always set to true in Wss4jSecurityInterceptor
- * [SWS-833] - All JMS headers ignored, if the are not contained in CONVERSION_TABLE or prefixed with SOAPJMS_
- * [SWS-837] - Typo in embedded HTTP server documentation
- * [SWS-840] - I can't set transformSchemaLocation attribute in MessageDispatcherServlet class through web.xml file
- * [SWS-844] - WebServiceTemplate(Marshaller marshaller) constructor doesn't call initDefaultStrategies()
- * [SWS-845] - checkForUtf8ByteOrderMark() will not detect BOM with some TLSv1 implementations
-
-** Improvement
- * [SWS-644] - ejb 2.1 dependency jar - change to freely available jar in M2 Central
- * [SWS-835] - HttpComponentsMessageSender inintuitive constructor
- * [SWS-838] - HttpComponentsMessageSender: Use the PoolingClientConnectionManager instead of the deprecated ThreadSafeClientConnManager
- * [SWS-839] - Update documentation to use HttpComponentsMessageSender in favour of deprecated CommonsHttpMessageSender
-
-** New Feature
- * [SWS-832] - Add support for programmatically instantiating MessageDispatcherServlet
-
-** Support
- * [SWS-841] - NullPointerException on First invocation to Spring WS Service with Nonce
-
-Changes in version 2.1.3.RELEASE
---------------------------------
-
-** Bug
- * [SWS-814] - EndPointIntercepters do not respect the (Autowired) properties provided in beans XML
- * [SWS-815] - Error loading SAML properties file
- * [SWS-816] - Missing encoding in dom4j element/document
- * [SWS-817] - Camel Spring-WS and AbstractAddressingEndpointMapping
- * [SWS-819] - SimpleNamespaceContext.removeBinding() does not clean up all references
- * [SWS-822] - NoSuchMethodError after upgrading to AXIOM 1.2.14
- * [SWS-824] - In v 2.1.0, dispatch method of MessageDispatcher does not call processEndpointException method if response schema validation fails
- * [SWS-825] - Binary data get inlined when using JAXB for marshaling MTOM-enabled Axiom SOAP messages
- * [SWS-828] - Setting bspCompliant = false has effect only for first request
-
-** Improvement
- * [SWS-813] - Cannot use jms MessagePostProcessor support with WebServiceMessageDrivenBean
- * [SWS-821] - Not possible to create wrapped doc/literal wsdls with SuffixBasedPortTypesProvider
-
-** Task
- * [SWS-774] - Migrate to springsource github
-
-Changes in version 2.1.2.RELEASE
---------------------------------
-
-** Bug
- * [SWS-797] - XsdSchemaHandlerAdapter does not transform schema locations
- * [SWS-806] - @ symbol in the content-id is converted to %40. The receiving web server is not able to handle it
-
-** Defect
- * [SWS-804] - WebServiceMessageReceiverHandlerAdapter not easily overridable to produce SOAP faults
-
-
-** Improvement
- * [SWS-796] - Ability to specify SAML properties file in Wss4jInterceptor
- * [SWS-798] - Ensure that only valid Java Identifiers are added to JMS headers
- * [SWS-803] - WebServiceTemple -> add logRequest method analogue to existing logResponse
- * [SWS-811] - When using annotation-driven register the SoapHeaderElementMethodArgumentResolver by default.
- * [SWS-812] - Document @SoapHeader in reference guide
-
-** New Feature
- * [SWS-807] - Introduce FactoryBean for javax.net.ssl.KeyManagerFactory
- * [SWS-808] - add support to pass in sslSocketFactory to org.springframework.ws.transport.http.HttpsUrlConnectionMessageSender
-
-Changes in version 2.1.1.RELEASE
---------------------------------
-
-** Bug
- * [SWS-776] - Windows-specific error with relative XSD referencing
- * [SWS-779] - PayloadValidatingInterceptor 's method is not getting triggered in the echo server sample program when the echo client program is executed.
- * [SWS-782] - DefaultMethodEndpointAdapter.JDOM_CLASS_NAME must be updated to "org.jdom2.Element"
- * [SWS-783] - SaxUtils leaks file handles, locks file on Windows
- * [SWS-787] - MethodEndpoint.getBean is inconsistent with its API
- * [SWS-789] - SoapEnvelopeLoggingInterceptor won't log
-
-** Improvement
- * [SWS-784] - Add URLPathEndpointMapping Feature
- * [SWS-785] - MTOM sample should not use deprecated api
-
-** New Feature
- * [SWS-786] - SOAP envelope Matcher / MessageCreator
- * [SWS-791] - Transform schemaLocation in WsdlDefinitionHandlerAdapter
-
-Changes in version 2.1.0.RELEASE
---------------------------------
-
-** Bug
- * [SWS-777] - SoapFaultMappingExceptionResolver not handling exception
-
-Changes in version 2.1.0.RC1
-----------------------------
-
-** Bug
- * [SWS-757] - Airline Sample Maven Build Error
-
-** Improvement
- * [SWS-711] - Upgrade to wss4j 1.6
- * [SWS-758] - Upgrade XmlSchemaCollection
- * [SWS-771] - Upgrade template.mf
- * [SWS-772] - should register a SoapFaultAnnotationExceptionResolver
-
-** New Feature
- * [SWS-563] - Provide support for Apache HttpClient 4.0
-
-Changes in version 2.0.5.RELEASE
---------------------------------
-
-** Bug
- * [SWS-754] - EndpointInterceptor.afterCompletion is not always invoked
- * [SWS-759] - FAQ about Mac OS X test failures needs updating
- * [SWS-763] - Namespace problems after upgrading to Axiom 1.2.13
-
-** Defect
- * [SWS-764] - SoapEnvelopeLoggingInterceptor logging only partial request/response when Axis SAAJ API is used along with Xalan 2.7.1 and log4j 1.2.16 (using %m option)
- * [SWS-766] - Broken link in SWS 2.0.4 - org.springframework.ws.soap.security.xwss
- * [SWS-769] - Error in org.springframework.ws.context's content
- * [SWS-770] - In documentation, JMS server configuration doesn't work
-
-** Improvement
- * [SWS-760] - Please specify URL and license in pom.xml
- * [SWS-761] - Add method to set digest algorithm for signature (WSS4J)
- * [SWS-762] - Allow multiple prefixes and suffixes in DefaultWsdl11Definition
- * [SWS-768] - Make JAXP13ValidatorFactory smarter
-
-Changes in version 2.0.4.RELEASE
---------------------------------
-
-** Bug
- * [SWS-647] - PayloadValidatingInterceptor throws IllegalArgumentException when passed a schema collection
- * [SWS-742] - JMSCorrelationID together with Oracle AQ
- * [SWS-748] - Not well formed xml causes server 500 error
- * [SWS-750] - SaajSoapMessageFactory's checkForUtf8ByteOrderMark is corrupting input stream
- * [SWS-752] - Provider com.sun.xml.stream.ZephyrParserFactory not found using annotation-driven
-
-** Improvement
- * [SWS-491] - Digital signing java 6
- * [SWS-745] - Convenience constructor for SimpleUsernamePasswordCallbackHandler
- * [SWS-749] - org.springframework.xml.sax.SaxUtils swallows exceptions
-
-Changes in version 2.0.3.RELEASE
---------------------------------
-
-** Bug
- * [SWS-687] - Attachment content id is resetted by spring web service
- * [SWS-702] - sws:annotation-driven does not pick up @Endpoint annotations on classes that are JDK proxies
- * [SWS-709] - JavaDoc for WebServiceTemplate#setFaultMessageResolver has wrong default class
- * [SWS-713] - Order of interceptor calls is dependent on the way the interceptors are included
- * [SWS-718] - Reloading the spring context does not refresh the MessageDispatcherServlet
- * [SWS-720] - samples build failure
- * [SWS-721] - EndpointExceptionResolver mentions SOAP but this interface is not necessarily SOAP releated
- * [SWS-724] - DefaultConcretePartProvider is not allowing a blank suffix, due to improper assertion
- * [SWS-726] - CryptoFactoryBean keystore location can't resolve ClassPathResource where resource is located in a jar
- * [SWS-727] - building a webapp targetting Java 1.5 environment on JDK5 and JDK6 pulled in different dependencies for spring-ws-core 2.0.2
- * [SWS-732] - OSGi manifest version range for javax.servlet package import too restrictive
- * [SWS-733] - Typo in marshalSendAndReceive javadoc
- * [SWS-734] - Project can not be built with Maven 3, missing org.springframework.build.aws.maven extension dependency
- * [SWS-737] - EndpointInterceptorAdapter removes "throws Exception" from handleFault() method defined by EndpointInterceptor
- * [SWS-739] - Spring WS Core manifest prevents usage of javax.servlet version 3.0.0
-
-** Improvement
- * [SWS-697] - Support Maven 3 Remove legacy xws-security
- * [SWS-710] - Make it possible to retrieve SoapHeaderElement from SoapHeader by QName
- * [SWS-714] - MockWebServiceClient.sendRequest swallows StackTrace of exceptions thrown during request processing
- * [SWS-716] - PayloadTransformingInterceptor.afterPropertiesSet() and TransformerFactory.newInstance()
- * [SWS-717] - Impossible to add custom error handling during JAXB marshalling/unmarshalling.
- * [SWS-725] - Add a constructor/setter to WebServiceTemplate which takes a Marshaller and assigns it as both Marshaller and Unmarshaller
- * [SWS-735] - JmsMessageReceiverConnection: use of correlationId on request should be configurable
-
-** Refactoring
- * [SWS-723] - Wss4jSecurityInterceptor design
-
-** Task
- * [SWS-715] - Upgrade Spring Security to 3.0.6
- * [SWS-728] - OXM chapter not linked from the index page
-
-Changes in version 2.0.2.RELEASE
---------------------------------
-
-** Bug
- * [SWS-702] - sws:annotation-driven does not pick up @Endpoint annotations on classes that are JDK proxies
- * [SWS-705] - OSGi import of org.springframework.security.authentication seems to be the wrong version
- * [SWS-708] - PayloadValidatingInterceptor errors not clearing SecurityContextHolder
-
-** Improvement
- * [SWS-706] - Jaxp13XPathTemplate should support StreamSources with only a systemId if it's a valid URL
-
-** New Feature
- * [SWS-662] - Support for UriEndpointMapping in server-side test
-
-Changes in version 2.0.1.RELEASE
---------------------------------
-
-** Bug
- * [SWS-242] - Allow for custom ErrorHandler in PayloadValidatingInterceptor
- * [SWS-681] - Manifest files in 2.0.0 release are incorrect
- * [SWS-682] - ExceptionResolver order is reversed
- * [SWS-691] - Annotation-driven tag does not support ws-addressing @Action
- * [SWS-698] - EndpointExceptionResolver is not registered automatically when used together with tag
- * [SWS-699] - XomPayloadMethodProcessor is not added methodReturnValueHandlers in DefaultMethodEndpointAdapter
-
-** Improvement
- * [SWS-551] - Support @Secured for @PayloadRoot methods
- * [SWS-676] - SOAP Envelope prefix
- * [SWS-683] - Improve the Maven archetype
- * [SWS-684] - Allow for bean references inside the namespace element
- * [SWS-686] - Make the locationURI in dynamic wsdls mandatory
- * [SWS-694] - Print SOAP message if validation fails
-
-** Task
- * [SWS-685] - Fix broken references in the reference doc
-
-Changes in version 2.0.0.RELEASE
---------------------------------
-
-** Bug
- * [SWS-585] - POMs of Spring-WS artifacts at maven central repo wrongfuly contain references to external repositories
- * [SWS-675] - XwssSecurityInterceptor in combination with
- * [SWS-677] - /META-INF/spring.schema
-
-** Improvement
- * [SWS-254] - Add an EndpointAdapter that adapts to a MethodEndpoint for a methos with one Source param containing the payload
- * [SWS-557] - Make XPathParamAnnotationMethodEndpointAdapter more extendable
- * [SWS-558] - Use custom data types for @XPathParam annotations
- * [SWS-673] - Remove final keyword from AbstractAnnotationMethodEndpointMapping initApplicationContext() method
-
-** New Feature
- * [SWS-263] - Provide xml based Mock for Web Services
-
-Changes in version 2.0 Release Candidate 2
-------------------------------------------
-
-** Sub-task
- * [SWS-668] - sws:annotation-driven
- * [SWS-669] - sws:static-wsdl and sws:dynamic-wsdl
- * [SWS-670] - sws:interceptors
-
-** Bug
- * [SWS-656] - ResponseMatcher.payload(Resource payload) should be static
- * [SWS-664] - Tutorial requires transformWsdlLocations true
-
-** Improvement
- * [SWS-672] - Allow MarshallingPayloadMethodProcessor to have a null marshaller or unmarshaller
-
-** New Feature
- * [SWS-667] - Improve SWS namespace
-
-** Task
- * [SWS-652] - Document full streaming WebServiceMessage
- * [SWS-653] - Make sure samples are included in release
- * [SWS-666] - Update tutorial
-
-Changes in version 2.0 Release Candidate 1
-------------------------------------------
-
-** Sub-task
- * [SWS-631] - Create Client-Side testing framework
- * [SWS-632] - Create Server-Side testing framework
- * [SWS-651] - Add documentation for testing framework
-
-** Bug
- * [SWS-640] - evaluateAsBoolean returns true for node with text content "false"
-
-** Improvement
- * [SWS-544] - Add test framework for Spring WS
- * [SWS-635] - handleUsernameTokenUnknown() should attach root cause
- * [SWS-641] - Make sentMessageTracingLogger independent from receivedMessageTracingLogger
- * [SWS-648] - Document Spring-WS Security exception handling
- * [SWS-650] - AxiomSoapMessageFactory does not provide way to set properties on XMLInputFactory
-
-** New Feature
- * [SWS-352] - Full streaming WebServiceMessage/SoapMessage
- * [SWS-642] - Support resolving SOAP header elements in @Endpoint method parameters
- * [SWS-643] - Create TransformerHelper class
-
-** Task
- * [SWS-639] - Deprecate redundant XML classes
-
-Changes in version 2.0 Milestone 3
-----------------------------------
-
-** Sub-task
- * [SWS-631] - Create Client-Side testing framework
-
-** Improvement
- * [SWS-610] - Incompatibility with WS-I requirement R2750
-
-** Task
- * [SWS-620] - Add the Spring-OXM jar to the "with dependencies" distribution
- * [SWS-624] - Documentation- explain that WSDL generation should better not be used in production
-
-Changes in version 2.0 Milestone 2
-----------------------------------
-
-** Bug
- * [SWS-613] - Jaxp13XPathTemplate uses thread-unsafe XPathFactory as field
-
-** Improvement
- * [SWS-538] - Add support for XWSS 3.1
-
-** New Feature
- * [SWS-193] - XwsSecurityInterceptor : funtionality for skipping the validate of a SOAP message when there are no WSSE headers in SOAP envelope.
- * [SWS-349] - Support @PayloadRoot annotation on methods with DOM, JDOM, DOM4J and XOM type method signatures
- * [SWS-351] - Arbitrary parameter injection for @Endpoints
- * [SWS-428] - XMPP support
- * [SWS-540] - Adding XML declaration to a response
-
-** Task
- * [SWS-559] - Upgrade Spring Security to 3.0.2
- * [SWS-603] - Drop OXM chapter from ref docs
- * [SWS-604] - Upgrade XSD schemas
-
-Changes in version 2.0 Milestone 1
-------------------------
-
-** Bug
- * [SWS-501] - Maven dependency for oxm 1.5.5.A non-existent version of Spring
-
-** Refactoring
- * [SWS-567] - Refactor to use OXM from Spring 3
-
-** Task
- * [SWS-451] - Update spring-ws Maven POM to use correct Spring artifactId values
- * [SWS-597] - Merge core and core-tiger modules
- * [SWS-598] - Drop OXM modules in favor of Spring 3.0
- * [SWS-599] - Change API to use Java 5+
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
deleted file mode 100644
index a1e6ffe4..00000000
--- a/core/pom.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
- spring-ws-parent
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../parent/pom.xml
-
- 4.0.0
- spring-ws-core
- jar
- Spring WS Core
- Spring Web Services Core package.
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.stream
- stax-api
-
-
- javax.xml.soap
- saaj-api
-
-
- com.sun.xml.messaging.saaj
- saaj-impl
- provided
-
-
- javax.activation
- activation
-
-
-
-
-
-
-
- com.springsource.bundlor
- com.springsource.bundlor.maven
-
-
- maven-jar-plugin
-
-
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
-
-
-
-
-
-
-
- org.springframework.ws
- spring-xml
-
-
-
- org.springframework
- spring-context
-
-
- org.springframework
- spring-aop
-
-
- org.springframework
- spring-oxm
-
-
- org.springframework
- spring-web
-
-
- org.springframework
- spring-webmvc
-
-
- org.springframework
- spring-test
-
-
-
- org.jdom
- jdom
- true
-
-
- dom4j
- dom4j
- true
-
-
- xom
- xom
- true
-
-
- org.codehaus.woodstox
- woodstox-core-asl
- test
-
-
- org.apache.ws.xmlschema
- xmlschema-core
- test
-
-
-
- org.apache.ws.commons.axiom
- axiom-api
- true
-
-
- org.apache.ws.commons.axiom
- axiom-impl
- true
-
-
-
- wsdl4j
- wsdl4j
-
-
-
- javax.servlet
- servlet-api
-
-
- javax.mail
- mail
-
-
-
- org.apache.httpcomponents
- httpclient
- true
-
-
- commons-httpclient
- commons-httpclient
- true
-
-
- org.mortbay.jetty
- jetty
- test
-
-
-
- org.aspectj
- aspectjrt
- 1.6.9
- test
-
-
- org.aspectj
- aspectjweaver
- 1.5.4
- test
-
-
- cglib
- cglib-nodep
- 2.1_3
- test
-
-
-
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..9385ad11
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+version=2.1.5.BUILD-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..667288ad
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..c01c7789
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Nov 07 12:02:13 CET 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..91a7e269
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..8a0b282a
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/notes.txt b/notes.txt
deleted file mode 100644
index 0f4f74b3..00000000
--- a/notes.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Dear Spring community,
-
-I'm pleased to announce that Spring Web Services 2.1.4.RELEASE has been released!
-
-This is the latest GA release in the 2.1 release cycle. It mainly
-consists of bug fixes.
-
-Please see the changelog for more details.
-
-For more information, refer to
-
-http://static.springframework.org/spring-ws/sites/2.0
diff --git a/notice.txt b/notice.txt
deleted file mode 100644
index 292aa940..00000000
--- a/notice.txt
+++ /dev/null
@@ -1,21 +0,0 @@
- ======================================================================
- == NOTICE file corresponding to section 4 d of the Apache License, ==
- == Version 2.0, in this case for the Spring Framework distribution. ==
- ======================================================================
-
- This product includes software developed by
- the Apache Software Foundation (http://www.apache.org).
-
- The end-user documentation included with a redistribution, if any,
- must include the following acknowledgement:
-
- "This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
- Alternatively, this acknowledgement may appear in the software itself,
- if and wherever such third-party acknowledgements normally appear.
-
- The names "Spring", "Spring Framework", and "Spring Web Services" must
- not be used to endorse or promote products derived from this software
- without prior written permission. For written permission, please contact
- enquiries@springsource.com.
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
deleted file mode 100644
index 85fbf079..00000000
--- a/parent/pom.xml
+++ /dev/null
@@ -1,762 +0,0 @@
-
-
- 4.0.0
- org.springframework.ws
- spring-ws-parent
- pom
- 2.1.5.RELEASE-SNAPSHOT
- Spring Web Services - Parent
- http://static.springframework.org/spring-ws/site/index.html
-
- The Spring Web Services Framework
- http://www.springframework.org/spring-ws
-
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
- http://static.springframework.org/spring-ws/site/downloads/releases.html
-
-
- spring-release
- Spring Release Repository
- s3://maven.springframework.org/release
-
-
- spring-snapshot
- Spring Snapshot Repository
- s3://maven.springframework.org/snapshot
-
-
- static.springframework.org
- scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/sites/2.0
-
-
-
- scm:svn:https://src.springframework.org/svn/spring-ws/trunk
- scm:svn:https://src.springframework.org/svn/spring-ws/trunk
- https://fisheye.springframework.org/browse/spring-ws/trunk
-
-
- 2.1.4.RELEASE
- "${osgi.version:[=.=.=, =.=.+1)}"
- 3.2.4.RELEASE
- "[3.2.4, 4.0.0)"
- UTF-8
-
-
-
- spring-release
- Spring Release Repository
- http://maven.springframework.org/release
-
-
- com.springsource.repository.bundles.release
- SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases
- http://repository.springsource.com/maven/bundles/release/
-
-
-
-
- spring-release
- Spring Release Repository
- http://maven.springframework.org/release
-
-
-
-
-
- org.springframework.build.aws
- org.springframework.build.aws.maven
- 3.1.0.RELEASE
-
-
-
-
-
- maven-compiler-plugin
- 2.1
-
- 1.5
- 1.5
-
-
-
- maven-surefire-plugin
- 2.3
-
- once
- false
-
-
-
- maven-jar-plugin
- 2.3
-
-
- maven-deploy-plugin
- 2.5
-
-
- maven-site-plugin
- 3.0
-
-
- maven-release-plugin
- 2.2.1
-
-
- maven-resources-plugin
- 2.5
-
- \
-
-
-
- com.springsource.bundlor
- com.springsource.bundlor.maven
- 1.0.0.RELEASE
-
-
- bundlor
-
- bundlor
-
-
-
-
-
- org.codehaus.mojo
- jaxb2-maven-plugin
- 1.3
-
-
- org.codehaus.mojo
- jaxws-maven-plugin
- 1.10
-
-
- org.codehaus.mojo
- axistools-maven-plugin
- 1.3
-
-
- org.codehaus.mojo
- xmlbeans-maven-plugin
- 2.3.3
-
-
- com.agilejava.docbkx
- docbkx-maven-plugin
- 2.0.13
-
-
-
-
-
-
- maven-compiler-plugin
-
-
- maven-surefire-plugin
-
-
- maven-jar-plugin
-
-
- maven-site-plugin
-
-
- org.apache.maven.wagon
- wagon-ssh
- 1.0-beta-7
-
-
-
-
-
-
-
-
- maven-jxr-plugin
- 2.1
-
- true
-
-
-
- maven-surefire-report-plugin
- 2.4.2
-
- true
-
-
-
- maven-javadoc-plugin
- 2.6.1
-
- true
-
-
-
-
- javadoc
-
-
-
-
-
-
-
-
-
-
- org.springframework.ws
- spring-xml
- ${project.version}
-
-
- org.springframework.ws
- spring-ws-core
- ${project.version}
-
-
- org.springframework.ws
- spring-ws-core
- ${project.version}
- tests
- test
-
-
- org.springframework.ws
- spring-ws-support
- ${project.version}
-
-
- org.springframework.ws
- spring-ws-security
- ${project.version}
-
-
- org.springframework.ws
- spring-ws-test
- ${project.version}
-
-
-
- org.springframework
- spring-core
- ${spring.framework.version}
-
-
- org.springframework
- spring-beans
- ${spring.framework.version}
-
-
- org.springframework
- spring-context
- ${spring.framework.version}
-
-
- org.springframework
- spring-aop
- ${spring.framework.version}
-
-
- org.springframework
- spring-web
- ${spring.framework.version}
-
-
- org.springframework
- spring-webmvc
- ${spring.framework.version}
-
-
- org.springframework
- spring-orm
- ${spring.framework.version}
-
-
- org.springframework
- spring-oxm
- ${spring.framework.version}
-
-
- org.springframework
- spring-jdbc
- ${spring.framework.version}
-
-
- org.springframework
- spring-tx
- ${spring.framework.version}
-
-
- org.springframework
- spring-jms
- ${spring.framework.version}
-
-
- org.springframework
- spring-test
- ${spring.framework.version}
- test
-
-
-
- javax.xml.stream
- stax-api
- 1.0-2
-
-
- jaxen
- jaxen
- 1.1.3
-
-
- maven-plugins
- maven-cobertura-plugin
-
-
- maven-plugins
- maven-findbugs-plugin
-
-
- xml-apis
- xml-apis
-
-
- dom4j
- dom4j
-
-
- jdom
- jdom
-
-
- xom
- xom
-
-
- xerces
- xmlParserAPIs
-
-
- xerces
- xercesImpl
-
-
-
-
- org.codehaus.woodstox
- woodstox-core-asl
- 4.1.3
-
-
- org.jdom
- jdom
- 2.0.1
-
-
- dom4j
- dom4j
- 1.6.1
-
-
- xml-apis
- xml-apis
-
-
-
-
- xom
- xom
- 1.2.5
-
-
- xerces
- xmlParserAPIs
-
-
- xerces
- xercesImpl
-
-
- xalan
- xalan
-
-
- jaxen
- jaxen
-
-
-
-
- xpp3
- xpp3
- 1.1.3.4.O
-
-
- org.apache.ws.xmlschema
- xmlschema-core
- 2.0.2
-
-
-
-
- org.apache.xmlbeans
- xmlbeans
- 2.4.0
-
-
-
- com.thoughtworks.xstream
- xstream
- 1.4.2
-
-
- stax
- stax
-
-
- stax
- stax-api
-
-
-
-
-
- com.sun.xml.messaging.saaj
- saaj-impl
- 1.3.19
-
-
- javax.activation
- activation
-
-
-
-
- org.apache.ws.commons.axiom
- axiom-api
- 1.2.14
-
-
- org.apache.geronimo.specs
- geronimo-activation_1.1_spec
-
-
- org.apache.geronimo.specs
- geronimo-javamail_1.4_spec
-
-
- junit
- junit
-
-
- org.apache.geronimo.specs
- geronimo-stax-api_1.0_spec
-
-
-
-
- org.apache.ws.commons.axiom
- axiom-impl
- 1.2.14
- runtime
-
-
- org.apache.geronimo.specs
- geronimo-activation_1.1_spec
-
-
- org.apache.geronimo.specs
- geronimo-javamail_1.4_spec
-
-
- org.apache.geronimo.specs
- geronimo-stax-api_1.0_spec
-
-
- jaxen
- jaxen
-
-
- javax.mail
- mail
-
-
- xml-apis
- xml-apis
-
-
- org.codehaus.woodstox
- wstx-asl
-
-
-
-
-
- wsdl4j
- wsdl4j
- 1.6.1
-
-
-
- com.sun.xml.wsit
- xws-security
-
- 1.3.1
-
-
- com.sun.xml.wsit
- wsit-rt
- 1.1
-
-
- org.apache.ws.security
- wss4j
- 1.6.5
-
-
- xalan
- xalan
-
-
- xerces
- xercesImpl
-
-
- xml-apis
- xml-apis
-
-
-
-
-
- org.springframework.security
- spring-security-core
- 3.1.0.RELEASE
-
-
- org.springframework
- spring-support
-
-
-
-
- org.springframework.security
- spring-security-config
- 3.1.0.RELEASE
-
-
- org.springframework.security
- spring-security-web
- 3.1.0.RELEASE
-
-
-
- net.sf.ehcache
- ehcache-core
- 2.5.2
- true
-
-
-
- javax.xml.soap
- saaj-api
- 1.3.4
- provided
-
-
- javax.activation
- activation
-
-
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- javax.mail
- mail
- 1.4.5
- provided
-
-
- javax.activation
- activation
-
-
-
-
- javax.activation
- activation
- 1.1.1
- provided
-
-
- org.apache.geronimo.specs
- geronimo-jms_1.1_spec
- 1.1.1
- provided
-
-
- org.apache.geronimo.specs
- geronimo-ejb_2.1_spec
- 1.1
- provided
-
-
- javax.persistence
- persistence-api
- 1.0.2
- provided
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.2.5
-
-
- commons-httpclient
- commons-httpclient
- 3.1
-
-
- org.mortbay.jetty
- jetty
- 6.1.26
-
-
- org.apache.activemq
- activemq-core
- 4.1.1
-
-
- org.apache.geronimo.specs
- geronimo-jms_1.1_spec
-
-
-
-
- jivesoftware
- smack
- 3.1.0
-
-
-
- commons-logging
- commons-logging
- 1.1.1
-
-
- log4j
- log4j
-
-
- logkit
- logkit
-
-
- avalon-framework
- avalon-framework
-
-
- javax.servlet
- servlet-api
-
-
-
-
- log4j
- log4j
- 1.2.16
- true
-
-
- javax.mail
- mail
-
-
- com.sun.jdmk
- jmxtools
-
-
- com.sun.jmx
- jmxri
-
-
-
-
-
- junit
- junit
- 4.10
- test
-
-
- xmlunit
- xmlunit
- 1.1
- test
-
-
- org.easymock
- easymock
- test
- 3.1
-
-
-
-
-
- commons-logging
- commons-logging
-
-
- org.springframework
- spring-core
-
-
- org.springframework
- spring-beans
-
-
- junit
- junit
- test
-
-
- xmlunit
- xmlunit
- test
-
-
- log4j
- log4j
- test
-
-
- org.easymock
- easymock
- test
-
-
-
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 3ca9d9dc..00000000
--- a/pom.xml
+++ /dev/null
@@ -1,366 +0,0 @@
-
-
- 4.0.0
- org.springframework.ws
- spring-ws
- pom
- 2.1.5.RELEASE-SNAPSHOT
- Spring Web Services
-
- Spring Web Services is a product of the Spring community focused on creating document-driven Web services. It
- aims to facilitate contract-first SOAP service development, allowing for the creation of flexible web services
- using one of the many ways to manipulate XML payloads.
-
- http://static.springframework.org/spring-ws/site/index.html
-
- JIRA
- http://jira.springframework.org/browse/SWS
-
-
- bamboo
- http://build.springframework.org/browse/SWS
-
- 2005
-
-
- apoutsma
- Arjen Poutsma
- apoutsma@vmware.com
- SpringSource - a division of VMware
- http://www.springsource.com
-
- Project Admin
- Developer
-
- +1
-
-
- tareqa
- Tareq Abed Rabbo
- tareq.abedrabbo@gmail.com
-
- Developer
-
- +1
-
-
-
-
- Ingo Siebert
-
-
- Ben Ethridge
-
-
- Kristoffer Moum
-
-
- Rick Evans
-
-
- Giovanni Cuccu
-
-
- Lukas Krecan
- http://blog.krecan.net
-
-
-
- The Spring Web Services Framework
- http://www.springframework.org/spring-ws
-
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
- http://www.springsource.com/download/community?project=Spring%20Web%20Services
-
-
- spring-release
- Spring Release Repository
- s3://maven.springframework.org/release
-
-
- spring-snapshot
- Spring Snapshot Repository
- s3://maven.springframework.org/snapshot
-
-
- static.springframework.org
- scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/sites/2.0
-
-
-
- scm:git:https://github.com/SpringSource/spring-ws.git
- scm:git:https://github.com/SpringSource/spring-ws.git
- https://fisheye.springframework.org/browse/spring-ws/trunk
-
-
- 3.2.4.RELEASE
-
-
- parent
- xml
- core
- support
- security
- test
- archetype
-
-
-
- samples
-
- samples
-
-
-
- release
-
-
-
- maven-assembly-plugin
- 2.2-beta-5
- false
-
-
- full
- package
-
- single
-
-
-
- src/assembly/full.xml
-
-
-
-
-
-
-
-
-
-
-
- spring-release
- Spring Release Repository
- http://maven.springframework.org/release
-
-
-
-
-
- org.springframework.build.aws
- org.springframework.build.aws.maven
- 3.1.0.RELEASE
-
-
-
-
- maven-release-plugin
- 2.2.1
-
-
- maven-site-plugin
- 3.0
-
-
- org.apache.maven.wagon
- wagon-ssh
- 1.0-beta-7
-
-
-
-
- maven-assembly-plugin
- 2.2-beta-5
- false
-
-
- all-jar
- package
-
- single
-
-
-
-
- true
-
-
- ${project.version}
-
-
-
- src/assembly/all.xml
-
-
-
-
- sources
- package
-
- single
-
-
-
-
- true
-
-
- ${project.version}
-
-
-
- src/assembly/sources.xml
-
-
-
-
- minimal-zip
- package
-
- single
-
-
-
- src/assembly/minimal.xml
-
-
-
-
-
-
- com.agilejava.docbkx
- docbkx-maven-plugin
- 2.0.13
-
-
-
- generate-html
- generate-pdf
-
- pre-site
-
-
-
-
- org.docbook
- docbook-xml
- 4.4
- runtime
-
-
-
- index.xml
- true
- css/html.css
- 1
- true
- src/docbkx/resources/xsl/html_chunk.xsl
- src/docbkx/resources/xsl/fopdf.xsl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- maven-jxr-plugin
- 2.1
-
- true
-
-
-
- maven-surefire-report-plugin
- 2.4.2
-
- true
-
-
-
- maven-javadoc-plugin
- 2.7
-
- true
- Spring Web Services Framework
- 1.5
- true
- ${basedir}/src/main/javadoc/javadoc.css
- ${basedir}/src/main/javadoc/overview.html
-
-
- Spring-WS
- org.springframework.ws*
-
-
- Spring-XML
- org.springframework.xml*
-
-
- ${basedir}/src/main/javadoc
- org.springframework.ws.samples
-
- http://java.sun.com/javase/6/docs/api/
- http://java.sun.com/javaee/5/docs/api/
- http://java.sun.com/webservices/docs/2.0/api
- http://java.sun.com/webservices/docs/2.0/xws-security/api/
- http://static.springframework.org/spring/docs/2.5.x/api
- http://jakarta.apache.org/commons/logging/apidocs/
- http://xmlbeans.apache.org/docs/2.0.0/reference
- http://jibx.sourceforge.net/api
- http://ws.apache.org/commons/axiom/apidocs/
- http://dom4j.org/apidocs/
- http://jdom.org/docs/apidocs/
- http://www.xom.nu/apidocs/
- http://acegisecurity.org/acegi-security/apidocs/
- http://www.extreme.indiana.edu/apis/wsdl4j/
- http://jakarta.apache.org/commons/httpclient/apidocs/
- http://ws.apache.org/wss4j/apidocs/
- http://java.sun.com/javase/6/docs/jre/api/net/httpserver/spec/
- http://ws.apache.org/commons/XmlSchema/apidocs/
-
-
-
-
-
- aggregate
-
-
-
-
-
-
-
diff --git a/readme.txt b/readme.txt
deleted file mode 100644
index 4ebacf19..00000000
--- a/readme.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-SPRING WEB SERVICES 2.1.4.RELEASE (August 2013)
--------------------------------
-http://www.springframework.org/spring-ws
-http://forum.springframework.org/forumdisplay.php?f=39
-
-
-1. INTRODUCTION
-
-Spring Web Services (Spring-WS) is a product of the Spring community focused on creating document-driven Web services.
-Spring-WS aims to facilitate contract-first SOAP service development, allowing for the creation of flexible web services
-using one of the many ways to manipulate XML payloads.
-
-2. RELEASE INFO
-
-Spring-WS requires J2SE 1.5 or higher and J2EE 1.4 or higher. J2SE 1.6 is required for building.
-
-Release contents:
-
-"." contains Spring-WS distribution units (jars and source zip archives), readme, and copyright
-"dist" contains the Spring-WS distribution
-"dist/modules" contains the Spring-WS modules
-
-The -with-dependencies distribution contains the following additional content:
-
-"dist/module-sources" contains the Spring-WS modules
-"docs" contains the Spring-WS reference manual and API Javadocs
-"samples" contains buildable Spring-WS sample application sources
-"lib" contains the Spring-WS dependencies
-
-See the readme.txt within the above directories for additional information.
-
-Spring-WS is released under the terms of the Apache Software License (see license.txt).
-
-3. DISTRIBUTION JAR FILES
-
-The following distinct jar files are included in the distribution. This list specifies the respective contents and
-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-ws-core-2.1.4.RELEASE.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-support-2.1.4.RELEASE.jar
-- Contents: The Spring-WS Support
-- Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
- [JMS, JavaMail]
-
-* spring-ws-security-2.1.4.RELEASE.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-ws-test-2.1.4.RELEASE.jar
-- Contents: Spring-WS Testing framework
-- Dependencies: JUnit, XMLUnit
-
-* spring-xml-2.1.4.RELEASE.jar
-- Contents: Spring XML utility framework
-- Dependencies: Commons Logging, spring-beans, spring-core
- [StAX, Xalan, Jaxen]
-
-* spring-ws-2.1.4.RELEASE-all.jar
-- Contents: Convenient al-in-one jar containing all of the jars described above
-
-
-4. WHERE TO START
-
-This distribution contains documentation and two sample applications illustrating the features of Spring-WS.
-
-A great way to get started is to review and run the sample applications, supplementing with reference manual
-material as needed. You will require Maven 2, which can be downloaded from http://maven.apache.org/, for building
-Spring-WS. To build deployable .war files for all samples, simply access the "samples" directory and
-execute the "mvn package" command, or run "mvn jetty:run" to run the samples directly in a Jetty 6 Web container.
-
-More information on deploying Spring-WS sample applications can be found at:
- samples/readme.txt
-
-5. ADDITIONAL RESOURCES
-
-The Spring-WS homepage is located at:
-
- http://www.springframework.org/spring-ws
-
-Spring-WS support forums are located at:
-
- http://forum.springframework.org/forumdisplay.php?f=39
-
-The Spring Framework portal is located at:
-
- http://www.springframework.org
diff --git a/release.sh b/release.sh
deleted file mode 100755
index 613e51d4..00000000
--- a/release.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-mvn -Dmaven.test.skip=true -P release clean javadoc:javadoc docbkx:generate-html docbkx:generate-pdf install
diff --git a/samples/airline/client/airline.wsdl b/samples/airline/client/airline.wsdl
deleted file mode 100644
index 73cc5a5b..00000000
--- a/samples/airline/client/airline.wsdl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/client/axis1/pom.xml b/samples/airline/client/axis1/pom.xml
deleted file mode 100644
index 7fe669c4..00000000
--- a/samples/airline/client/axis1/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- airline-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- airline-axis1-client
- jar
- Spring WS Airline Sample - Axis 1 Client
-
-
-
- org.codehaus.mojo
- axistools-maven-plugin
-
-
- file://${project.basedir}/../airline.wsdl
-
- org.springframework.ws.samples.airline.client.axis1
-
-
-
-
- wsdl2java
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.airline.client.axis1.Main
-
-
-
-
-
-
- axis
- axis
- 1.4
-
-
- axis
- axis-jaxrpc
- 1.4
-
-
- commons-discovery
- commons-discovery
- 0.4
-
-
- wsdl4j
- wsdl4j
-
-
-
-
-
diff --git a/samples/airline/client/axis1/readme.txt b/samples/airline/client/axis1/readme.txt
deleted file mode 100644
index c9fa3097..00000000
--- a/samples/airline/client/axis1/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-SPRING WEB SERVICES
-
-This directory contains a Java client for the Airline Web Service that uses JAX-RPC.
-The client can be run from the provided ant file, by calling "ant run".
-
-SAJA Client Sample table of contents
----------------------------------------------------
-* src - The source files for the client
-* build.xml - Ant build file with a 'build' and a 'run' target
-
diff --git a/samples/airline/client/axis1/src/main/java/org/springframework/ws/samples/airline/client/axis1/Main.java b/samples/airline/client/axis1/src/main/java/org/springframework/ws/samples/airline/client/axis1/Main.java
deleted file mode 100644
index 11a2cc6f..00000000
--- a/samples/airline/client/axis1/src/main/java/org/springframework/ws/samples/airline/client/axis1/Main.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.axis1;
-
-import java.rmi.RemoteException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Calendar;
-import javax.xml.rpc.ServiceException;
-
-/**
- * Simple client that calls the GetFlights and BookFlight operations using JAX-RPC (Axis 1).
- *
- * @author Arjen Poutsma
- */
-public class Main {
-
- public static void main(String[] args) throws ServiceException, RemoteException {
- AirlineServiceLocator service = new AirlineServiceLocator();
- if (args.length > 0) {
- service.setAirlineSoap11EndpointAddress(args[0]);
- }
- Airline airline = service.getAirlineSoap11();
- GetFlightsRequest request = new GetFlightsRequest();
- request.setFrom("AMS");
- request.setTo("VCE");
- Calendar departureCalendar = Calendar.getInstance();
- departureCalendar.set(Calendar.YEAR, 2006);
- departureCalendar.set(Calendar.MONTH, Calendar.JANUARY);
- departureCalendar.set(Calendar.DATE, 31);
- Date departureDate = departureCalendar.getTime();
- request.setDepartureDate(departureDate);
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- System.out.println("Requesting flights on " + dateFormat.format(departureDate));
- Flight[] flights = airline.getFlights(request).getFlight();
- System.out.println("Got " + flights.length + " results");
- if (flights.length > 0)
- {
- // Book the first flight using John Doe as a frequent flyer
- BookFlightRequest bookFlightRequest = new BookFlightRequest();
- bookFlightRequest.setFlightNumber(flights[0].getNumber());
- bookFlightRequest.setDepartureTime(flights[0].getDepartureTime());
- BookFlightRequestPassengers passengers = new BookFlightRequestPassengers();
- passengers.setUsername("john");
- bookFlightRequest.setPassengers(passengers);
- Ticket ticket = airline.bookFlight(bookFlightRequest);
- writeTicket(ticket);
- }
- }
-
- private static void writeTicket(Ticket ticket) {
- System.out.println("Ticket " + ticket.getId());
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- System.out.println("Ticket issue date:\t" + dateFormat.format(ticket.getIssueDate()));
- for (int i = 0; i < ticket.getPassengers().getPassenger().length; i++) {
- writeName(ticket.getPassengers().getPassenger()[i]);
-
- }
- writeFlight(ticket.getFlight());
- }
-
- private static void writeName(Name name) {
- System.out.println("Passenger Name:");
- System.out.println(name.getFirst() + " " + name.getLast());
- System.out.println("------------");
- }
-
- private static void writeFlight(Flight flight) {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- System.out.println(dateFormat.format(flight.getDepartureTime().getTime()));
- System.out.println(flight.getNumber() + "\t" + flight.getServiceClass());
- System.out.println("------------");
- System.out.println("Depart:\t" + flight.getFrom().getCode() + "-" + flight.getFrom().getName() + "\t" + dateFormat.format(flight.getDepartureTime().getTime()));
- System.out.println("\t" + flight.getFrom().getCity());
- System.out.println("Arrive:\t" + flight.getTo().getCode() + "-" + flight.getTo().getName() + "\t" + dateFormat.format(flight.getArrivalTime().getTime()));
- System.out.println("\t" + flight.getTo().getCity());
- }
-
-
-}
diff --git a/samples/airline/client/jax-ws/pom.xml b/samples/airline/client/jax-ws/pom.xml
deleted file mode 100644
index f4359661..00000000
--- a/samples/airline/client/jax-ws/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
- airline-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- airline-jax-ws-client
- jar
- Spring WS Airline Sample - JAX-WS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- compile
-
-
-
-
-
-
-
- org.codehaus.mojo
- jaxws-maven-plugin
-
-
-
- wsimport
-
-
-
- file://${project.basedir}/../airline.wsdl
-
- org.springframework.ws.samples.airline.client.jaxws
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.airline.client.jaxws.Main
-
-
-
-
-
diff --git a/samples/airline/client/jax-ws/readme.txt b/samples/airline/client/jax-ws/readme.txt
deleted file mode 100644
index 89a04c43..00000000
--- a/samples/airline/client/jax-ws/readme.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-SPRING WEB SERVICES
-
-This directory contains a Java client for the Airline Web Service that uses JAX-WS.
-The client can be run from the provided ant file, by calling "ant run".
-Note that the airline sample has to be running before invoking this target.
-
-Client Sample table of contents
----------------------------------------------------
-* src - The source files for the client
-* build.xml - Ant build file with a 'build' and a 'run' target
-
diff --git a/samples/airline/client/jax-ws/src/main/java/org/springframework/ws/samples/airline/client/jaxws/Main.java b/samples/airline/client/jax-ws/src/main/java/org/springframework/ws/samples/airline/client/jaxws/Main.java
deleted file mode 100644
index 12e2d2bd..00000000
--- a/samples/airline/client/jax-ws/src/main/java/org/springframework/ws/samples/airline/client/jaxws/Main.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.jaxws;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeConstants;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import javax.xml.ws.soap.SOAPFaultException;
-
-/**
- * Simple client that calls the GetFlights and BookFlight operations using JAX-WS.
- *
- * @author Arjen Poutsma
- */
-public class Main {
-
- public static void main(String[] args) throws MalformedURLException, DatatypeConfigurationException {
- try {
- AirlineService service;
- if (args.length == 0) {
- service = new AirlineService();
- }
- else {
- QName serviceName = new QName("http://www.springframework.org/spring-ws/samples/airline/definitions",
- "AirlineService");
- service = new AirlineService(new URL(args[0]), serviceName);
- }
- Airline airline = service.getAirlineSoap11();
- GetFlightsRequest request = new GetFlightsRequest();
- request.setFrom("AMS");
- request.setTo("VCE");
- XMLGregorianCalendar departureDate =
- DatatypeFactory.newInstance().newXMLGregorianCalendarDate(2006, 1, 31,
- DatatypeConstants.FIELD_UNDEFINED);
- request.setDepartureDate(departureDate);
- System.out.format("Requesting flights on %1tD%n", departureDate.toGregorianCalendar());
- GetFlightsResponse response = airline.getFlights(request);
- System.out.format("Got %1d results%n", response.getFlight().size());
- if (!response.getFlight().isEmpty())
- // Book the first flight using John Doe as a frequent flyer
- {
- Flight flight = response.getFlight().get(0);
- BookFlightRequest bookFlightRequest = new BookFlightRequest();
- bookFlightRequest.setFlightNumber(flight.getNumber());
- bookFlightRequest.setDepartureTime(flight.getDepartureTime());
- BookFlightRequest.Passengers passengers = new BookFlightRequest.Passengers();
- passengers.getPassengerOrUsername().add("john");
- bookFlightRequest.setPassengers(passengers);
- Ticket ticket = airline.bookFlight(bookFlightRequest);
- writeTicket(ticket);
- }
- }
- catch (SOAPFaultException ex) {
- System.out.format("SOAP Fault Code %1s%n", ex.getFault().getFaultCodeAsQName());
- System.out.format("SOAP Fault String: %1s%n", ex.getFault().getFaultString());
-
- }
- }
-
- private static void writeTicket(Ticket ticket) {
- System.out.format("Ticket %1d%n", ticket.getId());
- System.out.format("Ticket issue date:\t%1tD%n", ticket.getIssueDate().toGregorianCalendar());
- for (Name passenger : ticket.getPassengers().getPassenger()) {
- writeName(passenger);
-
- }
- writeFlight(ticket.flight);
- }
-
- private static void writeName(Name name) {
- System.out.format("Passenger Name:%n");
- System.out.format("%1s %2s%n", name.getFirst(), name.getLast());
- System.out.format("------------%n");
- }
-
- private static void writeFlight(Flight flight) {
- System.out.format("%1tD%n", flight.getDepartureTime().toGregorianCalendar());
- System.out.format("%1s\t%2s%n", flight.getNumber(), flight.getServiceClass());
- System.out.format("------------%n");
- System.out.format("Depart:\t%1s-%2s\t%tR%n", flight.getFrom().getCode(), flight.getFrom().getName(), flight.getDepartureTime().toGregorianCalendar());
- System.out.format("\t%1s%n", flight.getFrom().getCity());
- System.out.format("Arrive:\t%1s-%2s\t%tR%n", flight.getTo().getCode(), flight.getTo().getName(), flight.getArrivalTime().toGregorianCalendar());
- System.out.format("\t%1s%n", flight.getTo().getCity());
- }
-
-}
diff --git a/samples/airline/client/jms/pom.xml b/samples/airline/client/jms/pom.xml
deleted file mode 100644
index 7f4fccf4..00000000
--- a/samples/airline/client/jms/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
- airline-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- airline-jms-client
- jar
- Spring WS Airline Sample - JMS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- runtime
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.airline.client.jms.JmsClient
-
-
-
-
-
-
- org.apache.geronimo.specs
- geronimo-jms_1.1_spec
- compile
-
-
- org.springframework.ws
- spring-ws-support
-
-
- org.apache.activemq
- activemq-core
-
-
-
diff --git a/samples/airline/client/jms/readme.txt b/samples/airline/client/jms/readme.txt
deleted file mode 100644
index 36aa269e..00000000
--- a/samples/airline/client/jms/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-SPRING WEB SERVICES
-
-This directory contains a client for the Airline Web Service that uses JMS: Java Message Service. The client can be run
-from the provided ant file, by calling "ant run".
-
-JMS Client Sample table of contents
----------------------------------------------------
-* src - The source files for the client
-* build.xml - Ant build file with a 'build' and a 'run' target
-
diff --git a/samples/airline/client/jms/src/log4j.properties b/samples/airline/client/jms/src/log4j.properties
deleted file mode 100644
index ef742979..00000000
--- a/samples/airline/client/jms/src/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsClient.java b/samples/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsClient.java
deleted file mode 100644
index 34c5f683..00000000
--- a/samples/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsClient.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.jms;
-
-import java.io.IOException;
-import javax.jms.JMSException;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.stream.StreamResult;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-import org.springframework.xml.transform.StringSource;
-
-/** @author Arjen Poutsma */
-public class JmsClient extends WebServiceGatewaySupport {
-
- private static final String PAYLOAD =
- "" +
- "AMS " + "VCE " +
- "2006-01-31 " + " ";
-
- public void getFlights() throws SOAPException, IOException, TransformerException, JMSException {
- getWebServiceTemplate().sendSourceAndReceiveToResult(new StringSource(PAYLOAD), new StreamResult(System.out));
- }
-
- public static void main(String[] args) throws Exception {
- ApplicationContext applicationContext =
- new ClassPathXmlApplicationContext("applicationContext.xml", JmsClient.class);
- JmsClient jmsClient = (JmsClient) applicationContext.getBean("jmsClient", JmsClient.class);
- jmsClient.getFlights();
- }
-}
\ No newline at end of file
diff --git a/samples/airline/client/jms/src/main/resources/org/springframework/ws/samples/airline/client/jms/applicationContext.xml b/samples/airline/client/jms/src/main/resources/org/springframework/ws/samples/airline/client/jms/applicationContext.xml
deleted file mode 100644
index 790904c7..00000000
--- a/samples/airline/client/jms/src/main/resources/org/springframework/ws/samples/airline/client/jms/applicationContext.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/client/pom.xml b/samples/airline/client/pom.xml
deleted file mode 100644
index f1c2d585..00000000
--- a/samples/airline/client/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- airline
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- airline-client
- pom
- Spring WS Airline Sample - Clients
-
- saaj
- axis1
- spring-ws
- jms
- jax-ws
-
-
diff --git a/samples/airline/client/saaj/.gitignore b/samples/airline/client/saaj/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/airline/client/saaj/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/airline/client/saaj/pom.xml b/samples/airline/client/saaj/pom.xml
deleted file mode 100644
index 1156de25..00000000
--- a/samples/airline/client/saaj/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
- airline-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- airline-saaj-client
- jar
- Spring WS Airline Sample - SAAJ Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- compile
-
-
- com.sun.xml.messaging.saaj
- saaj-impl
-
-
- javax.activation
- activation
-
-
- com.sun.org.apache.xml.security
- xmlsec
-
-
-
-
-
-
- jboss.repository.releases.public
- JBoss Repo Public
- http://repository.jboss.org/nexus/content/groups/public-jboss
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.airline.client.saaj.Driver
-
-
-
-
-
-
- com.sun.xml.wsit
- xws-security
-
-
- com.sun.xml.wsit
- wsit-rt
-
-
-
diff --git a/samples/airline/client/saaj/readme.txt b/samples/airline/client/saaj/readme.txt
deleted file mode 100644
index b65bd622..00000000
--- a/samples/airline/client/saaj/readme.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-SPRING WEB SERVICES
-
-This directory contains two Java clients for the Airline Web Service that use SAAJ: SOAP with Attachments API for Java.
-There is a client for the GetFlights operation and a client for the secure GetFrequentFlyerMileage operation. Both
-clients can be run from the provided ant file, by calling "ant run".
-
-SAJA Client Sample table of contents
----------------------------------------------------
-* src - The source files for the client
-* build.xml - Ant build file with a 'build' and a 'run' target
-
diff --git a/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/Driver.java b/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/Driver.java
deleted file mode 100644
index 046d0023..00000000
--- a/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/Driver.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.saaj;
-
-/**
- * @author Arjen Poutsma
- */
-public class Driver {
-
- public static void main(String[] args) throws Exception {
- String url = "http://localhost:8080/airline-server/services";
- if (args.length > 0) {
- url = args[0];
- }
- GetFlights getFlights = new GetFlights(url);
- getFlights.getFlights();
-
- if (!System.getProperty("java.version").startsWith("1.5")) {
- return;
- }
- String username = "john";
- String password = "changeme";
- GetFrequentFlyerMileage getMileage = new GetFrequentFlyerMileage(url);
- getMileage.getMileage(username, password);
- }
-
-}
diff --git a/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFlights.java b/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFlights.java
deleted file mode 100644
index b6bf6f35..00000000
--- a/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFlights.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.saaj;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-/**
- * Simple client that calls the GetFlights operation using SAAJ.
- *
- * @author Arjen Poutsma
- */
-public class GetFlights {
-
- public static final String NAMESPACE_URI = "http://www.springframework.org/spring-ws/samples/airline/schemas/messages";
-
- public static final String PREFIX = "airline";
-
- private SOAPConnectionFactory connectionFactory;
-
- private MessageFactory messageFactory;
-
- private URL url;
-
- private TransformerFactory transfomerFactory;
-
- public GetFlights(String url) throws SOAPException, MalformedURLException {
- connectionFactory = SOAPConnectionFactory.newInstance();
- messageFactory = MessageFactory.newInstance();
- transfomerFactory = TransformerFactory.newInstance();
- this.url = new URL(url);
- }
-
- private SOAPMessage createGetFlightsRequest() throws SOAPException {
- SOAPMessage message = messageFactory.createMessage();
- SOAPEnvelope envelope = message.getSOAPPart().getEnvelope();
- Name getFlightsRequestName = envelope.createName("GetFlightsRequest", PREFIX, NAMESPACE_URI);
- SOAPBodyElement getFlightsRequestElement = message.getSOAPBody().addBodyElement(getFlightsRequestName);
- Name fromName = envelope.createName("from", PREFIX, NAMESPACE_URI);
- SOAPElement fromElement = getFlightsRequestElement.addChildElement(fromName);
- fromElement.setValue("AMS");
- Name toName = envelope.createName("to", PREFIX, NAMESPACE_URI);
- SOAPElement toElement = getFlightsRequestElement.addChildElement(toName);
- toElement.setValue("VCE");
- Name departureDateName = envelope.createName("departureDate", PREFIX, NAMESPACE_URI);
- SOAPElement departureDateElement = getFlightsRequestElement.addChildElement(departureDateName);
- departureDateElement.setValue("2006-01-31");
- return message;
- }
-
- public void getFlights() throws SOAPException, IOException, TransformerException {
- SOAPMessage request = createGetFlightsRequest();
- SOAPConnection connection = connectionFactory.createConnection();
- SOAPMessage response = connection.call(request, url);
- if (!response.getSOAPBody().hasFault()) {
- writeGetFlightsResponse(response);
- }
- else {
- SOAPFault fault = response.getSOAPBody().getFault();
- System.err.println("Received SOAP Fault");
- System.err.println("SOAP Fault Code: " + fault.getFaultCode());
- System.err.println("SOAP Fault String: " + fault.getFaultString());
- }
- }
-
- private void writeGetFlightsResponse(SOAPMessage message) throws SOAPException, TransformerException {
- SOAPEnvelope envelope = message.getSOAPPart().getEnvelope();
- Name getFlightsResponseName = envelope.createName("GetFlightsResponse", PREFIX, NAMESPACE_URI);
- SOAPBodyElement getFlightsResponseElement =
- (SOAPBodyElement) message.getSOAPBody().getChildElements(getFlightsResponseName).next();
- Name flightName = envelope.createName("flight", PREFIX, NAMESPACE_URI);
- Iterator iterator = getFlightsResponseElement.getChildElements(flightName);
- Transformer transformer = transfomerFactory.newTransformer();
- transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- int count = 1;
- while (iterator.hasNext()) {
- System.out.println("Flight " + count);
- System.out.println("--------");
- SOAPElement flightElement = (SOAPElement) iterator.next();
- DOMSource source = new DOMSource(flightElement);
- transformer.transform(source, new StreamResult(System.out));
- }
- }
-}
diff --git a/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java b/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java
deleted file mode 100644
index 8c27d41b..00000000
--- a/samples/airline/client/saaj/src/main/java/org/springframework/ws/samples/airline/client/saaj/GetFrequentFlyerMileage.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.saaj;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-
-import com.sun.xml.wss.ProcessingContext;
-import com.sun.xml.wss.XWSSProcessor;
-import com.sun.xml.wss.XWSSProcessorFactory;
-import com.sun.xml.wss.XWSSecurityException;
-import com.sun.xml.wss.impl.callback.PasswordCallback;
-import com.sun.xml.wss.impl.callback.UsernameCallback;
-
-/**
- * Simple client that calls the WS-Security GetFrequentFlyerMileage operation using SAAJ and XWSS.
- *
- * @author Arjen Poutsma
- */
-public class GetFrequentFlyerMileage {
-
- public static final String NAMESPACE_URI = "http://www.springframework.org/spring-ws/samples/airline/schemas/messages";
-
- public static final String PREFIX = "airline";
-
- private SOAPConnectionFactory connectionFactory;
-
- private MessageFactory messageFactory;
-
- private URL url;
-
- private XWSSProcessorFactory processorFactory;
-
- public GetFrequentFlyerMileage(String url) throws SOAPException, MalformedURLException, XWSSecurityException {
- connectionFactory = SOAPConnectionFactory.newInstance();
- messageFactory = MessageFactory.newInstance();
- processorFactory = XWSSProcessorFactory.newInstance();
- this.url = new URL(url);
- }
-
- private SOAPMessage createGetMileageRequest() throws SOAPException {
- SOAPMessage message = messageFactory.createMessage();
- SOAPEnvelope envelope = message.getSOAPPart().getEnvelope();
- Name getFlightsRequestName = envelope.createName("GetFrequentFlyerMileageRequest", GetFrequentFlyerMileage.PREFIX,
- GetFrequentFlyerMileage.NAMESPACE_URI);
- message.getSOAPBody().addBodyElement(getFlightsRequestName);
- return message;
- }
-
- private SOAPMessage secureMessage(SOAPMessage message, final String username, final String password)
- throws IOException, XWSSecurityException {
- CallbackHandler callbackHandler = new CallbackHandler() {
- public void handle(Callback[] callbacks) throws UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- if (callbacks[i] instanceof UsernameCallback) {
- UsernameCallback callback = (UsernameCallback) callbacks[i];
- callback.setUsername(username);
- }
- else if (callbacks[i] instanceof PasswordCallback) {
- PasswordCallback callback = (PasswordCallback) callbacks[i];
- callback.setPassword(password);
- }
- else {
- throw new UnsupportedCallbackException(callbacks[i]);
- }
- }
- }
- };
- InputStream policyStream = null;
- XWSSProcessor processor = null;
- try {
- policyStream = getClass().getResourceAsStream("securityPolicy.xml");
- processor = processorFactory.createProcessorForSecurityConfiguration(policyStream, callbackHandler);
- }
- finally {
- if (policyStream != null) {
- policyStream.close();
- }
- }
- ProcessingContext context = processor.createProcessingContext(message);
- return processor.secureOutboundMessage(context);
- }
-
- public void getMileage(String username, String password) throws SOAPException, IOException, XWSSecurityException {
- SOAPMessage request = createGetMileageRequest();
- request = secureMessage(request, username, password);
- SOAPConnection connection = connectionFactory.createConnection();
- SOAPMessage response = connection.call(request, url);
- if (!response.getSOAPBody().hasFault()) {
- SOAPBodyElement mileage = (SOAPBodyElement) response.getSOAPBody().getChildElements().next();
- System.out.println("'" + username + "' has " + mileage.getValue() + " frequent flyer miles");
- }
- else {
- SOAPFault fault = response.getSOAPBody().getFault();
- System.err.println("Received SOAP Fault");
- System.err.println("SOAP Fault Code: " + fault.getFaultCode());
- System.err.println("SOAP Fault String: " + fault.getFaultString());
- }
- }
-}
diff --git a/samples/airline/client/saaj/src/main/resources/org/springframework/ws/samples/airline/client/saaj/securityPolicy.xml b/samples/airline/client/saaj/src/main/resources/org/springframework/ws/samples/airline/client/saaj/securityPolicy.xml
deleted file mode 100644
index 85090738..00000000
--- a/samples/airline/client/saaj/src/main/resources/org/springframework/ws/samples/airline/client/saaj/securityPolicy.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/samples/airline/client/spring-ws/.gitignore b/samples/airline/client/spring-ws/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/airline/client/spring-ws/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/airline/client/spring-ws/pom.xml b/samples/airline/client/spring-ws/pom.xml
deleted file mode 100644
index cd8fa11b..00000000
--- a/samples/airline/client/spring-ws/pom.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
- airline-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- airline-spring-ws-client
- jar
- Spring WS Airline Sample - Spring-WS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- runtime
-
-
-
-
-
-
-
- org.codehaus.mojo
- xmlbeans-maven-plugin
-
-
-
- xmlbeans
-
-
-
-
- ${project.basedir}/../../server/src/main/webapp/
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.airline.client.sws.Driver
-
-
-
-
-
-
- org.apache.xmlbeans
- xmlbeans
-
-
- org.springframework
- spring-context
-
-
- org.springframework.ws
- spring-xml
-
-
- org.springframework.ws
- spring-ws-test
- test
-
-
- org.springframework.ws
- spring-ws-security
-
-
- org.springframework.ws
- spring-ws-core
-
-
- org.apache.ws.security
- wss4j
-
-
- org.springframework
- spring-test
-
-
- org.springframework.security
- spring-security-core
- test
-
-
- log4j
- log4j
- compile
-
-
-
-
diff --git a/samples/airline/client/spring-ws/src/log4j.properties b/samples/airline/client/spring-ws/src/log4j.properties
deleted file mode 100644
index 0f73a758..00000000
--- a/samples/airline/client/spring-ws/src/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/Driver.java b/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/Driver.java
deleted file mode 100644
index dc2d3504..00000000
--- a/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/Driver.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.sws;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * @author Arjen Poutsma
- */
-public class Driver {
-
- public static void main(String[] args) {
- ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
- "org/springframework/ws/samples/airline/client/sws/applicationContext.xml");
- GetFlights getFlights = applicationContext.getBean("getFlights", GetFlights.class);
- getFlights.getFlights();
-
- GetFrequentFlyerMileage getFrequentFlyerMileage = applicationContext
- .getBean("getFrequentFlyerMileage", GetFrequentFlyerMileage.class);
- getFrequentFlyerMileage.getFrequentFlyerMileage();
-
- }
-
-}
diff --git a/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java b/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java
deleted file mode 100644
index a2d3ef50..00000000
--- a/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFlights.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.sws;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import org.springframework.springWs.samples.airline.schemas.messages.BookFlightRequestDocument;
-import org.springframework.springWs.samples.airline.schemas.messages.BookFlightResponseDocument;
-import org.springframework.springWs.samples.airline.schemas.messages.GetFlightsRequestDocument;
-import org.springframework.springWs.samples.airline.schemas.messages.GetFlightsResponseDocument;
-import org.springframework.springWs.samples.airline.schemas.types.Flight;
-import org.springframework.springWs.samples.airline.schemas.types.Name;
-import org.springframework.springWs.samples.airline.schemas.types.Ticket;
-import org.springframework.ws.WebServiceMessageFactory;
-import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-
-public class GetFlights extends WebServiceGatewaySupport {
-
- public GetFlights(WebServiceMessageFactory messageFactory) {
- super(messageFactory);
- }
-
- public void getFlights() {
- GetFlightsRequestDocument getFlightsRequestDocument = GetFlightsRequestDocument.Factory.newInstance();
- GetFlightsRequestDocument.GetFlightsRequest getFlightsRequest =
- getFlightsRequestDocument.addNewGetFlightsRequest();
- getFlightsRequest.setFrom("AMS");
- getFlightsRequest.setTo("VCE");
- Calendar departureDate = Calendar.getInstance();
- departureDate.clear();
- departureDate.set(2006, Calendar.JANUARY, 31);
- getFlightsRequest.setDepartureDate(departureDate);
-
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- System.out.println("Requesting flights on " + dateFormat.format(departureDate.getTime()));
- GetFlightsResponseDocument getFlightsResponseDocument =
- (GetFlightsResponseDocument) getWebServiceTemplate().marshalSendAndReceive(getFlightsRequestDocument);
- GetFlightsResponseDocument.GetFlightsResponse response = getFlightsResponseDocument.getGetFlightsResponse();
- System.out.println("Got " + response.sizeOfFlightArray() + " results");
- if (response.sizeOfFlightArray() > 0) {
- // Book the first flight using John Doe as a frequent flyer
- BookFlightRequestDocument bookFlightRequestDocument = BookFlightRequestDocument.Factory.newInstance();
- BookFlightRequestDocument.BookFlightRequest bookFlightRequest =
- bookFlightRequestDocument.addNewBookFlightRequest();
- bookFlightRequest.setFlightNumber(response.getFlightArray(0).getNumber());
- bookFlightRequest.setDepartureTime(response.getFlightArray(0).getDepartureTime());
- BookFlightRequestDocument.BookFlightRequest.Passengers passengers = bookFlightRequest.addNewPassengers();
- passengers.addUsername("john");
-
- BookFlightResponseDocument bookFlightResponseDocument = (BookFlightResponseDocument) getWebServiceTemplate()
- .marshalSendAndReceive(bookFlightRequestDocument);
- Ticket ticket = bookFlightResponseDocument.getBookFlightResponse();
- writeTicket(ticket);
- }
- }
-
- private void writeTicket(Ticket ticket) {
- System.out.println("Ticket " + ticket.getId());
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- System.out.println("Ticket issue date:\t" + dateFormat.format(ticket.getIssueDate().getTime()));
- for (int i = 0; i < ticket.getPassengers().sizeOfPassengerArray(); i++) {
- writeName(ticket.getPassengers().getPassengerArray(i));
-
- }
- writeFlight(ticket.getFlight());
- }
-
- private void writeName(Name name) {
- System.out.println("Passenger Name:");
- System.out.println(name.getFirst() + " " + name.getLast());
- System.out.println("------------");
- }
-
- private void writeFlight(Flight flight) {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- System.out.println(dateFormat.format(flight.getDepartureTime().getTime()));
- System.out.println(flight.getNumber() + "\t" + flight.getServiceClass());
- System.out.println("------------");
- System.out.println("Depart:\t" + flight.getFrom().getCode() + "-" + flight.getFrom().getName() + "\t" +
- dateFormat.format(flight.getDepartureTime().getTime()));
- System.out.println("\t" + flight.getFrom().getCity());
- System.out.println("Arrive:\t" + flight.getTo().getCode() + "-" + flight.getTo().getName() + "\t" +
- dateFormat.format(flight.getArrivalTime().getTime()));
- System.out.println("\t" + flight.getTo().getCity());
- }
-
-}
diff --git a/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java b/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
deleted file mode 100644
index 99021bc9..00000000
--- a/samples/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/GetFrequentFlyerMileage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.sws;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamResult;
-
-import org.springframework.ws.WebServiceMessageFactory;
-import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-import org.springframework.xml.transform.StringSource;
-
-public class GetFrequentFlyerMileage extends WebServiceGatewaySupport {
-
- public GetFrequentFlyerMileage(WebServiceMessageFactory messageFactory) {
- super(messageFactory);
- }
-
- public void getFrequentFlyerMileage() {
- Source source = new StringSource(
- " ");
-
- getWebServiceTemplate().sendSourceAndReceiveToResult(source, new StreamResult(System.out));
-
- }
-
-}
diff --git a/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/applicationContext.xml b/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/applicationContext.xml
deleted file mode 100644
index 19c2ed62..00000000
--- a/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/applicationContext.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml b/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml
deleted file mode 100644
index 85090738..00000000
--- a/samples/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/samples/airline/client/spring-ws/src/test/java/org/springframework/ws/samples/airline/client/sws/GetFlightsTest.java b/samples/airline/client/spring-ws/src/test/java/org/springframework/ws/samples/airline/client/sws/GetFlightsTest.java
deleted file mode 100644
index 39eff19d..00000000
--- a/samples/airline/client/spring-ws/src/test/java/org/springframework/ws/samples/airline/client/sws/GetFlightsTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.client.sws;
-
-import java.util.Collections;
-import java.util.Map;
-import javax.xml.transform.Source;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.xml.transform.StringSource;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.ws.test.client.MockWebServiceServer;
-import static org.springframework.ws.test.client.RequestMatchers.*;
-import static org.springframework.ws.test.client.ResponseCreators.*;
-
-
-/**
- * This test illustrates the use of the client-side testing API, introduced in Spring-WS 2.0.
- *
- * @author Arjen Poutsma
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("applicationContext.xml")
-public class GetFlightsTest {
-
- @Autowired
- GetFlights getFlights;
-
- private MockWebServiceServer mockServer;
-
- private static final String MESSAGES_NS =
- "http://www.springframework.org/spring-ws/samples/airline/schemas/messages";
-
- private static final String TYPES_NS = "http://www.springframework.org/spring-ws/samples/airline/schemas/types";
-
- @Before
- public void setUpMocks() throws Exception {
- mockServer = MockWebServiceServer.createServer(getFlights);
- }
-
- @Test
- public void getFlights() throws Exception {
- Source getFlightsRequest = new StringSource(
- "" + "AMS " + "VCE " +
- "2006-01-31 " + " ");
-
- String flightInfo =
- "KL1653 " + "2006-01-31T10:05:00.000+01:00 " +
- "AMS Schiphol Airport Amsterdam " +
- "2006-01-31T12:25:00.000+01:00 " +
- "VCE Marco Polo Airport Venice " +
- "economy ";
-
- Source getFlightsResponse = new StringSource(
- "" + "" +
- flightInfo + " " + " ");
-
- mockServer.expect(payload(getFlightsRequest)).andRespond(withPayload(getFlightsResponse));
-
- Source bookFlightResponse = new StringSource(
- "" + "4 " +
- "2010-07-28 " +
- "John Doe " +
- "" + flightInfo + " " + " ");
-
- Map namespaces = Collections.singletonMap("m", MESSAGES_NS);
-
- mockServer.expect(xpath("/m:BookFlightRequest/m:flightNumber", namespaces).exists())
- .andExpect(xpath("/m:BookFlightRequest/m:departureTime", namespaces).exists())
- .andExpect(xpath("/m:BookFlightRequest/m:passengers", namespaces).exists())
- .andRespond(withPayload(bookFlightResponse));
-
- getFlights.getFlights();
-
- mockServer.verify();
-
- }
-
-
-}
diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
deleted file mode 100644
index 7228fb72..00000000
--- a/samples/airline/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- spring-ws-samples
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- airline
- pom
- Spring WS Airline Sample
-
- server
- client
-
-
diff --git a/samples/airline/readme.txt b/samples/airline/readme.txt
deleted file mode 100644
index a9ebbb5b..00000000
--- a/samples/airline/readme.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-=====================================================
-== Spring Web Service Airline sample application ==
-=====================================================
-
-1. INTRODUCTION
-
-Features a web service on top of an airline reservation system, backed by a database. The web service works by using XML
-Marshalling techniques (JAXB2), and XPath in combination with XPath queries to pull information from a message.
-Additionally, the Airline service has JMS support. All messages follow the messages.xsd schema in src/main/webapp.
-
-2. INSTALLATION
-
-The Airline sample is a normal web application that connects to an embedded
-HSQLDB database. It requires JDK 1.5 to run; JDK 1.6 works as well, except for
-the WS-Security endpoints.
-
-To execute the sample, run "mvn jetty:run" in the server directory to run the sample in the Jetty6 Web container.
-
-To create a war file instead of running in Jetty, use "mvn package".
-
-3. THE CLIENTS
-
-Simply run "mvn install exec:java" in each of the client subdirectories.
diff --git a/samples/airline/server/.gitignore b/samples/airline/server/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/airline/server/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/airline/server/pom.xml b/samples/airline/server/pom.xml
deleted file mode 100644
index af8f318b..00000000
--- a/samples/airline/server/pom.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-
-
- airline
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- airline-server
- war
- Spring WS Airline Sample - Server
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.bind
- jaxb-api
- 2.1
-
-
- javax.xml.stream
- stax-api
-
-
- javax.activation
- activation
-
-
-
-
- com.sun.xml.bind
- jaxb-impl
- 2.1.5
- runtime
-
-
- javax.xml.stream
- stax-api
- compile
-
-
- javax.xml.soap
- saaj-api
- runtime
-
-
- com.sun.xml.messaging.saaj
- saaj-impl
- runtime
-
-
- javax.activation
- activation
- runtime
-
-
-
-
-
-
-
- org.codehaus.mojo
- jaxb2-maven-plugin
-
-
-
- xjc
-
-
-
-
- src/main/webapp/
- org.springframework.ws.samples.airline.schema
-
-
-
- org.codehaus.mojo
- openjpa-maven-plugin
- 1.0
-
- org/springframework/ws/samples/airline/domain/*.class
- org/springframework/ws/samples/airline/domain/ServiceClass.class
-
-
-
- enhancer
- process-classes
-
- enhance
-
-
-
-
-
-
-
-
-
- org.springframework.ws
- spring-xml
-
-
- org.springframework.ws
- spring-ws-core
-
-
- org.springframework.ws
- spring-ws-support
- runtime
-
-
- org.codehaus.woodstox
- woodstox-core-asl
- runtime
-
-
- org.springframework.ws
- spring-ws-security
-
-
- org.apache.ws.security
- wss4j
-
-
-
-
-
- org.springframework
- spring-context
-
-
- org.springframework
- spring-beans
-
-
- org.springframework
- spring-aop
- runtime
-
-
- org.springframework
- spring-orm
- runtime
-
-
- org.springframework
- spring-tx
-
-
- org.springframework
- spring-jdbc
-
-
- org.springframework
- spring-web
-
-
- org.springframework
- spring-webmvc
-
-
- org.springframework
- spring-jms
-
-
- org.springframework
- spring-test
-
-
-
- javax.servlet
- servlet-api
- provided
-
-
- taglibs
- standard
- 1.1.2
- runtime
-
-
- javax.persistence
- persistence-api
- runtime
-
-
- org.apache.geronimo.specs
- geronimo-jms_1.1_spec
- runtime
-
-
-
- org.apache.openjpa
- openjpa
- 1.2.0
-
-
- commons-dbcp
- commons-dbcp
- 1.2.1
- runtime
-
-
- xml-apis
- xml-apis
-
-
- xerces
- xerces
-
-
-
-
- hsqldb
- hsqldb
- 1.8.0.7
- runtime
-
-
-
- joda-time
- joda-time
- 1.4
-
-
- joda-time
- joda-time-jsptags
- 1.0
- runtime
-
-
- aspectj
- aspectjweaver
- 1.5.3
- runtime
-
-
- org.springframework.security
- spring-security-core
-
-
- org.springframework.security
- spring-security-config
-
-
- org.springframework.security
- spring-security-web
-
-
- org.apache.activemq
- activemq-core
- runtime
-
-
- org.apache.derby
- derby
- 10.3.1.4
- runtime
-
-
- org.apache.ws.xmlschema
- xmlschema-core
-
-
-
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FlightDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FlightDao.java
deleted file mode 100644
index dc8c18c5..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FlightDao.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.ws.samples.airline.dao;
-
-import java.util.List;
-
-import org.joda.time.DateTime;
-import org.joda.time.Interval;
-import org.springframework.dao.DataAccessException;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-
-public interface FlightDao {
-
- List findFlights(String fromAirportCode, String toAirportCode, Interval interval, ServiceClass serviceClass)
- throws DataAccessException;
-
- Flight getFlight(Long id);
-
- Flight getFlight(String flightNumber, DateTime departureTime);
-
- Flight update(Flight flight);
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FrequentFlyerDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FrequentFlyerDao.java
deleted file mode 100644
index e889cc97..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/FrequentFlyerDao.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-
-public interface FrequentFlyerDao {
-
- FrequentFlyer get(String username) throws DataAccessException;
-
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/TicketDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/TicketDao.java
deleted file mode 100644
index e3be0acd..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/TicketDao.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.ws.samples.airline.domain.Ticket;
-
-public interface TicketDao {
-
- void save(Ticket ticket) throws DataAccessException;
-
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/DatabaseInitializer.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/DatabaseInitializer.java
deleted file mode 100644
index a4a506a7..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/DatabaseInitializer.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao.jpa;
-
-import javax.annotation.PostConstruct;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.ws.samples.airline.domain.Airport;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.joda.time.DateTime;
-
-/**
- * A simple class that uses JPA to initialize the database.
- *
- * @author Arjen Poutsma
- * @since 1.5.0
- */
-@Component
-public class DatabaseInitializer {
-
- private static final Log logger = LogFactory.getLog(DatabaseInitializer.class);
-
- private final TransactionTemplate transactionTemplate;
-
- @PersistenceContext
- private EntityManager entityManager;
-
- private Airport amsterdam;
-
- private Airport venice;
-
- @Autowired
- public DatabaseInitializer(PlatformTransactionManager transactionManager) {
- this.transactionTemplate = new TransactionTemplate(transactionManager);
- }
-
- @PostConstruct
- public void initDatabase() {
- transactionTemplate.execute(new TransactionCallbackWithoutResult() {
- protected void doInTransactionWithoutResult(TransactionStatus transactionStatus) {
- logger.info("Initializing Database");
- createAirports();
- createFlights();
- createFrequentFlyers();
- }
- });
- }
-
- private void createAirports() {
- amsterdam = new Airport("AMS", "Schiphol Airport", "Amsterdam");
- entityManager.persist(amsterdam);
- venice = new Airport("VCE", "Marco Polo Airport", "Venice");
- entityManager.persist(venice);
- }
-
- private void createFlights() {
- Flight flight = new Flight();
- flight.setNumber("KL1653");
- flight.setDepartureTime(new DateTime(2006, 1, 31, 10, 5, 0, 0));
- flight.setFrom(amsterdam);
- flight.setArrivalTime(new DateTime(2006, 1, 31, 12, 25, 0, 0));
- flight.setTo(venice);
- flight.setServiceClass(ServiceClass.ECONOMY);
- flight.setSeatsAvailable(5);
- flight.setMiles(200);
- entityManager.persist(flight);
- flight = new Flight();
- flight.setNumber("KL1654");
- flight.setDepartureTime(new DateTime(2006, 2, 5, 12, 40, 0, 0));
- flight.setFrom(venice);
- flight.setArrivalTime(new DateTime(2006, 2, 5, 14, 15, 0, 0));
- flight.setTo(amsterdam);
- flight.setServiceClass(ServiceClass.ECONOMY);
- flight.setSeatsAvailable(5);
- flight.setMiles(200);
- entityManager.persist(flight);
- }
-
- private void createFrequentFlyers() {
- entityManager.persist(new FrequentFlyer("John", "Doe", "john", "changeme"));
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDao.java
deleted file mode 100644
index 72ca105d..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDao.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao.jpa;
-
-import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.joda.time.DateTime;
-import org.joda.time.Interval;
-import org.springframework.dao.DataAccessException;
-import org.springframework.stereotype.Repository;
-import org.springframework.ws.samples.airline.dao.FlightDao;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-
-@Repository
-public class JpaFlightDao implements FlightDao {
-
- @PersistenceContext
- private EntityManager entityManager;
-
- public List findFlights(String fromAirportCode,
- String toAirportCode,
- Interval interval,
- ServiceClass serviceClass) throws DataAccessException {
- Query query = entityManager.createQuery("SELECT f FROM Flight f WHERE f.from.code = :fromParam " +
- "AND f.to.code = :toParam AND f.departureTime >= :start AND f.departureTime <= :end AND " +
- "f.serviceClass = :class");
- query.setParameter("fromParam", fromAirportCode);
- query.setParameter("toParam", toAirportCode);
- query.setParameter("start", interval.getStart());
- query.setParameter("end", interval.getEnd());
- query.setParameter("class", serviceClass);
- return query.getResultList();
- }
-
- public Flight getFlight(Long id) {
- return entityManager.find(Flight.class, id);
- }
-
- public Flight getFlight(String flightNumber, DateTime departureTime) {
- Query query = entityManager
- .createQuery("SELECT f FROM Flight f WHERE f.number = :number AND f.departureTime = :departureTime");
- query.setParameter("number", flightNumber);
- query.setParameter("departureTime", departureTime);
- try {
- return (Flight) query.getSingleResult();
- }
- catch (NoResultException e) {
- return null;
- }
- }
-
- public Flight update(Flight flight) {
- return entityManager.merge(flight);
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDao.java
deleted file mode 100644
index b7cb58df..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDao.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao.jpa;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.stereotype.Repository;
-import org.springframework.ws.samples.airline.dao.FrequentFlyerDao;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-
-@Repository
-public class JpaFrequentFlyerDao implements FrequentFlyerDao {
-
- @PersistenceContext
- private EntityManager entityManager;
-
- public FrequentFlyer get(String username) throws DataAccessException {
- Query query = entityManager.createQuery("SELECT f FROM FrequentFlyer f WHERE f.username = :username");
- query.setParameter("username", username);
- try {
- return (FrequentFlyer) query.getSingleResult();
- }
- catch (NoResultException e) {
- return null;
- }
- }
-
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDao.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDao.java
deleted file mode 100644
index ba11a44c..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDao.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao.jpa;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.stereotype.Repository;
-import org.springframework.ws.samples.airline.dao.TicketDao;
-import org.springframework.ws.samples.airline.domain.Ticket;
-
-@Repository
-public class JpaTicketDao implements TicketDao {
-
- @PersistenceContext
- private EntityManager entityManager;
-
- public void save(Ticket ticket) throws DataAccessException {
- entityManager.persist(ticket);
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Airport.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Airport.java
deleted file mode 100644
index d9951a03..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Airport.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.domain;
-
-import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "AIRPORT")
-public class Airport implements Serializable {
-
- @Id
- @Column(name = "CODE")
- private String code;
-
- @Column(name = "NAME")
- private String name;
-
- @Column(name = "CITY")
- private String city;
-
- public Airport() {
- }
-
- public Airport(String code, String name, String city) {
- this.code = code;
- this.name = name;
- this.city = city;
- }
-
- public String getCity() {
- return city;
- }
-
- public String getCode() {
- return code;
- }
-
- public String getName() {
- return name;
- }
-
- public boolean equals(Object other) {
- if (this == other) {
- return true;
- }
- if (!(other instanceof Airport)) {
- return false;
- }
- final Airport that = (Airport) other;
- return code.equals(that.code);
- }
-
- public int hashCode() {
- return code.hashCode();
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Flight.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Flight.java
deleted file mode 100644
index 102859f0..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Flight.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2005, 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.ws.samples.airline.domain;
-
-import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.apache.openjpa.persistence.Persistent;
-import org.joda.time.DateTime;
-
-@Entity
-@Table(name = "FLIGHT")
-public class Flight implements Serializable {
-
- @Id
- @Column(name = "ID")
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Long id;
-
- @Column(name = "NUMBER")
- private String number;
-
- @Column(name = "DEPARTURE_TIME")
- @Persistent
- private DateTime departureTime;
-
- @ManyToOne
- @JoinColumn(name = "FROM_AIRPORT_CODE", nullable = false)
- private Airport from;
-
- @Column(name = "ARRIVAL_TIME")
- @Persistent
- private DateTime arrivalTime;
-
- @ManyToOne
- @JoinColumn(name = "TO_AIRPORT_CODE", nullable = false)
- private Airport to;
-
- @Column(name = "SERVICE_CLASS")
- @Enumerated(EnumType.STRING)
- private ServiceClass serviceClass;
-
- @Column(name = "SEATS_AVAILABLE")
- private int seatsAvailable;
-
- @Column(name = "MILES")
- private int miles;
-
- public Flight() {
- }
-
- public Flight(Long id) {
- this.id = id;
- }
-
- public Long getId() {
- return id;
- }
-
- public DateTime getArrivalTime() {
- return arrivalTime;
- }
-
- public void setArrivalTime(DateTime arrivalTime) {
- this.arrivalTime = arrivalTime;
- }
-
- public DateTime getDepartureTime() {
- return departureTime;
- }
-
- public void setDepartureTime(DateTime departureTime) {
- this.departureTime = departureTime;
- }
-
- public Airport getFrom() {
- return from;
- }
-
- public void setFrom(Airport from) {
- this.from = from;
- }
-
- public int getMiles() {
- return miles;
- }
-
- public void setMiles(int miles) {
- this.miles = miles;
- }
-
- public String getNumber() {
- return number;
- }
-
- public void setNumber(String number) {
- this.number = number;
- }
-
- public int getSeatsAvailable() {
- return seatsAvailable;
- }
-
- public void setSeatsAvailable(int seatsAvailable) {
- this.seatsAvailable = seatsAvailable;
- }
-
- public ServiceClass getServiceClass() {
- return serviceClass;
- }
-
- public void setServiceClass(ServiceClass serviceClass) {
- this.serviceClass = serviceClass;
- }
-
- public Airport getTo() {
- return to;
- }
-
- public void setTo(Airport to) {
- this.to = to;
- }
-
- public void substractSeats(int count) {
- seatsAvailable -= count;
- }
-
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- final Flight flight = (Flight) o;
-
- if (!departureTime.equals(flight.departureTime)) {
- return false;
- }
- return number.equals(flight.number);
- }
-
- public int hashCode() {
- int result = number.hashCode();
- result = 29 * result + departureTime.hashCode();
- return result;
- }
-
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append(getNumber());
- buffer.append(' ');
- buffer.append(getDepartureTime().toString());
- return buffer.toString();
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/FrequentFlyer.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/FrequentFlyer.java
deleted file mode 100644
index 7e428ea3..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/FrequentFlyer.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.domain;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "FREQUENT_FLYER")
-@PrimaryKeyJoinColumn(name = "PASSENGER_ID")
-public class FrequentFlyer extends Passenger {
-
- @Column(name = "USERNAME")
- private String username;
-
- @Column(name = "PASSWORD")
- private String password;
-
- @Column(name = "MILES")
- private int miles;
-
- public FrequentFlyer() {
- }
-
- public FrequentFlyer(String username) {
- this.username = username;
- }
-
- public FrequentFlyer(String firstName, String lastName, String username, String password) {
- super(firstName, lastName);
- this.username = username;
- this.password = password;
- }
-
- public int getMiles() {
- return miles;
- }
-
- public void setMiles(int miles) {
- this.miles = miles;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public boolean equals(Object other) {
- if (this == other) {
- return true;
- }
- if (!(other instanceof FrequentFlyer)) {
- return false;
- }
- final FrequentFlyer that = (FrequentFlyer) other;
- return username.equals(that.username);
- }
-
- public int hashCode() {
- return username.hashCode();
- }
-
- public String toString() {
- return username;
- }
-
- public void addMiles(int miles) {
- this.miles += miles;
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Passenger.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Passenger.java
deleted file mode 100644
index 3aeb6282..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Passenger.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2005, 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.ws.samples.airline.domain;
-
-import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "PASSENGER")
-@Inheritance(strategy = InheritanceType.JOINED)
-public class Passenger implements Serializable {
-
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "ID")
- private Long id;
-
- @Column(name = "FIRST_NAME")
- private String firstName;
-
- @Column(name = "LAST_NAME")
- private String lastName;
-
- public Passenger() {
- }
-
- public Passenger(String firstName, String lastName) {
- this.firstName = firstName;
- this.lastName = lastName;
- }
-
- public Passenger(Long id, String firstName, String lastName) {
- this.id = id;
- this.firstName = firstName;
- this.lastName = lastName;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public Long getId() {
- return id;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public String toString() {
- return firstName + " " + lastName;
- }
-
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- final Passenger passenger = (Passenger) o;
-
- if (!getFirstName().equals(passenger.getFirstName())) {
- return false;
- }
- if (!getLastName().equals(passenger.getLastName())) {
- return false;
- }
-
- return true;
- }
-
- public int hashCode() {
- int result = getFirstName().hashCode();
- result = 29 * result + getLastName().hashCode();
- return result;
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/ServiceClass.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/ServiceClass.java
deleted file mode 100644
index 2c6dc5d3..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/ServiceClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.domain;
-
-public enum ServiceClass {
-
- ECONOMY,
-
- BUSINESS,
-
- FIRST
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Ticket.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Ticket.java
deleted file mode 100644
index da3593f1..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/Ticket.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.domain;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.apache.openjpa.persistence.Persistent;
-import org.joda.time.LocalDate;
-
-@Entity
-@Table(name = "TICKET")
-public class Ticket implements Serializable {
-
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Long id;
-
- @Column(name = "ISSUE_DATE")
- @Persistent
- private LocalDate issueDate;
-
- @ManyToOne
- @JoinColumn(name = "FLIGHT_ID", nullable = false)
- private Flight flight;
-
- @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
- @JoinTable(name = "PASSENGER_TICKET",
- joinColumns = @JoinColumn(name = "TICKET_ID"),
- inverseJoinColumns = @JoinColumn(name = "PASSENGER_ID"))
- private Set passengers = new HashSet();
-
- public Ticket() {
- }
-
- public Ticket(Long id) {
- this.id = id;
- }
-
- public Long getId() {
- return id;
- }
-
- public Flight getFlight() {
- return flight;
- }
-
- public void setFlight(Flight flight) {
- this.flight = flight;
- }
-
- public LocalDate getIssueDate() {
- return issueDate;
- }
-
- public void setIssueDate(LocalDate issueDate) {
- this.issueDate = issueDate;
- }
-
- public Set getPassengers() {
- return passengers;
- }
-
- public void setPassengers(Set passengers) {
- this.passengers = passengers;
- }
-
- public void addPassenger(Passenger passenger) {
- passengers.add(passenger);
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java
deleted file mode 100644
index e3d48426..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/DateTimeValueHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.domain.openjpa;
-
-import java.sql.Timestamp;
-
-import org.apache.openjpa.jdbc.kernel.JDBCStore;
-import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
-import org.apache.openjpa.jdbc.meta.ValueMapping;
-import org.apache.openjpa.jdbc.meta.strats.AbstractValueHandler;
-import org.apache.openjpa.jdbc.schema.Column;
-import org.apache.openjpa.jdbc.schema.ColumnIO;
-import org.joda.time.DateTime;
-
-/**
- * @author Arjen Poutsma
- * @since 1.1.0
- */
-public class DateTimeValueHandler extends AbstractValueHandler {
-
- private static final DateTimeValueHandler instance = new DateTimeValueHandler();
-
- public static DateTimeValueHandler getInstance() {
- return instance;
- }
-
- public Column[] map(ValueMapping vm, String name, ColumnIO io, boolean adapt) {
- Column col = new Column();
- col.setName(name);
- col.setJavaType(JavaSQLTypes.TIMESTAMP);
- return new Column[]{col};
- }
-
- @Override
- public Object toDataStoreValue(ValueMapping valueMapping, Object val, JDBCStore jdbcStore) {
- return val == null ? null : new Timestamp(((DateTime) val).getMillis());
- }
-
- @Override
- public Object toObjectValue(ValueMapping valueMapping, Object val) {
- return val == null ? null : new DateTime(val);
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java
deleted file mode 100644
index b05a46bb..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/domain/openjpa/LocalDateValueHandler.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.domain.openjpa;
-
-import java.sql.Date;
-
-import org.apache.openjpa.jdbc.kernel.JDBCStore;
-import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
-import org.apache.openjpa.jdbc.meta.ValueMapping;
-import org.apache.openjpa.jdbc.meta.strats.AbstractValueHandler;
-import org.apache.openjpa.jdbc.schema.Column;
-import org.apache.openjpa.jdbc.schema.ColumnIO;
-import org.joda.time.LocalDate;
-
-/**
- * @author Arjen Poutsma
- * @since 1.1.0
- */
-public class LocalDateValueHandler extends AbstractValueHandler {
-
- public Column[] map(ValueMapping vm, String name, ColumnIO io, boolean adapt) {
- Column col = new Column();
- col.setName(name);
- col.setJavaType(JavaSQLTypes.DATE);
- return new Column[]{col};
- }
-
- @Override
- public Object toDataStoreValue(ValueMapping valueMapping, Object val, JDBCStore jdbcStore) {
- return val == null ? null : new Date(((LocalDate) val).toDateMidnight().getMillis());
- }
-
- @Override
- public Object toObjectValue(ValueMapping valueMapping, Object val) {
- return val == null ? null : new LocalDate(val);
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/schema/support/SchemaConversionUtils.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/schema/support/SchemaConversionUtils.java
deleted file mode 100644
index 43355242..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/schema/support/SchemaConversionUtils.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.schema.support;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeConstants;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDate;
-import org.springframework.ws.samples.airline.domain.Passenger;
-import org.springframework.ws.samples.airline.schema.Airport;
-import org.springframework.ws.samples.airline.schema.Flight;
-import org.springframework.ws.samples.airline.schema.Name;
-import org.springframework.ws.samples.airline.schema.ServiceClass;
-import org.springframework.ws.samples.airline.schema.Ticket;
-
-/** @author Arjen Poutsma */
-public abstract class SchemaConversionUtils {
-
- private SchemaConversionUtils() {
- }
-
- public static Flight toSchemaType(org.springframework.ws.samples.airline.domain.Flight domainFlight)
- throws DatatypeConfigurationException {
- Flight schemaFlight = new Flight();
- schemaFlight.setNumber(domainFlight.getNumber());
- schemaFlight.setDepartureTime(toXMLGregorianCalendar(domainFlight.getDepartureTime()));
- schemaFlight.setFrom(toSchemaType(domainFlight.getFrom()));
- schemaFlight.setArrivalTime(toXMLGregorianCalendar(domainFlight.getArrivalTime()));
- schemaFlight.setTo(toSchemaType(domainFlight.getTo()));
- schemaFlight.setServiceClass(toSchemaType(domainFlight.getServiceClass()));
- return schemaFlight;
- }
-
- public static List toSchemaType(List domainFlights)
- throws DatatypeConfigurationException {
- List schemaFlights = new ArrayList(domainFlights.size());
- for (org.springframework.ws.samples.airline.domain.Flight domainFlight : domainFlights) {
- schemaFlights.add(toSchemaType(domainFlight));
- }
- return schemaFlights;
- }
-
- public static XMLGregorianCalendar toXMLGregorianCalendar(DateTime dateTime) throws DatatypeConfigurationException {
- DatatypeFactory factory = DatatypeFactory.newInstance();
- return factory.newXMLGregorianCalendar(dateTime.toGregorianCalendar());
- }
-
- public static DateTime toDateTime(XMLGregorianCalendar calendar) {
- int timeZoneMinutes = calendar.getTimezone();
- DateTimeZone timeZone = DateTimeZone.forOffsetHoursMinutes(timeZoneMinutes / 60, timeZoneMinutes % 60);
- return new DateTime(calendar.getYear(), calendar.getMonth(), calendar.getDay(), calendar.getHour(),
- calendar.getMinute(), calendar.getSecond(), calendar.getMillisecond(), timeZone);
- }
-
- public static XMLGregorianCalendar toXMLGregorianCalendar(LocalDate localDate)
- throws DatatypeConfigurationException {
- DatatypeFactory factory = DatatypeFactory.newInstance();
- return factory.newXMLGregorianCalendarDate(localDate.getYear(), localDate.getMonthOfYear(),
- localDate.getDayOfMonth(), DatatypeConstants.FIELD_UNDEFINED);
- }
-
- public static LocalDate toLocalDate(XMLGregorianCalendar calendar) {
- return new LocalDate(calendar.getYear(), calendar.getMonth(), calendar.getDay());
- }
-
- public static Airport toSchemaType(org.springframework.ws.samples.airline.domain.Airport domainAirport) {
- if (domainAirport == null) {
- return null;
- }
- Airport schemaAirport = new Airport();
- schemaAirport.setCode(domainAirport.getCode());
- schemaAirport.setName(domainAirport.getName());
- schemaAirport.setCity(domainAirport.getCity());
- return schemaAirport;
- }
-
- public static ServiceClass toSchemaType(org.springframework.ws.samples.airline.domain.ServiceClass domainServiceClass) {
- switch (domainServiceClass) {
- case BUSINESS:
- return ServiceClass.BUSINESS;
- case ECONOMY:
- return ServiceClass.ECONOMY;
- case FIRST:
- return ServiceClass.FIRST;
- default:
- throw new IllegalArgumentException("Invalid domain service class: [" + domainServiceClass + "]");
- }
- }
-
- public static org.springframework.ws.samples.airline.domain.ServiceClass toDomainType(ServiceClass schemaServiceClass) {
- if (schemaServiceClass == null) {
- return null;
- }
- switch (schemaServiceClass) {
- case BUSINESS:
- return org.springframework.ws.samples.airline.domain.ServiceClass.BUSINESS;
- case ECONOMY:
- return org.springframework.ws.samples.airline.domain.ServiceClass.ECONOMY;
- case FIRST:
- return org.springframework.ws.samples.airline.domain.ServiceClass.FIRST;
- default:
- throw new IllegalArgumentException("Invalid schema service class: [" + schemaServiceClass + "]");
- }
- }
-
- public static Name toSchemaType(org.springframework.ws.samples.airline.domain.Passenger passenger) {
- Name name = new Name();
- name.setFirst(passenger.getFirstName());
- name.setLast(passenger.getLastName());
- return name;
- }
-
- public static Ticket toSchemaType(org.springframework.ws.samples.airline.domain.Ticket domainTicket)
- throws DatatypeConfigurationException {
- Ticket schemaTicket = new Ticket();
- schemaTicket.setId(domainTicket.getId());
- schemaTicket.setFlight(toSchemaType(domainTicket.getFlight()));
- schemaTicket.setIssueDate(toXMLGregorianCalendar(domainTicket.getIssueDate()));
- if (!domainTicket.getPassengers().isEmpty()) {
- schemaTicket.setPassengers(new Ticket.Passengers());
- }
- for (Passenger passenger : domainTicket.getPassengers()) {
- schemaTicket.getPassengers().getPassenger().add(toSchemaType(passenger));
- }
- return schemaTicket;
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerDetails.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerDetails.java
deleted file mode 100644
index 6bda1d74..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerDetails.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-
-/**
- * A wrapper around an FrequentFlyer which provides extra functionality needed to implement the
- * UserDetails interface.
- *
- * @author Arjen Poutsma
- */
-public class FrequentFlyerDetails implements UserDetails {
-
- private FrequentFlyer frequentFlyer;
-
- public static final Collection GRANTED_AUTHORITIES =
- new ArrayList();
- {
- GRANTED_AUTHORITIES.add(new GrantedAuthorityImpl("ROLE_FREQUENT_FLYER"));
- };
-
- public FrequentFlyerDetails(FrequentFlyer frequentFlyer) {
- this.frequentFlyer = frequentFlyer;
- }
-
- public Collection getAuthorities() {
- return GRANTED_AUTHORITIES;
- }
-
- public String getPassword() {
- return frequentFlyer.getPassword();
- }
-
- public String getUsername() {
- return frequentFlyer.getUsername();
- }
-
- public boolean isAccountNonExpired() {
- return true;
- }
-
- public boolean isAccountNonLocked() {
- return true;
- }
-
- public boolean isCredentialsNonExpired() {
- return true;
- }
-
- public boolean isEnabled() {
- return true;
- }
-
- public FrequentFlyer getFrequentFlyer() {
- return frequentFlyer;
- }
-
- public String toString() {
- return frequentFlyer.toString();
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerSecurityService.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerSecurityService.java
deleted file mode 100644
index 5f442ea9..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerSecurityService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.security;
-
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.service.NoSuchFrequentFlyerException;
-
-/**
- * Defines the business logic for handling frequent flyers.
- *
- * @author Arjen Poutsma
- */
-public interface FrequentFlyerSecurityService {
-
- /**
- * Returns the FrequentFlyer with the given username.
- *
- * @param username the username
- * @return the frequent flyer with the given username, or null if not found
- * @throws NoSuchFrequentFlyerException when the frequent flyer cannot be found
- */
- FrequentFlyer getFrequentFlyer(String username) throws NoSuchFrequentFlyerException;
-
- /**
- * Returns the FrequentFlyer that is currently logged in.
- *
- * @return the frequent flyer that is currently logged in, or null if not found
- */
- FrequentFlyer getCurrentlyAuthenticatedFrequentFlyer();
-
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityService.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityService.java
deleted file mode 100644
index 355d2a7f..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityService.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ws.samples.airline.dao.FrequentFlyerDao;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.service.NoSuchFrequentFlyerException;
-
-/**
- * Implementation of the FrequentFlyerSecurityService that uses Spring Security.
- *
- * @author Arjen Poutsma
- */
-public class SpringFrequentFlyerSecurityService implements FrequentFlyerSecurityService, UserDetailsService {
-
- private FrequentFlyerDao frequentFlyerDao;
-
- @Autowired
- public SpringFrequentFlyerSecurityService(FrequentFlyerDao frequentFlyerDao) {
- this.frequentFlyerDao = frequentFlyerDao;
- }
-
- @Transactional
- public FrequentFlyer getCurrentlyAuthenticatedFrequentFlyer() {
- SecurityContext context = SecurityContextHolder.getContext();
- Authentication authentication = context.getAuthentication();
- if (authentication != null) {
- if (authentication.getPrincipal() instanceof FrequentFlyerDetails) {
- FrequentFlyerDetails details = (FrequentFlyerDetails) authentication.getPrincipal();
- return details.getFrequentFlyer();
- }
- else {
- return (FrequentFlyer) authentication.getPrincipal();
- }
- }
- else {
- return null;
- }
- }
-
- @Transactional
- public FrequentFlyer getFrequentFlyer(String username) throws NoSuchFrequentFlyerException {
- FrequentFlyer frequentFlyer = frequentFlyerDao.get(username);
- if (frequentFlyer != null) {
- return frequentFlyer;
- }
- else {
- throw new NoSuchFrequentFlyerException(username);
- }
- }
-
- @Transactional
- public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException {
- FrequentFlyer frequentFlyer = frequentFlyerDao.get(username);
- if (frequentFlyer != null) {
- return new FrequentFlyerDetails(frequentFlyer);
- }
- else {
- throw new UsernameNotFoundException("Frequent flyer '" + username + "' not found");
- }
- }
-
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/StubFrequentFlyerSecurityService.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/StubFrequentFlyerSecurityService.java
deleted file mode 100644
index b4c1f569..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/StubFrequentFlyerSecurityService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.security;
-
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.service.NoSuchFrequentFlyerException;
-
-/**
- * Stub implementation of FrequentFlyerSecurityService. This implementation is used by default by {@link
- * org.springframework.ws.samples.airline.service.impl.AirlineServiceImpl}, to allow it to run without depending on
- * Spring Security.
- *
- * @author Arjen Poutsma
- */
-public class StubFrequentFlyerSecurityService implements FrequentFlyerSecurityService {
-
- private FrequentFlyer john;
-
- public StubFrequentFlyerSecurityService() {
- john = new FrequentFlyer("John", "Doe", "john", "changeme");
- john.setMiles(10);
- }
-
- public FrequentFlyer getFrequentFlyer(String username) throws NoSuchFrequentFlyerException {
- if (john.getUsername().equals(username)) {
- return john;
- }
- else {
- throw new NoSuchFrequentFlyerException(username);
- }
- }
-
- public FrequentFlyer getCurrentlyAuthenticatedFrequentFlyer() {
- return john;
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/AirlineService.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/AirlineService.java
deleted file mode 100644
index 851a5a4e..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/AirlineService.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.ws.samples.airline.service;
-
-import java.util.List;
-
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.domain.Passenger;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-import org.springframework.ws.samples.airline.domain.Ticket;
-
-/**
- * Defines the business logic of the Airline application.
- *
- * @author Arjen Poutsma
- */
-public interface AirlineService {
-
- /**
- * Returns a single Flight with the given id.
- *
- * @param id the flight identifier
- * @return the flight
- * @throws NoSuchFlightException if a flight with the specified flight iddoes not exist
- */
- Flight getFlight(Long id) throws NoSuchFlightException;
-
- /**
- * Returns a list of Flight objects that fall within the specified criteria.
- *
- * @param fromAirportCode the three-letter airport code to get flights from
- * @param toAirportCode the three-letter airport code to get flights to
- * @param departureDate the date of the flights
- * @param serviceClass the desired service class level. May be null
- * @return a list of flights
- */
- List getFlights(String fromAirportCode,
- String toAirportCode,
- LocalDate departureDate,
- ServiceClass serviceClass);
-
- /**
- * Books a single flight for a number of passengers. Passengers can be either specified by name or by frequent flyer
- * username. If a {@link FrequentFlyer} is specified, the first and last name are looked up in the database.
- *
- * @param flightNumber the number of the flight to book
- * @param departureTime the departure time of the flight to book
- * @param passengers the list of passengers for the flight to book. Can be either {@link Passenger} objects with
- * a first and last name, or {@link FrequentFlyer} objects with a username.
- * @return the created ticket
- * @throws NoSuchFlightException if a flight with the specified flight number and departure time does not
- * exist
- * @throws NoSeatAvailableException if not enough seats are available for the flight
- * @throws NoSuchFrequentFlyerException if a specified {@link FrequentFlyer} cannot be found
- * @see org.springframework.ws.samples.airline.domain.Passenger
- * @see org.springframework.ws.samples.airline.domain.FrequentFlyer
- */
- Ticket bookFlight(String flightNumber, DateTime departureTime, List passengers)
- throws NoSuchFlightException, NoSeatAvailableException, NoSuchFrequentFlyerException;
-
- /**
- * Returns the amount of frequent flyer award miles for the currently logged in frequent flyer.
- *
- * @return the amount of frequent flyer miles
- */
- int getFrequentFlyerMileage();
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSeatAvailableException.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSeatAvailableException.java
deleted file mode 100644
index d04c62da..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSeatAvailableException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.service;
-
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.soap.server.endpoint.annotation.FaultCode;
-import org.springframework.ws.soap.server.endpoint.annotation.SoapFault;
-
-/**
- * Exception thrown when not enough seats are available for a flight.
- *
- * @author Arjen Poutsma
- */
-@SoapFault(faultCode = FaultCode.SERVER)
-public class NoSeatAvailableException extends Exception {
-
- private Flight flight;
-
- public NoSeatAvailableException(Flight flight) {
- super("Flight [" + flight + "] has not more seats available");
- this.flight = flight;
- }
-
- public Flight getFlight() {
- return flight;
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFlightException.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFlightException.java
deleted file mode 100644
index b79db40a..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFlightException.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.service;
-
-import org.joda.time.DateTime;
-import org.springframework.ws.soap.server.endpoint.annotation.FaultCode;
-import org.springframework.ws.soap.server.endpoint.annotation.SoapFault;
-
-/**
- * Exception thrown when a specified flight cannot be found.
- *
- * @author Arjen Poutsma
- */
-@SoapFault(faultCode = FaultCode.CLIENT)
-public class NoSuchFlightException extends Exception {
-
- private String flightNumber;
-
- private DateTime departureTime;
-
- public NoSuchFlightException(String flightNumber, DateTime departureTime) {
- super("No flight with number [" + flightNumber + "] and departure time [" + departureTime + "]");
- this.flightNumber = flightNumber;
- this.departureTime = departureTime;
- }
-
- public NoSuchFlightException(Long id) {
- super("No flight with id [" + id + "]");
- }
-
- public String getFlightNumber() {
- return flightNumber;
- }
-
- public DateTime getDepartureTime() {
- return departureTime;
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFrequentFlyerException.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFrequentFlyerException.java
deleted file mode 100644
index 3b8a8216..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/NoSuchFrequentFlyerException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.service;
-
-import org.springframework.ws.soap.server.endpoint.annotation.FaultCode;
-import org.springframework.ws.soap.server.endpoint.annotation.SoapFault;
-
-/**
- * Exception thrown when a specified frequent flyer cannot be found.
- *
- * @author Rossen Stoyanchev
- * @author Arjen Poutsma
- */
-@SoapFault(faultCode = FaultCode.CLIENT)
-public class NoSuchFrequentFlyerException extends Exception {
-
- private String username;
-
- public NoSuchFrequentFlyerException(String username) {
- super("No frequent flyer with name [" + username + "]");
- this.username = username;
- }
-
- public String getusername() {
- return username;
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImpl.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImpl.java
deleted file mode 100644
index c9cfec12..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImpl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.ws.samples.airline.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.annotation.Secured;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import org.springframework.ws.samples.airline.dao.FlightDao;
-import org.springframework.ws.samples.airline.dao.TicketDao;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.domain.Passenger;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-import org.springframework.ws.samples.airline.domain.Ticket;
-import org.springframework.ws.samples.airline.security.FrequentFlyerSecurityService;
-import org.springframework.ws.samples.airline.security.StubFrequentFlyerSecurityService;
-import org.springframework.ws.samples.airline.service.AirlineService;
-import org.springframework.ws.samples.airline.service.NoSeatAvailableException;
-import org.springframework.ws.samples.airline.service.NoSuchFlightException;
-import org.springframework.ws.samples.airline.service.NoSuchFrequentFlyerException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-
-/**
- * Default implementation of the AirlineService interface.
- *
- * @author Arjen Poutsma
- */
-@Service
-@Transactional(readOnly = true)
-public class AirlineServiceImpl implements AirlineService {
-
- private static final Log logger = LogFactory.getLog(AirlineServiceImpl.class);
-
- private FlightDao flightDao;
-
- private TicketDao ticketDao;
-
- private FrequentFlyerSecurityService frequentFlyerSecurityService = new StubFrequentFlyerSecurityService();
-
- @Autowired
- public AirlineServiceImpl(FlightDao flightDao, TicketDao ticketDao) {
- this.flightDao = flightDao;
- this.ticketDao = ticketDao;
- }
-
- @Autowired(required = false)
- public void setFrequentFlyerSecurityService(FrequentFlyerSecurityService frequentFlyerSecurityService) {
- this.frequentFlyerSecurityService = frequentFlyerSecurityService;
- }
-
- @Transactional(readOnly = false,
- rollbackFor = {NoSuchFlightException.class, NoSeatAvailableException.class, NoSuchFrequentFlyerException.class})
- public Ticket bookFlight(String flightNumber, DateTime departureTime, List passengers)
- throws NoSuchFlightException, NoSeatAvailableException, NoSuchFrequentFlyerException {
- Assert.notEmpty(passengers, "No passengers given");
- if (logger.isDebugEnabled()) {
- logger.debug("Booking flight '" + flightNumber + "' on '" + departureTime + "' for " + passengers);
- }
- Flight flight = flightDao.getFlight(flightNumber, departureTime);
- if (flight == null) {
- throw new NoSuchFlightException(flightNumber, departureTime);
- }
- else if (flight.getSeatsAvailable() < passengers.size()) {
- throw new NoSeatAvailableException(flight);
- }
- Ticket ticket = new Ticket();
- ticket.setIssueDate(new LocalDate());
- ticket.setFlight(flight);
- for (Passenger passenger : passengers) {
- // frequent flyer service is not required
- if (passenger instanceof FrequentFlyer && frequentFlyerSecurityService != null) {
- String username = ((FrequentFlyer) passenger).getUsername();
- Assert.hasLength(username, "No username specified");
- FrequentFlyer frequentFlyer = frequentFlyerSecurityService.getFrequentFlyer(username);
- frequentFlyer.addMiles(flight.getMiles());
- ticket.addPassenger(frequentFlyer);
- }
- else {
- ticket.addPassenger(passenger);
- }
- }
- flight.substractSeats(passengers.size());
- flightDao.update(flight);
- ticketDao.save(ticket);
- return ticket;
- }
-
- public Flight getFlight(Long id) throws NoSuchFlightException {
- Flight flight = flightDao.getFlight(id);
- if (flight != null) {
- return flight;
- }
- else {
- throw new NoSuchFlightException(id);
- }
- }
-
- public List getFlights(String fromAirportCode,
- String toAirportCode,
- LocalDate departureDate,
- ServiceClass serviceClass) {
- if (serviceClass == null) {
- serviceClass = ServiceClass.ECONOMY;
- }
- if (logger.isDebugEnabled()) {
- logger.debug(
- "Getting flights from '" + fromAirportCode + "' to '" + toAirportCode + "' on " + departureDate);
- }
- List flights =
- flightDao.findFlights(fromAirportCode, toAirportCode, departureDate.toInterval(), serviceClass);
- if (logger.isDebugEnabled()) {
- logger.debug("Returning " + flights.size() + " flights");
- }
- return flights;
- }
-
- @Secured({"ROLE_FREQUENT_FLYER"})
- public int getFrequentFlyerMileage() {
- if (logger.isDebugEnabled()) {
- logger.debug("Using " + frequentFlyerSecurityService + " for security");
- }
- FrequentFlyer frequentFlyer = frequentFlyerSecurityService.getCurrentlyAuthenticatedFrequentFlyer();
- return frequentFlyer != null ? frequentFlyer.getMiles() : 0;
- }
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/web/FlightsController.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/web/FlightsController.java
deleted file mode 100644
index 19e8525c..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/web/FlightsController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.web;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-import org.springframework.ws.samples.airline.service.AirlineService;
-import org.springframework.ws.samples.airline.service.NoSuchFlightException;
-
-import org.joda.time.LocalDate;
-
-/** @author Arjen Poutsma */
-@Controller
-@RequestMapping("/flights")
-public class FlightsController {
-
- private AirlineService airlineService;
-
- @Autowired
- public FlightsController(AirlineService airlineService) {
- Assert.notNull(airlineService, "'airlineService' must not be null");
- this.airlineService = airlineService;
- }
-
- @RequestMapping
- public String flightList(@RequestParam(value = "from", required = false)String fromAirportCode,
- @RequestParam(value = "to", required = false)String toAirportCode,
- @RequestParam(value = "departureDate", required = false)String departureDateString,
- @RequestParam(value = "serviceClass", required = false)String serviceClassString,
- ModelMap model) {
- if (!StringUtils.hasLength(departureDateString)) {
- departureDateString = new LocalDate().toString();
- }
- if (!StringUtils.hasLength(serviceClassString)) {
- serviceClassString = "ECONOMY";
- }
- ServiceClass serviceClass = ServiceClass.valueOf(serviceClassString);
- LocalDate departureDate = new LocalDate(departureDateString);
-
- if (StringUtils.hasLength(fromAirportCode) && StringUtils.hasLength(toAirportCode)) {
- model.addAttribute("from", fromAirportCode);
- model.addAttribute("to", toAirportCode);
- model.addAttribute("departureDate", departureDateString);
- model.addAttribute("serviceClass", serviceClassString);
- model.addAttribute("flights",
- airlineService.getFlights(fromAirportCode, toAirportCode, departureDate, serviceClass));
- }
- return "flights";
- }
-
- @RequestMapping(value = "{id}")
- public String singleFlight(@PathVariable("id") long id, ModelMap model) throws NoSuchFlightException {
- Flight flight = airlineService.getFlight(id);
- model.addAttribute(flight);
- return "flight";
- }
-
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineEndpoint.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineEndpoint.java
deleted file mode 100644
index e0c9f8d3..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineEndpoint.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.ws;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.domain.Passenger;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-import org.springframework.ws.samples.airline.schema.BookFlightRequest;
-import org.springframework.ws.samples.airline.schema.GetFlightsResponse;
-import org.springframework.ws.samples.airline.schema.Name;
-import org.springframework.ws.samples.airline.schema.ObjectFactory;
-import org.springframework.ws.samples.airline.schema.Ticket;
-import org.springframework.ws.samples.airline.schema.support.SchemaConversionUtils;
-import org.springframework.ws.samples.airline.service.AirlineService;
-import org.springframework.ws.samples.airline.service.NoSeatAvailableException;
-import org.springframework.ws.samples.airline.service.NoSuchFlightException;
-import org.springframework.ws.samples.airline.service.NoSuchFrequentFlyerException;
-import org.springframework.ws.server.endpoint.annotation.Endpoint;
-import org.springframework.ws.server.endpoint.annotation.Namespace;
-import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
-import org.springframework.ws.server.endpoint.annotation.RequestPayload;
-import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
-import org.springframework.ws.server.endpoint.annotation.XPathParam;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import static org.springframework.ws.samples.airline.ws.AirlineWebServiceConstants.*;
-
-/**
- * Endpoint that handles the Airline Web Service messages using a combination of JAXB2 marshalling and XPath
- * expressions.
- *
- * @author Arjen Poutsma
- */
-@Endpoint
-public class AirlineEndpoint {
-
- private static final Log logger = LogFactory.getLog(AirlineEndpoint.class);
-
- private final ObjectFactory objectFactory = new ObjectFactory();
-
- private final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-
- private final AirlineService airlineService;
-
- @Autowired
- public AirlineEndpoint(AirlineService airlineService) {
- this.airlineService = airlineService;
- }
-
- /**
- * This endpoint method uses a combination of XPath expressions and marshalling to handle message with a
- * <GetFlightsRequest> payload.
- *
- * @param from the from airport
- * @param to the to airport
- * @param departureDateString the string representation of the departure date
- * @param serviceClassString the string representation of the service class
- * @return the JAXB2 representation of a <GetFlightsResponse>
- */
- @PayloadRoot(localPart = GET_FLIGHTS_REQUEST, namespace = MESSAGES_NAMESPACE)
- @Namespace(prefix = "m", uri = MESSAGES_NAMESPACE)
- @ResponsePayload
- public GetFlightsResponse getFlights(@XPathParam("//m:from") String from,
- @XPathParam("//m:to") String to,
- @XPathParam("//m:departureDate") String departureDateString,
- @XPathParam("//m:serviceClass") String serviceClassString)
- throws DatatypeConfigurationException {
- if (logger.isDebugEnabled()) {
- logger.debug("Received GetFlightsRequest '" + from + "' to '" + to + "' on " + departureDateString);
- }
- LocalDate departureDate = new LocalDate(departureDateString);
- ServiceClass serviceClass = null;
- if (StringUtils.hasLength(serviceClassString)) {
- serviceClass = ServiceClass.valueOf(serviceClassString.toUpperCase());
- }
- List flights =
- airlineService.getFlights(from, to, departureDate, serviceClass);
-
- GetFlightsResponse response = objectFactory.createGetFlightsResponse();
- for (org.springframework.ws.samples.airline.domain.Flight domainFlight : flights) {
- response.getFlight().add(SchemaConversionUtils.toSchemaType(domainFlight));
- }
- return response;
- }
-
- /**
- * This endpoint method uses marshalling to handle message with a <BookFlightRequest> payload.
- *
- * @param request the JAXB2 representation of a <BookFlightRequest>
- * @return the JAXB2 representation of a <BookFlightResponse>
- */
- @PayloadRoot(localPart = BOOK_FLIGHT_REQUEST, namespace = MESSAGES_NAMESPACE)
- @ResponsePayload
- public JAXBElement bookFlight(@RequestPayload BookFlightRequest request)
- throws NoSeatAvailableException, DatatypeConfigurationException, NoSuchFlightException,
- NoSuchFrequentFlyerException {
- if (logger.isDebugEnabled()) {
- logger.debug("Received BookingFlightRequest '" + request.getFlightNumber() + "' on '" +
- request.getDepartureTime() + "' for " + request.getPassengers().getPassengerOrUsername());
- }
- Ticket ticket = bookSchemaFlight(request.getFlightNumber(), request.getDepartureTime(),
- request.getPassengers().getPassengerOrUsername());
- return objectFactory.createBookFlightResponse(ticket);
- }
-
- /**
- * Converts between the domain and schema types.
- */
- private Ticket bookSchemaFlight(String flightNumber,
- XMLGregorianCalendar xmlDepartureTime,
- List passengerOrUsernameList)
- throws NoSeatAvailableException, NoSuchFlightException, NoSuchFrequentFlyerException,
- DatatypeConfigurationException {
- DateTime departureTime = SchemaConversionUtils.toDateTime(xmlDepartureTime);
- List passengers = new ArrayList(passengerOrUsernameList.size());
- for (Iterator iterator = passengerOrUsernameList.iterator(); iterator.hasNext();) {
- Object passengerOrUsername = iterator.next();
- if (passengerOrUsername instanceof Name) {
- Name passengerName = (Name) passengerOrUsername;
- Passenger passenger = new Passenger(passengerName.getFirst(), passengerName.getLast());
- passengers.add(passenger);
- }
- else if (passengerOrUsername instanceof String) {
- String frequentFlyerUsername = (String) passengerOrUsername;
- FrequentFlyer frequentFlyer = new FrequentFlyer(frequentFlyerUsername);
- passengers.add(frequentFlyer);
- }
- }
- org.springframework.ws.samples.airline.domain.Ticket domainTicket =
- airlineService.bookFlight(flightNumber, departureTime, passengers);
- return SchemaConversionUtils.toSchemaType(domainTicket);
- }
-
- @PayloadRoot(localPart = GET_FREQUENT_FLYER_MILEAGE_REQUEST, namespace = MESSAGES_NAMESPACE)
- @ResponsePayload
- public Element getFrequentFlyerMileage() throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("Received GetFrequentFlyerMileageRequest");
- }
- int mileage = airlineService.getFrequentFlyerMileage();
- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
- Document document = documentBuilder.newDocument();
- Element response = document.createElementNS(MESSAGES_NAMESPACE, GET_FREQUENT_FLYER_MILEAGE_RESPONSE);
- response.setTextContent(Integer.toString(mileage));
- return response;
- }
-
-}
diff --git a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineWebServiceConstants.java b/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineWebServiceConstants.java
deleted file mode 100644
index b951c9bf..00000000
--- a/samples/airline/server/src/main/java/org/springframework/ws/samples/airline/ws/AirlineWebServiceConstants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.ws;
-
-/** @author Arjen Poutsma */
-public interface AirlineWebServiceConstants {
-
- String BOOK_FLIGHT_REQUEST = "BookFlightRequest";
-
- String GET_FLIGHTS_REQUEST = "GetFlightsRequest";
-
- String GET_FREQUENT_FLYER_MILEAGE_RESPONSE = "GetFrequentFlyerMileageResponse";
-
- String MESSAGES_NAMESPACE = "http://www.springframework.org/spring-ws/samples/airline/schemas/messages";
-
- String GET_FREQUENT_FLYER_MILEAGE_REQUEST = "GetFrequentFlyerMileageRequest";
-}
diff --git a/samples/airline/server/src/main/resources/META-INF/persistence.xml b/samples/airline/server/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 5f671782..00000000
--- a/samples/airline/server/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- org.apache.openjpa.persistence.PersistenceProviderImpl
- org.springframework.ws.samples.airline.domain.Airport
- org.springframework.ws.samples.airline.domain.Flight
- org.springframework.ws.samples.airline.domain.FrequentFlyer
- org.springframework.ws.samples.airline.domain.Passenger
- org.springframework.ws.samples.airline.domain.Ticket
-
-
-
diff --git a/samples/airline/server/src/main/resources/log4j.properties b/samples/airline/server/src/main/resources/log4j.properties
deleted file mode 100644
index c44d7a4a..00000000
--- a/samples/airline/server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-log4j.logger.openjpa=INFO
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml
deleted file mode 100644
index d322dc55..00000000
--- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- commons
- buildSchema
-
- FieldStrategies='org.joda.time.DateTime=org.springframework.ws.samples.airline.domain.openjpa.DateTimeValueHandler,
- org.joda.time.LocalDate=org.springframework.ws.samples.airline.domain.openjpa.LocalDateValueHandler'
-
- org.apache.openjpa.jdbc.sql.HSQLDictionary
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml
deleted file mode 100644
index aae02e20..00000000
--- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/jms/applicationContext-jms.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml
deleted file mode 100644
index e464450a..00000000
--- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/applicationContext-security.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- This application context contains the WS-Security and Spring Security beans.
-
-
-
-
-
-
-
-
-
-
- A security service used to obtain Frequent Flyer information.
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml
deleted file mode 100644
index b6d644b4..00000000
--- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml
deleted file mode 100644
index a24f49e4..00000000
--- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/service/applicationContext.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml b/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
deleted file mode 100644
index 0fe62f8d..00000000
--- a/samples/airline/server/src/main/resources/org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This bean wrap the messages.xsd (which imports types.xsd), and inlines them as a one.
-
-
-
-
-
-
diff --git a/samples/airline/server/src/main/webapp/WEB-INF/jsp/error.jsp b/samples/airline/server/src/main/webapp/WEB-INF/jsp/error.jsp
deleted file mode 100644
index d7654d9a..00000000
--- a/samples/airline/server/src/main/webapp/WEB-INF/jsp/error.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<%
- Exception ex = (Exception) request.getAttribute("exception");
-%>
-<%= ex.getMessage() %>
-
-
-<%= ex.getMessage() %>
-
-Flights
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/WEB-INF/jsp/flight.jsp b/samples/airline/server/src/main/webapp/WEB-INF/jsp/flight.jsp
deleted file mode 100644
index 7c76fc04..00000000
--- a/samples/airline/server/src/main/webapp/WEB-INF/jsp/flight.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="joda" uri="http://www.joda.org/joda/time/tags" %>
-
-Flights
-
-
-
- Number:
-
-
-
-
-
- From:
-
-
- (
-
- )
-
-
-
- Departure:
-
-
-
-
-
- To:
-
-
- (
-
- )
-
-
-
- Departure:
-
-
-
-
-
-Flights
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/WEB-INF/jsp/flights.jsp b/samples/airline/server/src/main/webapp/WEB-INF/jsp/flights.jsp
deleted file mode 100644
index 441c92ef..00000000
--- a/samples/airline/server/src/main/webapp/WEB-INF/jsp/flights.jsp
+++ /dev/null
@@ -1,73 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="joda" uri="http://www.joda.org/joda/time/tags" %>
-
-Flights
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/WEB-INF/jsp/noSuchFlight.jsp b/samples/airline/server/src/main/webapp/WEB-INF/jsp/noSuchFlight.jsp
deleted file mode 100644
index 161120ff..00000000
--- a/samples/airline/server/src/main/webapp/WEB-INF/jsp/noSuchFlight.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-No Such Flight
-
-<%
- Exception ex = (Exception) request.getAttribute("exception");
-%>
-No such flight: <%= ex.getMessage() %>
-
-Flights
-
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/WEB-INF/mvc-servlet.xml b/samples/airline/server/src/main/webapp/WEB-INF/mvc-servlet.xml
deleted file mode 100644
index 44e82e0d..00000000
--- a/samples/airline/server/src/main/webapp/WEB-INF/mvc-servlet.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
- This web application context contains a simple Spring Web MVC web application that shows flights
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- noSuchFlight
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/WEB-INF/web.xml b/samples/airline/server/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index da691a45..00000000
--- a/samples/airline/server/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- Spring-WS Airline Sample
-
- contextConfigLocation
-
- classpath:org/springframework/ws/samples/airline/dao/jpa/applicationContext-jpa.xml
- classpath:org/springframework/ws/samples/airline/service/applicationContext.xml
- classpath:org/springframework/ws/samples/airline/security/applicationContext-security.xml
- classpath:org/springframework/ws/samples/airline/ws/applicationContext-ws.xml
- classpath:org/springframework/ws/samples/airline/jms/applicationContext-jms.xml
-
-
-
- org.springframework.web.context.ContextLoaderListener
-
-
- ws
- org.springframework.ws.transport.http.MessageDispatcherServlet
-
-
- ws
- /services
-
-
- ws
- *.wsdl
-
-
- mvc
- org.springframework.web.servlet.DispatcherServlet
-
-
- mvc
- *.html
-
-
- xsd
- text/xml
-
-
- index.jsp
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/WEB-INF/ws-servlet.xml b/samples/airline/server/src/main/webapp/WEB-INF/ws-servlet.xml
deleted file mode 100644
index df46c1f0..00000000
--- a/samples/airline/server/src/main/webapp/WEB-INF/ws-servlet.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
- Builds a WSDL from the airline.xsd.This bean definition represents the airline.wsdl file found
- in the root of the web application.
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/index.jsp b/samples/airline/server/src/main/webapp/index.jsp
deleted file mode 100644
index 09375550..00000000
--- a/samples/airline/server/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/messages.xsd b/samples/airline/server/src/main/webapp/messages.xsd
deleted file mode 100644
index 309a03da..00000000
--- a/samples/airline/server/src/main/webapp/messages.xsd
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/airline/server/src/main/webapp/types.xsd b/samples/airline/server/src/main/webapp/types.xsd
deleted file mode 100644
index d51193f5..00000000
--- a/samples/airline/server/src/main/webapp/types.xsd
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDaoTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDaoTest.java
deleted file mode 100644
index 3637cdf1..00000000
--- a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFlightDaoTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao.jpa;
-
-import java.util.List;
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ws.samples.airline.dao.FlightDao;
-import org.springframework.ws.samples.airline.domain.Airport;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-
-import org.joda.time.DateTime;
-import org.joda.time.Interval;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("applicationContext-jpa.xml")
-@Transactional
-public class JpaFlightDaoTest {
-
- private DateTime departureTime;
-
- private DateTime arrivalTime;
-
- private Interval interval;
-
- private Airport fromAirport;
-
- private Airport toAirport;
-
- @Autowired
- private FlightDao flightDao;
-
- private JdbcTemplate jdbcTemplate;
-
- @Autowired
- public void setDataSource(DataSource dataSource) {
- jdbcTemplate = new JdbcTemplate(dataSource);
- }
-
- @BeforeTransaction
- public void createTestData() {
- departureTime = new DateTime(2006, 1, 31, 10, 5, 0, 0);
- arrivalTime = new DateTime(2006, 1, 31, 12, 25, 0, 0);
- interval = departureTime.toLocalDate().toInterval();
- fromAirport = new Airport("RTM", "Rotterdam Airport", "Rotterdam");
- toAirport = new Airport("OSL", "Gardermoen", "Oslo");
- }
-
- @Before
- public void insertTestData() {
- jdbcTemplate.update("INSERT INTO AIRPORT(CODE, NAME, CITY) VALUES('RTM', 'Rotterdam Airport', 'Rotterdam')");
- jdbcTemplate.update("INSERT INTO AIRPORT(CODE, NAME, CITY) VALUES('OSL', 'Gardermoen', 'Oslo')");
- }
-
- @Test
- public void getFlightsInPeriod() throws Exception {
- jdbcTemplate
- .update("INSERT INTO FLIGHT(NUMBER, DEPARTURE_TIME, FROM_AIRPORT_CODE, ARRIVAL_TIME, TO_AIRPORT_CODE, SERVICE_CLASS, SEATS_AVAILABLE, MILES) " +
- "VALUES ('KL020','2006-01-31 10:05:00', 'RTM', '2006-01-31 12:25:00', 'OSL', 'BUSINESS', 90, 10)");
- List flights = flightDao.findFlights("RTM", "OSL", interval, ServiceClass.BUSINESS);
- assertNotNull("Invalid result", flights);
- assertEquals("Invalid amount of flights", 1, flights.size());
- }
-
- @Test
- public void getFlightsOutOfPeriod() throws Exception {
- jdbcTemplate
- .update("INSERT INTO FLIGHT(NUMBER, DEPARTURE_TIME, FROM_AIRPORT_CODE, ARRIVAL_TIME, TO_AIRPORT_CODE, SERVICE_CLASS, SEATS_AVAILABLE, MILES) " +
- "VALUES ('KL020','2006-01-31 10:05:00', 'RTM', '2006-01-31 12:25:00', 'OSL', 'BUSINESS', 90, 10)");
- DateTime dateTime = new DateTime(2006, 6, 1, 0, 0, 0, 0);
- List flights = flightDao.findFlights("RTM", "OSL", new Interval(dateTime, dateTime), ServiceClass.BUSINESS);
- assertNotNull("Invalid result", flights);
- assertEquals("Invalid amount of flights", 0, flights.size());
- }
-
- @Test
- public void getFlightByNumberDepartureTime() throws Exception {
- jdbcTemplate
- .update("INSERT INTO FLIGHT(NUMBER, DEPARTURE_TIME, FROM_AIRPORT_CODE, ARRIVAL_TIME, TO_AIRPORT_CODE, SERVICE_CLASS, SEATS_AVAILABLE, MILES) " +
- "VALUES ('KL020','2006-01-31 10:05:00', 'RTM', '2006-01-31 12:25:00', 'OSL', 'BUSINESS', 90, 10)");
- Flight flight = flightDao.getFlight("KL020", departureTime);
- assertNotNull("No flight returned", flight);
- assertNotNull("Invalid flight id", flight.getId());
- assertEquals("Invalid flight number", "KL020", flight.getNumber());
- assertEquals("Invalid flight departure time", departureTime, flight.getDepartureTime());
- assertEquals("Invalid flight arrival time", arrivalTime, flight.getArrivalTime());
- assertEquals("Invalid flight from airport", fromAirport, flight.getFrom());
- assertEquals("Invalid flight to airport", toAirport, flight.getTo());
- assertEquals("Invalid flight service class", ServiceClass.BUSINESS, flight.getServiceClass());
- }
-
- @Test
- public void noSuchFlight() {
- Flight flight = flightDao.getFlight("INVALID", departureTime);
- assertNull("Flight returned", flight);
- }
-
-}
\ No newline at end of file
diff --git a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDaoTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDaoTest.java
deleted file mode 100644
index b6e20c57..00000000
--- a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaFrequentFlyerDaoTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao.jpa;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("applicationContext-jpa.xml")
-@Transactional
-public class JpaFrequentFlyerDaoTest {
-
- @Autowired
- private JpaFrequentFlyerDao frequentFlyerDao;
-
- private JdbcTemplate jdbcTemplate;
-
- @Autowired
- public void setDataSource(DataSource dataSource) {
- jdbcTemplate = new JdbcTemplate(dataSource);
- }
-
- @Before
- public void insertTestData() {
- jdbcTemplate
- .update("INSERT INTO PASSENGER(ID, FIRST_NAME, LAST_NAME) " + "VALUES (42, 'Arjen', 'Poutsma')");
- jdbcTemplate
- .update("INSERT INTO FREQUENT_FLYER(PASSENGER_ID, USERNAME, PASSWORD, MILES) " +
- "VALUES (42, 'arjen', 'changeme', 0)");
- }
-
- @Test
- public void getByUsername() throws Exception {
- FrequentFlyer flyer = frequentFlyerDao.get("arjen");
- assertNotNull("No frequent flyer returned", flyer);
- assertEquals("Invalid username", "arjen", flyer.getUsername());
- assertEquals("Invalid password", "changeme", flyer.getPassword());
- assertEquals("Invalid first name", "Arjen", flyer.getFirstName());
- assertEquals("Invalid last name", "Poutsma", flyer.getLastName());
- }
-
- @Test
- public void noSuchUsername() {
- FrequentFlyer flyer = frequentFlyerDao.get("invalid");
- assertNull("FrequentFlyer returned", flyer);
- }
-}
\ No newline at end of file
diff --git a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDaoTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDaoTest.java
deleted file mode 100644
index 2e4a5f7c..00000000
--- a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/dao/jpa/JpaTicketDaoTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.dao.jpa;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.Passenger;
-import org.springframework.ws.samples.airline.domain.Ticket;
-
-import org.joda.time.LocalDate;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("applicationContext-jpa.xml")
-@Transactional
-public class JpaTicketDaoTest {
-
- @Autowired
- private JpaTicketDao ticketDao;
-
- @Autowired
- private JpaFlightDao flightDao;
-
- private JdbcTemplate jdbcTemplate;
-
- @Autowired
- public void setDataSource(DataSource dataSource) {
- jdbcTemplate = new JdbcTemplate(dataSource);
- }
-
- @Before
- public void insertTestData() {
- jdbcTemplate.update("INSERT INTO AIRPORT(CODE, NAME, CITY) VALUES('RTM', 'Rotterdam Airport', 'Rotterdam')");
- jdbcTemplate.update("INSERT INTO AIRPORT(CODE, NAME, CITY) VALUES('OSL', 'Gardermoen', 'Oslo')");
- jdbcTemplate
- .update("INSERT INTO FLIGHT(ID, NUMBER, DEPARTURE_TIME, FROM_AIRPORT_CODE, ARRIVAL_TIME, TO_AIRPORT_CODE, SERVICE_CLASS, SEATS_AVAILABLE, MILES) " +
- "VALUES (42, 'KL020','2006-01-31 10:05:00', 'RTM', '2006-01-31 12:25:00', 'OSL', 'BUSINESS', 90, 10)");
- }
-
- @Test
- public void save() throws Exception {
- Passenger passenger = new Passenger("Arjen", "Poutsma");
- Flight flight = flightDao.getFlight(42L);
- Ticket ticket = new Ticket();
- ticket.addPassenger(passenger);
- ticket.setFlight(flight);
- ticket.setIssueDate(new LocalDate());
- int startTicketCount = jdbcTemplate.queryForInt("SELECT COUNT(0) FROM TICKET");
- int startPassengerCount = jdbcTemplate.queryForInt("SELECT COUNT(0) FROM PASSENGER");
- ticketDao.save(ticket);
- assertNotNull("No Id generated", ticket.getId());
- int endTicketCount = jdbcTemplate.queryForInt("SELECT COUNT(0) FROM TICKET");
- int endPassengerCount = jdbcTemplate.queryForInt("SELECT COUNT(0) FROM PASSENGER");
- assertEquals("Flight not inserted", 1, endTicketCount - startTicketCount);
- assertEquals("Passenger not inserted", 1, endPassengerCount - startPassengerCount);
- }
-
-}
\ No newline at end of file
diff --git a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java
deleted file mode 100644
index 6cbf5554..00000000
--- a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2005-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.security;
-
-import org.springframework.security.authentication.TestingAuthenticationToken;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.context.SecurityContextImpl;
-import org.springframework.ws.samples.airline.dao.FrequentFlyerDao;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-
-import junit.framework.TestCase;
-
-import static org.easymock.EasyMock.*;
-
-public class SpringFrequentFlyerSecurityServiceTest extends TestCase {
-
- private SpringFrequentFlyerSecurityService securityService;
-
- private FrequentFlyerDao flyerDaoMock;
-
- @Override
- protected void setUp() throws Exception {
- flyerDaoMock = createMock(FrequentFlyerDao.class);
- securityService = new SpringFrequentFlyerSecurityService(flyerDaoMock);
- }
-
- public void testGetCurrentlyAuthenticatedFrequentFlyer() throws Exception {
- FrequentFlyer frequentFlyer = new FrequentFlyer("john");
- FrequentFlyerDetails detail = new FrequentFlyerDetails(frequentFlyer);
- TestingAuthenticationToken token = new TestingAuthenticationToken(detail, null);
- SecurityContext context = new SecurityContextImpl();
- context.setAuthentication(token);
- SecurityContextHolder.setContext(context);
- replay(flyerDaoMock);
- FrequentFlyer result = securityService.getCurrentlyAuthenticatedFrequentFlyer();
- assertEquals("Invalid result", frequentFlyer, result);
- verify(flyerDaoMock);
- }
-
- public void testGetFrequentFlyer() throws Exception {
- FrequentFlyer frequentFlyer = new FrequentFlyer("john");
- expect(flyerDaoMock.get("john")).andReturn(frequentFlyer);
- replay(flyerDaoMock);
- FrequentFlyer result = securityService.getFrequentFlyer("john");
- assertEquals("Invalid result", frequentFlyer, result);
- verify(flyerDaoMock);
- }
-}
diff --git a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java
deleted file mode 100644
index db5cb715..00000000
--- a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.service.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-import static org.easymock.EasyMock.*;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.springframework.ws.samples.airline.dao.FlightDao;
-import org.springframework.ws.samples.airline.dao.TicketDao;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.domain.Passenger;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-import org.springframework.ws.samples.airline.domain.Ticket;
-import org.springframework.ws.samples.airline.security.FrequentFlyerSecurityService;
-import org.springframework.ws.samples.airline.service.NoSeatAvailableException;
-import org.springframework.ws.samples.airline.service.NoSuchFlightException;
-
-public class AirlineServiceImplTest extends TestCase {
-
- private AirlineServiceImpl airlineService;
-
- private FlightDao flightDaoMock;
-
- private TicketDao ticketDaoMock;
-
- private FrequentFlyerSecurityService securityServiceMock;
-
- private String flightNumber;
-
- @Override
- protected void setUp() throws Exception {
- flightDaoMock = createMock(FlightDao.class);
- ticketDaoMock = createMock(TicketDao.class);
- airlineService = new AirlineServiceImpl(flightDaoMock, ticketDaoMock);
- securityServiceMock = createMock(FrequentFlyerSecurityService.class);
- airlineService.setFrequentFlyerSecurityService(securityServiceMock);
- flightNumber = "AB1234";
- }
-
- public void testBookFlight() throws Exception {
- DateTime departureTime = new DateTime();
- Passenger passenger = new Passenger("John", "Doe");
- List passengers = new ArrayList();
- passengers.add(passenger);
- Flight flight = new Flight();
- flight.setNumber(flightNumber);
- flight.setSeatsAvailable(10);
- expect(flightDaoMock.getFlight(flightNumber, departureTime)).andReturn(flight);
- expect(flightDaoMock.update(flight)).andReturn(flight);
- Ticket ticket = new Ticket();
- ticket.setFlight(flight);
- ticketDaoMock.save(isA(Ticket.class));
-
- replay(flightDaoMock, ticketDaoMock, securityServiceMock);
-
- ticket = airlineService.bookFlight(flightNumber, departureTime, passengers);
- assertNotNull("Invalid ticket", ticket);
- assertEquals("Invalid flight", flight, ticket.getFlight());
- assertEquals("Invalid seats available", 9, flight.getSeatsAvailable());
- assertEquals("Invalid passengers count", 1, ticket.getPassengers().size());
-
- verify(flightDaoMock, ticketDaoMock, securityServiceMock);
- }
-
- public void testBookFlightFrequentFlyer() throws Exception {
- DateTime departureTime = new DateTime();
- FrequentFlyer frequentFlyer = new FrequentFlyer("John", "Doe", "john", "changeme");
- List passengers = new ArrayList();
- passengers.add(frequentFlyer);
- Flight flight = new Flight();
- flight.setNumber(flightNumber);
- flight.setSeatsAvailable(1);
- flight.setMiles(10);
- expect(securityServiceMock.getFrequentFlyer("john")).andReturn(frequentFlyer);
- expect(flightDaoMock.getFlight(flightNumber, departureTime)).andReturn(flight);
- expect(flightDaoMock.update(flight)).andReturn(flight);
- ticketDaoMock.save(isA(Ticket.class));
-
- replay(flightDaoMock, ticketDaoMock, securityServiceMock);
-
- Ticket ticket = airlineService.bookFlight(flightNumber, departureTime, passengers);
- assertNotNull("Invalid ticket", ticket);
- assertEquals("Invalid flight", flight, ticket.getFlight());
- assertEquals("Invalid amount of miles", 10, frequentFlyer.getMiles());
-
- verify(flightDaoMock, ticketDaoMock, securityServiceMock);
- }
-
- public void testBookFlightNoSeatAvailable() throws Exception {
- DateTime departureTime = new DateTime();
- List passengers = Collections.singletonList(new Passenger());
- Flight flight = new Flight();
- flight.setNumber("AB1234");
- flight.setDepartureTime(new DateTime());
- expect(flightDaoMock.getFlight(flightNumber, departureTime)).andReturn(flight);
-
- replay(flightDaoMock, ticketDaoMock, securityServiceMock);
-
- try {
- airlineService.bookFlight(flightNumber, departureTime, passengers);
- fail("Should have thrown an NoSeatAvailableException");
- }
- catch (NoSeatAvailableException ex) {
- }
-
- verify(flightDaoMock, ticketDaoMock, securityServiceMock);
- }
-
- public void testBookFlightNoSuchFlight() throws Exception {
- String flightNumber = "AB1234";
- DateTime departureTime = new DateTime();
- List passengers = Collections.singletonList(new Passenger());
- expect(flightDaoMock.getFlight(flightNumber, departureTime)).andReturn(null);
-
- replay(flightDaoMock, ticketDaoMock, securityServiceMock);
- try {
- airlineService.bookFlight(flightNumber, departureTime, passengers);
- fail("Should have thrown an NoSuchFlightException");
- }
- catch (NoSuchFlightException ex) {
- }
-
- verify(flightDaoMock, ticketDaoMock, securityServiceMock);
- }
-
- public void testGetFlights() throws Exception {
- LocalDate departureDate = new LocalDate(2006, 1, 31);
- Flight flight = new Flight();
- List flights = new ArrayList();
- flights.add(flight);
- String toCode = "to";
- String fromCode = "from";
-
- expect(flightDaoMock.findFlights(fromCode, toCode, departureDate.toInterval(), ServiceClass.ECONOMY))
- .andReturn(flights);
-
- replay(flightDaoMock, ticketDaoMock, securityServiceMock);
-
- List result = airlineService.getFlights(fromCode, toCode, departureDate, ServiceClass.ECONOMY);
- assertEquals("Invalid result", flights, result);
-
- verify(flightDaoMock, ticketDaoMock, securityServiceMock);
- }
-
- public void testGetFlightsDefaultServiceClass() throws Exception {
- LocalDate departureDate = new LocalDate(2006, 1, 31);
- Flight flight = new Flight();
- List flights = new ArrayList();
- flights.add(flight);
- String toCode = "to";
- String fromCode = "from";
-
- expect(flightDaoMock.findFlights(fromCode, toCode, departureDate.toInterval(), ServiceClass.ECONOMY))
- .andReturn(flights);
-
- replay(flightDaoMock, ticketDaoMock, securityServiceMock);
-
- List result = airlineService.getFlights(fromCode, toCode, departureDate, null);
- assertEquals("Invalid result", flights, result);
-
- verify(flightDaoMock, ticketDaoMock, securityServiceMock);
-
- }
-}
diff --git a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java
deleted file mode 100644
index b527afde..00000000
--- a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.web;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-import static org.easymock.EasyMock.*;
-import org.joda.time.LocalDate;
-
-import org.springframework.ui.ModelMap;
-import org.springframework.ws.samples.airline.domain.Flight;
-import org.springframework.ws.samples.airline.domain.ServiceClass;
-import org.springframework.ws.samples.airline.service.AirlineService;
-
-public class FlightsControllerTest extends TestCase {
-
- private FlightsController flightsController;
-
- private AirlineService airlineServiceMock;
-
- @Override
- protected void setUp() throws Exception {
- airlineServiceMock = createMock(AirlineService.class);
- flightsController = new FlightsController(airlineServiceMock);
- }
-
- public void testFlightList() throws Exception {
- String from = "AMS";
- String to = "VCE";
- LocalDate departureDate = new LocalDate();
- ServiceClass serviceClass = ServiceClass.FIRST;
- List flights = new ArrayList();
- flights.add(new Flight());
- expect(airlineServiceMock.getFlights(from, to, departureDate, serviceClass)).andReturn(flights);
-
- replay(airlineServiceMock);
-
- ModelMap model = new ModelMap();
- String view = flightsController
- .flightList(from, to, departureDate.toString(), serviceClass.toString(), model);
- assertNotNull("No view returned", view);
- assertEquals("Invalid view name", "flights", view);
- assertTrue("No flights in ModelAndView", model.containsAttribute("flights"));
- verify(airlineServiceMock);
- }
-}
\ No newline at end of file
diff --git a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/AirlineEndpointTest.java b/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/AirlineEndpointTest.java
deleted file mode 100644
index 870c4433..00000000
--- a/samples/airline/server/src/test/java/org/springframework/ws/samples/airline/ws/AirlineEndpointTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright 2005-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.airline.ws;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import javax.xml.bind.JAXBElement;
-import javax.xml.datatype.DatatypeConstants;
-import javax.xml.datatype.DatatypeFactory;
-
-import org.springframework.ws.samples.airline.domain.Airport;
-import org.springframework.ws.samples.airline.domain.FrequentFlyer;
-import org.springframework.ws.samples.airline.domain.Passenger;
-import org.springframework.ws.samples.airline.schema.BookFlightRequest;
-import org.springframework.ws.samples.airline.schema.Flight;
-import org.springframework.ws.samples.airline.schema.GetFlightsResponse;
-import org.springframework.ws.samples.airline.schema.Name;
-import org.springframework.ws.samples.airline.schema.ObjectFactory;
-import org.springframework.ws.samples.airline.schema.ServiceClass;
-import org.springframework.ws.samples.airline.schema.Ticket;
-import org.springframework.ws.samples.airline.service.AirlineService;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDate;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.w3c.dom.Element;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertNotNull;
-
-public class AirlineEndpointTest {
-
- private AirlineEndpoint endpoint;
-
- private AirlineService airlineServiceMock;
-
- private DatatypeFactory datatypeFactory;
-
- private ObjectFactory objectFactory;
-
- @Before
- public void setUp() throws Exception {
- airlineServiceMock = createMock(AirlineService.class);
- endpoint = new AirlineEndpoint(airlineServiceMock);
- datatypeFactory = DatatypeFactory.newInstance();
- objectFactory = new ObjectFactory();
- }
-
- @Test
- public void testGetFlights() throws Exception {
- org.springframework.ws.samples.airline.domain.Flight domainFlight = createDomainFlight();
-
- expect(airlineServiceMock.getFlights("ABC", "DEF", new LocalDate(2007, 6, 13),
- org.springframework.ws.samples.airline.domain.ServiceClass.FIRST))
- .andReturn(Collections.singletonList(domainFlight));
-
- replay(airlineServiceMock);
-
- GetFlightsResponse response = endpoint.getFlights("ABC", "DEF", "2007-06-13", "first");
- Assert.assertEquals("Invalid amount of flights received", 1, response.getFlight().size());
- Flight schemaFlight = response.getFlight().get(0);
- verifySchemaFlight(schemaFlight);
-
- verify(airlineServiceMock);
- }
-
- private void verifySchemaFlight(Flight schemaFlight) {
- Assert.assertEquals("Invalid number", "ABC1234", schemaFlight.getNumber());
- Assert.assertEquals("Invalid departure time",
- datatypeFactory.newXMLGregorianCalendar(2007, 6, 13, 12, 0, 0, 0, 0), schemaFlight.getDepartureTime());
- Assert.assertEquals("Invalid from code", "ABC", schemaFlight.getFrom().getCode());
- Assert.assertEquals("Invalid from name", "ABC Airport", schemaFlight.getFrom().getName());
- Assert.assertEquals("Invalid from city", "ABC City", schemaFlight.getFrom().getCity());
- Assert.assertEquals("Invalid arrival time",
- datatypeFactory.newXMLGregorianCalendar(2007, 6, 13, 14, 0, 0, 0, 0), schemaFlight.getArrivalTime());
- Assert.assertEquals("Invalid to code", "DEF", schemaFlight.getTo().getCode());
- Assert.assertEquals("Invalid to name", "DEF Airport", schemaFlight.getTo().getName());
- Assert.assertEquals("Invalid to city", "DEF City", schemaFlight.getTo().getCity());
- Assert.assertEquals("Invalid service class", ServiceClass.FIRST, schemaFlight.getServiceClass());
- }
-
- private org.springframework.ws.samples.airline.domain.Flight createDomainFlight() {
- org.springframework.ws.samples.airline.domain.Flight domainFlight =
- new org.springframework.ws.samples.airline.domain.Flight();
- domainFlight.setNumber("ABC1234");
- domainFlight.setDepartureTime(new DateTime(2007, 6, 13, 12, 0, 0, 0, DateTimeZone.UTC));
- domainFlight.setFrom(new Airport("ABC", "ABC Airport", "ABC City"));
- domainFlight.setArrivalTime(new DateTime(2007, 6, 13, 14, 0, 0, 0, DateTimeZone.UTC));
- domainFlight.setTo(new Airport("DEF", "DEF Airport", "DEF City"));
- domainFlight.setServiceClass(org.springframework.ws.samples.airline.domain.ServiceClass.FIRST);
- return domainFlight;
- }
-
- @Test
- public void bookFlightPassenger() throws Exception {
- BookFlightRequest request = objectFactory.createBookFlightRequest();
- request.setDepartureTime(datatypeFactory.newXMLGregorianCalendar(2007, 6, 13, 12, 0, 0, 0, 0));
- request.setFlightNumber("ABC1234");
- Name passengerName = new Name();
- passengerName.setFirst("John");
- passengerName.setLast("Doe");
- BookFlightRequest.Passengers passengers = new BookFlightRequest.Passengers();
- passengers.getPassengerOrUsername().add(passengerName);
- request.setPassengers(passengers);
-
- Passenger domainPassenger = new Passenger("John", "Doe");
-
- org.springframework.ws.samples.airline.domain.Ticket domainTicket =
- new org.springframework.ws.samples.airline.domain.Ticket(42L);
- domainTicket.setFlight(createDomainFlight());
- domainTicket.setIssueDate(new LocalDate(2007, 6, 13));
- domainTicket.setPassengers(Collections.singleton(domainPassenger));
-
- expect(airlineServiceMock.bookFlight("ABC1234", new DateTime(2007, 6, 13, 12, 0, 0, 0, DateTimeZone.UTC),
- Collections.singletonList(domainPassenger))).andReturn(domainTicket);
-
- replay(airlineServiceMock);
-
- JAXBElement response = endpoint.bookFlight(request);
- Ticket schemaTicket = response.getValue();
- Assert.assertEquals("Invalid id", 42L, schemaTicket.getId());
- Assert.assertEquals("Invalid issue date",
- datatypeFactory.newXMLGregorianCalendarDate(2007, 6, 13, DatatypeConstants.FIELD_UNDEFINED),
- schemaTicket.getIssueDate());
- Assert.assertEquals("Invalid amount of passengers", 1, schemaTicket.getPassengers().getPassenger().size());
- Name schemaPassenger = schemaTicket.getPassengers().getPassenger().get(0);
- Assert.assertEquals("Invalid passenger first name", "John", schemaPassenger.getFirst());
- Assert.assertEquals("Invalid passenger first name", "Doe", schemaPassenger.getLast());
- verifySchemaFlight(schemaTicket.getFlight());
-
- verify(airlineServiceMock);
- }
-
- @Test
- public void testBookFlightFrequentFlyer() throws Exception {
- BookFlightRequest request = objectFactory.createBookFlightRequest();
- request.setDepartureTime(datatypeFactory.newXMLGregorianCalendar(2007, 6, 13, 12, 0, 0, 0, 0));
- request.setFlightNumber("ABC1234");
- BookFlightRequest.Passengers passengers = new BookFlightRequest.Passengers();
- passengers.getPassengerOrUsername().add("john");
- request.setPassengers(passengers);
-
- FrequentFlyer domainFrequentFlyer = new FrequentFlyer("John", "Doe", "john", "changeme");
- Set domainPassengers = new HashSet();
- domainPassengers.add(domainFrequentFlyer);
-
- org.springframework.ws.samples.airline.domain.Ticket domainTicket =
- new org.springframework.ws.samples.airline.domain.Ticket(42L);
- domainTicket.setFlight(createDomainFlight());
- domainTicket.setIssueDate(new LocalDate(2007, 6, 13));
- domainTicket.setPassengers(domainPassengers);
-
- List domainPassengerList = new ArrayList(domainPassengers);
- expect(airlineServiceMock
- .bookFlight("ABC1234", new DateTime(2007, 6, 13, 12, 0, 0, 0, DateTimeZone.UTC), domainPassengerList))
- .andReturn(domainTicket);
-
- replay(airlineServiceMock);
-
- JAXBElement response = endpoint.bookFlight(request);
- Ticket schemaTicket = response.getValue();
- Assert.assertEquals("Invalid id", 42L, schemaTicket.getId());
- Assert.assertEquals("Invalid issue date",
- datatypeFactory.newXMLGregorianCalendarDate(2007, 6, 13, DatatypeConstants.FIELD_UNDEFINED),
- schemaTicket.getIssueDate());
- Assert.assertEquals("Invalid amount of passengers", 1, schemaTicket.getPassengers().getPassenger().size());
- Name schemaPassenger = schemaTicket.getPassengers().getPassenger().get(0);
- Assert.assertEquals("Invalid passenger first name", "John", schemaPassenger.getFirst());
- Assert.assertEquals("Invalid passenger first name", "Doe", schemaPassenger.getLast());
- verifySchemaFlight(schemaTicket.getFlight());
-
- verify(airlineServiceMock);
- }
-
- @Test
- public void testGetFrequentFlyerMileage() throws Exception {
- expect(airlineServiceMock.getFrequentFlyerMileage()).andReturn(42);
-
- replay(airlineServiceMock);
-
- Element response = endpoint.getFrequentFlyerMileage();
- assertNotNull("Invalid response", response);
-
- verify(airlineServiceMock);
- }
-
-}
\ No newline at end of file
diff --git a/samples/echo/client/pom.xml b/samples/echo/client/pom.xml
deleted file mode 100644
index c5b3a5c5..00000000
--- a/samples/echo/client/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- echo
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- echo-client
- pom
- Spring WS Echo Sample - Clients
-
- saaj
- spring-ws
-
-
diff --git a/samples/echo/client/saaj/.gitignore b/samples/echo/client/saaj/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/echo/client/saaj/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/echo/client/saaj/pom.xml b/samples/echo/client/saaj/pom.xml
deleted file mode 100644
index 811c8156..00000000
--- a/samples/echo/client/saaj/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- echo-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- echo-saaj-client
- jar
- Spring WS Echo Sample - SAAJ Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- compile
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.2
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.echo.client.saaj.EchoClient
-
-
-
-
-
diff --git a/samples/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/EchoClient.java b/samples/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/EchoClient.java
deleted file mode 100644
index a8ee4f25..00000000
--- a/samples/echo/client/saaj/src/main/java/org/springframework/ws/samples/echo/client/saaj/EchoClient.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.echo.client.saaj;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-
-/**
- * A client for the Echo Web Service that uses SAAJ.
- *
- * @author Ben Ethridge
- * @author Arjen Poutsma
- */
-public class EchoClient {
-
- public static final String NAMESPACE_URI = "http://www.springframework.org/spring-ws/samples/echo";
-
- public static final String PREFIX = "tns";
-
- private SOAPConnectionFactory connectionFactory;
-
- private MessageFactory messageFactory;
-
- private URL url;
-
- public EchoClient(String url) throws SOAPException, MalformedURLException {
- connectionFactory = SOAPConnectionFactory.newInstance();
- messageFactory = MessageFactory.newInstance();
- this.url = new URL(url);
- }
-
- private SOAPMessage createEchoRequest() throws SOAPException {
- SOAPMessage message = messageFactory.createMessage();
- SOAPEnvelope envelope = message.getSOAPPart().getEnvelope();
- Name echoRequestName = envelope.createName("echoRequest", PREFIX, NAMESPACE_URI);
- SOAPBodyElement echoRequestElement = message.getSOAPBody()
- .addBodyElement(echoRequestName);
- echoRequestElement.setValue("Hello");
- return message;
- }
-
- public void callWebService() throws SOAPException, IOException {
- SOAPMessage request = createEchoRequest();
- SOAPConnection connection = connectionFactory.createConnection();
- SOAPMessage response = connection.call(request, url);
- if (!response.getSOAPBody().hasFault()) {
- writeEchoResponse(response);
- }
- else {
- SOAPFault fault = response.getSOAPBody().getFault();
- System.err.println("Received SOAP Fault");
- System.err.println("SOAP Fault Code :" + fault.getFaultCode());
- System.err.println("SOAP Fault String :" + fault.getFaultString());
- }
- }
-
- private void writeEchoResponse(SOAPMessage message) throws SOAPException {
- SOAPEnvelope envelope = message.getSOAPPart().getEnvelope();
- Name echoResponseName = envelope.createName("echoResponse", PREFIX, NAMESPACE_URI);
- SOAPBodyElement echoResponseElement = (SOAPBodyElement) message
- .getSOAPBody().getChildElements(echoResponseName).next();
- String echoValue = echoResponseElement.getTextContent();
- System.out.println();
- System.out.println("Echo Response [" + echoValue + "]");
- System.out.println();
- }
-
- public static void main(String[] args) throws Exception {
- String url = "http://localhost:8080/echo-server/services";
- if (args.length > 0) {
- url = args[0];
- }
- EchoClient echoClient = new EchoClient(url);
- echoClient.callWebService();
- }
-}
\ No newline at end of file
diff --git a/samples/echo/client/spring-ws/.gitignore b/samples/echo/client/spring-ws/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/echo/client/spring-ws/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/echo/client/spring-ws/pom.xml b/samples/echo/client/spring-ws/pom.xml
deleted file mode 100644
index 38b8c9d9..00000000
--- a/samples/echo/client/spring-ws/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
- echo-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- echo-spring-ws-client
- jar
- Spring WS Echo Sample - Spring-WS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- runtime
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.2
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.echo.client.sws.EchoClient
-
-
-
-
-
-
- org.springframework
- spring-context
-
-
- org.springframework.ws
- spring-xml
-
-
- org.springframework.ws
- spring-ws-core
-
-
-
diff --git a/samples/echo/client/spring-ws/src/main/java/org/springframework/ws/samples/echo/client/sws/EchoClient.java b/samples/echo/client/spring-ws/src/main/java/org/springframework/ws/samples/echo/client/sws/EchoClient.java
deleted file mode 100644
index 6eb79a92..00000000
--- a/samples/echo/client/spring-ws/src/main/java/org/springframework/ws/samples/echo/client/sws/EchoClient.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.echo.client.sws;
-
-import java.io.IOException;
-import javax.xml.transform.Source;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.io.Resource;
-import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-import org.springframework.xml.transform.ResourceSource;
-import org.springframework.xml.transform.StringResult;
-
-public class EchoClient extends WebServiceGatewaySupport {
-
- private Resource request;
-
- public void setRequest(Resource request) {
- this.request = request;
- }
-
- public void echo() throws IOException {
- Source requestSource = new ResourceSource(request);
- StringResult result = new StringResult();
- getWebServiceTemplate().sendSourceAndReceiveToResult(requestSource, result);
- System.out.println();
- System.out.println(result);
- System.out.println();
- }
-
- public static void main(String[] args) throws IOException {
- ApplicationContext applicationContext =
- new ClassPathXmlApplicationContext("applicationContext.xml", EchoClient.class);
- EchoClient echoClient = (EchoClient) applicationContext.getBean("echoClient");
- echoClient.echo();
- }
-
-}
diff --git a/samples/echo/client/spring-ws/src/main/resources/log4j.properties b/samples/echo/client/spring-ws/src/main/resources/log4j.properties
deleted file mode 100644
index 0f73a758..00000000
--- a/samples/echo/client/spring-ws/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/echo/client/spring-ws/src/main/resources/org/springframework/ws/samples/echo/client/sws/applicationContext.xml b/samples/echo/client/spring-ws/src/main/resources/org/springframework/ws/samples/echo/client/sws/applicationContext.xml
deleted file mode 100644
index 21376fc1..00000000
--- a/samples/echo/client/spring-ws/src/main/resources/org/springframework/ws/samples/echo/client/sws/applicationContext.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/samples/echo/client/spring-ws/src/main/resources/org/springframework/ws/samples/echo/client/sws/echoRequest.xml b/samples/echo/client/spring-ws/src/main/resources/org/springframework/ws/samples/echo/client/sws/echoRequest.xml
deleted file mode 100644
index 36da9480..00000000
--- a/samples/echo/client/spring-ws/src/main/resources/org/springframework/ws/samples/echo/client/sws/echoRequest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Hello
diff --git a/samples/echo/pom.xml b/samples/echo/pom.xml
deleted file mode 100644
index 8a82570a..00000000
--- a/samples/echo/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- spring-ws-samples
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- echo
- pom
- Spring WS Echo Sample
-
- server
- client
-
-
diff --git a/samples/echo/readme.txt b/samples/echo/readme.txt
deleted file mode 100644
index 72d2f55f..00000000
--- a/samples/echo/readme.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-=====================================================
-== Spring Web Service Echo sample application ==
-=====================================================
-
-
-1. INTRODUCTION
-
-This sample shows a bare-bones echoing service. Incoming messages are handled
-via DOM, and a simple 'business logic' service is used to obtain the result.
-
-2. SERVER
-
-Simply run "mvn package" in the server directory and deploy the war file generated in 'target'.
-Alternatively, run "mvn jetty:run" to run the sample in a built-in Jetty6 Web
-container.
-
-3. CLIENT
-
-Simply run "mvn install exec:java" in each of the client subdirectories.
diff --git a/samples/echo/server/.gitignore b/samples/echo/server/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/echo/server/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/echo/server/pom.xml b/samples/echo/server/pom.xml
deleted file mode 100644
index 05b2aee3..00000000
--- a/samples/echo/server/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
- echo
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- echo-server
- war
- Spring WS Echo Sample - Server
- A minimal Spring-WS sample that uses W3C DOM to echo back an incoming string.
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.stream
- stax-api
-
-
- javax.xml.soap
- saaj-api
-
-
-
-
-
-
-
- org.springframework.ws
- spring-ws-core
-
-
-
diff --git a/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/service/EchoService.java b/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/service/EchoService.java
deleted file mode 100644
index 602adee3..00000000
--- a/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/service/EchoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.echo.service;
-
-/**
- * Defines the "business logic" of the web service.
- *
- * @author Ingo Siebert
- * @author Arjen Poutsma
- */
-public interface EchoService {
-
- /**
- * Returns the given string.
- *
- * @return s
- */
- String echo(String s);
-}
diff --git a/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/service/impl/EchoServiceImpl.java b/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/service/impl/EchoServiceImpl.java
deleted file mode 100755
index 954b9a3f..00000000
--- a/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/service/impl/EchoServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.echo.service.impl;
-
-import org.springframework.stereotype.Service;
-import org.springframework.ws.samples.echo.service.EchoService;
-
-/**
- * Default implementation of EchoService.
- *
- * @author Ingo Siebert
- * @author Arjen Poutsma
- */
-@Service
-public class EchoServiceImpl implements EchoService {
-
- public String echo(String s) {
- return s;
- }
-}
diff --git a/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/ws/EchoEndpoint.java b/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/ws/EchoEndpoint.java
deleted file mode 100755
index 5f612747..00000000
--- a/samples/echo/server/src/main/java/org/springframework/ws/samples/echo/ws/EchoEndpoint.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.echo.ws;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Assert;
-import org.springframework.ws.samples.echo.service.EchoService;
-import org.springframework.ws.server.endpoint.annotation.Endpoint;
-import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
-import org.springframework.ws.server.endpoint.annotation.RequestPayload;
-import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-/**
- * Simple echoing Web service endpoint. Uses a EchoService to create a response string.
- *
- * @author Ingo Siebert
- * @author Arjen Poutsma
- */
-@Endpoint
-public class EchoEndpoint {
-
- /**
- * Namespace of both request and response.
- */
- public static final String NAMESPACE_URI = "http://www.springframework.org/spring-ws/samples/echo";
-
- /**
- * The local name of the expected request.
- */
- public static final String ECHO_REQUEST_LOCAL_NAME = "echoRequest";
-
- /**
- * The local name of the created response.
- */
- public static final String ECHO_RESPONSE_LOCAL_NAME = "echoResponse";
-
- private final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-
- private final EchoService echoService;
-
- @Autowired
- public EchoEndpoint(EchoService echoService) {
- this.echoService = echoService;
- }
-
-
- /**
- * Reads the given requestElement, and sends a the response back.
- *
- * @param requestElement the contents of the SOAP message as DOM elements
- * @return the response element
- */
- @PayloadRoot(localPart = ECHO_REQUEST_LOCAL_NAME, namespace = NAMESPACE_URI)
- @ResponsePayload
- public Element handleEchoRequest(@RequestPayload Element requestElement) throws ParserConfigurationException {
- Assert.isTrue(NAMESPACE_URI.equals(requestElement.getNamespaceURI()), "Invalid namespace");
- Assert.isTrue(ECHO_REQUEST_LOCAL_NAME.equals(requestElement.getLocalName()), "Invalid local name");
-
- NodeList children = requestElement.getChildNodes();
- Text requestText = null;
- for (int i = 0; i < children.getLength(); i++) {
- if (children.item(i).getNodeType() == Node.TEXT_NODE) {
- requestText = (Text) children.item(i);
- break;
- }
- }
- if (requestText == null) {
- throw new IllegalArgumentException("Could not find request text node");
- }
-
- String echo = echoService.echo(requestText.getNodeValue());
-
- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
- Document document = documentBuilder.newDocument();
- Element responseElement = document.createElementNS(NAMESPACE_URI, ECHO_RESPONSE_LOCAL_NAME);
- Text responseText = document.createTextNode(echo);
- responseElement.appendChild(responseText);
- return responseElement;
- }
-}
diff --git a/samples/echo/server/src/main/resources/log4j.properties b/samples/echo/server/src/main/resources/log4j.properties
deleted file mode 100644
index 0f73a758..00000000
--- a/samples/echo/server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/echo/server/src/main/webapp/WEB-INF/echo.xsd b/samples/echo/server/src/main/webapp/WEB-INF/echo.xsd
deleted file mode 100644
index 1fac4c16..00000000
--- a/samples/echo/server/src/main/webapp/WEB-INF/echo.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/echo/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/echo/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml
deleted file mode 100755
index 9a63b52e..00000000
--- a/samples/echo/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- This web application context contains Spring-WS beans. The beans defined in this context are automatically
- detected by Spring-WS, similar to the way Controllers are picked up in Spring Web MVC.
-
-
-
-
-
-
-
-
-
- This interceptor validates both incoming and outgoing message contents according to the 'echo.xsd' XML
- Schema file.
-
-
-
-
-
-
-
- This interceptor logs the message payload.
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/echo/server/src/main/webapp/WEB-INF/web.xml b/samples/echo/server/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755
index 52cc4fc5..00000000
--- a/samples/echo/server/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
- "Echo" WebService
-
- Returns a given string(only A-Z and a-z chars allowed). See echo.xsd file.
-
-
-
- spring-ws
- org.springframework.ws.transport.http.MessageDispatcherServlet
-
-
- transformWsdlLocations
- true
-
-
-
-
-
- spring-ws
- /*
-
-
-
\ No newline at end of file
diff --git a/samples/echo/server/src/test/java/org/springframework/ws/samples/echo/ws/EchoEndpointTest.java b/samples/echo/server/src/test/java/org/springframework/ws/samples/echo/ws/EchoEndpointTest.java
deleted file mode 100644
index 6ce3af3b..00000000
--- a/samples/echo/server/src/test/java/org/springframework/ws/samples/echo/ws/EchoEndpointTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.echo.ws;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.springframework.ws.samples.echo.service.EchoService;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-import static org.easymock.EasyMock.*;
-
-public class EchoEndpointTest {
-
- private EchoEndpoint endpoint;
-
- private Document requestDocument;
-
- private Document responseDocument;
-
- private EchoService mock;
-
- @Before
- public void setUp() throws Exception {
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware(true);
- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
- requestDocument = documentBuilder.newDocument();
- responseDocument = documentBuilder.newDocument();
- mock = createMock(EchoService.class);
- endpoint = new EchoEndpoint(mock);
- }
-
- @Test
- public void testInvokeInternal() throws Exception {
- Element echoRequest =
- requestDocument.createElementNS(EchoEndpoint.NAMESPACE_URI, EchoEndpoint.ECHO_REQUEST_LOCAL_NAME);
- String content = "ABC";
- Text requestText = requestDocument.createTextNode(content);
- echoRequest.appendChild(requestText);
- String result = "DEF";
- expect(mock.echo(content)).andReturn(result);
-
- replay(mock);
-
- Element echoResponse = endpoint.handleEchoRequest(echoRequest);
- Assert.assertEquals("Invalid namespace", EchoEndpoint.NAMESPACE_URI, echoResponse.getNamespaceURI());
- Assert.assertEquals("Invalid namespace", EchoEndpoint.ECHO_RESPONSE_LOCAL_NAME, echoResponse.getLocalName());
- Text responseText = (Text) echoResponse.getChildNodes().item(0);
- Assert.assertEquals("Invalid content", result, responseText.getNodeValue());
-
- verify(mock);
- }
-
-}
\ No newline at end of file
diff --git a/samples/echo/server/src/test/resources/log4j.properties b/samples/echo/server/src/test/resources/log4j.properties
deleted file mode 100644
index ad4c9d4d..00000000
--- a/samples/echo/server/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootCategory=WARN, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
diff --git a/samples/mtom/client/jax-ws/.gitignore b/samples/mtom/client/jax-ws/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/mtom/client/jax-ws/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/mtom/client/jax-ws/mtom.wsdl b/samples/mtom/client/jax-ws/mtom.wsdl
deleted file mode 100644
index 0a6e0ba8..00000000
--- a/samples/mtom/client/jax-ws/mtom.wsdl
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/mtom/client/jax-ws/pom.xml b/samples/mtom/client/jax-ws/pom.xml
deleted file mode 100644
index 37f9233b..00000000
--- a/samples/mtom/client/jax-ws/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
- mtom-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- mtom-jax-ws-client
- jar
- Spring WS MTOM Sample - JAX-WS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- compile
-
-
-
-
-
-
-
- org.codehaus.mojo
- jaxws-maven-plugin
-
-
-
- wsimport
-
-
-
- file://${project.basedir}/mtom.wsdl
-
- org.springframework.ws.samples.mtom.client.jaxws
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.mtom.client.jaxws.Main
-
-
-
-
-
diff --git a/samples/mtom/client/jax-ws/src/main/java/org/springframework/ws/samples/mtom/client/jaxws/Main.java b/samples/mtom/client/jax-ws/src/main/java/org/springframework/ws/samples/mtom/client/jaxws/Main.java
deleted file mode 100644
index 85ebca15..00000000
--- a/samples/mtom/client/jax-ws/src/main/java/org/springframework/ws/samples/mtom/client/jaxws/Main.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.mtom.client.jaxws;
-
-import java.io.File;
-import java.io.IOException;
-import java.awt.image.RenderedImage;
-import java.awt.Toolkit;
-import javax.activation.DataHandler;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.ws.soap.SOAPFaultException;
-
-import org.springframework.util.StopWatch;
-
-/**
- * Simple client that calls the GetFlights and BookFlight operations using JAX-WS.
- *
- * @author Arjen Poutsma
- */
-public class Main {
-
- public static void main(String[] args) throws IOException {
- try {
-
- String fileName = "../spring-ws-logo.png";
- if (args.length > 0) {
- fileName = args[0];
- }
-
- ImageRepositoryService service = new ImageRepositoryService();
- ImageRepository imageRepository = service.getImageRepositorySoap11();
- SOAPBinding binding = (SOAPBinding) ((BindingProvider) imageRepository).getBinding();
- binding.setMTOMEnabled(true);
-
- Image request = new Image();
- File file = new File(fileName);
- if (!file.exists()) {
- System.err.println("File [" + fileName + "] does not exist");
- System.exit(-1);
- }
- request.setName(file.getName());
- request.setImage(Toolkit.getDefaultToolkit().getImage(file.getAbsolutePath()));
- StopWatch stopWatch = new StopWatch();
- stopWatch.start("store");
- imageRepository.storeImage(request);
- stopWatch.stop();
-
- stopWatch.start("load");
- Image response = imageRepository.loadImage(file.getName());
- stopWatch.stop();
- System.out.println(stopWatch.prettyPrint());
- }
- catch (SOAPFaultException ex) {
- System.err.format("SOAP Fault Code %1s%n", ex.getFault().getFaultCodeAsQName());
- System.err.format("SOAP Fault String: %1s%n", ex.getFault().getFaultString());
- }
-
- }
-
-
-}
diff --git a/samples/mtom/client/pom.xml b/samples/mtom/client/pom.xml
deleted file mode 100644
index d694f622..00000000
--- a/samples/mtom/client/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- mtom
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- mtom-client
- pom
- Spring WS MTOM Sample - Clients
-
- jax-ws
- spring-ws
-
-
diff --git a/samples/mtom/client/spring-ws/.gitignore b/samples/mtom/client/spring-ws/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/mtom/client/spring-ws/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/mtom/client/spring-ws/pom.xml b/samples/mtom/client/spring-ws/pom.xml
deleted file mode 100644
index b22f1dd5..00000000
--- a/samples/mtom/client/spring-ws/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
- mtom-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- mtom-spring-ws-client
- jar
- Spring WS MTOM Sample - Spring-WS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- runtime
-
-
-
-
-
-
-
- org.codehaus.mojo
- jaxb2-maven-plugin
-
-
-
- xjc
-
-
-
-
- ${project.basedir}/../../server/src/main/webapp/WEB-INF/
- org.springframework.ws.samples.mtom.client.sws
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.mtom.client.sws.Driver
-
-
-
-
-
-
- org.springframework
- spring-context
-
-
- org.springframework.ws
- spring-ws-core
-
-
- org.apache.ws.commons.axiom
- axiom-api
-
-
- org.apache.ws.commons.axiom
- axiom-impl
-
-
- javax.mail
- mail
- runtime
-
-
-
diff --git a/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/AxiomMtomClient.java b/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/AxiomMtomClient.java
deleted file mode 100644
index a6ec661e..00000000
--- a/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/AxiomMtomClient.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2002-2009 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.mtom.client.sws;
-
-import java.io.IOException;
-import java.util.Iterator;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import javax.imageio.ImageIO;
-import javax.xml.transform.TransformerException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.OMText;
-import org.apache.axiom.soap.SOAPBody;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPMessage;
-
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StopWatch;
-import org.springframework.util.StringUtils;
-import org.springframework.ws.WebServiceMessage;
-import org.springframework.ws.client.core.WebServiceMessageCallback;
-import org.springframework.ws.client.core.WebServiceMessageExtractor;
-import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-import org.springframework.ws.soap.axiom.AxiomSoapMessage;
-import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
-import org.springframework.ws.soap.client.SoapFaultClientException;
-
-/**
- * Simple client that demonstartes MTOM by invoking StoreImage and LoadImage using a
- * WebServiceTemplate and Axiom.
- *
- * @author Arjen Poutsma
- */
-public class AxiomMtomClient extends WebServiceGatewaySupport {
-
- private StopWatch stopWatch = new StopWatch(ClassUtils.getShortName(getClass()));
-
- public AxiomMtomClient(AxiomSoapMessageFactory messageFactory) {
- super(messageFactory);
- }
-
- public void doIt(String path) {
- try {
- store(path);
- load(path);
- System.out.println(stopWatch.prettyPrint());
- }
- catch (SoapFaultClientException ex) {
- System.err.format("SOAP Fault Code %1s%n", ex.getFaultCode());
- System.err.format("SOAP Fault String: %1s%n", ex.getFaultStringOrReason());
- }
-
- }
-
- private void store(final String path) {
- stopWatch.start("store");
- getWebServiceTemplate().sendAndReceive(new WebServiceMessageCallback() {
- public void doWithMessage(WebServiceMessage message) throws IOException, TransformerException {
- AxiomSoapMessage soapMessage = (AxiomSoapMessage) message;
- SOAPMessage axiomMessage = soapMessage.getAxiomMessage();
- SOAPFactory factory = (SOAPFactory) axiomMessage.getOMFactory();
- SOAPBody body = axiomMessage.getSOAPEnvelope().getBody();
-
- OMNamespace ns =
- factory.createOMNamespace("http://www.springframework.org/spring-ws/samples/mtom", "tns");
-
- OMElement storeImageRequestElement = factory.createOMElement("StoreImageRequest", ns);
- body.addChild(storeImageRequestElement);
- OMElement nameElement = factory.createOMElement("name", ns);
- storeImageRequestElement.addChild(nameElement);
- nameElement.setText(StringUtils.getFilename(path));
- OMElement imageElement = factory.createOMElement("image", ns);
- storeImageRequestElement.addChild(imageElement);
- DataSource dataSource = new FileDataSource(path);
- DataHandler dataHandler = new DataHandler(dataSource);
- OMText text = factory.createOMText(dataHandler, true);
- imageElement.addChild(text);
-
- OMOutputFormat outputFormat = new OMOutputFormat();
- outputFormat.setSOAP11(true);
- outputFormat.setDoOptimize(true);
- soapMessage.setOutputFormat(outputFormat);
- }
- }, new WebServiceMessageExtractor() {
- public Object extractData(WebServiceMessage message) throws IOException, TransformerException {
- return null;
- }
- });
- stopWatch.stop();
- }
-
- private void load(final String path) {
- final StringBuilder name = new StringBuilder();
- stopWatch.start("load");
- java.awt.Image image = (java.awt.Image) getWebServiceTemplate().sendAndReceive(new WebServiceMessageCallback() {
- public void doWithMessage(WebServiceMessage message) throws IOException, TransformerException {
- SOAPMessage axiomMessage = ((AxiomSoapMessage) message).getAxiomMessage();
- SOAPFactory factory = (SOAPFactory) axiomMessage.getOMFactory();
- SOAPBody body = axiomMessage.getSOAPEnvelope().getBody();
-
- OMNamespace ns =
- factory.createOMNamespace("http://www.springframework.org/spring-ws/samples/mtom", "tns");
-
- OMElement loadImageRequestElement = factory.createOMElement("LoadImageRequest", ns);
- loadImageRequestElement.setText(StringUtils.getFilename(path));
- body.addChild(loadImageRequestElement);
- }
- }, new WebServiceMessageExtractor() {
- public Object extractData(WebServiceMessage message) throws IOException, TransformerException {
- SOAPMessage axiomMessage = ((AxiomSoapMessage) message).getAxiomMessage();
- SOAPBody body = axiomMessage.getSOAPEnvelope().getBody();
- OMElement loadImageResponseElement = (OMElement) body.getChildElements().next();
- Assert.isTrue("LoadImageResponse".equals(loadImageResponseElement.getLocalName()));
- Iterator childElements = loadImageResponseElement.getChildElements();
- OMElement nameElement = (OMElement) childElements.next();
- Assert.isTrue("name".equals(nameElement.getLocalName()));
- name.append(nameElement.getText());
- OMElement imageElement = (OMElement) childElements.next();
- Assert.isTrue("image".equals(imageElement.getLocalName()));
- OMText text = (OMText) imageElement.getFirstOMChild();
-
- DataHandler dataHandler = (DataHandler) text.getDataHandler();
- return ImageIO.read(dataHandler.getInputStream());
- }
- });
- stopWatch.stop();
- logger.info("Received image " + name + " [" + image.getWidth(null) + "x" + image.getHeight(null) + "]");
- }
-
-
-}
diff --git a/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/Driver.java b/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/Driver.java
deleted file mode 100644
index 2f7c5565..00000000
--- a/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/Driver.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2002-2009 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.mtom.client.sws;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class Driver {
-
- public static void main(String[] args) {
- String fileName = "../spring-ws-logo.png";
- if (args.length > 0) {
- fileName = args[0];
- }
- ApplicationContext applicationContext =
- new ClassPathXmlApplicationContext("applicationContext.xml", Driver.class);
-
- SaajMtomClient saajClient = applicationContext.getBean("saajClient", SaajMtomClient.class);
- saajClient.doIt(fileName);
-
- AxiomMtomClient axiomClient = applicationContext.getBean("axiomClient", AxiomMtomClient.class);
- axiomClient.doIt(fileName);
- }
-
-}
diff --git a/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/SaajMtomClient.java b/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/SaajMtomClient.java
deleted file mode 100644
index de78e430..00000000
--- a/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/SaajMtomClient.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2002-2009 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.mtom.client.sws;
-
-import java.awt.Toolkit;
-import javax.xml.bind.JAXBElement;
-
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StopWatch;
-import org.springframework.util.StringUtils;
-import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-import org.springframework.ws.soap.client.SoapFaultClientException;
-import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
-
-/**
- * Simple client that demonstartes MTOM by invoking StoreImage and LoadImage using a
- * WebServiceTemplate and SAAJ.
- *
- * @author Tareq Abed Rabbo
- * @author Arjen Poutsma
- */
-public class SaajMtomClient extends WebServiceGatewaySupport {
-
- private ObjectFactory objectFactory = new ObjectFactory();
-
- private StopWatch stopWatch = new StopWatch(ClassUtils.getShortName(getClass()));
-
- public SaajMtomClient(SaajSoapMessageFactory messageFactory) {
- super(messageFactory);
- }
-
- public void doIt(String path) {
- try {
- store(path);
- load(path);
- System.out.println(stopWatch.prettyPrint());
- }
- catch (SoapFaultClientException ex) {
- System.err.format("SOAP Fault Code %1s%n", ex.getFaultCode());
- System.err.format("SOAP Fault String: %1s%n", ex.getFaultStringOrReason());
- }
-
- }
-
- private void store(String path) {
- Image image = objectFactory.createImage();
- image.setName(StringUtils.getFilename(path));
- image.setImage(Toolkit.getDefaultToolkit().getImage(path));
- JAXBElement storeImageRequest = objectFactory.createStoreImageRequest(image);
- stopWatch.start("store");
- getWebServiceTemplate().marshalSendAndReceive(storeImageRequest);
- stopWatch.stop();
- }
-
- private void load(String path) {
- JAXBElement loadImageRequest = objectFactory.createLoadImageRequest(StringUtils.getFilename(path));
-
- stopWatch.start("load");
- JAXBElement loadImageResponse =
- (JAXBElement) getWebServiceTemplate().marshalSendAndReceive(loadImageRequest);
- stopWatch.stop();
- Image image = loadImageResponse.getValue();
- logger.info("Received image " + image.getName() + " [" + image.getImage().getWidth(null) + "x" +
- image.getImage().getHeight(null) + "]");
-
- }
-
-}
diff --git a/samples/mtom/client/spring-ws/src/main/resources/log4j.properties b/samples/mtom/client/spring-ws/src/main/resources/log4j.properties
deleted file mode 100644
index ecbc6e2b..00000000
--- a/samples/mtom/client/spring-ws/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws.samples=INFO
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
diff --git a/samples/mtom/client/spring-ws/src/main/resources/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml b/samples/mtom/client/spring-ws/src/main/resources/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml
deleted file mode 100644
index 52d63951..00000000
--- a/samples/mtom/client/spring-ws/src/main/resources/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/mtom/pom.xml b/samples/mtom/pom.xml
deleted file mode 100644
index dbbc95ce..00000000
--- a/samples/mtom/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- spring-ws-samples
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- mtom
- pom
- Spring WS MTOM Sample
-
- server
- client
-
-
diff --git a/samples/mtom/readme.txt b/samples/mtom/readme.txt
deleted file mode 100644
index f2cca447..00000000
--- a/samples/mtom/readme.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-====================================
-== Spring Web Service MTOM Sample ==
-====================================
-
-
-1. INTRODUCTION
-
-This sample shows how to use marshal and unmarshal MTOM attachments using JAXB2.
-
-2. SERVER
-
-Simply run "mvn package" in the server directory and deploy the war file generated in 'target'.
-Alternatively, run "mvn jetty:run" to run the sample in a built-in Jetty6 Web
-container.
-
-3. CLIENT
-
-Simply run "mvn install exec:java" in each of the client subdirectories.
diff --git a/samples/mtom/server/.gitignore b/samples/mtom/server/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/mtom/server/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/mtom/server/pom.xml b/samples/mtom/server/pom.xml
deleted file mode 100644
index 7dd26e8a..00000000
--- a/samples/mtom/server/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
- mtom
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- mtom-server
- war
- Spring WS MTOM Sample - Server
- This sample shows how to use MTOM and JAXB2.
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.bind
- jaxb-api
- provided
- true
-
-
- javax.xml.stream
- stax-api
-
-
- javax.activation
- activation
-
-
-
-
- com.sun.xml.bind
- jaxb-impl
- provided
-
-
- javax.activation
- activation
-
-
-
-
-
-
-
- org.codehaus.mojo
- jaxb2-maven-plugin
-
-
-
- xjc
-
-
-
-
- src/main/webapp/WEB-INF
- org.springframework.ws.samples.mtom.schema
-
-
-
-
-
-
-
- org.springframework.ws
- spring-ws-core
-
-
-
diff --git a/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/ImageRepository.java b/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/ImageRepository.java
deleted file mode 100644
index 3107214e..00000000
--- a/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/ImageRepository.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.mtom.service;
-
-import java.awt.Image;
-import java.io.IOException;
-
-/** @author Arjen Poutsma */
-public interface ImageRepository {
-
- Image readImage(String name) throws IOException;
-
- void storeImage(String name, Image image) throws IOException;
-
-}
diff --git a/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/StubImageRepository.java b/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/StubImageRepository.java
deleted file mode 100644
index 163a228a..00000000
--- a/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/StubImageRepository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2002-2009 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.mtom.service;
-
-import java.awt.Image;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/** @author Arjen Poutsma */
-public class StubImageRepository implements ImageRepository {
-
- private static final Log logger = LogFactory.getLog(StubImageRepository.class);
-
- private Map images = new HashMap();
-
- public Image readImage(String name) throws IOException {
- logger.info("Loading image " + name);
- return images.get(name);
- }
-
- public void storeImage(String name, Image image) throws IOException {
- logger.info("Storing image " + name + " [" + image.getWidth(null) + "x" + image.getHeight(null) + "]");
- images.put(name, image);
- }
-}
diff --git a/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/ws/ImageRepositoryEndpoint.java b/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/ws/ImageRepositoryEndpoint.java
deleted file mode 100644
index bacba4c1..00000000
--- a/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/ws/ImageRepositoryEndpoint.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2005-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.mtom.ws;
-
-import java.io.IOException;
-import javax.xml.bind.JAXBElement;
-
-import org.springframework.util.Assert;
-import org.springframework.ws.samples.mtom.schema.Image;
-import org.springframework.ws.samples.mtom.schema.ObjectFactory;
-import org.springframework.ws.samples.mtom.service.ImageRepository;
-import org.springframework.ws.server.endpoint.annotation.Endpoint;
-import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
-import org.springframework.ws.server.endpoint.annotation.RequestPayload;
-import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
-
-/** @author Arjen Poutsma */
-@Endpoint
-public class ImageRepositoryEndpoint {
-
- private ImageRepository imageRepository;
-
- private ObjectFactory objectFactory;
-
- public ImageRepositoryEndpoint(ImageRepository imageRepository) {
- Assert.notNull(imageRepository, "'imageRepository' must not be null");
- this.imageRepository = imageRepository;
- this.objectFactory = new ObjectFactory();
- }
-
- @PayloadRoot(localPart = "StoreImageRequest", namespace = "http://www.springframework.org/spring-ws/samples/mtom")
- @ResponsePayload
- public void store(@RequestPayload JAXBElement requestElement) throws IOException {
- Image request = requestElement.getValue();
- imageRepository.storeImage(request.getName(), request.getImage());
- }
-
- @PayloadRoot(localPart = "LoadImageRequest", namespace = "http://www.springframework.org/spring-ws/samples/mtom")
- @ResponsePayload
- public JAXBElement load(@RequestPayload JAXBElement requestElement) throws IOException {
- String name = requestElement.getValue();
- Image response = new Image();
- response.setName(name);
- response.setImage(imageRepository.readImage(name));
- return objectFactory.createLoadImageResponse(response);
- }
-
-
-}
diff --git a/samples/mtom/server/src/main/resources/log4j.properties b/samples/mtom/server/src/main/resources/log4j.properties
deleted file mode 100644
index 5bb7c900..00000000
--- a/samples/mtom/server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-log4j.logger.org.springframework.ws.samples=INFO
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
diff --git a/samples/mtom/server/src/main/webapp/WEB-INF/schema.xsd b/samples/mtom/server/src/main/webapp/WEB-INF/schema.xsd
deleted file mode 100644
index 1af18f52..00000000
--- a/samples/mtom/server/src/main/webapp/WEB-INF/schema.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/mtom/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/mtom/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml
deleted file mode 100644
index 58e0614f..00000000
--- a/samples/mtom/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/mtom/server/src/main/webapp/WEB-INF/web.xml b/samples/mtom/server/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 68288e8a..00000000
--- a/samples/mtom/server/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- MyCompany HR Holiday Service
-
-
- spring-ws
- org.springframework.ws.transport.http.MessageDispatcherServlet
-
-
-
- spring-ws
- /*
-
-
-
diff --git a/samples/pom.xml b/samples/pom.xml
deleted file mode 100644
index 8cbeb1ea..00000000
--- a/samples/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
- spring-ws-parent
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../parent/pom.xml
-
- 4.0.0
- spring-ws-samples
- pom
- Spring WS Samples
-
- echo
- tutorial
- mtom
- pox
- stockquote
- airline
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.2
-
-
- org.mortbay.jetty
- maven-jetty-plugin
- 6.1.26
-
-
- maven-war-plugin
- 2.1.1
-
- ${project.artifactId}
-
-
-
-
-
-
- org.mortbay.jetty
- maven-jetty-plugin
-
-
- maven-deploy-plugin
-
- true
-
-
-
- maven-war-plugin
-
-
-
-
-
-
- log4j
- log4j
- runtime
-
-
-
diff --git a/samples/pox/client/pom.xml b/samples/pox/client/pom.xml
deleted file mode 100644
index 5e9ee82e..00000000
--- a/samples/pox/client/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- pox
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- pox-client
- pom
- Spring WS POX Sample - Clients
-
- spring-ws
-
-
diff --git a/samples/pox/client/spring-ws/.gitignore b/samples/pox/client/spring-ws/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/pox/client/spring-ws/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/pox/client/spring-ws/pom.xml b/samples/pox/client/spring-ws/pom.xml
deleted file mode 100644
index 727f041a..00000000
--- a/samples/pox/client/spring-ws/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- pox-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- pox-spring-ws-client
- jar
- Spring WS POX Sample - Spring-WS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- runtime
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.pox.client.sws.ContactsClient
-
-
-
-
-
-
- org.springframework
- spring-context
-
-
- org.springframework.ws
- spring-xml
-
-
- org.springframework.ws
- spring-ws-core
-
-
-
diff --git a/samples/pox/client/spring-ws/src/main/java/org/springframework/ws/samples/pox/client/sws/ContactsClient.java b/samples/pox/client/spring-ws/src/main/java/org/springframework/ws/samples/pox/client/sws/ContactsClient.java
deleted file mode 100644
index de19ac8d..00000000
--- a/samples/pox/client/spring-ws/src/main/java/org/springframework/ws/samples/pox/client/sws/ContactsClient.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.pox.client.sws;
-
-import java.io.IOException;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMResult;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.io.Resource;
-import org.springframework.ws.WebServiceMessageFactory;
-import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-import org.springframework.xml.transform.ResourceSource;
-import org.springframework.xml.transform.StringResult;
-import org.springframework.xml.xpath.XPathExpression;
-
-public class ContactsClient extends WebServiceGatewaySupport {
-
- private Resource request;
-
- private XPathExpression expression;
-
- public ContactsClient(WebServiceMessageFactory messageFactory) {
- super(messageFactory);
- }
-
- public void setRequest(Resource request) {
- this.request = request;
- }
-
- public void setExpression(XPathExpression expression) {
- this.expression = expression;
- }
-
- public void contacts() throws IOException {
- Source requestSource = new ResourceSource(request);
- DOMResult result = new DOMResult();
- getWebServiceTemplate().sendSourceAndReceiveToResult(requestSource, result);
- int contactCount = (int) expression.evaluateAsNumber(result.getNode());
- System.out.println();
- System.out.println("contactCount = " + contactCount);
- System.out.println();
- }
-
- public static void main(String[] args) throws IOException {
- ApplicationContext applicationContext =
- new ClassPathXmlApplicationContext("applicationContext.xml", ContactsClient.class);
- ContactsClient contactsClient = (ContactsClient) applicationContext.getBean("contactsClient");
- contactsClient.contacts();
- }
-}
diff --git a/samples/pox/client/spring-ws/src/main/resources/log4j.properties b/samples/pox/client/spring-ws/src/main/resources/log4j.properties
deleted file mode 100644
index 0f73a758..00000000
--- a/samples/pox/client/spring-ws/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/applicationContext.xml b/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/applicationContext.xml
deleted file mode 100644
index d8ac2897..00000000
--- a/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/applicationContext.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- http://www.springframework.org/spring-ws/samples/pox
-
-
-
-
-
-
diff --git a/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/contactsRequest.xml b/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/contactsRequest.xml
deleted file mode 100644
index ad5fdc4f..00000000
--- a/samples/pox/client/spring-ws/src/main/resources/org/springframework/ws/samples/pox/client/sws/contactsRequest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- John Doe
- 626-555-3456
-
-
- Jane Doe
- 626-555-6543
-
-
\ No newline at end of file
diff --git a/samples/pox/pom.xml b/samples/pox/pom.xml
deleted file mode 100644
index ca4c6dd4..00000000
--- a/samples/pox/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- spring-ws-samples
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- pox
- pom
- Spring WS POX Sample
-
- server
- client
-
-
diff --git a/samples/pox/readme.txt b/samples/pox/readme.txt
deleted file mode 100644
index 703a0098..00000000
--- a/samples/pox/readme.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-=========================================================
-== Spring Web Service Plain Old XML sample application ==
-=========================================================
-
-
-1. INTRODUCTION
-
-This sample shows a service that uses Plain Old XML rather than SOAP. Incoming
-messages are handled via SAX, and a response is created using DOM.
-
-2. SERVER
-
-Simply run "mvn package" in the server directory and deploy the war file generated in 'target'.
-Alternatively, run "mvn jetty:run" to run the sample in a built-in Jetty6 Web
-container.
-
-3. CLIENT
-
-Simply run "mvn install exec:java" in each of the client subdirectories.
diff --git a/samples/pox/server/.gitignore b/samples/pox/server/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/pox/server/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/pox/server/pom.xml b/samples/pox/server/pom.xml
deleted file mode 100644
index 290eb8f5..00000000
--- a/samples/pox/server/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
- pox
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- pox-server
- war
- Spring WS POX Sample - Server
- A Spring-WS sample that uses Plain Old XML, rather than SOAP.
-
-
- jdk14-jdk15
-
- !1.6
-
-
-
- javax.xml.stream
- stax-api
-
-
-
-
-
-
-
- org.springframework.ws
- spring-ws-core
-
-
- org.springframework.ws
- spring-xml
-
-
-
diff --git a/samples/pox/server/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java b/samples/pox/server/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java
deleted file mode 100644
index 48c7cb1c..00000000
--- a/samples/pox/server/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.pox.ws;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import org.springframework.ws.server.endpoint.AbstractSaxPayloadEndpoint;
-
-public class ContactCountEndpoint extends AbstractSaxPayloadEndpoint {
-
- private static final String NAMESPACE_URI = "http://www.springframework.org/spring-ws/samples/pox";
-
- private static final String CONTANT_NAME = "Contact";
-
- private static final String CONTANT_COUNT_NAME = "ContactCount";
-
- private DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-
- public ContactCountEndpoint() {
- documentBuilderFactory.setNamespaceAware(true);
- }
-
- protected ContentHandler createContentHandler() throws Exception {
- return new ContactCounter();
- }
-
- protected Source getResponse(ContentHandler contentHandler) throws Exception {
- ContactCounter counter = (ContactCounter) contentHandler;
-
- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
- Document response = documentBuilder.newDocument();
- Element contactCountElement = response.createElementNS(NAMESPACE_URI, CONTANT_COUNT_NAME);
- response.appendChild(contactCountElement);
- contactCountElement.setTextContent(Integer.toString(counter.contactCount));
-
- return new DOMSource(response);
- }
-
- private static class ContactCounter extends DefaultHandler {
-
- private int contactCount = 0;
-
- @Override
- public void startElement(String uri, String localName, String qName, Attributes attributes)
- throws SAXException {
- if (NAMESPACE_URI.equals(uri) && CONTANT_NAME.equals(localName)) {
- contactCount++;
- }
- }
-
-
- }
-}
diff --git a/samples/pox/server/src/main/resources/log4j.properties b/samples/pox/server/src/main/resources/log4j.properties
deleted file mode 100644
index 0f73a758..00000000
--- a/samples/pox/server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/pox/server/src/main/webapp/WEB-INF/contacts.xsd b/samples/pox/server/src/main/webapp/WEB-INF/contacts.xsd
deleted file mode 100644
index 857167b4..00000000
--- a/samples/pox/server/src/main/webapp/WEB-INF/contacts.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
- Defines a contact-list, with names and phone numbers.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/pox/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/pox/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml
deleted file mode 100755
index 9499118d..00000000
--- a/samples/pox/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- This web application context contains Spring-WS beans. The beans defined in this context are automatically
- detected by Spring-WS, similar to the way Controllers are picked up in Spring Web MVC.
-
-
-
-
- This endpoint mapping uses the qualified name of the payload (body contents) to determine the endpoint for
- an incoming message. Every message is passed to the default endpoint. Additionally, messages are logged
- using the logging interceptor.
-
-
-
-
-
-
-
- This interceptor validates both incoming and outgoing message contents according to the 'contacts.xsd' XML
- Schema file.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/pox/server/src/main/webapp/WEB-INF/web.xml b/samples/pox/server/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755
index 2cd18033..00000000
--- a/samples/pox/server/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
- POX WebService
-
- A Spring-WS sample that uses Plain Old XML, rather than SOAP.
-
-
-
- spring-ws
- org.springframework.ws.transport.http.MessageDispatcherServlet
-
-
-
-
- spring-ws
- /*
-
-
-
diff --git a/samples/pox/server/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java b/samples/pox/server/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java
deleted file mode 100644
index 8f9b8c8d..00000000
--- a/samples/pox/server/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.pox.ws;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.stream.StreamResult;
-
-import org.springframework.ws.samples.pox.ws.ContactCountEndpoint;
-import org.springframework.xml.sax.SaxUtils;
-import org.springframework.core.io.ClassPathResource;
-
-import org.custommonkey.xmlunit.XMLTestCase;
-import org.w3c.dom.Document;
-
-public class ContactCountEndpointTest extends XMLTestCase {
-
- private ContactCountEndpoint endpoint;
-
- private Transformer transformer;
-
- private DocumentBuilder documentBuilder;
-
- @Override
- protected void setUp() throws Exception {
- endpoint = new ContactCountEndpoint();
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware(true);
- documentBuilder = documentBuilderFactory.newDocumentBuilder();
- TransformerFactory transformerFactory = TransformerFactory.newInstance();
- transformer = transformerFactory.newTransformer();
- }
-
- public void testInvoke() throws Exception {
- Document request = documentBuilder
- .parse(SaxUtils.createInputSource(new ClassPathResource("contactsRequest.xml", getClass())));
- Document expected = documentBuilder
- .parse(SaxUtils.createInputSource(new ClassPathResource("contactCountResponse.xml", getClass())));
-
- Source source = endpoint.invoke(new DOMSource(request));
- DOMResult result = new DOMResult();
- transformer.transform(source, result);
- assertXMLEqual("Invalid resonse", expected, (Document) result.getNode());
- }
-}
\ No newline at end of file
diff --git a/samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactCountResponse.xml b/samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactCountResponse.xml
deleted file mode 100644
index 524d381c..00000000
--- a/samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactCountResponse.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-2
diff --git a/samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactsRequest.xml b/samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactsRequest.xml
deleted file mode 100644
index ad5fdc4f..00000000
--- a/samples/pox/server/src/test/resources/org/springframework/ws/samples/pox/ws/contactsRequest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- John Doe
- 626-555-3456
-
-
- Jane Doe
- 626-555-6543
-
-
\ No newline at end of file
diff --git a/samples/readme.txt b/samples/readme.txt
deleted file mode 100644
index 0e0e43eb..00000000
--- a/samples/readme.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-SPRING WEB SERVICES
-
-Sample table of contents
----------------------------------------------------
-* airline - A complete airline sample that shows both Web Service and
- O/X Mapping functionality in a complete application
-* echo - A simple sample that shows a bare-bones Echo service
-* mtom - Shows how to use MTOM and JAXB2 marshalling
-* pox - Shows Plain Old XML usage
-* stock - Shows how to use WS-Addressing and the Java 6 HTTP Server
-* tutorial - Contains the code from the Spring-WS tutorial
-
-Except the tutorial, all of these samples consist of a separate 'server' and 'client' project.
-The server projects can be run using the "mvn jetty:run" command, or by using "mvn package" and deploying the resulting
-war archives to a Web Container.
-The client projects are typically command-line projects, and can by started by issuing the 'mvn install exec:java' command.
\ No newline at end of file
diff --git a/samples/stockquote/client/jax-ws/.gitignore b/samples/stockquote/client/jax-ws/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/stockquote/client/jax-ws/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/stockquote/client/jax-ws/pom.xml b/samples/stockquote/client/jax-ws/pom.xml
deleted file mode 100644
index 24dcf70e..00000000
--- a/samples/stockquote/client/jax-ws/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
- stockquote-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- stockquote-jax-ws-client
- jar
- Spring WS Stock Quote Sample - JAX-WS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- compile
-
-
-
-
-
-
-
- org.codehaus.mojo
- jaxws-maven-plugin
-
-
-
- wsimport
-
-
-
- file://${project.basedir}/../../server//src/main/resources/org/springframework/ws/samples/stockquote/ws/stockquote.wsdl
-
- org.springframework.ws.samples.stockquote.client.jaxws
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.stockquote.client.jaxws.Main
-
-
-
-
-
diff --git a/samples/stockquote/client/jax-ws/src/main/java/org/springframework/ws/samples/stockquote/client/jaxws/Main.java b/samples/stockquote/client/jax-ws/src/main/java/org/springframework/ws/samples/stockquote/client/jaxws/Main.java
deleted file mode 100644
index 8931d2f1..00000000
--- a/samples/stockquote/client/jax-ws/src/main/java/org/springframework/ws/samples/stockquote/client/jaxws/Main.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.stockquote.client.jaxws;
-
-import java.net.URL;
-import javax.xml.namespace.QName;
-
-/**
- * Simple client that calls the StockQuote operations using JAX-WS.
- *
- * @author Arjen Poutsma
- */
-public class Main {
-
- public static void main(String[] args) throws Exception {
- StockService service;
- if (args.length == 0) {
- service = new StockService();
- }
- else {
- QName serviceName = new QName("http://www.springframework.org/spring-ws/samples/stockquote", "StockSoap11");
- service = new StockService(new URL(args[0]), serviceName);
- }
- Stock stock = service.getStockSoap11();
- StockQuoteRequest request = new StockQuoteRequest();
- request.getSymbol().add("FABRIKAM");
- request.getSymbol().add("CONTOSO");
-
- System.out.format("Requesting quotes for %s%n", request.getSymbol());
-
- StockQuoteResponse response = stock.stockQuote(request);
-
- System.out.format("Got %d results%n", response.getStockQuote().size());
- for (StockQuote quote : response.getStockQuote()) {
- System.out.println();
- System.out.println("Symbol: " + quote.getSymbol());
- System.out.println("\tName:\t\t\t" + quote.getName());
- System.out.println("\tLast Price:\t\t" + quote.getLast());
- System.out.println("\tPrevious Change:\t" + quote.getChange() + "%");
- }
- }
-
-}
diff --git a/samples/stockquote/client/pom.xml b/samples/stockquote/client/pom.xml
deleted file mode 100644
index a7628b04..00000000
--- a/samples/stockquote/client/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- stockquote
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- stockquote-client
- pom
- Spring WS Stock Quote Sample - Clients
-
- jax-ws
- spring-ws
-
-
diff --git a/samples/stockquote/client/spring-ws/.gitignore b/samples/stockquote/client/spring-ws/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/stockquote/client/spring-ws/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/stockquote/client/spring-ws/pom.xml b/samples/stockquote/client/spring-ws/pom.xml
deleted file mode 100644
index 4b24d723..00000000
--- a/samples/stockquote/client/spring-ws/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- stockquote-client
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- stockquote-spring-ws-client
- jar
- Spring WS Stock Quote Sample - Spring-WS Client
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
- runtime
-
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.stockquote.client.sws.StockClient
-
-
-
-
-
-
- org.springframework
- spring-context
-
-
- org.springframework.ws
- spring-xml
-
-
- org.springframework.ws
- spring-ws-core
-
-
-
diff --git a/samples/stockquote/client/spring-ws/src/main/java/org/springframework/ws/samples/stockquote/client/sws/StockClient.java b/samples/stockquote/client/spring-ws/src/main/java/org/springframework/ws/samples/stockquote/client/sws/StockClient.java
deleted file mode 100644
index 1f05c2bd..00000000
--- a/samples/stockquote/client/spring-ws/src/main/java/org/springframework/ws/samples/stockquote/client/sws/StockClient.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.stockquote.client.sws;
-
-import java.io.IOException;
-import java.net.URI;
-import javax.xml.transform.Source;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.io.Resource;
-import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
-import org.springframework.ws.soap.addressing.client.ActionCallback;
-import org.springframework.xml.transform.ResourceSource;
-import org.springframework.xml.transform.StringResult;
-
-public class StockClient extends WebServiceGatewaySupport {
-
- private Resource request;
-
- private URI action;
-
- public void setRequest(Resource request) {
- this.request = request;
- }
-
- public void setAction(URI action) {
- this.action = action;
- }
-
- public void quotes() throws IOException {
- Source requestSource = new ResourceSource(request);
- StringResult result = new StringResult();
- getWebServiceTemplate().sendSourceAndReceiveToResult(requestSource, new ActionCallback(action), result);
- System.out.println();
- System.out.println(result);
- System.out.println();
- }
-
- public static void main(String[] args) throws IOException {
- ApplicationContext applicationContext =
- new ClassPathXmlApplicationContext("applicationContext.xml", StockClient.class);
- StockClient stockClient = (StockClient) applicationContext.getBean("stockClient");
- stockClient.quotes();
- }
-
-}
diff --git a/samples/stockquote/client/spring-ws/src/main/resources/log4j.properties b/samples/stockquote/client/spring-ws/src/main/resources/log4j.properties
deleted file mode 100644
index 0f73a758..00000000
--- a/samples/stockquote/client/spring-ws/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/stockquote/client/spring-ws/src/main/resources/org/springframework/ws/samples/stockquote/client/sws/applicationContext.xml b/samples/stockquote/client/spring-ws/src/main/resources/org/springframework/ws/samples/stockquote/client/sws/applicationContext.xml
deleted file mode 100644
index 83cbb814..00000000
--- a/samples/stockquote/client/spring-ws/src/main/resources/org/springframework/ws/samples/stockquote/client/sws/applicationContext.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/stockquote/client/spring-ws/src/main/resources/org/springframework/ws/samples/stockquote/client/sws/quotesRequest.xml b/samples/stockquote/client/spring-ws/src/main/resources/org/springframework/ws/samples/stockquote/client/sws/quotesRequest.xml
deleted file mode 100644
index b40a2dc6..00000000
--- a/samples/stockquote/client/spring-ws/src/main/resources/org/springframework/ws/samples/stockquote/client/sws/quotesRequest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- FABRIKAM
- CONTOSO
-
diff --git a/samples/stockquote/pom.xml b/samples/stockquote/pom.xml
deleted file mode 100644
index 11e5e20d..00000000
--- a/samples/stockquote/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- spring-ws-samples
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- stockquote
- pom
- Spring WS Stock Quote Sample
-
- server
- client
-
-
diff --git a/samples/stockquote/readme.txt b/samples/stockquote/readme.txt
deleted file mode 100644
index e6fab5e0..00000000
--- a/samples/stockquote/readme.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-=======================================================
-== Spring Web Service Stock Quote sample application ==
-=======================================================
-
-
-1. INTRODUCTION
-
-This sample shows a Stock Quote service. Incoming messages are routed via
-WS-Addressing, and SOAP message content is handled using JAXB2. Additionally,
-this sample uses the HTTP server built into Java 6.
-
-2. RUNNING
-
-This sample contains a main() method in the Driver class. To start it, simply
-run "mvn install exec:java" in the server directory
-
-3. CLIENT
-
-Simply run "mvn install exec:java" in each of the client subdirectories.
diff --git a/samples/stockquote/server/.gitignore b/samples/stockquote/server/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/stockquote/server/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/stockquote/server/pom.xml b/samples/stockquote/server/pom.xml
deleted file mode 100644
index d8afdeac..00000000
--- a/samples/stockquote/server/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
- stockquote
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- stockquote-server
- jar
- Spring WS Stock Quote Sample - Server
- A Spring-WS sample that shows usage of WS-Addressing and the HTTP Server built into JDK 1.6.
-
-
-
- org.codehaus.mojo
- jaxb2-maven-plugin
-
-
-
- xjc
-
-
-
-
- src/main/resources/org/springframework/ws/samples/stockquote/ws
- stockquote.wsdl
- org.springframework.ws.samples.stockquote.schema
- true
- false
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
- java
-
-
-
-
- org.springframework.ws.samples.stockquote.Driver
-
-
-
-
-
-
-
- org.springframework
- spring-context
-
-
-
- org.springframework.ws
- spring-ws-core
-
-
- org.springframework.ws
- spring-ws-support
-
-
- log4j
- log4j
-
-
-
diff --git a/samples/stockquote/server/src/main/java/org/springframework/ws/samples/stockquote/Driver.java b/samples/stockquote/server/src/main/java/org/springframework/ws/samples/stockquote/Driver.java
deleted file mode 100644
index 75bac39d..00000000
--- a/samples/stockquote/server/src/main/java/org/springframework/ws/samples/stockquote/Driver.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.stockquote;
-
-import java.io.IOException;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class Driver {
-
- public static void main(String[] args) throws IOException {
- ClassPathXmlApplicationContext applicationContext =
- new ClassPathXmlApplicationContext("applicationContext.xml", Driver.class);
- System.out.println();
- System.out.println("Press [Enter] to shut down...");
- System.in.read();
- applicationContext.close();
- }
-
-}
diff --git a/samples/stockquote/server/src/main/java/org/springframework/ws/samples/stockquote/ws/StockService.java b/samples/stockquote/server/src/main/java/org/springframework/ws/samples/stockquote/ws/StockService.java
deleted file mode 100644
index 64eed485..00000000
--- a/samples/stockquote/server/src/main/java/org/springframework/ws/samples/stockquote/ws/StockService.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ws.samples.stockquote.ws;
-
-import java.util.GregorianCalendar;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.springframework.ws.samples.stockquote.schema.StockQuote;
-import org.springframework.ws.samples.stockquote.schema.StockQuoteRequest;
-import org.springframework.ws.samples.stockquote.schema.StockQuoteResponse;
-import org.springframework.ws.server.endpoint.annotation.Endpoint;
-import org.springframework.ws.soap.addressing.server.annotation.Action;
-import org.springframework.ws.soap.addressing.server.annotation.Address;
-
-@Endpoint
-@Address("http://localhost:8080/StockService")
-// optional
-public class StockService {
-
- private DatatypeFactory datatypeFactory;
-
- public StockService() throws DatatypeConfigurationException {
- datatypeFactory = DatatypeFactory.newInstance();
- }
-
- @Action(value = "http://www.springframework.org/spring-ws/samples/stockquote/StockService/GetQuote",
- output = "http://www.springframework.org/spring-ws/samples/stockquote/StockService/Quotes")
- public StockQuoteResponse getStockQuotes(StockQuoteRequest request) {
- StockQuoteResponse response = new StockQuoteResponse();
-
- XMLGregorianCalendar now = datatypeFactory.newXMLGregorianCalendar(new GregorianCalendar());
- for (String symbol : request.getSymbol()) {
- StockQuote quote = new StockQuote();
- quote.setSymbol(symbol);
- quote.setDate(now);
- if ("FABRIKAM".equals(symbol)) {
- quote.setName("Fabrikam, Inc.");
- quote.setLast(120.00);
- quote.setChange(5.5);
- }
- else {
- quote.setName("Contoso Corp.");
- quote.setLast(50.07);
- quote.setChange(1.15);
- }
- response.getStockQuote().add(quote);
- }
-
- return response;
- }
-
-}
diff --git a/samples/stockquote/server/src/main/resources/log4j.properties b/samples/stockquote/server/src/main/resources/log4j.properties
deleted file mode 100644
index 0f73a758..00000000
--- a/samples/stockquote/server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/applicationContext.xml b/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/applicationContext.xml
deleted file mode 100644
index 8f53e13c..00000000
--- a/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/applicationContext.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/ws/applicationContext-ws.xml b/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/ws/applicationContext-ws.xml
deleted file mode 100644
index ca23b945..00000000
--- a/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/ws/applicationContext-ws.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/ws/stockquote.wsdl b/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/ws/stockquote.wsdl
deleted file mode 100644
index 76a212d3..00000000
--- a/samples/stockquote/server/src/main/resources/org/springframework/ws/samples/stockquote/ws/stockquote.wsdl
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/tutorial/.gitignore b/samples/tutorial/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/samples/tutorial/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
deleted file mode 100644
index b13996be..00000000
--- a/samples/tutorial/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- spring-ws-samples
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- tutorial
- war
- Spring WS Holiday Service Tutorial
- This sample contains the code for the tutorial in the reference documentation.
-
-
-
- maven-javadoc-plugin
-
- ${basedir}/../../src/main/javadoc/javadoc.css
-
-
-
-
-
-
-
- org.springframework.ws
- spring-ws-core
-
-
- org.jdom
- jdom
-
-
- jaxen
- jaxen
- runtime
-
-
- dom4j
- dom4j
-
-
- jdom
- jdom
-
-
- xom
- xom
-
-
- xerces
- xmlParserAPIs
-
-
- xerces
- xercesImpl
-
-
-
-
-
diff --git a/samples/tutorial/readme.txt b/samples/tutorial/readme.txt
deleted file mode 100644
index a1310898..00000000
--- a/samples/tutorial/readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-=================================
-== Spring Web Service Tutorial ==
-=================================
-
-
-1. INTRODUCTION
-
-This sample contains the code for the tutorial, which can be found at
-http://static.springframework.org/spring-ws/site/reference/html/tutorial.html
-
-2. INSTALLATION
-
-Simply run "mvn package" and deploy the war file generated in target
diff --git a/samples/tutorial/src/main/java/com/mycompany/hr/service/HumanResourceService.java b/samples/tutorial/src/main/java/com/mycompany/hr/service/HumanResourceService.java
deleted file mode 100644
index ebc47d85..00000000
--- a/samples/tutorial/src/main/java/com/mycompany/hr/service/HumanResourceService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mycompany.hr.service;
-
-import java.util.Date;
-
-/**
- * This interface defined the contract for a HR business service. It is used by the {@link
- * com.mycompany.hr.ws.HolidayEndpoint}.
- *
- * @author Arjen Poutsma
- */
-public interface HumanResourceService {
-
- /**
- * Books a holiday.
- *
- * @param startDate the start date of the holiday
- * @param endDate the end date of the holiday
- * @param name the name of the person taking the holiday
- */
- void bookHoliday(Date startDate, Date endDate, String name);
-
-}
diff --git a/samples/tutorial/src/main/java/com/mycompany/hr/service/StubHumanResourceService.java b/samples/tutorial/src/main/java/com/mycompany/hr/service/StubHumanResourceService.java
deleted file mode 100644
index 3da8b6d1..00000000
--- a/samples/tutorial/src/main/java/com/mycompany/hr/service/StubHumanResourceService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mycompany.hr.service;
-
-import java.util.Date;
-
-import org.springframework.stereotype.Service;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Simple stub implementation of {@link HumanResourceService}, which does nothing but logging.
- *
- * @author Arjen Poutsma
- */
-@Service
-public class StubHumanResourceService implements HumanResourceService {
-
- private static final Log logger = LogFactory.getLog(StubHumanResourceService.class);
-
- public void bookHoliday(Date startDate, Date endDate, String name) {
- logger.info("Booking holiday for [" + startDate + "-" + endDate + "] for [" + name + "] ");
- }
-}
diff --git a/samples/tutorial/src/main/java/com/mycompany/hr/ws/HolidayEndpoint.java b/samples/tutorial/src/main/java/com/mycompany/hr/ws/HolidayEndpoint.java
deleted file mode 100644
index 8442a8a2..00000000
--- a/samples/tutorial/src/main/java/com/mycompany/hr/ws/HolidayEndpoint.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mycompany.hr.ws;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ws.server.endpoint.annotation.Endpoint;
-import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
-import org.springframework.ws.server.endpoint.annotation.RequestPayload;
-
-import com.mycompany.hr.service.HumanResourceService;
-import org.jdom2.Element;
-import org.jdom2.JDOMException;
-import org.jdom2.Namespace;
-import org.jdom2.filter.Filters;
-import org.jdom2.xpath.XPathExpression;
-import org.jdom2.xpath.XPathFactory;
-
-/**
- * This endpoint handles holiday requests. It uses a combination of JDOM and XPath to extract interesting pieces of XML
- * from the incoming message, and invoked the injected {@link HumanResourceService} with those.
- *
- * @author Arjen Poutsma
- */
-@Endpoint
-public class HolidayEndpoint {
-
- private static final String NAMESPACE_URI = "http://mycompany.com/hr/schemas";
-
- private XPathExpression startDateExpression;
-
- private XPathExpression endDateExpression;
-
- private XPathExpression firstNameExpression;
-
- private XPathExpression lastNameExpression;
-
- private HumanResourceService humanResourceService;
-
- @Autowired
- public HolidayEndpoint(HumanResourceService humanResourceService) throws JDOMException {
- this.humanResourceService = humanResourceService;
- Namespace namespace = Namespace.getNamespace("hr", NAMESPACE_URI);
- XPathFactory xPathFactory = XPathFactory.instance();
- startDateExpression = xPathFactory.compile("//hr:StartDate", Filters.element(), null, namespace);
- endDateExpression = xPathFactory.compile("//hr:EndDate", Filters.element(), null, namespace);
- firstNameExpression = xPathFactory.compile("//hr:FirstName", Filters.element(), null, namespace);
- lastNameExpression = xPathFactory.compile("//hr:LastName", Filters.element(), null, namespace);
- }
-
- @PayloadRoot(namespace = NAMESPACE_URI, localPart = "HolidayRequest")
- public void handleHolidayRequest(@RequestPayload Element holidayRequest) throws Exception {
- Date startDate = parseDate(startDateExpression, holidayRequest);
- Date endDate = parseDate(endDateExpression, holidayRequest);
- String name = firstNameExpression.evaluateFirst(holidayRequest).getText() + " " + lastNameExpression.evaluateFirst(holidayRequest).getText();
-
- humanResourceService.bookHoliday(startDate, endDate, name);
- }
-
- private Date parseDate(XPathExpression expression, Element element) throws ParseException {
- Element result = expression.evaluateFirst(element);
- if (result != null) {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- return dateFormat.parse(result.getText());
- } else {
- throw new IllegalArgumentException("Could not evaluate [" + expression + "] on [" + element + "]");
- }
- }
-
-}
diff --git a/samples/tutorial/src/main/resources/log4j.properties b/samples/tutorial/src/main/resources/log4j.properties
deleted file mode 100644
index 16826636..00000000
--- a/samples/tutorial/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2007 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-log4j.rootLogger=WARN, stdout
-log4j.logger.org.springframework.ws=DEBUG
-log4j.logger.org.springframework.xml=DEBUG
-log4j.logger.com.mycompany.hr=DEBUG
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
\ No newline at end of file
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/hr.wsdl b/samples/tutorial/src/main/webapp/WEB-INF/hr.wsdl
deleted file mode 100644
index e21e5221..00000000
--- a/samples/tutorial/src/main/webapp/WEB-INF/hr.wsdl
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/hr.xsd b/samples/tutorial/src/main/webapp/WEB-INF/hr.xsd
deleted file mode 100644
index 3cd5b870..00000000
--- a/samples/tutorial/src/main/webapp/WEB-INF/hr.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml
deleted file mode 100644
index b0848520..00000000
--- a/samples/tutorial/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/web.xml b/samples/tutorial/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 408aa8d1..00000000
--- a/samples/tutorial/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
- MyCompany HR Holiday Service
-
-
- spring-ws
- org.springframework.ws.transport.http.MessageDispatcherServlet
-
- transformWsdlLocations
- true
-
-
-
-
- spring-ws
- /*
-
-
-
diff --git a/samples/tutorial/src/test/java/com/mycompany/hr/ws/HolidayEndpointTest.java b/samples/tutorial/src/test/java/com/mycompany/hr/ws/HolidayEndpointTest.java
deleted file mode 100644
index 74717908..00000000
--- a/samples/tutorial/src/test/java/com/mycompany/hr/ws/HolidayEndpointTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mycompany.hr.ws;
-
-import java.io.InputStream;
-import java.util.Calendar;
-
-import com.mycompany.hr.service.HumanResourceService;
-import org.jdom2.Document;
-import org.jdom2.input.SAXBuilder;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.easymock.EasyMock.*;
-
-public class HolidayEndpointTest {
-
- private Document holidayRequest;
-
- private HolidayEndpoint endpoint;
-
- private HumanResourceService serviceMock;
-
- private Calendar startCalendar;
-
- private Calendar endCalendar;
-
- @Before
- public void setUp() throws Exception {
- serviceMock = createMock(HumanResourceService.class);
- SAXBuilder builder = new SAXBuilder();
- InputStream is = getClass().getResourceAsStream("holidayRequest.xml");
- try {
- holidayRequest = builder.build(is);
- }
- finally {
- is.close();
- }
- endpoint = new HolidayEndpoint(serviceMock);
- startCalendar = Calendar.getInstance();
- startCalendar.clear();
- startCalendar.set(2006, Calendar.JULY, 3);
- endCalendar = Calendar.getInstance();
- endCalendar.clear();
- endCalendar.set(2006, Calendar.JULY, 7);
- }
-
- @Test
- public void handleHolidayRequest() throws Exception {
- serviceMock.bookHoliday(startCalendar.getTime(), endCalendar.getTime(), "John Doe");
- replay(serviceMock);
- endpoint.handleHolidayRequest(holidayRequest.getRootElement());
- verify(serviceMock);
- }
-
-
-}
diff --git a/samples/tutorial/src/test/resources/com/mycompany/hr/ws/holidayRequest.xml b/samples/tutorial/src/test/resources/com/mycompany/hr/ws/holidayRequest.xml
deleted file mode 100644
index bfa7e796..00000000
--- a/samples/tutorial/src/test/resources/com/mycompany/hr/ws/holidayRequest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- 2006-07-03
- 2006-07-07
-
-
- 42
- John
- Doe
-
-
\ No newline at end of file
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
deleted file mode 100644
index c746afd8..00000000
--- a/sandbox/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
- spring-ws-parent
- org.springframework.ws
- 2.1.2.RELEASE-SNAPSHOT
- ../parent/pom.xml
-
- 4.0.0
- spring-ws-sandbox
- jar
- Spring WS Sandbox
-
-
-
- org.springframework.ws
- spring-ws-core
-
-
- org.springframework.ws
- spring-ws-support
-
-
-
- org.springframework
- spring-context
-
-
- org.springframework
- spring-aop
-
-
- org.springframework
- spring-web
-
-
- org.springframework
- spring-webmvc
-
-
- org.springframework
- spring-jms
-
-
- org.springframework
- spring-test
-
-
-
- javax.xml.soap
- saaj-api
- provided
-
-
- javax.mail
- mail
- runtime
-
-
- javax.servlet
- servlet-api
- provided
-
-
- org.apache.geronimo.specs
- geronimo-jms_1.1_spec
- provided
-
-
- javax.xml.ws
- jaxws-api
- 2.1
-
-
- javax.xml.bind
- jaxb-api
-
-
-
-
-
- org.codehaus.woodstox
- woodstox-core-asl
-
-
- com.sun.xml.messaging.saaj
- saaj-impl
-
-
- org.apache.ws.commons.axiom
- axiom-api
-
-
- org.apache.ws.commons.axiom
- axiom-impl
-
-
- commons-httpclient
- commons-httpclient
- true
-
-
- com.sun.xsom
- xsom
- 20070515
-
-
- log4j
- log4j
- runtime
-
-
-
diff --git a/security/.gitignore b/security/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/security/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/security/pom.xml b/security/pom.xml
deleted file mode 100644
index f9a0f909..00000000
--- a/security/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
- spring-ws-parent
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../parent/pom.xml
-
- 4.0.0
- spring-ws-security
- jar
- Spring WS Security
- Spring-WS WS-Security implementation
-
-
- jboss.repository.releases.public
- JBoss Repo Public
- http://repository.jboss.org/nexus/content/groups/public-jboss
-
-
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.stream
- stax-api
-
-
- javax.xml.soap
- saaj-api
-
-
- javax.activation
- activation
-
-
-
-
-
-
-
- com.springsource.bundlor
- com.springsource.bundlor.maven
-
-
- maven-jar-plugin
-
-
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
-
-
-
-
-
-
-
- org.springframework.ws
- spring-ws-core
-
-
- org.springframework.ws
- spring-xml
- test
-
-
-
- org.springframework
- spring-tx
-
-
-
- com.sun.xml.messaging.saaj
- saaj-impl
- provided
-
-
- org.apache.ws.commons.axiom
- axiom-api
- true
-
-
- org.apache.ws.commons.axiom
- axiom-impl
- true
-
-
-
- com.sun.xml.wsit
- xws-security
-
-
- com.sun.xml.wsit
- wsit-rt
-
-
-
- org.apache.ws.security
- wss4j
-
-
-
- org.springframework.security
- spring-security-core
-
-
-
- net.sf.ehcache
- ehcache-core
- true
-
-
-
- javax.mail
- mail
-
-
-
- org.codehaus.woodstox
- woodstox-core-asl
- test
-
-
-
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..8a4b4d5c
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,7 @@
+rootProject.name = 'spring-ws'
+
+include 'spring-xml'
+include 'spring-ws-core'
+include 'spring-ws-support'
+include 'spring-ws-security'
+include 'spring-ws-test'
diff --git a/archetype/.gitignore b/spring-ws-core/.gitignore
similarity index 100%
rename from archetype/.gitignore
rename to spring-ws-core/.gitignore
diff --git a/core/src/main/java/org/springframework/ws/FaultAwareWebServiceMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/FaultAwareWebServiceMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/FaultAwareWebServiceMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/FaultAwareWebServiceMessage.java
diff --git a/core/src/main/java/org/springframework/ws/InvalidXmlException.java b/spring-ws-core/src/main/java/org/springframework/ws/InvalidXmlException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/InvalidXmlException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/InvalidXmlException.java
diff --git a/core/src/main/java/org/springframework/ws/NoEndpointFoundException.java b/spring-ws-core/src/main/java/org/springframework/ws/NoEndpointFoundException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/NoEndpointFoundException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/NoEndpointFoundException.java
diff --git a/core/src/main/java/org/springframework/ws/WebServiceException.java b/spring-ws-core/src/main/java/org/springframework/ws/WebServiceException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/WebServiceException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/WebServiceException.java
diff --git a/core/src/main/java/org/springframework/ws/WebServiceMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/WebServiceMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessage.java
diff --git a/core/src/main/java/org/springframework/ws/WebServiceMessageException.java b/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessageException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/WebServiceMessageException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessageException.java
diff --git a/core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java
rename to spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java
diff --git a/core/src/main/java/org/springframework/ws/client/WebServiceClientException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceClientException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/WebServiceClientException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceClientException.java
diff --git a/core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java
diff --git a/core/src/main/java/org/springframework/ws/client/WebServiceIOException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceIOException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/WebServiceIOException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceIOException.java
diff --git a/core/src/main/java/org/springframework/ws/client/WebServiceTransformerException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceTransformerException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/WebServiceTransformerException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceTransformerException.java
diff --git a/core/src/main/java/org/springframework/ws/client/WebServiceTransportException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceTransportException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/WebServiceTransportException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceTransportException.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/FaultMessageResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/FaultMessageResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/FaultMessageResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/FaultMessageResolver.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/SimpleFaultMessageResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/SimpleFaultMessageResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/SimpleFaultMessageResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/SimpleFaultMessageResolver.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/WebServiceMessageCallback.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceMessageCallback.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/WebServiceMessageCallback.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceMessageCallback.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/WebServiceMessageExtractor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceMessageExtractor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/WebServiceMessageExtractor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceMessageExtractor.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/WebServiceOperations.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceOperations.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/WebServiceOperations.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceOperations.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/package.html b/spring-ws-core/src/main/java/org/springframework/ws/client/core/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/package.html
diff --git a/core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java
diff --git a/core/src/main/java/org/springframework/ws/client/core/support/package.html b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/core/support/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/client/core/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/client/package.html b/spring-ws-core/src/main/java/org/springframework/ws/client/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/client/package.html
diff --git a/core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvisionException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvisionException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvisionException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvisionException.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/destination/package.html b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/destination/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/package.html
diff --git a/core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java
diff --git a/core/src/main/java/org/springframework/ws/client/support/interceptor/package.html b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/interceptor/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/package.html
diff --git a/core/src/main/java/org/springframework/ws/client/support/package.html b/spring-ws-core/src/main/java/org/springframework/ws/client/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/client/support/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/client/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java
rename to spring-ws-core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java
rename to spring-ws-core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/ws/config/InterceptorsBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/InterceptorsBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/config/InterceptorsBeanDefinitionParser.java
rename to spring-ws-core/src/main/java/org/springframework/ws/config/InterceptorsBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java
rename to spring-ws-core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/ws/config/StaticWsdlBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/StaticWsdlBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/config/StaticWsdlBeanDefinitionParser.java
rename to spring-ws-core/src/main/java/org/springframework/ws/config/StaticWsdlBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/ws/config/WebServicesNamespaceHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/config/WebServicesNamespaceHandler.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/config/WebServicesNamespaceHandler.java
rename to spring-ws-core/src/main/java/org/springframework/ws/config/WebServicesNamespaceHandler.java
diff --git a/core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java
rename to spring-ws-core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/ws/config/package.html b/spring-ws-core/src/main/java/org/springframework/ws/config/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/config/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/config/package.html
diff --git a/core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java b/spring-ws-core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java
rename to spring-ws-core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java
diff --git a/core/src/main/java/org/springframework/ws/context/DefaultMessageContext.java b/spring-ws-core/src/main/java/org/springframework/ws/context/DefaultMessageContext.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/context/DefaultMessageContext.java
rename to spring-ws-core/src/main/java/org/springframework/ws/context/DefaultMessageContext.java
diff --git a/core/src/main/java/org/springframework/ws/context/MessageContext.java b/spring-ws-core/src/main/java/org/springframework/ws/context/MessageContext.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/context/MessageContext.java
rename to spring-ws-core/src/main/java/org/springframework/ws/context/MessageContext.java
diff --git a/core/src/main/java/org/springframework/ws/context/package.html b/spring-ws-core/src/main/java/org/springframework/ws/context/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/context/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/context/package.html
diff --git a/core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java
diff --git a/core/src/main/java/org/springframework/ws/mime/Attachment.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/mime/Attachment.java
rename to spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java
diff --git a/core/src/main/java/org/springframework/ws/mime/AttachmentException.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/AttachmentException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/mime/AttachmentException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/mime/AttachmentException.java
diff --git a/core/src/main/java/org/springframework/ws/mime/MimeMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/MimeMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/mime/MimeMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/mime/MimeMessage.java
diff --git a/core/src/main/java/org/springframework/ws/mime/package.html b/spring-ws-core/src/main/java/org/springframework/ws/mime/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/mime/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/mime/package.html
diff --git a/core/src/main/java/org/springframework/ws/package.html b/spring-ws-core/src/main/java/org/springframework/ws/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/package.html
diff --git a/core/src/main/java/org/springframework/ws/pox/PoxMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/PoxMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/PoxMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/pox/PoxMessage.java
diff --git a/core/src/main/java/org/springframework/ws/pox/PoxMessageException.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/PoxMessageException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/PoxMessageException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/pox/PoxMessageException.java
diff --git a/core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java
diff --git a/core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageException.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageException.java
diff --git a/core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java
rename to spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java
diff --git a/core/src/main/java/org/springframework/ws/pox/dom/package.html b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/dom/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/pox/dom/package.html
diff --git a/core/src/main/java/org/springframework/ws/pox/package.html b/spring-ws-core/src/main/java/org/springframework/ws/pox/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/pox/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/pox/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/EndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/EndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/EndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/EndpointExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointExceptionResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/EndpointExceptionResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/EndpointExceptionResolver.java
diff --git a/core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java
diff --git a/core/src/main/java/org/springframework/ws/server/EndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/EndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/EndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java b/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
diff --git a/core/src/main/java/org/springframework/ws/server/SmartEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/SmartEndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/SmartEndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/SmartEndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/AbstractMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/AbstractMethodEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/AbstractMethodEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/AbstractMethodEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadSourceMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadSourceMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadSourceMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadSourceMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolver.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MethodArgumentResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MethodArgumentResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MethodArgumentResolver.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MethodReturnValueHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MethodReturnValueHandler.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MethodReturnValueHandler.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MethodReturnValueHandler.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespace.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespace.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespace.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespace.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespaces.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespaces.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespaces.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespaces.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/annotation/RequestPayload.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/RequestPayload.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/annotation/RequestPayload.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/RequestPayload.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/annotation/ResponsePayload.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/ResponsePayload.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/annotation/ResponsePayload.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/ResponsePayload.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/DelegatingSmartEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/DelegatingSmartEndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/interceptor/DelegatingSmartEndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/DelegatingSmartEndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/mapping/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/support/NamespaceUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/NamespaceUtils.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/support/NamespaceUtils.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/NamespaceUtils.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java
diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/support/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/endpoint/support/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/server/package.html b/spring-ws-core/src/main/java/org/springframework/ws/server/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/server/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/server/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/AbstractSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/AbstractSoapMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/AbstractSoapMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/AbstractSoapMessage.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapBody.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapBody.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapBody.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapBody.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapBodyException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapBodyException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapBodyException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapBodyException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapElementException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapElementException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapElementException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapElementException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapEnvelope.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapEnvelope.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapEnvelope.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapEnvelope.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapEnvelopeException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapEnvelopeException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapEnvelopeException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapEnvelopeException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapFault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapFault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapFaultDetail.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetail.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapFaultDetail.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetail.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapFaultDetailElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetailElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapFaultDetailElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetailElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapFaultException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapFaultException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapHeader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapHeader.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapHeaderElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeaderElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapHeaderElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeaderElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapHeaderException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeaderException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapHeaderException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeaderException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessage.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapMessageCreationException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessageCreationException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapMessageCreationException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessageCreationException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapMessageException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessageException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapMessageException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessageException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessageFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapMessageFactory.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessageFactory.java
diff --git a/core/src/main/java/org/springframework/ws/soap/SoapVersion.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapVersion.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/SoapVersion.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/SoapVersion.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/AddressingException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/AddressingException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/AddressingException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/AddressingException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/core/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/core/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/messageid/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/messageid/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionMethodEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionMethodEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionMethodEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/server/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/version/AddressingVersion.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AddressingVersion.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/version/AddressingVersion.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AddressingVersion.java
diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/version/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/addressing/version/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AbstractPayload.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AbstractPayload.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AbstractPayload.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AbstractPayload.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomAttachment.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomAttachment.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomAttachment.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomAttachment.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomAttachmentException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomAttachmentException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomAttachmentException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomAttachmentException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomHandler.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomHandler.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomHandler.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomResult.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomResult.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomResult.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomResult.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Fault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Fault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Fault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Fault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Header.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Header.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Header.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Header.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Body.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Body.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Body.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Fault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Fault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Fault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Fault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Header.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Header.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Header.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Header.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBodyException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBodyException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBodyException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBodyException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapElementException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapElementException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapElementException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapElementException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelope.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelope.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelope.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelope.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelopeException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelopeException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelopeException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelopeException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetail.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetail.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetail.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetail.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapFaultException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeader.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeader.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeader.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeaderElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeaderElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeaderElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeaderElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeaderException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeaderException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeaderException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapHeaderException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageCreationException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageCreationException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageCreationException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageCreationException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/NonCachingPayload.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/NonCachingPayload.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/NonCachingPayload.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/NonCachingPayload.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/Payload.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/Payload.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/Payload.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/Payload.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/StreamingOMDataSource.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/StreamingOMDataSource.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/StreamingOMDataSource.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/StreamingOMDataSource.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java
diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/support/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/axiom/support/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java
diff --git a/core/src/main/java/org/springframework/ws/soap/client/core/SoapFaultMessageResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapFaultMessageResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/client/core/SoapFaultMessageResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapFaultMessageResolver.java
diff --git a/core/src/main/java/org/springframework/ws/soap/client/core/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/client/core/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/client/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/client/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/client/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachmentException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachmentException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachmentException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachmentException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajImplementation.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajImplementation.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajImplementation.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajImplementation.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Fault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Fault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Fault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Fault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Header.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Header.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Header.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Header.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Header.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Header.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Header.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Header.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBody.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBody.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBody.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBody.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBodyException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBodyException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBodyException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBodyException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElementException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElementException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElementException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElementException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelope.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelope.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelope.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelope.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelopeException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelopeException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelopeException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelopeException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetailElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetailElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetailElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetailElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderElement.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderElement.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderElement.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageCreationException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageCreationException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageCreationException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageCreationException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageException.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java
diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/support/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/saaj/support/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/SmartSoapEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SmartSoapEndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/SmartSoapEndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/SmartSoapEndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/SoapEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/SoapEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolver.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapHeader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapHeader.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapHeader.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapHeader.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/DelegatingSmartSoapEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/DelegatingSmartSoapEndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/DelegatingSmartSoapEndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/DelegatingSmartSoapEndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/endpoint/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/server/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/server/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/server/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java
diff --git a/core/src/main/java/org/springframework/ws/soap/soap11/Soap11Fault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Fault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap11/Soap11Fault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Fault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/soap11/Soap11Header.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Header.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap11/Soap11Header.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Header.java
diff --git a/core/src/main/java/org/springframework/ws/soap/soap11/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap11/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/soap12/Soap12Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap12/Soap12Body.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap12/Soap12Body.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/soap12/Soap12Body.java
diff --git a/core/src/main/java/org/springframework/ws/soap/soap12/Soap12Fault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap12/Soap12Fault.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap12/Soap12Fault.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/soap12/Soap12Fault.java
diff --git a/core/src/main/java/org/springframework/ws/soap/soap12/Soap12Header.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap12/Soap12Header.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap12/Soap12Header.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/soap12/Soap12Header.java
diff --git a/core/src/main/java/org/springframework/ws/soap/soap12/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap12/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/soap12/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/soap12/package.html
diff --git a/core/src/main/java/org/springframework/ws/soap/support/SoapUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/support/SoapUtils.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/support/SoapUtils.java
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/support/SoapUtils.java
diff --git a/core/src/main/java/org/springframework/ws/soap/support/package.html b/spring-ws-core/src/main/java/org/springframework/ws/soap/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/soap/support/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/soap/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/stream/StreamingPayload.java b/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingPayload.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/stream/StreamingPayload.java
rename to spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingPayload.java
diff --git a/core/src/main/java/org/springframework/ws/stream/StreamingWebServiceMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingWebServiceMessage.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/stream/StreamingWebServiceMessage.java
rename to spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingWebServiceMessage.java
diff --git a/core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java b/spring-ws-core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java
rename to spring-ws-core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java
diff --git a/core/src/main/java/org/springframework/ws/support/MarshallingUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/support/MarshallingUtils.java
rename to spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java
diff --git a/core/src/main/java/org/springframework/ws/support/package.html b/spring-ws-core/src/main/java/org/springframework/ws/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/support/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/EndpointAwareWebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/EndpointAwareWebServiceConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/EndpointAwareWebServiceConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/EndpointAwareWebServiceConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/FaultAwareWebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/FaultAwareWebServiceConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/FaultAwareWebServiceConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/FaultAwareWebServiceConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/TransportConstants.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportConstants.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/TransportConstants.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/TransportConstants.java
diff --git a/core/src/main/java/org/springframework/ws/transport/TransportException.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/TransportException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/TransportException.java
diff --git a/core/src/main/java/org/springframework/ws/transport/TransportInputStream.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/TransportInputStream.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java
diff --git a/core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java
diff --git a/core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/WebServiceMessageReceiver.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceMessageReceiver.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/WebServiceMessageReceiver.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceMessageReceiver.java
diff --git a/core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java
diff --git a/core/src/main/java/org/springframework/ws/transport/context/DefaultTransportContext.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/DefaultTransportContext.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/context/DefaultTransportContext.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/context/DefaultTransportContext.java
diff --git a/core/src/main/java/org/springframework/ws/transport/context/TransportContext.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContext.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/context/TransportContext.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContext.java
diff --git a/core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java
diff --git a/core/src/main/java/org/springframework/ws/transport/context/package.html b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/context/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/context/package.html
diff --git a/core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpComponentsConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/HttpComponentsConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpTransportConstants.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpTransportConstants.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/HttpTransportConstants.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpTransportConstants.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpTransportException.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpTransportException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/HttpTransportException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpTransportException.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/LastModifiedHelper.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LastModifiedHelper.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/LastModifiedHelper.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/LastModifiedHelper.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java
diff --git a/core/src/main/java/org/springframework/ws/transport/http/package.html b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/http/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/http/package.html
diff --git a/core/src/main/java/org/springframework/ws/transport/package.html b/spring-ws-core/src/main/java/org/springframework/ws/transport/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/package.html
diff --git a/core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java
diff --git a/core/src/main/java/org/springframework/ws/transport/support/TransportUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/TransportUtils.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/support/TransportUtils.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/support/TransportUtils.java
diff --git a/core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java
diff --git a/core/src/main/java/org/springframework/ws/transport/support/package.html b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/transport/support/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/transport/support/package.html
diff --git a/core/src/main/java/org/springframework/ws/wsdl/WsdlDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/WsdlDefinition.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/WsdlDefinition.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/WsdlDefinition.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/WsdlDefinitionException.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/WsdlDefinitionException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/WsdlDefinitionException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/WsdlDefinitionException.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/package.html b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/package.html
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionException.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionException.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionException.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionException.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/package.html b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/package.html
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingsProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingsProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingsProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingsProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ImportsProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ImportsProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ImportsProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ImportsProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/MessagesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/MessagesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/MessagesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/MessagesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/PortTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/PortTypesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/PortTypesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/PortTypesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServicesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServicesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServicesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServicesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/TypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/TypesProvider.java
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/TypesProvider.java
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/TypesProvider.java
diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/package.html b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/package.html
similarity index 100%
rename from core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/package.html
rename to spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/package.html
diff --git a/core/src/main/resources/META-INF/spring.handlers b/spring-ws-core/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from core/src/main/resources/META-INF/spring.handlers
rename to spring-ws-core/src/main/resources/META-INF/spring.handlers
diff --git a/core/src/main/resources/META-INF/spring.schemas b/spring-ws-core/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from core/src/main/resources/META-INF/spring.schemas
rename to spring-ws-core/src/main/resources/META-INF/spring.schemas
diff --git a/core/src/main/resources/org/springframework/ws/client/core/WebServiceTemplate.properties b/spring-ws-core/src/main/resources/org/springframework/ws/client/core/WebServiceTemplate.properties
similarity index 100%
rename from core/src/main/resources/org/springframework/ws/client/core/WebServiceTemplate.properties
rename to spring-ws-core/src/main/resources/org/springframework/ws/client/core/WebServiceTemplate.properties
diff --git a/core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd b/spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd
similarity index 100%
rename from core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd
rename to spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd
diff --git a/core/src/main/resources/org/springframework/ws/config/web-services-2.0.xsd b/spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-2.0.xsd
similarity index 100%
rename from core/src/main/resources/org/springframework/ws/config/web-services-2.0.xsd
rename to spring-ws-core/src/main/resources/org/springframework/ws/config/web-services-2.0.xsd
diff --git a/core/src/main/resources/org/springframework/ws/server/MessageDispatcher.properties b/spring-ws-core/src/main/resources/org/springframework/ws/server/MessageDispatcher.properties
similarity index 100%
rename from core/src/main/resources/org/springframework/ws/server/MessageDispatcher.properties
rename to spring-ws-core/src/main/resources/org/springframework/ws/server/MessageDispatcher.properties
diff --git a/core/src/main/resources/org/springframework/ws/soap/server/SoapMessageDispatcher.properties b/spring-ws-core/src/main/resources/org/springframework/ws/soap/server/SoapMessageDispatcher.properties
similarity index 100%
rename from core/src/main/resources/org/springframework/ws/soap/server/SoapMessageDispatcher.properties
rename to spring-ws-core/src/main/resources/org/springframework/ws/soap/server/SoapMessageDispatcher.properties
diff --git a/core/src/main/resources/org/springframework/ws/transport/http/MessageDispatcherServlet.properties b/spring-ws-core/src/main/resources/org/springframework/ws/transport/http/MessageDispatcherServlet.properties
similarity index 100%
rename from core/src/main/resources/org/springframework/ws/transport/http/MessageDispatcherServlet.properties
rename to spring-ws-core/src/main/resources/org/springframework/ws/transport/http/MessageDispatcherServlet.properties
diff --git a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java b/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/MockWebServiceMessage.java
rename to spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java
diff --git a/core/src/test/java/org/springframework/ws/MockWebServiceMessageFactory.java b/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessageFactory.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/MockWebServiceMessageFactory.java
rename to spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessageFactory.java
diff --git a/core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java
rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java
diff --git a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java
diff --git a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java
diff --git a/core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java
diff --git a/core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java
diff --git a/core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java
diff --git a/core/src/test/java/org/springframework/ws/config/DummyInterceptor.java b/spring-ws-core/src/test/java/org/springframework/ws/config/DummyInterceptor.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/DummyInterceptor.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/DummyInterceptor.java
diff --git a/core/src/test/java/org/springframework/ws/config/DummyInterceptorDependency.java b/spring-ws-core/src/test/java/org/springframework/ws/config/DummyInterceptorDependency.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/DummyInterceptorDependency.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/DummyInterceptorDependency.java
diff --git a/core/src/test/java/org/springframework/ws/config/DummyMarshaller.java b/spring-ws-core/src/test/java/org/springframework/ws/config/DummyMarshaller.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/DummyMarshaller.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/DummyMarshaller.java
diff --git a/core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java
diff --git a/core/src/test/java/org/springframework/ws/config/MyInterceptor.java b/spring-ws-core/src/test/java/org/springframework/ws/config/MyInterceptor.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/MyInterceptor.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/MyInterceptor.java
diff --git a/core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java
diff --git a/core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java
diff --git a/core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java
diff --git a/core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java b/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java
diff --git a/core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java
diff --git a/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomHandlerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomHandlerTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomHandlerTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomHandlerTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/AbstractSaajImplementationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/AbstractSaajImplementationTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/AbstractSaajImplementationTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/AbstractSaajImplementationTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj11ImplementationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/Saaj11ImplementationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/Saaj11ImplementationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/Saaj11ImplementationTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj12ImplementationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/Saaj12ImplementationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/Saaj12ImplementationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/Saaj12ImplementationTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj13ImplementationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/Saaj13ImplementationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/Saaj13ImplementationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/Saaj13ImplementationTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTest.java
diff --git a/core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java
diff --git a/core/src/test/java/org/springframework/ws/support/MarshallingUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/support/MarshallingUtilsTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java
diff --git a/core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java
diff --git a/core/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java
diff --git a/core/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java
diff --git a/core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java
diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java
similarity index 100%
rename from core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java
rename to spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java
diff --git a/core/src/test/resources/log4j.properties b/spring-ws-core/src/test/resources/log4j.properties
similarity index 100%
rename from core/src/test/resources/log4j.properties
rename to spring-ws-core/src/test/resources/log4j.properties
diff --git a/core/src/test/resources/org/springframework/ws/client/support/destination/complex.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/destination/complex.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/destination/complex.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/destination/complex.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/client/support/destination/simple.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/destination/simple.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/destination/simple.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/destination/simple.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/client/support/interceptor/invalidMessage.xml b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/invalidMessage.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/interceptor/invalidMessage.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/invalidMessage.xml
diff --git a/core/src/test/resources/org/springframework/ws/client/support/interceptor/productSchema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/productSchema.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/interceptor/productSchema.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/productSchema.xsd
diff --git a/core/src/test/resources/org/springframework/ws/client/support/interceptor/schema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/schema.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/interceptor/schema.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/schema.xsd
diff --git a/core/src/test/resources/org/springframework/ws/client/support/interceptor/schema2.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/schema2.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/interceptor/schema2.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/schema2.xsd
diff --git a/core/src/test/resources/org/springframework/ws/client/support/interceptor/sizeSchema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/sizeSchema.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/interceptor/sizeSchema.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/sizeSchema.xsd
diff --git a/core/src/test/resources/org/springframework/ws/client/support/interceptor/validMessage.xml b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/validMessage.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/interceptor/validMessage.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/validMessage.xml
diff --git a/core/src/test/resources/org/springframework/ws/client/support/interceptor/validSoapMessage.xml b/spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/validSoapMessage.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/client/support/interceptor/validSoapMessage.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/client/support/interceptor/validSoapMessage.xml
diff --git a/core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/config/annotationDrivenBeanDefinitionParserTest.xml
diff --git a/core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserInjectionTest.xml
diff --git a/core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserOrderTest.xml
diff --git a/core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/config/interceptorsBeanDefinitionParserTest.xml
diff --git a/core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml
diff --git a/core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml
diff --git a/core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/config/wsdlBeanDefinitionParserTest.xml
diff --git a/core/src/test/resources/org/springframework/ws/mime/spring-ws.png b/spring-ws-core/src/test/resources/org/springframework/ws/mime/spring-ws.png
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/mime/spring-ws.png
rename to spring-ws-core/src/test/resources/org/springframework/ws/mime/spring-ws.png
diff --git a/core/src/test/resources/org/springframework/ws/payload.xml b/spring-ws-core/src/test/resources/org/springframework/ws/payload.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/payload.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/payload.xml
diff --git a/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformInput.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformInput.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformInput.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformInput.xml
diff --git a/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformOutput.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformOutput.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformOutput.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformOutput.xml
diff --git a/core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformation.xslt b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformation.xslt
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformation.xslt
rename to spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/interceptor/transformation.xslt
diff --git a/core/src/test/resources/org/springframework/ws/server/endpoint/mapping/bridged-method-registration.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/bridged-method-registration.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/server/endpoint/mapping/bridged-method-registration.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/bridged-method-registration.xml
diff --git a/core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml
diff --git a/core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml
diff --git a/core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/request-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-anonymous.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/request-anonymous.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-anonymous.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/request-fault-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-fault-to.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/request-fault-to.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-fault-to.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-message-id.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-message-id.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-message-id.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-message-id.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-reply-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-reply-to.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-reply-to.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-reply-to.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-to.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-to.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-no-to.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/request-none.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-none.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/request-none.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/request-none.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-anonymous.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/response-fault-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-fault-to.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/response-fault-to.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-fault-to.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/response-no-message-id.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-no-message-id.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/response-no-message-id.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/response-no-message-id.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/10/valid.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-no-message-id.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-no-message-id.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-no-message-id.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-no-message-id.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/axiom/SWS-502.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/axiom/SWS-502.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/axiom/SWS-502.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/axiom/SWS-502.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/saaj/support/invalidNamespaceReferenceSoapMessage.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/saaj/support/invalidNamespaceReferenceSoapMessage.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/saaj/support/invalidNamespaceReferenceSoapMessage.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/saaj/support/invalidNamespaceReferenceSoapMessage.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/saaj/support/soapMessage.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/saaj/support/soapMessage.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/saaj/support/soapMessage.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/saaj/support/soapMessage.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/axiom.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/axiom.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/axiom.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/axiom.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/codexws.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/codexws.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/codexws.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/codexws.xsd
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/invalidMessage.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/invalidMessage.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/invalidMessage.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/invalidMessage.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/multipleNamespaces.xsd
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/productSchema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/productSchema.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/productSchema.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/productSchema.xsd
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/schema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/schema.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/schema.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/schema.xsd
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/schema2.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/schema2.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/schema2.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/schema2.xsd
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/sizeSchema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/sizeSchema.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/sizeSchema.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/sizeSchema.xsd
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/validMessage.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/validMessage.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/validMessage.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/validMessage.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/validSoapMessage.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/validSoapMessage.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/validSoapMessage.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/interceptor/validSoapMessage.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/server/endpoint/messages.properties b/spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/messages.properties
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/server/endpoint/messages.properties
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/server/endpoint/messages.properties
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap11/soap11-attachment.bin b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-attachment.bin
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap11/soap11-attachment.bin
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-attachment.bin
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap11/soap11-ill-formed.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-ill-formed.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap11/soap11-ill-formed.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-ill-formed.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap11/soap11-mtom.bin b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-mtom.bin
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap11/soap11-mtom.bin
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-mtom.bin
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf16-be-bom.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf16-be-bom.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf16-be-bom.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf16-be-bom.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf16-le-bom.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf16-le-bom.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf16-le-bom.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf16-le-bom.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf8-bom.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf8-bom.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf8-bom.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11-utf8-bom.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap11/soap11.xsd
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap12/soap12-attachment.bin b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12-attachment.bin
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap12/soap12-attachment.bin
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12-attachment.bin
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap12/soap12-ill-formed.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12-ill-formed.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap12/soap12-ill-formed.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12-ill-formed.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap12/soap12-mtom.bin b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12-mtom.bin
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap12/soap12-mtom.bin
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12-mtom.bin
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xml b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xml
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/soap12.xsd
diff --git a/core/src/test/resources/org/springframework/ws/soap/soap12/xml.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/xml.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/soap/soap12/xml.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/soap/soap12/xml.xsd
diff --git a/core/src/test/resources/org/springframework/ws/support/strategies.properties b/spring-ws-core/src/test/resources/org/springframework/ws/support/strategies.properties
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/support/strategies.properties
rename to spring-ws-core/src/test/resources/org/springframework/ws/support/strategies.properties
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/sws-servlet.xml b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/sws-servlet.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/sws-servlet.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/WEB-INF/sws-servlet.xml
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/echo-expected.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/echo-expected.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/echo-expected.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/echo-expected.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/echo-input.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/echo-input.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/echo-input.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/echo-input.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/importing-expected.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/importing-expected.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/importing-expected.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/importing-expected.xsd
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/importing-input.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/importing-input.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/importing-input.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/importing-input.xsd
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/single.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/single.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/single.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/single.xsd
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/wsdl11-expected.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/wsdl11-expected.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/wsdl11-expected.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/wsdl11-expected.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/transport/http/wsdl11-input.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/transport/http/wsdl11-input.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/transport/http/wsdl11-input.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/transport/http/wsdl11-input.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/abstract.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/complete.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/complete.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/complete.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/complete.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/concrete.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/concrete.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/concrete.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/concrete.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/import-inline.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/import-inline.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/import-inline.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/import-inline.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/imported.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/imported.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/imported.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/imported.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/importing.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/importing.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/importing.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/importing.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/include-inline.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/include-inline.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/include-inline.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/include-inline.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/included.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/included.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/included.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/included.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/including.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/including.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/including.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/including.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/C.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/C.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/C.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/C.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/D.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/D.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/D.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/D.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/schema.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/schema.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/schema.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/schema.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/single-inline.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/single-inline.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/single-inline.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/single-inline.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/single.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/single.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/single.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/single.xsd
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/soap-11-12.wsdl b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/soap-11-12.wsdl
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/soap-11-12.wsdl
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/soap-11-12.wsdl
diff --git a/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/types.xsd b/spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/types.xsd
similarity index 100%
rename from core/src/test/resources/org/springframework/ws/wsdl/wsdl11/types.xsd
rename to spring-ws-core/src/test/resources/org/springframework/ws/wsdl/wsdl11/types.xsd
diff --git a/core/template.mf b/spring-ws-core/template.mf
similarity index 100%
rename from core/template.mf
rename to spring-ws-core/template.mf
diff --git a/core/.gitignore b/spring-ws-security/.gitignore
similarity index 100%
rename from core/.gitignore
rename to spring-ws-security/.gitignore
diff --git a/security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/callback/AbstractCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/AbstractCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/callback/AbstractCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/AbstractCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/callback/CleanupCallback.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CleanupCallback.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/callback/CleanupCallback.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CleanupCallback.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/callback/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/callback/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/package.html
diff --git a/security/src/main/java/org/springframework/ws/soap/security/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/package.html
diff --git a/security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreUtils.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreUtils.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreUtils.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreUtils.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/support/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/support/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/package.html
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/UsernameTokenPrincipalCallback.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/UsernameTokenPrincipalCallback.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/UsernameTokenPrincipalCallback.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/UsernameTokenPrincipalCallback.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/package.html
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/package.html
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBean.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBean.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBean.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/support/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/wss4j/support/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/package.html
diff --git a/security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthoritiesPopulator.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthoritiesPopulator.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthoritiesPopulator.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthoritiesPopulator.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/x509/cache/NullX509UserCache.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/NullX509UserCache.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/x509/cache/NullX509UserCache.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/NullX509UserCache.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/x509/cache/X509UserCache.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/X509UserCache.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/x509/cache/X509UserCache.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/X509UserCache.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityFaultException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityFaultException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityFaultException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityFaultException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecuritySecurementException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecuritySecurementException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecuritySecurementException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecuritySecurementException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityValidationException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityValidationException.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityValidationException.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityValidationException.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/XwssCallbackHandlerChain.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/XwssCallbackHandlerChain.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/XwssCallbackHandlerChain.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/XwssCallbackHandlerChain.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/AbstractJaasValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/AbstractJaasValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/AbstractJaasValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/AbstractJaasValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/package.html
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/callback/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/callback/package.html
diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/package.html
similarity index 100%
rename from security/src/main/java/org/springframework/ws/soap/security/xwss/package.html
rename to spring-ws-security/src/main/java/org/springframework/ws/soap/security/xwss/package.html
diff --git a/security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jInterceptorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jInterceptorTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jInterceptorTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jInterceptorTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorEncryptionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorEncryptionTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorEncryptionTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorEncryptionTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorHeaderTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorHeaderTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorHeaderTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorHeaderTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSignTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSignTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSignTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSignTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSoapActionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSoapActionTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSoapActionTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSoapActionTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorTimestampTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorTimestampTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorTimestampTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorTimestampTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorUsernameTokenSignatureTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorUsernameTokenSignatureTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorUsernameTokenSignatureTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorUsernameTokenSignatureTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorUsernameTokenTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorUsernameTokenTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorUsernameTokenTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorUsernameTokenTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorX509Test.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorX509Test.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorX509Test.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/AxiomWss4jMessageInterceptorX509Test.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jInterceptorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jInterceptorTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jInterceptorTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jInterceptorTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorEncryptionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorEncryptionTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorEncryptionTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorEncryptionTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorHeaderTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorHeaderTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorHeaderTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorHeaderTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSignTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSignTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSignTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSignTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSoapActionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSoapActionTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSoapActionTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSoapActionTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorTimestampTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorTimestampTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorTimestampTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorTimestampTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorUsernameTokenTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorUsernameTokenTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorUsernameTokenTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorUsernameTokenTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorX509Test.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorX509Test.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorX509Test.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorX509Test.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jInterceptorTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jInterceptorTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jInterceptorTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jInterceptorTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorHeaderTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorHeaderTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorHeaderTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorHeaderTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSignTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSignTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSignTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSignTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSoapActionTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSoapActionTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSoapActionTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSoapActionTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorTimestampTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorTimestampTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorTimestampTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorTimestampTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenSignatureTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenSignatureTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenSignatureTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenSignatureTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBeanTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBeanTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBeanTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBeanTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorKeyStoreTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorKeyStoreTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorKeyStoreTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorKeyStoreTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorTestCase.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorTestCase.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorTestCase.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorSignTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorSignTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorSignTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorSignTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorUsernameTokenTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorUsernameTokenTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorUsernameTokenTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorUsernameTokenTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidatorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidatorTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidatorTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidatorTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/CertificateLoginModule.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/CertificateLoginModule.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/CertificateLoginModule.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/CertificateLoginModule.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandlerTest.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandlerTest.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandlerTest.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/PlainTextLoginModule.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/PlainTextLoginModule.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/PlainTextLoginModule.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/PlainTextLoginModule.java
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/SimplePrincipal.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/SimplePrincipal.java
similarity index 100%
rename from security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/SimplePrincipal.java
rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/SimplePrincipal.java
diff --git a/security/src/test/resources/log4j.properties b/spring-ws-security/src/test/resources/log4j.properties
similarity index 100%
rename from security/src/test/resources/log4j.properties
rename to spring-ws-security/src/test/resources/log4j.properties
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/emptyHeader-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/emptyHeader-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/emptyHeader-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/emptyHeader-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/noHeader-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/noHeader-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/noHeader-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/noHeader-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/noSecurityHeader-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/noSecurityHeader-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/noSecurityHeader-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/noSecurityHeader-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/customHeader-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/customHeader-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/customHeader-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/customHeader-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/echo-response.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/echo-response.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/echo-response.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/echo-response.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/empty-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/empty-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/empty-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/empty-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/empty-soap12.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/empty-soap12.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/empty-soap12.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/empty-soap12.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/emptySecurityHeader-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/emptySecurityHeader-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/emptySecurityHeader-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/emptySecurityHeader-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/expiredTimestamp-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/expiredTimestamp-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/expiredTimestamp-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/expiredTimestamp-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap12.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap12.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap12.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap12.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextQualifiedType-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextQualifiedType-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextQualifiedType-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextQualifiedType-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/callback/jaas/jaas.config b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/callback/jaas/jaas.config
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/callback/jaas/jaas.config
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/callback/jaas/jaas.config
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/decrypt-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/decrypt-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/decrypt-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/decrypt-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/empty-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/empty-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/empty-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/empty-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-alias-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-alias-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-alias-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-alias-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypt-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypted-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypted-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypted-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/encrypted-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/requireSignature-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/requireSignature-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/requireSignature-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/requireSignature-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-digest-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-digest-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-digest-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-digest-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-nonce-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-nonce-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-nonce-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/requireUsernameToken-plainText-nonce-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-alias-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-alias-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-alias-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-alias-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/sign-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/signed-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/signed-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/signed-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/signed-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/test-keystore.jks b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/test-keystore.jks
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/test-keystore.jks
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/test-keystore.jks
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/test-truststore.jks b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/test-truststore.jks
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/test-truststore.jks
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/test-truststore.jks
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/test.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/test.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/test.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/test.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-digest-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-digest-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-digest-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-digest-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-nonce-config.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-nonce-config.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-nonce-config.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameToken-plainText-nonce-config.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenDigest-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenDigest-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenDigest-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenDigest-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-nonce-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-nonce-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-nonce-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-nonce-soap.xml
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-soap.xml b/spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-soap.xml
similarity index 100%
rename from security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-soap.xml
rename to spring-ws-security/src/test/resources/org/springframework/ws/soap/security/xwss/usernameTokenPlainText-soap.xml
diff --git a/security/src/test/resources/private.jks b/spring-ws-security/src/test/resources/private.jks
similarity index 100%
rename from security/src/test/resources/private.jks
rename to spring-ws-security/src/test/resources/private.jks
diff --git a/security/template.mf b/spring-ws-security/template.mf
similarity index 100%
rename from security/template.mf
rename to spring-ws-security/template.mf
diff --git a/samples/airline/client/axis1/.gitignore b/spring-ws-support/.gitignore
similarity index 100%
rename from samples/airline/client/axis1/.gitignore
rename to spring-ws-support/.gitignore
diff --git a/support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java
diff --git a/support/src/main/java/org/springframework/ws/transport/http/HttpsTransportException.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsTransportException.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/http/HttpsTransportException.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsTransportException.java
diff --git a/support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
diff --git a/support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java
diff --git a/support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsTransportConstants.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportConstants.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/JmsTransportConstants.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportConstants.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/TextMessageInputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageInputStream.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/TextMessageInputStream.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageInputStream.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageDrivenBean.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageDrivenBean.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageDrivenBean.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageDrivenBean.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/package.html b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/package.html
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/package.html
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/package.html
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java
diff --git a/support/src/main/java/org/springframework/ws/transport/jms/support/package.html b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/support/package.html
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/jms/support/package.html
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/jms/support/package.html
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailTransportConstants.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportConstants.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/MailTransportConstants.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportConstants.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/MonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/MonitoringStrategy.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/monitor/MonitoringStrategy.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/MonitoringStrategy.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/package.html b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/package.html
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/monitor/package.html
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/package.html
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/package.html b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/package.html
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/package.html
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/package.html
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java
diff --git a/support/src/main/java/org/springframework/ws/transport/mail/support/package.html b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/support/package.html
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/mail/support/package.html
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/mail/support/package.html
diff --git a/support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java
diff --git a/support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java
diff --git a/support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/MessageOutputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageOutputStream.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/MessageOutputStream.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageOutputStream.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/XmppTransportConstants.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppTransportConstants.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/XmppTransportConstants.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppTransportConstants.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/package.html b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/package.html
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/package.html
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/package.html
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java
diff --git a/support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java
similarity index 100%
rename from support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java
rename to spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppTransportUtils.java
diff --git a/support/src/test/java/org/springframework/ws/transport/SimpleTestingMessageReceiver.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/SimpleTestingMessageReceiver.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/SimpleTestingMessageReceiver.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/SimpleTestingMessageReceiver.java
diff --git a/support/src/test/java/org/springframework/ws/transport/http/FaultEndpoint.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/FaultEndpoint.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/http/FaultEndpoint.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/http/FaultEndpoint.java
diff --git a/support/src/test/java/org/springframework/ws/transport/http/NoResponseEndpoint.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/NoResponseEndpoint.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/http/NoResponseEndpoint.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/http/NoResponseEndpoint.java
diff --git a/support/src/test/java/org/springframework/ws/transport/http/ResponseEndpoint.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/ResponseEndpoint.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/http/ResponseEndpoint.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/http/ResponseEndpoint.java
diff --git a/support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java
diff --git a/support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java
diff --git a/support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java
diff --git a/support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java
diff --git a/support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java
diff --git a/support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
diff --git a/support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java
diff --git a/support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTest.java
diff --git a/support/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/support/EchoPayloadEndpoint.java
diff --git a/support/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/support/FreePortScanner.java
diff --git a/support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java
similarity index 100%
rename from support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java
rename to spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java
diff --git a/support/src/test/resources/log4j.properties b/spring-ws-support/src/test/resources/log4j.properties
similarity index 100%
rename from support/src/test/resources/log4j.properties
rename to spring-ws-support/src/test/resources/log4j.properties
diff --git a/support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
similarity index 100%
rename from support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
rename to spring-ws-support/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml
diff --git a/support/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml
similarity index 100%
rename from support/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml
rename to spring-ws-support/src/test/resources/org/springframework/ws/transport/http/soapRequest.xml
diff --git a/support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
similarity index 100%
rename from support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
rename to spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml
diff --git a/support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml
similarity index 100%
rename from support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml
rename to spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml
diff --git a/support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml
similarity index 100%
rename from support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml
rename to spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml
diff --git a/support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
similarity index 100%
rename from support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
rename to spring-ws-support/src/test/resources/org/springframework/ws/transport/mail/mail-applicationContext.xml
diff --git a/support/template.mf b/spring-ws-support/template.mf
similarity index 100%
rename from support/template.mf
rename to spring-ws-support/template.mf
diff --git a/samples/airline/client/jax-ws/.gitignore b/spring-ws-test/.gitignore
similarity index 100%
rename from samples/airline/client/jax-ws/.gitignore
rename to spring-ws-test/.gitignore
diff --git a/test/src/main/java/org/springframework/ws/test/client/AbstractResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/AbstractResponseCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/AbstractResponseCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/AbstractResponseCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/RequestMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/RequestMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/ResponseActions.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseActions.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/ResponseActions.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseActions.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/ResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/ResponseCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/UriMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/UriMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/XPathExpectationsHelperAdapter.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/XPathExpectationsHelperAdapter.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/XPathExpectationsHelperAdapter.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/XPathExpectationsHelperAdapter.java
diff --git a/test/src/main/java/org/springframework/ws/test/client/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/package-info.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/client/package-info.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/client/package-info.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/RequestCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/RequestCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/RequestCreators.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/RequestCreators.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/ResponseActions.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseActions.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/ResponseActions.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseActions.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/ResponseMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/ResponseMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/XPathExpectationsHelperAdapter.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/XPathExpectationsHelperAdapter.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/XPathExpectationsHelperAdapter.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/XPathExpectationsHelperAdapter.java
diff --git a/test/src/main/java/org/springframework/ws/test/server/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/package-info.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/server/package-info.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/server/package-info.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/AssertionErrors.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/AssertionErrors.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/AssertionErrors.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/AssertionErrors.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/MockStrategiesHelper.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/MockStrategiesHelper.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/MockStrategiesHelper.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/MockStrategiesHelper.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/creator/AbstractMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/AbstractMessageCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/creator/AbstractMessageCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/AbstractMessageCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/creator/WebServiceMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/WebServiceMessageCreator.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/creator/WebServiceMessageCreator.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/WebServiceMessageCreator.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/creator/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/package-info.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/creator/package-info.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/package-info.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/WebServiceMessageMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/WebServiceMessageMatcher.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/WebServiceMessageMatcher.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/WebServiceMessageMatcher.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java
diff --git a/test/src/main/java/org/springframework/ws/test/support/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/package-info.java
similarity index 100%
rename from test/src/main/java/org/springframework/ws/test/support/package-info.java
rename to spring-ws-test/src/main/java/org/springframework/ws/test/support/package-info.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/UriMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/UriMatcherTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/client/integration/CustomerClient.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/CustomerClient.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/client/integration/CustomerClient.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/CustomerClient.java
diff --git a/test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java
diff --git a/test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java b/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java
diff --git a/test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/server/integration/CustomerEndpoint.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/CustomerEndpoint.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/server/integration/CustomerEndpoint.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/CustomerEndpoint.java
diff --git a/test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java
diff --git a/test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTest.java
similarity index 100%
rename from test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTest.java
rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTest.java
diff --git a/test/src/test/resources/log4j.properties b/spring-ws-test/src/test/resources/log4j.properties
similarity index 100%
rename from test/src/test/resources/log4j.properties
rename to spring-ws-test/src/test/resources/log4j.properties
diff --git a/test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml b/spring-ws-test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml
similarity index 100%
rename from test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml
rename to spring-ws-test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml
diff --git a/test/src/test/resources/org/springframework/ws/test/client/schemaValidatingRequestMatcherTest.xsd b/spring-ws-test/src/test/resources/org/springframework/ws/test/client/schemaValidatingRequestMatcherTest.xsd
similarity index 100%
rename from test/src/test/resources/org/springframework/ws/test/client/schemaValidatingRequestMatcherTest.xsd
rename to spring-ws-test/src/test/resources/org/springframework/ws/test/client/schemaValidatingRequestMatcherTest.xsd
diff --git a/test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml b/spring-ws-test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml
similarity index 100%
rename from test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml
rename to spring-ws-test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml
diff --git a/test/src/test/resources/org/springframework/ws/test/support/matcher/schemaValidatingMatcherTest.xsd b/spring-ws-test/src/test/resources/org/springframework/ws/test/support/matcher/schemaValidatingMatcherTest.xsd
similarity index 100%
rename from test/src/test/resources/org/springframework/ws/test/support/matcher/schemaValidatingMatcherTest.xsd
rename to spring-ws-test/src/test/resources/org/springframework/ws/test/support/matcher/schemaValidatingMatcherTest.xsd
diff --git a/test/src/test/resources/org/springframework/ws/test/support/schemaValidatingMatcherTest.xsd b/spring-ws-test/src/test/resources/org/springframework/ws/test/support/schemaValidatingMatcherTest.xsd
similarity index 100%
rename from test/src/test/resources/org/springframework/ws/test/support/schemaValidatingMatcherTest.xsd
rename to spring-ws-test/src/test/resources/org/springframework/ws/test/support/schemaValidatingMatcherTest.xsd
diff --git a/test/template.mf b/spring-ws-test/template.mf
similarity index 100%
rename from test/template.mf
rename to spring-ws-test/template.mf
diff --git a/samples/airline/client/jms/.gitignore b/spring-xml/.gitignore
similarity index 100%
rename from samples/airline/client/jms/.gitignore
rename to spring-xml/.gitignore
diff --git a/xml/src/main/java/org/springframework/xml/JaxpVersion.java b/spring-xml/src/main/java/org/springframework/xml/JaxpVersion.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/JaxpVersion.java
rename to spring-xml/src/main/java/org/springframework/xml/JaxpVersion.java
diff --git a/xml/src/main/java/org/springframework/xml/XmlException.java b/spring-xml/src/main/java/org/springframework/xml/XmlException.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/XmlException.java
rename to spring-xml/src/main/java/org/springframework/xml/XmlException.java
diff --git a/xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java b/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java
rename to spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java
diff --git a/xml/src/main/java/org/springframework/xml/dom/package.html b/spring-xml/src/main/java/org/springframework/xml/dom/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/dom/package.html
rename to spring-xml/src/main/java/org/springframework/xml/dom/package.html
diff --git a/xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java
rename to spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java
diff --git a/xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java
rename to spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java
diff --git a/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java b/spring-xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java
rename to spring-xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java
diff --git a/xml/src/main/java/org/springframework/xml/namespace/package.html b/spring-xml/src/main/java/org/springframework/xml/namespace/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/namespace/package.html
rename to spring-xml/src/main/java/org/springframework/xml/namespace/package.html
diff --git a/xml/src/main/java/org/springframework/xml/package.html b/spring-xml/src/main/java/org/springframework/xml/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/package.html
rename to spring-xml/src/main/java/org/springframework/xml/package.html
diff --git a/xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java b/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java
rename to spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java
diff --git a/xml/src/main/java/org/springframework/xml/sax/SaxUtils.java b/spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/sax/SaxUtils.java
rename to spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java
diff --git a/xml/src/main/java/org/springframework/xml/sax/package.html b/spring-xml/src/main/java/org/springframework/xml/sax/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/sax/package.html
rename to spring-xml/src/main/java/org/springframework/xml/sax/package.html
diff --git a/xml/src/main/java/org/springframework/xml/transform/ResourceSource.java b/spring-xml/src/main/java/org/springframework/xml/transform/ResourceSource.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/transform/ResourceSource.java
rename to spring-xml/src/main/java/org/springframework/xml/transform/ResourceSource.java
diff --git a/xml/src/main/java/org/springframework/xml/transform/StringResult.java b/spring-xml/src/main/java/org/springframework/xml/transform/StringResult.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/transform/StringResult.java
rename to spring-xml/src/main/java/org/springframework/xml/transform/StringResult.java
diff --git a/xml/src/main/java/org/springframework/xml/transform/StringSource.java b/spring-xml/src/main/java/org/springframework/xml/transform/StringSource.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/transform/StringSource.java
rename to spring-xml/src/main/java/org/springframework/xml/transform/StringSource.java
diff --git a/xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java
rename to spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java
diff --git a/xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java
rename to spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java
diff --git a/xml/src/main/java/org/springframework/xml/transform/TraxUtils.java b/spring-xml/src/main/java/org/springframework/xml/transform/TraxUtils.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/transform/TraxUtils.java
rename to spring-xml/src/main/java/org/springframework/xml/transform/TraxUtils.java
diff --git a/xml/src/main/java/org/springframework/xml/transform/package.html b/spring-xml/src/main/java/org/springframework/xml/transform/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/transform/package.html
rename to spring-xml/src/main/java/org/springframework/xml/transform/package.html
diff --git a/xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java
rename to spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java
diff --git a/xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java b/spring-xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java
rename to spring-xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java
diff --git a/xml/src/main/java/org/springframework/xml/validation/ValidationErrorHandler.java b/spring-xml/src/main/java/org/springframework/xml/validation/ValidationErrorHandler.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/validation/ValidationErrorHandler.java
rename to spring-xml/src/main/java/org/springframework/xml/validation/ValidationErrorHandler.java
diff --git a/xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java
rename to spring-xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java
diff --git a/xml/src/main/java/org/springframework/xml/validation/XmlValidator.java b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidator.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/validation/XmlValidator.java
rename to spring-xml/src/main/java/org/springframework/xml/validation/XmlValidator.java
diff --git a/xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java
rename to spring-xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java
diff --git a/xml/src/main/java/org/springframework/xml/validation/package.html b/spring-xml/src/main/java/org/springframework/xml/validation/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/validation/package.html
rename to spring-xml/src/main/java/org/springframework/xml/validation/package.html
diff --git a/xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/JaxenXPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathTemplate.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/JaxenXPathTemplate.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathTemplate.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/NodeCallbackHandler.java b/spring-xml/src/main/java/org/springframework/xml/xpath/NodeCallbackHandler.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/NodeCallbackHandler.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/NodeCallbackHandler.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java b/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/XPathException.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathException.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/XPathException.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/XPathException.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/XPathExpression.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpression.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/XPathExpression.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpression.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/XPathOperations.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathOperations.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/XPathOperations.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/XPathOperations.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/XPathParseException.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathParseException.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/XPathParseException.java
rename to spring-xml/src/main/java/org/springframework/xml/xpath/XPathParseException.java
diff --git a/xml/src/main/java/org/springframework/xml/xpath/package.html b/spring-xml/src/main/java/org/springframework/xml/xpath/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xpath/package.html
rename to spring-xml/src/main/java/org/springframework/xml/xpath/package.html
diff --git a/xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java
rename to spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java
diff --git a/xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java
rename to spring-xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java
diff --git a/xml/src/main/java/org/springframework/xml/xsd/XsdSchemaCollection.java b/spring-xml/src/main/java/org/springframework/xml/xsd/XsdSchemaCollection.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/XsdSchemaCollection.java
rename to spring-xml/src/main/java/org/springframework/xml/xsd/XsdSchemaCollection.java
diff --git a/xml/src/main/java/org/springframework/xml/xsd/XsdSchemaException.java b/spring-xml/src/main/java/org/springframework/xml/xsd/XsdSchemaException.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/XsdSchemaException.java
rename to spring-xml/src/main/java/org/springframework/xml/xsd/XsdSchemaException.java
diff --git a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java
rename to spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java
diff --git a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java
rename to spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java
diff --git a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaException.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaException.java
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaException.java
rename to spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaException.java
diff --git a/xml/src/main/java/org/springframework/xml/xsd/commons/package.html b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/commons/package.html
rename to spring-xml/src/main/java/org/springframework/xml/xsd/commons/package.html
diff --git a/xml/src/main/java/org/springframework/xml/xsd/package.html b/spring-xml/src/main/java/org/springframework/xml/xsd/package.html
similarity index 100%
rename from xml/src/main/java/org/springframework/xml/xsd/package.html
rename to spring-xml/src/main/java/org/springframework/xml/xsd/package.html
diff --git a/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java
rename to spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java
diff --git a/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java
rename to spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java
diff --git a/xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java
rename to spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java
diff --git a/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java
rename to spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java
diff --git a/xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java
rename to spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java
diff --git a/xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java
rename to spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java
diff --git a/xml/src/test/java/org/springframework/xml/transform/StringResultTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/transform/StringResultTest.java
rename to spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java
diff --git a/xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java
rename to spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java
diff --git a/xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java
rename to spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java
diff --git a/xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java
rename to spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java
diff --git a/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java
rename to spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java
diff --git a/xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java
rename to spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java
diff --git a/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java
rename to spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java
diff --git a/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
rename to spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java
rename to spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java
diff --git a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java
rename to spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java
diff --git a/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java
rename to spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java
diff --git a/xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java
diff --git a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java
similarity index 100%
rename from xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java
rename to spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java
diff --git a/xml/src/test/resources/log4j.properties b/spring-xml/src/test/resources/log4j.properties
similarity index 100%
rename from xml/src/test/resources/log4j.properties
rename to spring-xml/src/test/resources/log4j.properties
diff --git a/xml/src/test/resources/org/springframework/xml/transform/resourceSource.xml b/spring-xml/src/test/resources/org/springframework/xml/transform/resourceSource.xml
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/transform/resourceSource.xml
rename to spring-xml/src/test/resources/org/springframework/xml/transform/resourceSource.xml
diff --git a/xml/src/test/resources/org/springframework/xml/validation/encoding.xsd b/spring-xml/src/test/resources/org/springframework/xml/validation/encoding.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/encoding.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/validation/encoding.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/validation/envelope.xsd b/spring-xml/src/test/resources/org/springframework/xml/validation/envelope.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/envelope.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/validation/envelope.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/validation/invalidDocument.xml b/spring-xml/src/test/resources/org/springframework/xml/validation/invalidDocument.xml
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/invalidDocument.xml
rename to spring-xml/src/test/resources/org/springframework/xml/validation/invalidDocument.xml
diff --git a/xml/src/test/resources/org/springframework/xml/validation/multipleSchemas1.xml b/spring-xml/src/test/resources/org/springframework/xml/validation/multipleSchemas1.xml
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/multipleSchemas1.xml
rename to spring-xml/src/test/resources/org/springframework/xml/validation/multipleSchemas1.xml
diff --git a/xml/src/test/resources/org/springframework/xml/validation/multipleSchemas1.xsd b/spring-xml/src/test/resources/org/springframework/xml/validation/multipleSchemas1.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/multipleSchemas1.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/validation/multipleSchemas1.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/validation/multipleSchemas2.xml b/spring-xml/src/test/resources/org/springframework/xml/validation/multipleSchemas2.xml
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/multipleSchemas2.xml
rename to spring-xml/src/test/resources/org/springframework/xml/validation/multipleSchemas2.xml
diff --git a/xml/src/test/resources/org/springframework/xml/validation/multipleSchemas2.xsd b/spring-xml/src/test/resources/org/springframework/xml/validation/multipleSchemas2.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/multipleSchemas2.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/validation/multipleSchemas2.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/validation/schema.xsd b/spring-xml/src/test/resources/org/springframework/xml/validation/schema.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/schema.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/validation/schema.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/validation/validDocument.xml b/spring-xml/src/test/resources/org/springframework/xml/validation/validDocument.xml
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/validation/validDocument.xml
rename to spring-xml/src/test/resources/org/springframework/xml/validation/validDocument.xml
diff --git a/xml/src/test/resources/org/springframework/xml/xpath/namespaces.xml b/spring-xml/src/test/resources/org/springframework/xml/xpath/namespaces.xml
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xpath/namespaces.xml
rename to spring-xml/src/test/resources/org/springframework/xml/xpath/namespaces.xml
diff --git a/xml/src/test/resources/org/springframework/xml/xpath/nonamespaces.xml b/spring-xml/src/test/resources/org/springframework/xml/xpath/nonamespaces.xml
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xpath/nonamespaces.xml
rename to spring-xml/src/test/resources/org/springframework/xml/xpath/nonamespaces.xml
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/A.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/A.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/A.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/A.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/ABC.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/ABC.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/ABC.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/ABC.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/B.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/B.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/B.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/B.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/C.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/C.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/C.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/C.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/CD.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/CD.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/CD.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/CD.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/D.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/D.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/D.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/D.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/circular-1.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/circular-1.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/circular-1.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/circular-1.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/circular-2.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/circular-2.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/circular-2.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/circular-2.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/circular-3.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/circular-3.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/circular-3.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/circular-3.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/commons/employee.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/commons/employee.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/commons/employee.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/commons/employee.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/commons/holiday.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/commons/holiday.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/commons/holiday.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/commons/holiday.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/commons/hr.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/commons/hr.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/commons/hr.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/commons/hr.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/commons/hr_employee.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/commons/hr_employee.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/commons/hr_employee.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/commons/hr_employee.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/imported.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/imported.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/imported.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/imported.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/importing.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/importing.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/importing.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/importing.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/included.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/included.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/included.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/included.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/including.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/including.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/including.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/including.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/invalid.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/invalid.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/invalid.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/invalid.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/single.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/single.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/single.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/single.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/xmime.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/xmime.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/xmime.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/xmime.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/xml.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/xml.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/xml.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/xml.xsd
diff --git a/xml/src/test/resources/org/springframework/xml/xsd/xmlNamespace.xsd b/spring-xml/src/test/resources/org/springframework/xml/xsd/xmlNamespace.xsd
similarity index 100%
rename from xml/src/test/resources/org/springframework/xml/xsd/xmlNamespace.xsd
rename to spring-xml/src/test/resources/org/springframework/xml/xsd/xmlNamespace.xsd
diff --git a/xml/template.mf b/spring-xml/template.mf
similarity index 100%
rename from xml/template.mf
rename to spring-xml/template.mf
diff --git a/src/api/overview.html b/src/api/overview.html
new file mode 100644
index 00000000..a0e5a77e
--- /dev/null
+++ b/src/api/overview.html
@@ -0,0 +1,7 @@
+
+
+
+This is the public API documentation for Spring Web Services .
+
+
+
diff --git a/src/assembly/all.xml b/src/assembly/all.xml
deleted file mode 100644
index e6668a6e..00000000
--- a/src/assembly/all.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- all
-
- jar
-
- false
-
-
-
- org.springframework.ws:spring-xml
- org.springframework.ws:spring-ws-core
- org.springframework.ws:spring-ws-support
- org.springframework.ws:spring-ws-security
- org.springframework.ws:spring-ws-test
-
-
-
- false
- true
-
-
- **/spring.handlers
- **/spring.schemas
-
-
-
-
-
-
-
- src/main/resources/META-INF
- META-INF
-
-
-
\ No newline at end of file
diff --git a/src/assembly/docs.xml b/src/assembly/docs.xml
deleted file mode 100644
index e1bd529a..00000000
--- a/src/assembly/docs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- .
-
- readme.txt
- license.txt
- notice.txt
-
-
- dos
-
-
-
\ No newline at end of file
diff --git a/src/assembly/full.xml b/src/assembly/full.xml
deleted file mode 100644
index 83541f15..00000000
--- a/src/assembly/full.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
- full
-
- zip
-
-
- src/assembly/docs.xml
-
- true
-
-
-
- org.springframework.ws:spring-ws-parent
- org.springframework.ws:spring-xml
- org.springframework.ws:spring-ws-core
- org.springframework.ws:spring-ws-support
- org.springframework.ws:spring-ws-security
-
-
- false
- false
- dist/modules/${module.artifactId}-${module.version}.${module.extension}
-
-
-
-
- src/main/java
-
-
- dist/module-sources/${module.artifactId}
-
-
-
-
-
- target/${artifactId}-${version}-all.jar
- dist
-
-
- target/${artifactId}-${version}-sources.jar
- dist
-
-
-
-
-
- target/site/apidocs
- docs/api
-
-
- target/site/reference
- docs/reference
-
-
-
- samples
- samples
-
- **/readme.txt
-
- dos
-
-
- samples
- samples
-
- **/src/**
- **/build*.xml
- **/*.bat
- **/pom.xml
- **/Makefile
- mtom/**/spring-ws-logo.png
- maven-ant-tasks-*.jar
- **/ant-dotnet-*.jar
- **/*.exe
-
-
- airline/activemq-data
- airline/activemq-data/**
- **/target
- **/target/**
- **/bin
- **/bin/**
-
-
-
-
diff --git a/src/assembly/minimal.xml b/src/assembly/minimal.xml
deleted file mode 100644
index 48a5ce76..00000000
--- a/src/assembly/minimal.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- minimal
-
- zip
-
-
- src/assembly/docs.xml
-
- true
-
-
-
- org.springframework.ws:spring-xml
- org.springframework.ws:spring-ws-core
- org.springframework.ws:spring-ws-support
- org.springframework.ws:spring-ws-security
- org.springframework.ws:spring-ws-test
-
-
- false
- false
- dist/modules/${module.artifactId}-${module.version}.${module.extension}
-
-
-
-
-
- target/${artifactId}-${version}-all.jar
- dist
-
-
-
diff --git a/src/assembly/sources.xml b/src/assembly/sources.xml
deleted file mode 100644
index 98e0f187..00000000
--- a/src/assembly/sources.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- sources
-
- jar
-
- false
-
-
- xml/src/main/java
-
-
-
- core/src/main/java
-
-
-
- support/src/main/java
-
-
-
- security/src/main/java
-
-
-
- test/src/main/java
-
-
-
-
\ No newline at end of file
diff --git a/license.txt b/src/dist/license.txt
similarity index 100%
rename from license.txt
rename to src/dist/license.txt
diff --git a/src/dist/notice.txt b/src/dist/notice.txt
new file mode 100644
index 00000000..043f8d89
--- /dev/null
+++ b/src/dist/notice.txt
@@ -0,0 +1,11 @@
+Spring Web Services ${version}
+Copyright (c) 2002-${copyright} Pivotal, Inc
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license.txt file.
diff --git a/src/dist/readme.txt b/src/dist/readme.txt
new file mode 100644
index 00000000..370e6a26
--- /dev/null
+++ b/src/dist/readme.txt
@@ -0,0 +1,14 @@
+Spring Web Services version ${version}
+=====================================================================================
+
+To find out what has changed since earlier releases, see the 'Change Log' section at
+https://jira.springsource.org/browse/SWS
+
+Please consult the documentation located within the 'docs/reference'
+directory of this release and also visit the official Spring Web Services home at
+http://projects.spring.io/spring-ws
+
+There you will find links to the forum, issue tracker, and other resources.
+
+See https://github.com/spring-projects/spring-ws#readme for additional
+information including instructions on building from source.
diff --git a/src/docbkx/resources/css/html.css b/src/docbkx/resources/css/html.css
deleted file mode 100644
index 36297ac3..00000000
--- a/src/docbkx/resources/css/html.css
+++ /dev/null
@@ -1,421 +0,0 @@
-body {
- text-align: justify;
- margin-right: 2em;
- margin-left: 2em;
-}
-
-a,
- a[accesskey^
-
-=
-"h"
-]
-,
-a[accesskey^
-
-=
-"n"
-]
-,
-a[accesskey^
-
-=
-"u"
-]
-,
-a[accesskey^
-
-=
-"p"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-font-size:
-
-12
-px
-
-;
-color: #003399
-
-;
-}
-
-a:active {
- color: #003399;
-}
-
-a:visited {
- color: #888888;
-}
-
-p {
- font-family: Verdana, Arial, sans-serif;
-}
-
-dt {
- font-family: Verdana, Arial, sans-serif;
- font-size: 12px;
-}
-
-p, dl, dt, dd, blockquote {
- color: #000000;
- margin-bottom: 3px;
- margin-top: 3px;
- padding-top: 0px;
-}
-
-ol, ul, p {
- margin-top: 6px;
- margin-bottom: 6px;
-}
-
-p, blockquote {
- font-size: 90%;
-}
-
-p.releaseinfo {
- font-size: 100%;
- font-weight: bold;
- font-family: Verdana, Arial, helvetica, sans-serif;
- padding-top: 10px;
-}
-
-p.pubdate {
- font-size: 120%;
- font-weight: bold;
- font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-td {
- font-size: 80%;
-}
-
-td, th, span {
- color: #000000;
-}
-
-td[width^
-
-=
-"40%"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-font-size:
-
-12
-px
-
-;
-color: #003399
-
-;
-}
-
-table[summary^
-
-=
-"Navigation header"
-]
-tbody tr th[colspan^
-
-=
-"3"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-}
-
-blockquote {
- margin-right: 0px;
-}
-
-h1, h2, h3, h4, h6, H6 {
- color: #000000;
- font-weight: 500;
- margin-top: 0px;
- padding-top: 14px;
- font-family: Verdana, Arial, helvetica, sans-serif;
- margin-bottom: 0px;
-}
-
-h2.title {
- font-weight: 800;
- margin-bottom: 8px;
-}
-
-h2.subtitle {
- font-weight: 800;
- margin-bottom: 20px;
-}
-
-.firstname, .surname {
- font-size: 12px;
- font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-table {
- border-collapse: collapse;
- border-spacing: 0;
- border: 1px black;
- empty-cells: hide;
- margin: 10px 0px 30px 50px;
- width: 90%;
-}
-
-div.table {
- margin: 30px 0px 30px 0px;
- border: 1px dashed gray;
- padding: 10px;
-}
-
-div .table-contents table {
- border: 1px solid black;
-}
-
-div.table > p.title {
- padding-left: 10px;
-}
-
-table[summary^
-
-=
-"Navigation footer"
-]
-{
-border-collapse: collapse
-
-;
-border-spacing:
-
-0
-;
-border:
-
-1
-px black
-
-;
-empty-cells: hide
-
-;
-margin:
-
-0
-px
-
-;
-width:
-
-100
-%
-;
-}
-
-table[summary^
-
-=
-"Note"
-]
-,
-table[summary^
-
-=
-"Warning"
-]
-,
-table[summary^
-
-=
-"Tip"
-]
-{
-border-collapse: collapse
-
-;
-border-spacing:
-
-0
-;
-border:
-
-1
-px black
-
-;
-empty-cells: hide
-
-;
-margin:
-
-10
-px
-
-0
-px
-
-10
-px
-
--
-20
-px
-
-;
-width:
-
-100
-%
-;
-}
-
-td {
- padding: 4pt;
- font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-div.warning TD {
- text-align: justify;
-}
-
-h1 {
- font-size: 150%;
-}
-
-h2 {
- font-size: 110%;
-}
-
-h3 {
- font-size: 100%;
- font-weight: bold;
-}
-
-h4 {
- font-size: 90%;
- font-weight: bold;
-}
-
-h5 {
- font-size: 90%;
- font-style: italic;
-}
-
-h6 {
- font-size: 100%;
- font-style: italic;
-}
-
-tt {
- font-size: 110%;
- font-family: "Courier New", Courier, monospace;
- color: #000000;
-}
-
-.navheader, .navfooter {
- border: none;
-}
-
-div.navfooter table {
- border: dashed gray;
- border-width: 1px 1px 1px 1px;
- background-color: #cde48d;
-}
-
-pre {
- font-size: 110%;
- padding: 5px;
- border-style: solid;
- border-width: 1px;
- border-color: #CCCCCC;
- background-color: #f3f5e9;
-}
-
-ul, ol, li {
- list-style: disc;
-}
-
-hr {
- width: 100%;
- height: 1px;
- background-color: #CCCCCC;
- border-width: 0px;
- padding: 0px;
-}
-
-.variablelist {
- padding-top: 10px;
- padding-bottom: 10px;
- margin: 0;
-}
-
-.term {
- font-weight: bold;
-}
-
-.mediaobject {
- padding-top: 30px;
- padding-bottom: 30px;
-}
-
-.legalnotice {
- font-family: Verdana, Arial, helvetica, sans-serif;
- font-size: 12px;
- font-style: italic;
-}
-
-.sidebar {
- float: right;
- margin: 10px 0px 10px 30px;
- padding: 10px 20px 20px 20px;
- width: 33%;
- border: 1px solid black;
- background-color: #F4F4F4;
- font-size: 14px;
-}
-
-.property {
- font-family: "Courier New", Courier, monospace;
-}
-
-a code {
- font-family: Verdana, Arial, monospace;
- font-size: 12px;
-}
-
-td code {
- font-size: 110%;
-}
-
-div.note * td,
- div.tip * td,
- div.warning * td,
- div.calloutlist * td {
- text-align: justify;
- font-size: 100%;
-}
-
-.programlisting .interfacename,
- .programlisting .literal,
- .programlisting .classname {
- font-size: 95%;
-}
-
-.title .interfacename,
- .title .literal,
- .title .classname {
- font-size: 130%;
-}
-
-/* everything in a is displayed in a coloured, comment-like font */
-.programlisting * .lineannotation,
- .programlisting * .lineannotation * {
- color: green;
-}
diff --git a/src/docbkx/resources/images/callouts/1.png b/src/docbkx/resources/images/callouts/1.png
deleted file mode 100644
index 7d473430..00000000
Binary files a/src/docbkx/resources/images/callouts/1.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/10.png b/src/docbkx/resources/images/callouts/10.png
deleted file mode 100644
index 997bbc82..00000000
Binary files a/src/docbkx/resources/images/callouts/10.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/11.png b/src/docbkx/resources/images/callouts/11.png
deleted file mode 100644
index ce47dac3..00000000
Binary files a/src/docbkx/resources/images/callouts/11.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/12.png b/src/docbkx/resources/images/callouts/12.png
deleted file mode 100644
index 31daf4e2..00000000
Binary files a/src/docbkx/resources/images/callouts/12.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/13.png b/src/docbkx/resources/images/callouts/13.png
deleted file mode 100644
index 14021a89..00000000
Binary files a/src/docbkx/resources/images/callouts/13.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/14.png b/src/docbkx/resources/images/callouts/14.png
deleted file mode 100644
index 64014b75..00000000
Binary files a/src/docbkx/resources/images/callouts/14.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/15.png b/src/docbkx/resources/images/callouts/15.png
deleted file mode 100644
index 0d65765f..00000000
Binary files a/src/docbkx/resources/images/callouts/15.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/2.png b/src/docbkx/resources/images/callouts/2.png
deleted file mode 100644
index 5d09341b..00000000
Binary files a/src/docbkx/resources/images/callouts/2.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/3.png b/src/docbkx/resources/images/callouts/3.png
deleted file mode 100644
index ef7b7004..00000000
Binary files a/src/docbkx/resources/images/callouts/3.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/4.png b/src/docbkx/resources/images/callouts/4.png
deleted file mode 100644
index adb8364e..00000000
Binary files a/src/docbkx/resources/images/callouts/4.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/5.png b/src/docbkx/resources/images/callouts/5.png
deleted file mode 100644
index 4d7eb460..00000000
Binary files a/src/docbkx/resources/images/callouts/5.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/6.png b/src/docbkx/resources/images/callouts/6.png
deleted file mode 100644
index 0ba694af..00000000
Binary files a/src/docbkx/resources/images/callouts/6.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/7.png b/src/docbkx/resources/images/callouts/7.png
deleted file mode 100644
index 472e96f8..00000000
Binary files a/src/docbkx/resources/images/callouts/7.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/8.png b/src/docbkx/resources/images/callouts/8.png
deleted file mode 100644
index 5e60973c..00000000
Binary files a/src/docbkx/resources/images/callouts/8.png and /dev/null differ
diff --git a/src/docbkx/resources/images/callouts/9.png b/src/docbkx/resources/images/callouts/9.png
deleted file mode 100644
index a0676d26..00000000
Binary files a/src/docbkx/resources/images/callouts/9.png and /dev/null differ
diff --git a/src/docbkx/resources/images/spring-ws-logo.png b/src/docbkx/resources/images/spring-ws-logo.png
deleted file mode 100644
index 2bdbd1a6..00000000
Binary files a/src/docbkx/resources/images/spring-ws-logo.png and /dev/null differ
diff --git a/src/docbkx/resources/xsl/fopdf.xsl b/src/docbkx/resources/xsl/fopdf.xsl
deleted file mode 100644
index 7ee4b067..00000000
--- a/src/docbkx/resources/xsl/fopdf.xsl
+++ /dev/null
@@ -1,418 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Copyright © 2005-2007
-
-
- ,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -5em
- -5em
-
-
-
-
-
-
-
-
-
-
- Spring-WS (
-
- )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
- 0
- 1
-
- 1
-
-
-
-
-
- book toc
-
-
-
- 2
-
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
- 5mm
- 10mm
- 10mm
-
- 15mm
- 10mm
- 0mm
-
- 18mm
- 18mm
-
-
- 0pc
-
-
-
-
- justify
- false
-
-
- 11
- 8
-
-
- 1.4
-
-
-
-
-
-
- 0.8em
-
-
-
-
-
- 17.4cm
-
-
-
- 4pt
- 4pt
- 4pt
- 4pt
-
-
-
- 0.1pt
- 0.1pt
-
-
-
-
- 1
-
-
-
-
-
-
-
- left
- bold
-
-
- pt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0.8em
- 0.8em
- 0.8em
-
-
- pt
-
- 0.1em
- 0.1em
- 0.1em
-
-
- 0.6em
- 0.6em
- 0.6em
-
-
- pt
-
- 0.1em
- 0.1em
- 0.1em
-
-
- 0.4em
- 0.4em
- 0.4em
-
-
- pt
-
- 0.1em
- 0.1em
- 0.1em
-
-
-
-
- bold
-
-
- pt
-
- false
- 0.4em
- 0.6em
- 0.8em
-
-
-
-
-
-
-
-
- pt
-
-
-
-
- 1em
- 1em
- 1em
- #444444
- solid
- 0.1pt
- 0.5em
- 0.5em
- 0.5em
- 0.5em
- 0.5em
- 0.5em
-
-
-
- 1
-
- #F0F0F0
-
-
-
-
-
- 0
- 1
-
-
- 90
-
-
-
-
- '1'
-
-
-
-
-
-
- figure after
- example before
- equation before
- table before
- procedure before
-
-
-
- 1
-
-
-
- 0.8em
- 0.8em
- 0.8em
- 0.1em
- 0.1em
- 0.1em
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/docbkx/resources/xsl/html.xsl b/src/docbkx/resources/xsl/html.xsl
deleted file mode 100644
index aa7930ba..00000000
--- a/src/docbkx/resources/xsl/html.xsl
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
- html.css
-
-
- 1
- 0
- 1
- 0
-
-
-
-
-
- book toc
-
-
-
- 3
-
-
-
-
- 1
-
-
-
-
-
-
- 0
-
-
- 90
-
-
-
-
- 0
-
-
-
-
- figure after
- example before
- equation before
- table before
- procedure before
-
-
-
- ,
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/docbkx/resources/xsl/html_chunk.xsl b/src/docbkx/resources/xsl/html_chunk.xsl
deleted file mode 100644
index 59016d81..00000000
--- a/src/docbkx/resources/xsl/html_chunk.xsl
+++ /dev/null
@@ -1,208 +0,0 @@
-
-
-
-
-
-
- '5'
- '1'
-
- 1
- 0
- 1
- 0
-
-
-
- book toc
-
-
- 3
-
-
- 1
-
-
-
-
- 1
- 90
-
-
-
- figure after
- example before
- equation before
- table before
- procedure before
-
-
-
- ,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/javadoc/javadoc.css b/src/main/javadoc/javadoc.css
deleted file mode 100644
index 1f009c4b..00000000
--- a/src/main/javadoc/javadoc.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Spring-specific Javadoc style sheet rules */
-
-#overviewBody {
-
-}
-
-.code {
- border: 1px solid black;
- background-color: #F4F4F4;
- padding: 5px;
-}
-
-/* Vanilla Javadoc style sheet rules */
-
-body {
- font-family: Helvetica, Arial, sans-serif;
- background-color: white;
- font-size: 10pt;
-}
-
-td { font-size: 10pt; font-family: Helvetica, Arial, sans-serif }/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Headings */
-h1 { font-size: 145% }
-
-/* Table colors */
-.TableHeadingColor { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */
-.TableRowColor { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
-.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif }
-.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1 { background-color:#EEEEFF;} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
-.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
deleted file mode 100644
index b3021202..00000000
--- a/src/main/javadoc/overview.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-This document is the API specification for the Spring WS Framework
-
-
-
- For further API reference and developer documentation, see the
- Spring
- Web Services reference documentation .
- That documentation contains more detailed, developer-targeted
- descriptions, with conceptual overviews, definitions of terms,
- workarounds, and working code examples.
-
-
-
- If you are interested in commercial training, consultancy, and
- support for the Spring Web Services Framework,
- SpringSource provides
- such commercial support.
-
-
-
-
diff --git a/src/main/resources/META-INF/spring.handlers b/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index b50a91db..00000000
--- a/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/web-services=org.springframework.ws.config.WebServicesNamespaceHandler
\ No newline at end of file
diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 68d53048..00000000
--- a/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1,3 +0,0 @@
-http\://www.springframework.org/schema/web-services/web-services-1.5.xsd=/org/springframework/ws/config/web-services-1.5.xsd
-http\://www.springframework.org/schema/web-services/web-services-2.0.xsd=/org/springframework/ws/config/web-services-2.0.xsd
-http\://www.springframework.org/schema/web-services/web-services.xsd=/org/springframework/ws/config/web-services-2.0.xsd
\ No newline at end of file
diff --git a/src/docbkx/bibliography.xml b/src/reference/docbook/bibliography.xml
similarity index 100%
rename from src/docbkx/bibliography.xml
rename to src/reference/docbook/bibliography.xml
diff --git a/src/docbkx/client.xml b/src/reference/docbook/client.xml
similarity index 100%
rename from src/docbkx/client.xml
rename to src/reference/docbook/client.xml
diff --git a/src/docbkx/common.xml b/src/reference/docbook/common.xml
similarity index 100%
rename from src/docbkx/common.xml
rename to src/reference/docbook/common.xml
diff --git a/src/docbkx/resources/images/i21-banner-rhs.jpg b/src/reference/docbook/images/i21-banner-rhs.jpg
similarity index 100%
rename from src/docbkx/resources/images/i21-banner-rhs.jpg
rename to src/reference/docbook/images/i21-banner-rhs.jpg
diff --git a/src/docbkx/resources/images/oxm-exceptions.png b/src/reference/docbook/images/oxm-exceptions.png
similarity index 100%
rename from src/docbkx/resources/images/oxm-exceptions.png
rename to src/reference/docbook/images/oxm-exceptions.png
diff --git a/src/docbkx/resources/images/oxm-exceptions.svg b/src/reference/docbook/images/oxm-exceptions.svg
similarity index 100%
rename from src/docbkx/resources/images/oxm-exceptions.svg
rename to src/reference/docbook/images/oxm-exceptions.svg
diff --git a/src/docbkx/resources/images/s2_box_logo.png b/src/reference/docbook/images/s2_box_logo.png
similarity index 100%
rename from src/docbkx/resources/images/s2_box_logo.png
rename to src/reference/docbook/images/s2_box_logo.png
diff --git a/src/docbkx/resources/images/sequence.png b/src/reference/docbook/images/sequence.png
similarity index 100%
rename from src/docbkx/resources/images/sequence.png
rename to src/reference/docbook/images/sequence.png
diff --git a/src/docbkx/resources/images/spring-deps.png b/src/reference/docbook/images/spring-deps.png
similarity index 100%
rename from src/docbkx/resources/images/spring-deps.png
rename to src/reference/docbook/images/spring-deps.png
diff --git a/samples/mtom/client/spring-ws-logo.png b/src/reference/docbook/images/spring-ws-logo.png
similarity index 100%
rename from samples/mtom/client/spring-ws-logo.png
rename to src/reference/docbook/images/spring-ws-logo.png
diff --git a/src/docbkx/resources/images/xdev-spring_logo.jpg b/src/reference/docbook/images/xdev-spring_logo.jpg
similarity index 100%
rename from src/docbkx/resources/images/xdev-spring_logo.jpg
rename to src/reference/docbook/images/xdev-spring_logo.jpg
diff --git a/src/docbkx/index.xml b/src/reference/docbook/index.xml
similarity index 98%
rename from src/docbkx/index.xml
rename to src/reference/docbook/index.xml
index 92798c08..e452203d 100644
--- a/src/docbkx/index.xml
+++ b/src/reference/docbook/index.xml
@@ -5,7 +5,7 @@
Spring Web Services
Reference Documentation
-
+ ${version}
diff --git a/src/docbkx/preface.xml b/src/reference/docbook/preface.xml
similarity index 100%
rename from src/docbkx/preface.xml
rename to src/reference/docbook/preface.xml
diff --git a/src/docbkx/security.xml b/src/reference/docbook/security.xml
similarity index 100%
rename from src/docbkx/security.xml
rename to src/reference/docbook/security.xml
diff --git a/src/docbkx/server.xml b/src/reference/docbook/server.xml
similarity index 100%
rename from src/docbkx/server.xml
rename to src/reference/docbook/server.xml
diff --git a/src/docbkx/tutorial.xml b/src/reference/docbook/tutorial.xml
similarity index 100%
rename from src/docbkx/tutorial.xml
rename to src/reference/docbook/tutorial.xml
diff --git a/src/docbkx/what-is-spring-ws.xml b/src/reference/docbook/what-is-spring-ws.xml
similarity index 100%
rename from src/docbkx/what-is-spring-ws.xml
rename to src/reference/docbook/what-is-spring-ws.xml
diff --git a/src/docbkx/why-contract-first.xml b/src/reference/docbook/why-contract-first.xml
similarity index 100%
rename from src/docbkx/why-contract-first.xml
rename to src/reference/docbook/why-contract-first.xml
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
deleted file mode 100644
index e97f6f3f..00000000
--- a/src/site/apt/downloads/releases.apt
+++ /dev/null
@@ -1,15 +0,0 @@
- ---------
- Downloads
- ---------
-
-Downloads
-
-* Get the latest Spring Web Services releases here
-
- * <>
-
- * {{{http://www.springsource.com/download/community?project=Spring%20Web%20Services}Download}} | {{{http://static.springframework.org/spring-ws/docs/2.0.4.RELEASE/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=126098}Announcement}}
-
- * <>
-
- * {{{./snapshots.html}Download nightly snapshots}}
diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt
deleted file mode 100644
index 510f3630..00000000
--- a/src/site/apt/downloads/snapshots.apt
+++ /dev/null
@@ -1,32 +0,0 @@
- ---------
- Snapshots
- ---------
-
-Snapshot Builds
-
- These builds are provided for testing and development purposes only. They are built by a Bamboo process
- automatically using the latest snapshot from Subversion.
-
- The snapshots are deloyed to a Maven2 snapshot repository. To use it, just add the following repository to the POM:
-
-+---------------
-
- spring-s3
- Springframework Maven SNAPSHOT Repository
- http://maven.springframework.org/snapshot
-
-+---------------
-
- Individual dependencies can then by added like so:
-
-+---------------
-
- org.springframework.ws
- spring-ws-core
- 2.0.5.RELEASE-SNAPSHOT
-
-+---------------
-
- Additionally, there are
- {{{http://static.springframework.org/spring-ws/downloads/2.0-snapshot-download.php}zips}}
- available which contain all jars.
diff --git a/src/site/apt/reference.apt b/src/site/apt/reference.apt
deleted file mode 100644
index a4e68b2d..00000000
--- a/src/site/apt/reference.apt
+++ /dev/null
@@ -1,11 +0,0 @@
- ----------------
- Reference Manual
- ----------------
-
-Reference Manual
-
- The reference manual is available as HTML, and as PDF.
-
- * View the {{{./reference/html/index.html}HTML version}}
-
- * Download the {{{./reference/pdf/spring-ws-reference.pdf}PDF version}}
diff --git a/src/site/apt/resources.apt b/src/site/apt/resources.apt
deleted file mode 100644
index 134fe783..00000000
--- a/src/site/apt/resources.apt
+++ /dev/null
@@ -1,74 +0,0 @@
- -------------------
- Resources and Tools
- -------------------
-
-Resources
-
- On this page, we give some general resource related to XML, SOAP, XSD, WSDL, and WS-Security. Note that these
- resources are generic, and not tied to Spring Web Services.
-
-* XML
-
-
-** XML
-
- * {{{http://www.w3schools.com/xml/default.asp}XML tutorial}}
-
- * {{{http://www.amazon.com/gp/product/0321150406/}Effective XML}}, a good book on XML
-
-** XSD
-
- * {{{http://www.w3.org/XML/Schema}the XSD 1.1 specification}}
-
- * {{{http://www.w3schools.com/schema/default.asp}XSD tutorial}}
-
- * {{{http://www.amazon.com/gp/product/0130655678}Definite XML Schema}}, a good book on XSDs
-
- * {{{http://www.amazon.com/gp/product/0201740958}Essential XML Quick Reference}}, a good reference on XML, XPath, XSL, XSD, and more
-
- * {{{http://www.xfront.com/GlobalVersusLocal.html}XML Schemas: Best Practices}}
-
-* Web Services
-
-** SOAP
-
- * {{{http://www.w3.org/TR/2000/NOTE-SOAP-20000508/}the SOAP 1.1 specification}}
-
- * {{{http://www.ws-i.org/Profiles/BasicProfile-1.1.html}the WS-Interop basic profile}}, to make sure your Web services are interopable with other platforms
-
- * {{{http://www.w3schools.com/soap/default.asp}SOAP tutorial}}
-
- * {{{http://www.jguru.com/forums/SOAP}the jGuru SOAP forum}}
-
- * {{{http://www.daniweb.com/techtalkforums/forum151.html}another XML and SOAP forum}}
-
- * {{{http://www.amazon.com/gp/product/0131488740}Web Services Platform Architecture}} is a good book on SOAP, WSDL, and all current and upcoming WS-* specifications
-
-** WSDL
-
- * {{{http://www.w3.org/TR/wsdl}the WSDL 1.1 specification}}
-
- * {{{http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html}the WS-I basic profile}}, something every Web service should adhere to
-
- * {{{http://www.w3schools.com/wsdl/default.asp}WSDL tutorial}}
-
- * {{{http://www.amazon.com/gp/product/0131488740}Web Services Platform Architecture}} is a good book on SOAP, WSDL, and all current and upcoming WS-* specifications
-
-** WS-Security
-
- * {{{http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wss}the WS-Security 1.1 specification}}
-
- * {{{http://dev2dev.bea.com/pub/a/2004/05/WS-Security.html}WS-Security and Java: Practical, In-Depth, Message-Based Security}}
-
- * {{{http://www.amazon.com/gp/product/0131488740}Web Services Platform Architecture}} is a good book on SOAP, WSDL, and all current and upcoming WS-* specifications
-
-Tools
-
- These tools can help you test your Web service applications.
-
- * {{{http://www.soapui.org/}soapui}} is a desktop application for inspecting, invoking and testing (functional and load) of web services over HTTP.
-
- * {{{http://www.ws-i.org/deliverables/workinggroup.aspx?wg=testingtools}the WS-I testing tools}}, which make sure your Web service is {{{http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html}interoperable}}.
-
- * {{{http://ws.apache.org/axis/java/user-guide.html#AppendixUsingTheAxisTCPMonitorTcpmon}Axis Tcpmon}} is a monitoring tool which allows you to see the XML as it is sent and received across the wire.
-
diff --git a/src/site/apt/upgrading.apt b/src/site/apt/upgrading.apt
deleted file mode 100644
index 217d36e9..00000000
--- a/src/site/apt/upgrading.apt
+++ /dev/null
@@ -1,129 +0,0 @@
- ---------
- Upgrading
- ---------
-
-Upgrading from version 1.0-RC2 to 1.0
-
- No major changes have occured since RC2.
-
-Upgrading from version 1.0-RC1 to 1.0-RC2
-
- Some minor last changes were made between version 1.0 Release Candidate 1 and 2 of the project. The following
-should help most users the project update their applications:
-
-* Client-side
-
- Some issues have been resolved which make the WebServiceTemplate more useable in Plain Old XML settings, and less
-SOAP-specific.
-
- * The various overloaded <<>> methods have been renamed to aid comprehension. The method signature
- now reflects what is sent (eg. a Source), and what is received (eg. a Result).
-
- * The <<>> method <<>> has been renamed to <<>>, since it
- was poorly named.
-
- * The <<>> has been renamed to <<>> to indicate its responsibility more clearly.
-
- * The <<>> has been moved to <<>>.
-
-Upgrading from version 1.0-M3 to 1.0-RC1
-
- Some minor changes were made between version 1.0 Milestone 3 and Release Candidate 1 of the project. The following
-should help most users the project update their applications:
-
-* Attachments
-
- Attachment support had to be moved and changed to facilitate MTOM.
-
- * The <<>> interface was moved from <<>> to <<>>.
-
- * The <<>> property on <<> was renamed to <>>.
-
- * Methods for getting and adding attachments were taken from <<>> and extraced into a new interface:
-<<>>. Adding a method requires a content id now.
-
-* WebServiceTemplate
-
- The <<>> no longer declares an IOException for each method. Rather, an runtime exception
- hierarchy has been created in <<>>.
-
-* HttpUrlConnectionMessageSender and CommonsHttpMessageSender
-
- The <<>> and <<>> have lost their <<>> property. URLs
-(or rather: URIs) are now defined on the <<>> by specifying a default URI, or by giving the URI as a
-parameter.
-
-
-* EndpointInterceptor
-
- The <<>> has a <<>> method now, which gets invoked
- (rather than <<>>) when <<>> is true for the response.
-
-* SoapMessageDispatcher
-
- * All of SoapMessageDispatcher's strategy interfaces (<<>>, <<>>)
- have been moved from <<>> to <<>>.
-
-Upgrading from version 1.0-M2 to 1.0-M3
-
- Several changes were made between version 1.0 Milestone 2 and Milestone 3 of the project. These changes increased
-modularity of the code, enhanced unit testing, made package roles clearer, and added compelling alternatives to
-adapters and using web.xml security constraints to protect HTTP resources.
-
- Unfortunately, changes to the API and package locations were required. The following should help most users
-the project update their applications:
-
-
-* MessageContextFactory
-
- The MessageContextFactory has been refactored into the WebServiceMessageFactory, and doesn't create MessageContexts any more, but WebServiceMessages. This change is mostly internal, but you need to change the name of the factory:
-
- * If you used <<>> before, replace it with <<>>.
-
- * If you used <<>> before, replace with <<>>.
-
-* MessageDispatcher
-
- To make a clear distinction between server-side and client-side code, we had to move the various server-side classes.
-
- * The <<>> has been moved to the <<>> package.
-
- * The <<>> has been moved to the <<>> package.
-
- * All of MessageDispatcher's strategy interfaces (<<>>, <<>>, <<>>, <<>>) have been moved from <<>> to <<>>.
-
-** Endpoints
-
- * All endpoint implementations and adpters in <<>> have been moved to <<>>.
-
- * <<>> has been moved into the Spring-XML module.
-
-** Endpoint interceptors
-
- * All <<>>s in <<>> have been moved to <<>>.
-
- * All <<>>s in <<>> have been moved to <<>>.
-
- * The <<>> has been moved to <<>> as well.
-
-** Endpoint mappings
-
- * All <<>>s in <<>> have been moved to <<>>.
-
- * All <<>>s in <<>> have been moved to <<>>.
-
-** Endpoint exception resolvers
-
- * All <<>>s in <<>> have been moved to <<>>.
-
-* TransportContext
-
- * <<>> and <<>> have been moved to <<>> package.
-
-* MessageEndpointAdapter
-
- * The <<>> has been renamed to <<>>, but still resides in the same package (<<>>).
-
-* SoapMessageContext
-
- * The <<>> has been removed. The <<>> offers the same functionality, though it might require casting.
\ No newline at end of file
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
deleted file mode 100644
index 21b3f897..00000000
--- a/src/site/fml/faq.fml
+++ /dev/null
@@ -1,269 +0,0 @@
-
-
-
- General
-
- Do I need any other SOAP framework to run Spring Web Services?
-
- You don't need any other SOAP framework to use Spring Web services, though it can use some of the
- features of Axis 1 and 2.
-
-
-
- I get NAMESPACE_ERR exceptions when using Spring-WS. What can I do about it?
-
-
- If you get the following Exception:
-
-
-NAMESPACE_ERR: An attempt is made to create or change an object in a way which is incorrect with regard to namespaces.
-
-
- Most often, this exception is related to an older version of Xalan being used. Make sure to upgrade
- to 2.7.0.
-
-
-
-
-
-
- Java
-
- Does Spring-WS run under Java 1.3 or 1.4?
-
-
- As of version 2.0, Spring Web Services requires Java 1.5 or higher.
-
-
-
-
- Does Spring-WS work under Java 1.6?
-
-
- Java 1.6 ships with SAAJ 1.3, JAXB 2.0, and JAXP 1.4 (a custom version of Xerces and Xalan).
- Overriding these libraries by putting different version on the classpath will result in various
- classloading issues, or exceptions in org.apache.xml.serializer.ToXMLSAXHandler .
- The only option for using more recent versions is to put the newer version in the
- endorsed directory (see above).
-
-
-
-
-
- SAAJ
-
- What is SAAJ?
-
-
- SAAJ is the SOAP with Attachments API for Java. Like most Java EE libraries, it consists of a set of
- interfaces (saaj-api.jar ), and implementations (saaj-impl.jar ). When running in
- a Application Server, the implementation is typically provided by the application server.
- Previously, SAAJ has been part of JAXM, but it has
- been released as a seperate API as part of the
- Java Web Service Developer Pack , and
- also as part of J2EE 1.4. SAAJ is generally known as the packagejavax.xml.soap .
-
-
- Spring-WS uses this standard SAAJ library to create representations of SOAP messages. Alternatively,
- it can useApache AXIOM .
-
-
-
-
- What version of SAAJ does my application server support?
-
-
-
- Application Server SAAJ Version
- BEA WebLogic 8 1.1
- BEA WebLogic 9 1.1/1.2*
- BEA WebLogic 10 1.3**
- IBM WebSphere 6 1.2
- SUN Glassfish 1 1.3
- JBoss 4.2 1.3***
-
-
- * = See below .
- ** = See below .
- *** = See below .
- Additionally, Java SE 6 includes SAAJ 1.3.
-
-
-
- I get a NoSuchMethodError when using SAAJ. What can I do about it?
-
-
- If you get the following stack trace:
-
-org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'org.springframework.ws.soap.saaj.SaajSoapMessageFactory' defined in ServletContext resource [/WEB-INF/springws-servlet.xml]:
-Invocation of init method failed;
-nested exception is java.lang.NoSuchMethodError:
-javax.xml.soap.MessageFactory.newInstance(Ljava/lang/String;)Ljavax/xml/soap/MessageFactory;
-Caused by:
-java.lang.NoSuchMethodError:
-javax.xml.soap.MessageFactory.newInstance(Ljava/lang/String;)Ljavax/xml/soap/MessageFactory;
-
-
- Like most J2EE libraries, SAAJ consists of two parts: the API that consists of interfaces
- (saaj-api.jar ) and the implementation (saaj-impl.jar ).
- The stack trace is due to the fact that you are using a new version of the API (SAAJ 1.3), while
- your application server provides an earlier version of the implementation (SAAJ 1.2 or even 1.1).
- Spring-WS supports all three versions of SAAJ (1.1 through 1.3), but things break when it sees
- the 1.3 API, while there is no 1.3 implementation.
-
-
- The solution therefore is quite simple: to remove the newer 1.3 version of the API, from the class
- path, and replace it with the version supported by your application server.
-
-
-
-
-
- I get an UnsupportedOperationException "This class does not support SAAJ 1.1" when I use SAAJ under WebLogic 9. What can I do about it?
-
-
-
- WebLogic 9 has a known bug in the SAAJ 1.2 implementation: it implement all the 1.2 interfaces,
- but throws UnsupportedOperationExceptions when you call them.
- Confusingly, the exception message is This class does not support SAAJ 1.1 , even though
- it supports SAAJ 1.1 just fine; it just doesn't support SAAJ 1.2 .
- See alsothis BEA forum post .
-
-
- Spring-WS has a workaround for this, we basically use SAAJ 1.1 only when dealing with WebLogic 9.
- Unfortunately, other frameworks which depend on SAAJ, such as XWSS, do not have this workaround.
- These frameworks happily call SAAJ 1.2 methods, which throw this exception.
-
-
- The solution is to not use BEA's version of SAAJ, but to use another implementation, like the one
- from Axis 1, or SUN. In you application context, use the following:
-
-<bean id="messageFactory" class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory">
- <property name="messageFactory">
- <bean class="com.sun.xml.messaging.saaj.soap.MessageFactoryImpl"/>
- </property>
-</bean>
-
-
-
-
-
-
- I get an UnsupportedOperationException "This class does not support SAAJ 1.1" when I use SAAJ under WebLogic 10. What can I do about it?
-
-
-
- Weblogic 10 ships with two SAAJ implementations. By default the buggy 9.x implementation is used
- (which lives in the package weblogic.webservice.core.soap ),
- but there is a new implementation, which supports SAAJ 1.3
- (which lives in the package weblogic.xml.saaj ).
- By looking at the DEBUG logging when Spring Web Services starts up, you can see which SAAJ
- implementation is used.
-
-
- To use this new version, you have to create a message factory bean like so:
-
-<bean id="messageFactory" class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory">
- <property name="messageFactory">
- <bean class="weblogic.xml.saaj.MessageFactoryImpl"/>
- </property>
-</bean>
-
-
-
-
-
-
- I get an IndexOutOfBoundsException when I use SAAJ under JBoss. What can I do about it?
-
-
-
- The SAAJ implementation provided by JBoss has some issues. The solution is therefore not to use
- the JBoss implementation, but to use another implementation. For instance, you can use SUN's
- reference implementation like so:
-
-<bean id="messageFactory" class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory">
- <property name="messageFactory">
- <bean class="com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl"/>
- </property>
-</bean>
-
-
-
-
-
-
- Does Spring-WS run on IBM WebSphere?
-
-
-
- WebSphere bundles some libraries which are out-of-date, and need to be upgraded with more recent
- versions. Specifically, this includes XML-apis, Xerces, Xalan, and WSDL4J.
-
-
- There are a couple of ways to upgrade these libraries, all using parent-last or application-first
- classloading.
-
-
- Package the libraries as part of the WAR (in WEB-INF/lib), and run the web application with
- the parent-last (application-first) classloading.
-
-
- Package the libraries as part of the EAR, add class-path entries to the manifest of the web
- application, and run the entire application with the parent-last classloading.
-
-
- Create a new classloader in the WebSphere console, and associate the libraries with. Set
- this classloader to parent-last.
-
-
- The last approach has the advantage of restricting the parent-last classloading to the conflicting
- libraries only, and not to the entire application.
-
-
-
-
-
- WSDL
-
- Why does Spring-WS only support contract-first?
-
-
- You can find the answer to this question on
- a
- separate page
- . Note that Spring-WS only requires you to write the XSD; the WSDL can be generated from that.
- The
- tutorial illustrates how.
-
-
-
-
- How do I retrieve the WSDL from a Service? The &WSDL query parameter does not work.
-
-
- The &WSDL query parameter is a way to get a WSDL of a class. In SWS, a service is generally not
- implemented as a single class, but as a collection of endpoints.
-
-
- There are two ways to expose a WSDL:
-
-
- Simply add the WSDL to the root of the WAR, and the file is served normally. This has the
- disadvantage that the "location" attribute in the WSDL is static, i.e. it does not
- necessarily reflect the host name of the server. You can transform locations by using a
-
- WsdlDefinitionHandlerAdapter .
-
- Use theMessageDispatcherServlet , which is done is the samples. Every
- WsdlDefinition listed in the *-servlet.xml will be exposed under the
- bean name. So if you define a WsdlDefinition namedecho , it will be
- exposed as echo.wsdl (i.e.http://localhost:8080/echo/echo.wsdl ).
-
-
-
-
-
-
-
diff --git a/src/site/resources/images/external.png b/src/site/resources/images/external.png
deleted file mode 100644
index 3f999fc8..00000000
Binary files a/src/site/resources/images/external.png and /dev/null differ
diff --git a/src/site/resources/images/logos/bamboo.png b/src/site/resources/images/logos/bamboo.png
deleted file mode 100644
index d4a071fb..00000000
Binary files a/src/site/resources/images/logos/bamboo.png and /dev/null differ
diff --git a/src/site/resources/images/logos/contegix.png b/src/site/resources/images/logos/contegix.png
deleted file mode 100644
index dc3841d3..00000000
Binary files a/src/site/resources/images/logos/contegix.png and /dev/null differ
diff --git a/src/site/resources/images/logos/jira.png b/src/site/resources/images/logos/jira.png
deleted file mode 100644
index 006aca67..00000000
Binary files a/src/site/resources/images/logos/jira.png and /dev/null differ
diff --git a/src/site/resources/images/logos/s101d.png b/src/site/resources/images/logos/s101d.png
deleted file mode 100644
index 4d4939c1..00000000
Binary files a/src/site/resources/images/logos/s101d.png and /dev/null differ
diff --git a/src/site/resources/images/logos/spring.png b/src/site/resources/images/logos/spring.png
deleted file mode 100644
index e773b170..00000000
Binary files a/src/site/resources/images/logos/spring.png and /dev/null differ
diff --git a/src/site/resources/images/spring-ws.png b/src/site/resources/images/spring-ws.png
deleted file mode 100644
index f589a8a8..00000000
Binary files a/src/site/resources/images/spring-ws.png and /dev/null differ
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index b528ba86..00000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- org.springframework.maven.skins
- maven-spring-skin
- 1.0.4
-
-
-
- Spring Web Services
- images/spring-ws.png
- http://www.springframework.org/spring-ws
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
deleted file mode 100644
index 8fb23fe8..00000000
--- a/src/site/xdoc/index.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
- Home
-
-
- What is Spring Web Services?
-
- Spring Web Services is a product of the Spring community
- focused on creating document-driven Web services. Spring Web Services aims to facilitate contract-first
- SOAP service development, allowing for the creation of flexible web services using one of the many ways
- to manipulate XML payloads.
-
- Key Features
-
- Makes the Best Practice an Easy Practice: Spring Web Services makes enforcing best practices
- easier. This includes practices such as the WS-I basic profile, Contract-First development, and having
- a loose coupling between contract and implementation.
- Powerful mappings: You can distribute incoming XML request to any object, depending on message
- payload, SOAP Action header, or an XPath expression.
- XML API support: Incoming XML messages can be handled in standard JAXP APIs such as DOM, SAX,
- and StAX, but also JDOM, dom4j, XOM, or even marshalling technologies.
- Flexible XML Marshalling: The Object/XML Mapping module in the Spring Web Services distribution
- supports JAXB 1 and 2, Castor, XMLBeans, JiBX, and XStream. And because it is a separate module,
- you can use it in non-Web services code as well.
- Reuses your Spring expertise: Spring-WS uses Spring application contexts for all configuration,
- which should help Spring developers get up-to-speed nice and quickly. Also, the architecture of
- Spring-WS resembles that of Spring-MVC.
- Supports WS-Security: WS-Security allows you to sign SOAP messages, encrypt and decrypt them,
- or authenticate against them.
- Integrates with Acegi Security: The WS-Security implementation of Spring Web Services provides
- integration with Spring Security .
- This means you can use your existing configuration for your SOAP service as well.
- Built by Maven: This assists you in effectively reusing the Spring Web Services artifacts
- in your own Maven-based projects.
- Apache license. You can confidently use Spring-WS in your project.
-
-
-
\ No newline at end of file
diff --git a/support/.gitignore b/support/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/support/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/support/pom.xml b/support/pom.xml
deleted file mode 100644
index 7be58403..00000000
--- a/support/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
- spring-ws-parent
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../parent/pom.xml
-
- 4.0.0
- org.springframework.ws
- spring-ws-support
- jar
- Spring WS Support
- Spring Web Services Support package.
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.soap
- saaj-api
-
-
- com.sun.xml.messaging.saaj
- saaj-impl
- provided
-
-
- javax.activation
- activation
-
-
-
-
-
-
-
- com.springsource.bundlor
- com.springsource.bundlor.maven
-
-
- maven-jar-plugin
-
-
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
-
-
-
-
-
-
-
- org.springframework.ws
- spring-xml
-
-
- org.springframework.ws
- spring-ws-core
-
-
-
- org.springframework
- spring-jms
-
-
- org.springframework
- spring-tx
-
-
- org.springframework
- spring-test
-
-
-
- org.apache.geronimo.specs
- geronimo-jms_1.1_spec
- true
-
-
- org.apache.geronimo.specs
- geronimo-ejb_2.1_spec
- true
-
-
- javax.mail
- mail
- true
-
-
- jivesoftware
- smack
- true
-
-
-
- org.apache.activemq
- activemq-core
- test
-
-
- org.jvnet.mock-javamail
- mock-javamail
- 1.6
- test
-
-
- commons-httpclient
- commons-httpclient
- test
-
-
-
diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/test/pom.xml b/test/pom.xml
deleted file mode 100644
index 8a39601d..00000000
--- a/test/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
- spring-ws-parent
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../parent/pom.xml
-
- 4.0.0
- org.springframework.ws
- spring-ws-test
- jar
- Spring WS Test
- Spring Web Services Testing package.
-
-
-
- com.springsource.bundlor
- com.springsource.bundlor.maven
-
-
- maven-jar-plugin
-
-
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
-
-
-
-
-
-
-
- org.springframework.ws
- spring-xml
-
-
- org.springframework.ws
- spring-ws-core
-
-
-
- junit
- junit
- test
-
-
- xmlunit
- xmlunit
- compile
-
-
- org.springframework
- spring-test
- compile
-
-
-
diff --git a/xml/.gitignore b/xml/.gitignore
deleted file mode 100644
index 27399402..00000000
--- a/xml/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-target
-*.iml
-.classpath
-.project
-.settings
-
diff --git a/xml/pom.xml b/xml/pom.xml
deleted file mode 100644
index f6f90cb2..00000000
--- a/xml/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
- spring-ws-parent
- org.springframework.ws
- 2.1.5.RELEASE-SNAPSHOT
- ../parent/pom.xml
-
- 4.0.0
- spring-xml
- jar
- Spring XML
- Various XML support classes for Spring Web Services
-
-
- jdk15
-
- !1.6
-
-
-
- javax.xml.stream
- stax-api
-
-
-
-
-
-
-
- com.springsource.bundlor
- com.springsource.bundlor.maven
-
-
- maven-jar-plugin
-
-
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
-
-
-
-
-
-
-
- org.springframework
- spring-context
-
-
-
- jaxen
- jaxen
- true
-
-
- org.codehaus.woodstox
- woodstox-core-asl
- test
-
-
- org.apache.ws.xmlschema
- xmlschema-core
- true
-
-
-