From f73e2288a26ac9e007bc892cee35c05436fe8450 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Mon, 1 Feb 2010 10:19:29 +0000 Subject: [PATCH] Moved oxm-tiger code to oxm --- .../oxm/jaxb/JaxbUtilsTest.java | 30 ---------------- .../springframework/oxm/xstream/Flight.java | 34 ------------------ .../oxm/GenericMarshaller.java | 0 .../oxm/GenericUnmarshaller.java | 0 .../oxm/jaxb/Jaxb2Marshaller.java | 0 .../xstream/AnnotationXStreamMarshaller.java | 0 .../config/Jaxb2OxmNamespaceHandlerTest.java | 0 .../oxm/jaxb/BinaryObject.java | 0 .../oxm/jaxb/Jaxb2MarshallerTest.java | 0 .../oxm/jaxb/Jaxb2UnmarshallerTest.java | 0 .../AnnotationXStreamMarshallerTest.java | 0 .../config/jaxb2OxmNamespaceHandlerTest.xml | 0 .../resources/org/springframework/oxm/jaxb | Bin 13 files changed, 64 deletions(-) delete mode 100644 oxm-tiger/src/test/java/org/springframework/oxm/jaxb/JaxbUtilsTest.java delete mode 100644 oxm-tiger/src/test/java/org/springframework/oxm/xstream/Flight.java rename {oxm-tiger => oxm}/src/main/java/org/springframework/oxm/GenericMarshaller.java (100%) rename {oxm-tiger => oxm}/src/main/java/org/springframework/oxm/GenericUnmarshaller.java (100%) rename {oxm-tiger => oxm}/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java (100%) rename {oxm-tiger => oxm}/src/main/java/org/springframework/oxm/xstream/AnnotationXStreamMarshaller.java (100%) rename {oxm-tiger => oxm}/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java (100%) rename {oxm-tiger => oxm}/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java (100%) rename {oxm-tiger => oxm}/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java (100%) rename {oxm-tiger => oxm}/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java (100%) rename {oxm-tiger => oxm}/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java (100%) rename {oxm-tiger => oxm}/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml (100%) rename oxm-tiger/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png => oxm/src/test/resources/org/springframework/oxm/jaxb (100%) diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/JaxbUtilsTest.java b/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/JaxbUtilsTest.java deleted file mode 100644 index 393770fb..00000000 --- a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/JaxbUtilsTest.java +++ /dev/null @@ -1,30 +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.oxm.jaxb; - -import javax.xml.bind.JAXBException; -import javax.xml.bind.MarshalException; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.ValidationException; - -import junit.framework.TestCase; - -public class JaxbUtilsTest extends TestCase { - - public void testGetJaxbVersion() throws Exception { - assertEquals("Invalid JAXB version", JaxbUtils.JAXB_2, JaxbUtils.getJaxbVersion()); - } -} diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/xstream/Flight.java b/oxm-tiger/src/test/java/org/springframework/oxm/xstream/Flight.java deleted file mode 100644 index 8152f1e2..00000000 --- a/oxm-tiger/src/test/java/org/springframework/oxm/xstream/Flight.java +++ /dev/null @@ -1,34 +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.oxm.xstream; - -import com.thoughtworks.xstream.annotations.XStreamAlias; - -@XStreamAlias("flight") -public class Flight { - - @XStreamAlias("number") - private long flightNumber; - - public long getFlightNumber() { - return flightNumber; - } - - public void setFlightNumber(long number) { - this.flightNumber = number; - } -} \ No newline at end of file diff --git a/oxm-tiger/src/main/java/org/springframework/oxm/GenericMarshaller.java b/oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java similarity index 100% rename from oxm-tiger/src/main/java/org/springframework/oxm/GenericMarshaller.java rename to oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java diff --git a/oxm-tiger/src/main/java/org/springframework/oxm/GenericUnmarshaller.java b/oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java similarity index 100% rename from oxm-tiger/src/main/java/org/springframework/oxm/GenericUnmarshaller.java rename to oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java diff --git a/oxm-tiger/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java similarity index 100% rename from oxm-tiger/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java rename to oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java diff --git a/oxm-tiger/src/main/java/org/springframework/oxm/xstream/AnnotationXStreamMarshaller.java b/oxm/src/main/java/org/springframework/oxm/xstream/AnnotationXStreamMarshaller.java similarity index 100% rename from oxm-tiger/src/main/java/org/springframework/oxm/xstream/AnnotationXStreamMarshaller.java rename to oxm/src/main/java/org/springframework/oxm/xstream/AnnotationXStreamMarshaller.java diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java b/oxm/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java similarity index 100% rename from oxm-tiger/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java rename to oxm/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java b/oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java similarity index 100% rename from oxm-tiger/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java rename to oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java similarity index 100% rename from oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java rename to oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java similarity index 100% rename from oxm-tiger/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java rename to oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java diff --git a/oxm-tiger/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java similarity index 100% rename from oxm-tiger/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java rename to oxm/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java diff --git a/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml b/oxm/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml similarity index 100% rename from oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml rename to oxm/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml diff --git a/oxm-tiger/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png b/oxm/src/test/resources/org/springframework/oxm/jaxb similarity index 100% rename from oxm-tiger/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png rename to oxm/src/test/resources/org/springframework/oxm/jaxb