diff --git a/xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java b/xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java index 2017ebdd..fb7e40d9 100644 --- a/xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java @@ -19,6 +19,8 @@ package org.springframework.xml.dom; import java.util.ArrayList; import java.util.List; +import org.springframework.util.Assert; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -29,8 +31,6 @@ import org.xml.sax.ContentHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; -import org.springframework.util.Assert; - /** * SAX ContentHandler that transforms callback calls to DOM Nodes. * diff --git a/xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java b/xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java index ad2c4e57..cbdb5bac 100644 --- a/xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java +++ b/xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * 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. @@ -20,6 +20,7 @@ import javax.xml.namespace.QName; import org.springframework.util.Assert; import org.springframework.util.StringUtils; + import org.w3c.dom.Node; /** diff --git a/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java b/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java index 2b4b33e6..7aa8ff5c 100644 --- a/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java +++ b/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java @@ -19,11 +19,11 @@ package org.springframework.xml.namespace; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.HashSet; import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; diff --git a/xml/src/main/java/org/springframework/xml/sax/SaxUtils.java b/xml/src/main/java/org/springframework/xml/sax/SaxUtils.java index 8b1e223f..4d9325c2 100644 --- a/xml/src/main/java/org/springframework/xml/sax/SaxUtils.java +++ b/xml/src/main/java/org/springframework/xml/sax/SaxUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * 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. @@ -20,10 +20,10 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.xml.sax.InputSource; - import org.springframework.core.io.Resource; +import org.xml.sax.InputSource; + /** * Convenient utility methods for dealing with SAX. * diff --git a/xml/src/main/java/org/springframework/xml/stream/AbstractStaxContentHandler.java b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxContentHandler.java index 243c1bec..4c849c4f 100644 --- a/xml/src/main/java/org/springframework/xml/stream/AbstractStaxContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxContentHandler.java @@ -21,6 +21,7 @@ import javax.xml.stream.XMLStreamException; import org.springframework.xml.namespace.QNameUtils; import org.springframework.xml.namespace.SimpleNamespaceContext; + import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; diff --git a/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java index e1ec7d83..e62fb71c 100644 --- a/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java @@ -19,6 +19,8 @@ package org.springframework.xml.stream; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; +import org.springframework.xml.sax.AbstractXmlReader; + import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.Locator; @@ -27,8 +29,6 @@ import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; import org.xml.sax.SAXParseException; -import org.springframework.xml.sax.AbstractXmlReader; - /** * Abstract base class for SAX XMLReader implementations that use StAX as a basis. * diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java b/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java index 8bf9197c..268780f8 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java @@ -32,6 +32,7 @@ import javax.xml.stream.util.XMLEventConsumer; import org.springframework.util.StringUtils; import org.springframework.xml.namespace.QNameUtils; import org.springframework.xml.namespace.SimpleNamespaceContext; + import org.xml.sax.Attributes; import org.xml.sax.Locator; diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java index 8bae306f..1abc18d6 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java @@ -34,13 +34,13 @@ import javax.xml.stream.events.ProcessingInstruction; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import org.springframework.util.StringUtils; +import org.springframework.xml.namespace.QNameUtils; + import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import org.springframework.util.StringUtils; -import org.springframework.xml.namespace.QNameUtils; - /** * SAX XMLReader that reads from a StAX XMLEventReader. Consumes XMLEvents from * an XMLEventReader, and calls the corresponding methods on the SAX callback interfaces. diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java b/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java index 5deff9fa..039129c7 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java @@ -24,6 +24,7 @@ import javax.xml.stream.XMLStreamWriter; import org.springframework.util.StringUtils; import org.springframework.xml.namespace.QNameUtils; import org.springframework.xml.namespace.SimpleNamespaceContext; + import org.xml.sax.Attributes; import org.xml.sax.Locator; diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java index 2c89f37e..76bee5fc 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java @@ -21,14 +21,14 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; - import org.springframework.util.StringUtils; import org.springframework.xml.namespace.QNameUtils; import org.springframework.xml.namespace.SimpleNamespaceContext; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; + /** * SAX XMLReader that reads from a StAX XMLStreamReader. Reads from an * XMLStreamReader, and calls the corresponding methods on the SAX callback interfaces. diff --git a/xml/src/main/java/org/springframework/xml/transform/ResourceSource.java b/xml/src/main/java/org/springframework/xml/transform/ResourceSource.java index 87380a4c..2630937e 100644 --- a/xml/src/main/java/org/springframework/xml/transform/ResourceSource.java +++ b/xml/src/main/java/org/springframework/xml/transform/ResourceSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * 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. @@ -21,6 +21,7 @@ import javax.xml.transform.sax.SAXSource; import org.springframework.core.io.Resource; import org.springframework.xml.sax.SaxUtils; + import org.xml.sax.XMLReader; /** diff --git a/xml/src/main/java/org/springframework/xml/transform/StaxResult.java b/xml/src/main/java/org/springframework/xml/transform/StaxResult.java index d471ff81..f0ca9541 100644 --- a/xml/src/main/java/org/springframework/xml/transform/StaxResult.java +++ b/xml/src/main/java/org/springframework/xml/transform/StaxResult.java @@ -21,11 +21,11 @@ import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.sax.SAXResult; -import org.xml.sax.ContentHandler; - import org.springframework.xml.stream.StaxEventContentHandler; import org.springframework.xml.stream.StaxStreamContentHandler; +import org.xml.sax.ContentHandler; + /** * Implementation of the Result tagging interface for StAX writers. Can be constructed with a * XMLEventConsumer or a XMLStreamWriter. diff --git a/xml/src/main/java/org/springframework/xml/transform/StaxSource.java b/xml/src/main/java/org/springframework/xml/transform/StaxSource.java index a96aefcb..abfd5d22 100644 --- a/xml/src/main/java/org/springframework/xml/transform/StaxSource.java +++ b/xml/src/main/java/org/springframework/xml/transform/StaxSource.java @@ -20,12 +20,12 @@ import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.sax.SAXSource; -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; - import org.springframework.xml.stream.StaxEventXmlReader; import org.springframework.xml.stream.StaxStreamXmlReader; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; + /** * Implementation of the Source tagging interface for StAX readers. Can be constructed with a * XMLEventReader or a XMLStreamReader. diff --git a/xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java b/xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java index acf0b1a0..e2b2e9db 100644 --- a/xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java +++ b/xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java @@ -24,11 +24,11 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; +import org.springframework.util.Assert; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.util.Assert; - /** * Convenient base class for objects that use a Transformer. Subclasses can call {@link * #createTransformer()} or {@link #transform(Source, Result)}. This should be done per thread (i.e. per incoming diff --git a/xml/src/main/java/org/springframework/xml/transform/TraxUtils.java b/xml/src/main/java/org/springframework/xml/transform/TraxUtils.java index 54e3185f..c8350a22 100644 --- a/xml/src/main/java/org/springframework/xml/transform/TraxUtils.java +++ b/xml/src/main/java/org/springframework/xml/transform/TraxUtils.java @@ -37,6 +37,9 @@ import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import org.springframework.util.Assert; +import org.springframework.xml.JaxpVersion; + import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.ContentHandler; @@ -45,9 +48,6 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.ext.LexicalHandler; -import org.springframework.util.Assert; -import org.springframework.xml.JaxpVersion; - /** * Convenient utility methods for dealing with TrAX. * diff --git a/xml/src/main/java/org/springframework/xml/validation/Jaxp10ValidatorFactory.java b/xml/src/main/java/org/springframework/xml/validation/Jaxp10ValidatorFactory.java index b8f53f9b..316c3001 100644 --- a/xml/src/main/java/org/springframework/xml/validation/Jaxp10ValidatorFactory.java +++ b/xml/src/main/java/org/springframework/xml/validation/Jaxp10ValidatorFactory.java @@ -35,6 +35,7 @@ import javax.xml.transform.stream.StreamSource; import org.springframework.core.io.Resource; import org.springframework.xml.sax.SaxUtils; + import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java b/xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java index a3364c32..88682e77 100644 --- a/xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java +++ b/xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java @@ -23,6 +23,7 @@ import javax.xml.transform.Source; import javax.xml.validation.Schema; import org.springframework.core.io.Resource; + import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java b/xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java index 109a02af..cfb68f7c 100644 --- a/xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java +++ b/xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * 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. @@ -24,6 +24,7 @@ import javax.xml.validation.SchemaFactory; import org.springframework.core.io.Resource; import org.springframework.util.Assert; import org.springframework.xml.transform.ResourceSource; + import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; diff --git a/xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java b/xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java index 0c7ac662..f7a20cf5 100644 --- a/xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java +++ b/xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java @@ -19,12 +19,13 @@ package org.springframework.xml.validation; import java.io.IOException; import javax.xml.validation.Validator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.core.io.Resource; import org.springframework.util.Assert; import org.springframework.xml.JaxpVersion; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Factory for {@link XmlValidator} objects, being aware of JAXP 1.3 {@link Validator}s, and JAXP 1.0 parsing * capababilities. Mainly for internal use within the framework. diff --git a/xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java b/xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java index 6ab480ff..1e464bb5 100644 --- a/xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java +++ b/xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java @@ -17,12 +17,12 @@ package org.springframework.xml.xpath; import java.util.Map; -import java.util.Properties; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.dom.DOMResult; import org.springframework.xml.transform.TransformerObjectSupport; + import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java b/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java index f7571641..48e623aa 100644 --- a/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java +++ b/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java @@ -26,6 +26,7 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import org.springframework.xml.namespace.SimpleNamespaceContext; + import org.w3c.dom.DOMException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java b/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java index 0f46cde4..344e5522 100644 --- a/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java +++ b/xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java @@ -29,15 +29,15 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactoryConfigurationException; +import org.springframework.xml.namespace.SimpleNamespaceContext; +import org.springframework.xml.transform.TraxUtils; + import org.w3c.dom.DOMException; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import org.springframework.xml.namespace.SimpleNamespaceContext; -import org.springframework.xml.transform.TraxUtils; - /** * Implementation of {@link XPathOperations} that uses JAXP 1.3. JAXP 1.3 is part of Java SE since 1.5. *

diff --git a/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java b/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java index 91415203..d97d5631 100644 --- a/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java +++ b/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java @@ -19,13 +19,13 @@ package org.springframework.xml.xpath; import java.util.Collections; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.xml.JaxpVersion; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Factory for compiled XPathExpressions, being aware of JAXP 1.3+ XPath functionality, and Jaxen. Mainly * for internal use of the framework. diff --git a/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java b/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java index 8746e653..885670fd 100644 --- a/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java +++ b/xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java @@ -16,16 +16,12 @@ package org.springframework.xml.xpath; -import java.util.Enumeration; -import java.util.LinkedHashMap; import java.util.Map; -import java.util.Properties; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import org.springframework.util.ObjectUtils; /** * Spring {@link FactoryBean} for {@link XPathExpression} object. Facilitates injection of XPath expressions into diff --git a/xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java b/xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java index ed124448..09c69889 100644 --- a/xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java +++ b/xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java @@ -24,10 +24,6 @@ import javax.xml.parsers.ParserConfigurationException; 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.SAXException; - import org.springframework.beans.factory.InitializingBean; import org.springframework.core.io.Resource; import org.springframework.util.Assert; @@ -36,6 +32,10 @@ import org.springframework.xml.sax.SaxUtils; import org.springframework.xml.validation.XmlValidator; import org.springframework.xml.validation.XmlValidatorFactory; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.xml.sax.SAXException; + /** * The default {@link XsdSchema} implementation. *

diff --git a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java b/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java index 44e68a65..0e1851a2 100644 --- a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java +++ b/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java @@ -27,11 +27,6 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; -import org.apache.ws.commons.schema.XmlSchema; -import org.apache.ws.commons.schema.XmlSchemaCollection; -import org.apache.ws.commons.schema.XmlSchemaSerializer; -import org.w3c.dom.Document; - import org.springframework.beans.BeanInstantiationException; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; @@ -41,6 +36,11 @@ import org.springframework.xml.validation.XmlValidator; import org.springframework.xml.validation.XmlValidatorFactory; import org.springframework.xml.xsd.XsdSchema; +import org.apache.ws.commons.schema.XmlSchema; +import org.apache.ws.commons.schema.XmlSchemaCollection; +import org.apache.ws.commons.schema.XmlSchemaSerializer; +import org.w3c.dom.Document; + /** * Implementation of the {@link XsdSchema} interface that uses Apache WS-Commons XML Schema. * diff --git a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java b/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java index 7bcb7db2..9932fc7e 100644 --- a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java +++ b/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java @@ -22,6 +22,19 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.context.ResourceLoaderAware; +import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; +import org.springframework.core.io.UrlResource; +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; +import org.springframework.xml.sax.SaxUtils; +import org.springframework.xml.validation.XmlValidator; +import org.springframework.xml.validation.XmlValidatorFactory; +import org.springframework.xml.xsd.XsdSchema; +import org.springframework.xml.xsd.XsdSchemaCollection; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ws.commons.schema.ValidationEventHandler; @@ -36,19 +49,6 @@ import org.apache.ws.commons.schema.resolver.DefaultURIResolver; import org.apache.ws.commons.schema.resolver.URIResolver; import org.xml.sax.InputSource; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.ResourceLoaderAware; -import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; -import org.springframework.core.io.UrlResource; -import org.springframework.util.Assert; -import org.springframework.util.StringUtils; -import org.springframework.xml.sax.SaxUtils; -import org.springframework.xml.validation.XmlValidator; -import org.springframework.xml.validation.XmlValidatorFactory; -import org.springframework.xml.xsd.XsdSchema; -import org.springframework.xml.xsd.XsdSchemaCollection; - /** * Implementation of the {@link XsdSchemaCollection} that uses Apache WS-Commons XML Schema. *

diff --git a/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java b/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java index 07e18f2f..c925b3cd 100644 --- a/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java +++ b/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java @@ -20,8 +20,6 @@ import java.io.StringReader; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; import org.junit.Before; import org.junit.Test; import org.w3c.dom.Document; diff --git a/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java b/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java index 60cbd452..2e8cb9e3 100644 --- a/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java +++ b/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java @@ -18,7 +18,6 @@ package org.springframework.xml.namespace; import javax.xml.namespace.QName; -import junit.framework.TestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java b/xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java index 784da4c2..dade17fa 100644 --- a/xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java +++ b/xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java @@ -20,10 +20,10 @@ import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import junit.framework.TestCase; +import org.springframework.util.StringUtils; + import org.junit.Assert; import org.junit.Test; -import org.springframework.util.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java b/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java index ca85abe8..0981b28d 100644 --- a/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java +++ b/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java @@ -18,10 +18,8 @@ package org.springframework.xml.namespace; import java.util.Collections; import java.util.Iterator; - import javax.xml.XMLConstants; -import junit.framework.TestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java b/xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java index b5a39903..96285163 100644 --- a/xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java +++ b/xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java @@ -16,12 +16,11 @@ package org.springframework.xml.sax; -import junit.framework.TestCase; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.Resource; import org.junit.Assert; import org.junit.Test; -import org.springframework.core.io.FileSystemResource; -import org.springframework.core.io.Resource; public class SaxUtilsTest { diff --git a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java index 02152d9c..58799272 100644 --- a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java +++ b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java @@ -21,8 +21,6 @@ import java.io.StringWriter; import java.io.Writer; import javax.xml.stream.XMLStreamException; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; import org.junit.Before; import org.junit.Test; import org.xml.sax.InputSource; diff --git a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java index d3860330..d16b92f1 100644 --- a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java +++ b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java @@ -22,7 +22,10 @@ import java.util.Arrays; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; -import junit.framework.TestCase; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.xml.sax.SaxUtils; + import org.easymock.AbstractMatcher; import org.easymock.MockControl; import org.junit.Before; @@ -37,10 +40,6 @@ import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLReaderFactory; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.xml.sax.SaxUtils; - @SuppressWarnings("Since15") public abstract class AbstractStaxXmlReaderTestCase { diff --git a/xml/src/test/java/org/springframework/xml/stream/XmlEventStreamReaderTest.java b/xml/src/test/java/org/springframework/xml/stream/XmlEventStreamReaderTest.java index 6d0b04fd..18d4d737 100644 --- a/xml/src/test/java/org/springframework/xml/stream/XmlEventStreamReaderTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/XmlEventStreamReaderTest.java @@ -22,11 +22,11 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; import org.springframework.xml.transform.StaxSource; import org.springframework.xml.transform.StringResult; +import junit.framework.TestCase; + import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; @SuppressWarnings("Since15") diff --git a/xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java b/xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java index 57ced5d8..086a474f 100644 --- a/xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java +++ b/xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java @@ -20,11 +20,10 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; +import org.springframework.core.io.ClassPathResource; + import org.junit.Assert; import org.junit.Test; -import org.springframework.core.io.ClassPathResource; import org.w3c.dom.Element; public class ResourceSourceTest { diff --git a/xml/src/test/java/org/springframework/xml/transform/StaxResultTest.java b/xml/src/test/java/org/springframework/xml/transform/StaxResultTest.java index 5b8cacf6..aa0621d2 100644 --- a/xml/src/test/java/org/springframework/xml/transform/StaxResultTest.java +++ b/xml/src/test/java/org/springframework/xml/transform/StaxResultTest.java @@ -24,8 +24,6 @@ import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/xml/src/test/java/org/springframework/xml/transform/StaxSourceTest.java b/xml/src/test/java/org/springframework/xml/transform/StaxSourceTest.java index 455114d2..fe101215 100644 --- a/xml/src/test/java/org/springframework/xml/transform/StaxSourceTest.java +++ b/xml/src/test/java/org/springframework/xml/transform/StaxSourceTest.java @@ -24,8 +24,6 @@ import javax.xml.transform.Result; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/xml/src/test/java/org/springframework/xml/transform/StringResultTest.java b/xml/src/test/java/org/springframework/xml/transform/StringResultTest.java index 054adeaa..f76b0217 100644 --- a/xml/src/test/java/org/springframework/xml/transform/StringResultTest.java +++ b/xml/src/test/java/org/springframework/xml/transform/StringResultTest.java @@ -21,8 +21,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java b/xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java index 778acccd..6f0648f8 100644 --- a/xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java +++ b/xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java @@ -21,7 +21,6 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; -import junit.framework.TestCase; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Element; diff --git a/xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java b/xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java index e5e0a652..ecc8a550 100644 --- a/xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java +++ b/xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java @@ -45,8 +45,6 @@ import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; import org.easymock.MockControl; import org.junit.Assert; import org.junit.Test; diff --git a/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java b/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java index d0fc84d4..94b08eb7 100644 --- a/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java +++ b/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java @@ -23,14 +23,14 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; -import junit.framework.TestCase; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.xml.transform.ResourceSource; + import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.xml.transform.ResourceSource; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; diff --git a/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java b/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java index 1d04903d..a964cab3 100644 --- a/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java +++ b/xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java @@ -19,12 +19,12 @@ package org.springframework.xml.validation; import javax.xml.XMLConstants; import javax.xml.validation.Schema; -import junit.framework.TestCase; -import org.junit.Assert; -import org.junit.Test; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; +import org.junit.Assert; +import org.junit.Test; + public class SchemaLoaderUtilsTest { @Test diff --git a/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java b/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java index 99064b1a..e6c2088a 100644 --- a/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java +++ b/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java @@ -22,13 +22,12 @@ import java.io.InputStream; import java.net.URI; import java.net.URL; -import junit.framework.TestCase; +import org.springframework.core.io.AbstractResource; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; import org.junit.Assert; import org.junit.Test; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.core.io.AbstractResource; public class XmlValidatorFactoryTest { diff --git a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java b/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java index b32232f4..e1de09ae 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java +++ b/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java @@ -24,11 +24,11 @@ import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import junit.framework.TestCase; +import org.springframework.util.StringUtils; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.springframework.util.StringUtils; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java b/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java index 687cfc5e..a2ddf8cb 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java +++ b/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java @@ -26,13 +26,13 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; -import junit.framework.TestCase; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.springframework.core.io.ClassPathResource; import org.springframework.xml.sax.SaxUtils; import org.springframework.xml.transform.ResourceSource; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java b/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java index eaa2a43d..44caa043 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java +++ b/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java @@ -16,7 +16,6 @@ package org.springframework.xml.xpath; -import junit.framework.TestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java b/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java index ef56d1b8..eb6333de 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java +++ b/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java @@ -16,7 +16,6 @@ package org.springframework.xml.xpath; -import junit.framework.TestCase; import org.junit.Assert; import org.junit.Test; diff --git a/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java b/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java index 54205930..251b8137 100644 --- a/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java +++ b/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java @@ -22,19 +22,17 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; -import junit.framework.TestCase; -import org.custommonkey.xmlunit.XMLTestCase; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.xml.sax.SaxUtils; +import org.springframework.xml.validation.XmlValidator; + import org.custommonkey.xmlunit.XMLUnit; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.w3c.dom.Document; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.xml.sax.SaxUtils; -import org.springframework.xml.validation.XmlValidator; - import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; public abstract class AbstractXsdSchemaTestCase { diff --git a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java b/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java index d099f714..028300fb 100644 --- a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java +++ b/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java @@ -22,12 +22,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; -import org.custommonkey.xmlunit.XMLUnit; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.w3c.dom.Document; - import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.xml.sax.SaxUtils; @@ -35,6 +29,12 @@ import org.springframework.xml.validation.XmlValidator; import org.springframework.xml.xsd.AbstractXsdSchemaTestCase; import org.springframework.xml.xsd.XsdSchema; +import org.custommonkey.xmlunit.XMLUnit; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.w3c.dom.Document; + import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; public class CommonsXsdSchemaCollectionTest { diff --git a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java b/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java index 575f38a6..af87f9f5 100644 --- a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java +++ b/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java @@ -18,18 +18,18 @@ package org.springframework.xml.xsd.commons; import javax.xml.transform.dom.DOMSource; -import org.apache.ws.commons.schema.XmlSchema; -import org.apache.ws.commons.schema.XmlSchemaCollection; -import org.junit.Test; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.xml.sax.SaxUtils; import org.springframework.xml.xsd.AbstractXsdSchemaTestCase; import org.springframework.xml.xsd.XsdSchema; +import org.apache.ws.commons.schema.XmlSchema; +import org.apache.ws.commons.schema.XmlSchemaCollection; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull;