From acc08212778eb12e53b21e42a08c0d4a2d58bd6b Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Mon, 1 Feb 2010 10:37:45 +0000 Subject: [PATCH] Merged core and core-tiger modules --- .../ws/config/DummyMarshaller.java | 44 ------------------- ...nericMarshallingMethodEndpointAdapter.java | 0 ...hParamAnnotationMethodEndpointAdapter.java | 0 .../server/endpoint/annotation/Endpoint.java | 0 .../endpoint/annotation/PayloadRoot.java | 0 .../endpoint/annotation/XPathParam.java | 0 .../server/endpoint/annotation/package.html | 0 ...stractAnnotationMethodEndpointMapping.java | 0 ...adRootAnnotationMethodEndpointMapping.java | 0 .../AnnotationActionEndpointMapping.java | 0 .../addressing/server/annotation/Action.java | 0 .../addressing/server/annotation/Address.java | 0 .../SoapFaultAnnotationExceptionResolver.java | 0 .../server/endpoint/annotation/FaultCode.java | 0 .../endpoint/annotation/SoapAction.java | 0 .../server/endpoint/annotation/SoapFault.java | 0 .../server/endpoint/annotation/package.html | 0 ...ActionAnnotationMethodEndpointMapping.java | 0 .../WebServicesNamespaceHandlerTigerTest.java | 0 ...cMarshallingMethodEndpointAdapterTest.java | 0 ...amAnnotationMethodEndpointAdapterTest.java | 0 .../ws/server/endpoint/mapping/Log.java | 0 .../ws/server/endpoint/mapping/LogAspect.java | 0 .../ws/server/endpoint/mapping/OtherBean.java | 0 ...otAnnotationMethodEndpointMappingTest.java | 0 .../endpoint/mapping/PayloadRootEndpoint.java | 0 ...tationActionMethodEndpointMappingTest.java | 0 ...pFaultAnnotationExceptionResolverTest.java | 0 ...onAnnotationMethodEndpointMappingTest.java | 0 .../webServicesNamespaceHandlerTest-tiger.xml | 0 .../ws/server/endpoint/mapping | 0 .../springframework/ws/soap/addressing/server | 0 32 files changed, 44 deletions(-) delete mode 100644 core-tiger/src/test/java/org/springframework/ws/config/DummyMarshaller.java rename {core-tiger => core}/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html (100%) rename {core-tiger => core}/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/server/endpoint/mapping/OtherBean.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java (100%) rename {core-tiger => core}/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java (100%) rename {core-tiger => core}/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml (100%) rename core-tiger/src/test/resources/org/springframework/ws/server/endpoint/mapping/applicationContext.xml => core/src/test/resources/org/springframework/ws/server/endpoint/mapping (100%) rename core-tiger/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml => core/src/test/resources/org/springframework/ws/soap/addressing/server (100%) diff --git a/core-tiger/src/test/java/org/springframework/ws/config/DummyMarshaller.java b/core-tiger/src/test/java/org/springframework/ws/config/DummyMarshaller.java deleted file mode 100644 index 9cb6e69e..00000000 --- a/core-tiger/src/test/java/org/springframework/ws/config/DummyMarshaller.java +++ /dev/null @@ -1,44 +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.config; - -import java.io.IOException; -import javax.xml.transform.Result; -import javax.xml.transform.Source; - -import org.springframework.oxm.Marshaller; -import org.springframework.oxm.Unmarshaller; -import org.springframework.oxm.XmlMappingException; - -/** - * @author Arjen Poutsma - * @since 1.1.0 - */ -public class DummyMarshaller implements Marshaller, Unmarshaller { - - public void marshal(Object graph, Result result) throws XmlMappingException, IOException { - throw new UnsupportedOperationException(); - } - - public boolean supports(Class clazz) { - throw new UnsupportedOperationException(); - } - - public Object unmarshal(Source source) throws XmlMappingException, IOException { - throw new UnsupportedOperationException(); - } -} \ No newline at end of file diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java rename to core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java rename to core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java rename to core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java b/core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java rename to core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java b/core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java rename to core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html b/core/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html rename to core/src/main/java/org/springframework/ws/server/endpoint/annotation/package.html diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java rename to core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java diff --git a/core-tiger/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java rename to core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java rename to core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java b/core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java rename to core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Action.java diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java b/core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java rename to core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/Address.java diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html b/core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/package.html diff --git a/core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java similarity index 100% rename from core-tiger/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java rename to core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java diff --git a/core-tiger/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java b/core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java rename to core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java rename to core/src/test/java/org/springframework/ws/server/endpoint/mapping/Log.java diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java rename to core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/OtherBean.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/OtherBean.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/OtherBean.java rename to core/src/test/java/org/springframework/ws/server/endpoint/mapping/OtherBean.java diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java diff --git a/core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java rename to core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java diff --git a/core-tiger/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java rename to core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java diff --git a/core-tiger/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java rename to core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java diff --git a/core-tiger/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java similarity index 100% rename from core-tiger/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java rename to core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java diff --git a/core-tiger/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml b/core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml similarity index 100% rename from core-tiger/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml rename to core/src/test/resources/org/springframework/ws/config/webServicesNamespaceHandlerTest-tiger.xml diff --git a/core-tiger/src/test/resources/org/springframework/ws/server/endpoint/mapping/applicationContext.xml b/core/src/test/resources/org/springframework/ws/server/endpoint/mapping similarity index 100% rename from core-tiger/src/test/resources/org/springframework/ws/server/endpoint/mapping/applicationContext.xml rename to core/src/test/resources/org/springframework/ws/server/endpoint/mapping diff --git a/core-tiger/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/server similarity index 100% rename from core-tiger/src/test/resources/org/springframework/ws/soap/addressing/server/valid.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/server