diff --git a/core-tiger/src/test/resources/org/springframework/ws/config/SwsNamespaceHandlerTigerTest.java b/core-tiger/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java similarity index 88% rename from core-tiger/src/test/resources/org/springframework/ws/config/SwsNamespaceHandlerTigerTest.java rename to core-tiger/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java index ed310862..014033fd 100644 --- a/core-tiger/src/test/resources/org/springframework/ws/config/SwsNamespaceHandlerTigerTest.java +++ b/core-tiger/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java @@ -18,19 +18,20 @@ package org.springframework.ws.config; import java.util.Map; +import junit.framework.TestCase; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ws.server.endpoint.adapter.GenericMarshallingMethodEndpointAdapter; import org.springframework.ws.server.endpoint.adapter.XPathParamAnnotationMethodEndpointAdapter; -import junit.framework.TestCase; - -public class SwsNamespaceHandlerTigerTest extends TestCase { +public class WebServicesNamespaceHandlerTigerTest extends TestCase { private ApplicationContext applicationContext; protected void setUp() throws Exception { - applicationContext = new ClassPathXmlApplicationContext("swsNamespaceHandlerTest-tiger.xml", getClass()); + applicationContext = + new ClassPathXmlApplicationContext("webServicesNamespaceHandlerTest-tiger.xml", getClass()); } public void testMarshallingEndpoints() throws Exception { diff --git a/core-tiger/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest-tiger.xml b/core-tiger/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml similarity index 63% rename from core-tiger/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest-tiger.xml rename to core-tiger/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml index b066bec0..0b33cb19 100644 --- a/core-tiger/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest-tiger.xml +++ b/core-tiger/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml @@ -1,10 +1,9 @@ + http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-1.5.xsd"> @@ -13,7 +12,7 @@ - + diff --git a/core/src/main/java/org/springframework/ws/config/SwsNamespaceHandler.java b/core/src/main/java/org/springframework/ws/config/WebServicesNamespaceHandler.java similarity index 87% rename from core/src/main/java/org/springframework/ws/config/SwsNamespaceHandler.java rename to core/src/main/java/org/springframework/ws/config/WebServicesNamespaceHandler.java index 2b1713f1..e53370fc 100644 --- a/core/src/main/java/org/springframework/ws/config/SwsNamespaceHandler.java +++ b/core/src/main/java/org/springframework/ws/config/WebServicesNamespaceHandler.java @@ -20,12 +20,12 @@ import org.springframework.beans.factory.xml.NamespaceHandler; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; /** - * {@link NamespaceHandler} for the 'sws' namespace. + * {@link NamespaceHandler} for the 'web-services' namespace. * * @author Arjen Poutsma * @since 1.5.0 */ -public class SwsNamespaceHandler extends NamespaceHandlerSupport { +public class WebServicesNamespaceHandler extends NamespaceHandlerSupport { public void init() { registerBeanDefinitionParser("marshalling-endpoints", new MarshallingEndpointsBeanDefinitionParser()); diff --git a/core/src/main/resources/META-INF/spring.handlers b/core/src/main/resources/META-INF/spring.handlers index b4b41535..b50a91db 100644 --- a/core/src/main/resources/META-INF/spring.handlers +++ b/core/src/main/resources/META-INF/spring.handlers @@ -1 +1 @@ -http\://www.springframework.org/spring-ws/schema/sws=org.springframework.ws.config.SwsNamespaceHandler \ No newline at end of file +http\://www.springframework.org/schema/web-services=org.springframework.ws.config.WebServicesNamespaceHandler \ No newline at end of file diff --git a/core/src/main/resources/META-INF/spring.schemas b/core/src/main/resources/META-INF/spring.schemas index a8713656..c8688119 100644 --- a/core/src/main/resources/META-INF/spring.schemas +++ b/core/src/main/resources/META-INF/spring.schemas @@ -1 +1 @@ -http\://www.springframework.org/spring-ws/schema/sws/spring-ws-1.5.xsd=/org/springframework/ws/config/spring-ws-1.5.xsd \ No newline at end of file +http\://www.springframework.org/schema/web-services/web-services-1.5.xsd=/org/springframework/ws/config/web-services-1.5.xsd \ No newline at end of file diff --git a/core/src/main/resources/org/springframework/ws/config/spring-ws-1.5.xsd b/core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd similarity index 94% rename from core/src/main/resources/org/springframework/ws/config/spring-ws-1.5.xsd rename to core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd index 0e602720..da14eecc 100644 --- a/core/src/main/resources/org/springframework/ws/config/spring-ws-1.5.xsd +++ b/core/src/main/resources/org/springframework/ws/config/web-services-1.5.xsd @@ -1,8 +1,8 @@ - @@ -13,7 +13,7 @@ Defines the configuration elements for Spring Web Services. - + - - diff --git a/core/src/test/java/org/springframework/ws/config/SwsNamespaceHandlerTest.java b/core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java similarity index 92% rename from core/src/test/java/org/springframework/ws/config/SwsNamespaceHandlerTest.java rename to core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java index 11d9a5d3..6db37eb8 100644 --- a/core/src/test/java/org/springframework/ws/config/SwsNamespaceHandlerTest.java +++ b/core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java @@ -18,18 +18,18 @@ package org.springframework.ws.config; import java.util.Map; +import junit.framework.TestCase; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ws.server.endpoint.adapter.MarshallingMethodEndpointAdapter; -import junit.framework.TestCase; - -public class SwsNamespaceHandlerTest extends TestCase { +public class WebServiceNamespaceHandlerTest extends TestCase { private ApplicationContext applicationContext; protected void setUp() throws Exception { - applicationContext = new ClassPathXmlApplicationContext("swsNamespaceHandlerTest.xml", getClass()); + applicationContext = new ClassPathXmlApplicationContext("webServiceNamespaceHandlerTest.xml", getClass()); } public void testMarshallingMethods() throws Exception { diff --git a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java b/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java deleted file mode 100644 index 2dffc31b..00000000 --- a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java +++ /dev/null @@ -1,107 +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.transport.http; - -import java.io.File; -import java.io.IOException; - -import junit.framework.TestCase; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.InputStreamRequestEntity; -import org.apache.commons.httpclient.methods.PostMethod; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.ws.transport.TransportConstants; - -public class MessageDispatcherServletIntegrationTest extends TestCase { - - private Server jettyServer; - - private HttpClient client; - - private static final String CONTENT_TYPE = "Content-Type"; - - protected final void setUp() throws Exception { - jettyServer = new Server(8888); - Context jettyContext = new Context(jettyServer, "/"); - File dir = new File(getClass().getResource(".").toURI()); - jettyContext.setResourceBase(dir.getAbsolutePath()); - ServletHolder servletHolder = new ServletHolder(new MessageDispatcherServlet()); - servletHolder.setName("spring-ws"); - jettyContext.addServlet(servletHolder, "/*"); - jettyServer.start(); - client = new HttpClient(); - } - - protected void tearDown() throws Exception { - jettyServer.stop(); - } - - public void testNoResponse() throws IOException { - PostMethod postMethod = new PostMethod("http://localhost:8888/service"); - postMethod.addRequestHeader(CONTENT_TYPE, "text/xml"); - postMethod.addRequestHeader(TransportConstants.HEADER_SOAP_ACTION, - "http://springframework.org/spring-ws/NoResponse"); - Resource soapRequest = new ClassPathResource("soapRequest.xml", MessageDispatcherServletIntegrationTest.class); - postMethod.setRequestEntity(new InputStreamRequestEntity(soapRequest.getInputStream())); - client.executeMethod(postMethod); - assertEquals("Invalid Response Code", HttpStatus.SC_ACCEPTED, postMethod.getStatusCode()); - assertEquals("Response retrieved", 0, postMethod.getResponseContentLength()); - } - - public void testResponse() throws IOException { - PostMethod postMethod = new PostMethod("http://localhost:8888/service"); - postMethod.addRequestHeader(CONTENT_TYPE, "text/xml"); - postMethod.addRequestHeader(TransportConstants.HEADER_SOAP_ACTION, - "http://springframework.org/spring-ws/Response"); - Resource soapRequest = new ClassPathResource("soapRequest.xml", MessageDispatcherServletIntegrationTest.class); - postMethod.setRequestEntity(new InputStreamRequestEntity(soapRequest.getInputStream())); - client.executeMethod(postMethod); - assertEquals("Invalid Response Code", HttpStatus.SC_OK, postMethod.getStatusCode()); - assertTrue("No Response retrieved", postMethod.getResponseContentLength() > 0); - } - - public void testNoEndpoint() throws IOException { - PostMethod postMethod = new PostMethod("http://localhost:8888/service"); - postMethod.addRequestHeader(CONTENT_TYPE, "text/xml"); - postMethod.addRequestHeader(TransportConstants.HEADER_SOAP_ACTION, - "http://springframework.org/spring-ws/NoEndpoint"); - Resource soapRequest = new ClassPathResource("soapRequest.xml", MessageDispatcherServletIntegrationTest.class); - postMethod.setRequestEntity(new InputStreamRequestEntity(soapRequest.getInputStream())); - client.executeMethod(postMethod); - assertEquals("Invalid Response Code", HttpStatus.SC_NOT_FOUND, postMethod.getStatusCode()); - assertEquals("Response retrieved", 0, postMethod.getResponseContentLength()); - } - - public void testFault() throws IOException { - PostMethod postMethod = new PostMethod("http://localhost:8888/service"); - postMethod.addRequestHeader(CONTENT_TYPE, "text/xml"); - postMethod - .addRequestHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Fault"); - Resource soapRequest = new ClassPathResource("soapRequest.xml", MessageDispatcherServletIntegrationTest.class); - postMethod.setRequestEntity(new InputStreamRequestEntity(soapRequest.getInputStream())); - client.executeMethod(postMethod); - assertEquals("Invalid Response Code", HttpStatus.SC_INTERNAL_SERVER_ERROR, postMethod.getStatusCode()); - assertTrue("No Response retrieved", postMethod.getResponseContentLength() > 0); - } - - -} diff --git a/core/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest.xml b/core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml similarity index 71% rename from core/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest.xml rename to core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml index dfe5d128..14f40919 100644 --- a/core/src/test/resources/org/springframework/ws/config/swsNamespaceHandlerTest.xml +++ b/core/src/test/resources/org/springframework/ws/config/webServiceNamespaceHandlerTest.xml @@ -1,10 +1,10 @@ + http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-1.5.xsd">