You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by aj...@apache.org on 2007/03/30 04:00:20 UTC
svn commit: r523906 - in /webservices/commons/trunk/modules/XmlSchema/src:
main/java/org/apache/ws/commons/schema/
main/java/org/apache/ws/commons/schema/extensions/
main/java/org/apache/ws/commons/schema/resolver/
main/java/org/apache/ws/commons/schem...
Author: ajith
Date: Thu Mar 29 19:00:17 2007
New Revision: 523906
URL: http://svn.apache.org/viewvc?view=rev&rev=523906
Log:
1.Fixed the unused imports - No code changes!
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSeverityType.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XDOMUtil.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementRefs.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeDeserializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtensionRegistry.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementDeserializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestRoundTripXSD.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java Thu Mar 29 19:00:17 2007
@@ -17,27 +17,20 @@
package org.apache.ws.commons.schema;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.Stack;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.apache.ws.commons.schema.XmlSchemaCollection.SchemaKey;
import org.apache.ws.commons.schema.constants.Constants;
+import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
import org.apache.ws.commons.schema.utils.NodeNamespaceContext;
import org.apache.ws.commons.schema.utils.TargetNamespaceValidator;
import org.apache.ws.commons.schema.utils.XDOMUtil;
-import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import org.w3c.dom.*;
import org.xml.sax.InputSource;
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.StringTokenizer;
+import java.util.Vector;
public class SchemaBuilder {
Document doc;
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java Thu Mar 29 19:00:17 2007
@@ -16,18 +16,13 @@
package org.apache.ws.commons.schema;
-import org.w3c.dom.Document;
import org.apache.ws.commons.schema.constants.Constants;
import org.apache.ws.commons.schema.utils.NamespaceContextOwner;
import org.apache.ws.commons.schema.utils.NamespacePrefixList;
+import org.w3c.dom.Document;
import javax.xml.namespace.QName;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.*;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.io.IOException;
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java Thu Mar 29 19:00:17 2007
@@ -16,37 +16,30 @@
package org.apache.ws.commons.schema;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.dom.DOMSource;
-
import org.apache.ws.commons.schema.constants.Constants;
+import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.apache.ws.commons.schema.resolver.URIResolver;
-import org.apache.ws.commons.schema.utils.TargetNamespaceValidator;
import org.apache.ws.commons.schema.utils.NamespacePrefixList;
-import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
+import org.apache.ws.commons.schema.utils.TargetNamespaceValidator;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.*;
+
/**
* Contains a cache of XML Schema definition language (XSD).
*
@@ -255,7 +248,7 @@
// extension registry class. if so we'll instantiate a new one
// and set it as the extension registry
//if there is an error, we'll just print out a message and move on.
-
+
if (System.getProperty(Constants.SystemConstants.EXTENSION_REGISTRY_KEY)!= null){
try {
Class clazz = Class.forName(System.getProperty(Constants.SystemConstants.EXTENSION_REGISTRY_KEY));
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java Thu Mar 29 19:00:17 2007
@@ -16,8 +16,8 @@
package org.apache.ws.commons.schema;
-import org.apache.ws.commons.schema.constants.Enum;
import org.apache.ws.commons.schema.constants.Constants;
+import org.apache.ws.commons.schema.constants.Enum;
/**
* Enumerations for the content model of the complex type. This
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java Thu Mar 29 19:00:17 2007
@@ -19,19 +19,6 @@
import org.w3c.dom.Element;
-import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
-import org.apache.ws.commons.schema.XmlSchemaFractionDigitsFacet;
-import org.apache.ws.commons.schema.XmlSchemaLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxExclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxInclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinExclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinInclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaPatternFacet;
-import org.apache.ws.commons.schema.XmlSchemaTotalDigitsFacet;
-import org.apache.ws.commons.schema.XmlSchemaWhiteSpaceFacet;
-
/**
* Abstract class for all facets that are used when simple types are
* derived by restriction.
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java Thu Mar 29 19:00:17 2007
@@ -16,8 +16,8 @@
package org.apache.ws.commons.schema;
-import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.Map;
public abstract class XmlSchemaObject {
int lineNumber;
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java Thu Mar 29 19:00:17 2007
@@ -17,25 +17,15 @@
package org.apache.ws.commons.schema;
import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.ws.commons.schema.utils.NamespacePrefixList;
import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
+import org.apache.ws.commons.schema.utils.NamespacePrefixList;
+import org.w3c.dom.*;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
public class XmlSchemaSerializer {
/**
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSeverityType.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSeverityType.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSeverityType.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSeverityType.java Thu Mar 29 19:00:17 2007
@@ -16,8 +16,8 @@
package org.apache.ws.commons.schema;
-import org.apache.ws.commons.schema.constants.Enum;
import org.apache.ws.commons.schema.constants.Constants;
+import org.apache.ws.commons.schema.constants.Enum;
/**
* Represents the severity of the validation event.
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java Thu Mar 29 19:00:17 2007
@@ -5,8 +5,8 @@
import org.w3c.dom.Node;
import javax.xml.namespace.QName;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* Default deserializer. The action taken when there is nothing specific
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java Thu Mar 29 19:00:17 2007
@@ -2,11 +2,11 @@
import org.apache.ws.commons.schema.XmlSchemaObject;
import org.apache.ws.commons.schema.constants.Constants;
-import org.w3c.dom.Node;
import org.w3c.dom.Document;
+import org.w3c.dom.Node;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
/**
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java Thu Mar 29 19:00:17 2007
@@ -3,12 +3,12 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.net.MalformedURLException;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java Thu Mar 29 19:00:17 2007
@@ -16,11 +16,7 @@
package org.apache.ws.commons.schema.utils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
+import org.w3c.dom.*;
/**
* Some useful utility methods.
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java Thu Mar 29 19:00:17 2007
@@ -1,10 +1,6 @@
package org.apache.ws.commons.schema.utils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
public class NamespaceMap extends HashMap implements NamespacePrefixList {
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java Thu Mar 29 19:00:17 2007
@@ -16,18 +16,11 @@
package org.apache.ws.commons.schema.utils;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import org.apache.ws.commons.schema.constants.Constants;
+import org.w3c.dom.Node;
import javax.xml.namespace.NamespaceContext;
-
-import org.w3c.dom.Node;
-import org.apache.ws.commons.schema.constants.Constants;
+import java.util.*;
/**
* Implementation of {@link NamespaceContext}, which is based on a DOM node.
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java Thu Mar 29 19:00:17 2007
@@ -16,9 +16,9 @@
package org.apache.ws.commons.schema.utils;
+import org.apache.ws.commons.schema.constants.Constants;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.apache.ws.commons.schema.constants.Constants;
/**
* Searches for namespace prefix declarations.
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XDOMUtil.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XDOMUtil.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XDOMUtil.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XDOMUtil.java Thu Mar 29 19:00:17 2007
@@ -18,7 +18,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.ws.commons.schema.utils.DOMUtil;
public class XDOMUtil extends DOMUtil {
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java Thu Mar 29 19:00:17 2007
@@ -1,15 +1,13 @@
package tests;
import junit.framework.TestCase;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaType;
+import org.w3c.dom.Document;
+import javax.xml.parsers.DocumentBuilderFactory;
import java.util.Iterator;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java Thu Mar 29 19:00:17 2007
@@ -17,31 +17,17 @@
*/
package tests;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.stream.StreamSource;
-
import junit.framework.TestCase;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.NodeList;
+import org.apache.ws.commons.schema.*;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaAnnotation;
-import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaAppInfo;
-import org.apache.ws.commons.schema.XmlSchemaDocumentation;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
public class AnnotationTest extends TestCase {
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java Thu Mar 29 19:00:17 2007
@@ -1,19 +1,11 @@
package tests;
import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
+import org.w3c.dom.Document;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.namespace.QName;
-
-import org.w3c.dom.Document;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaParticle;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;
+import javax.xml.parsers.DocumentBuilderFactory;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java Thu Mar 29 19:00:17 2007
@@ -1,33 +1,14 @@
package tests;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaContentModel;
-import org.apache.ws.commons.schema.XmlSchemaComplexContent;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaUnique;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaXPath;
-import org.apache.ws.commons.schema.XmlSchemaParticle;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaAll;
-import org.apache.ws.commons.schema.XmlSchemaAny;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaContentProcessing;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java Thu Mar 29 19:00:17 2007
@@ -1,27 +1,13 @@
package tests;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaObjectTable;
-import org.apache.ws.commons.schema.XmlSchemaAttributeGroupRef;
-import org.apache.ws.commons.schema.XmlSchemaAttributeGroup;
-import org.apache.ws.commons.schema.XmlSchemaAttribute;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Iterator;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java Thu Mar 29 19:00:17 2007
@@ -1,16 +1,14 @@
package tests;
import junit.framework.TestCase;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaElement;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-import java.io.InputStream;
import java.io.FileInputStream;
-
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
+import java.io.InputStream;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java Thu Mar 29 19:00:17 2007
@@ -1,24 +1,15 @@
package tests;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
import java.io.FileInputStream;
import java.io.InputStream;
-
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.HashSet;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaChoice;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java Thu Mar 29 19:00:17 2007
@@ -1,13 +1,12 @@
package tests;
-import java.io.File;
-import java.io.FileInputStream;
-
import junit.framework.TestCase;
-
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.xml.sax.InputSource;
+
+import java.io.File;
+import java.io.FileInputStream;
public class CircularSchemaTest extends TestCase
{
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java Thu Mar 29 19:00:17 2007
@@ -1,26 +1,14 @@
package tests;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaContentModel;
-import org.apache.ws.commons.schema.XmlSchemaContent;
-import org.apache.ws.commons.schema.XmlSchemaComplexContentRestriction;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java Thu Mar 29 19:00:17 2007
@@ -1,26 +1,14 @@
package tests;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaKey;
-import org.apache.ws.commons.schema.XmlSchemaKeyref;
-import org.apache.ws.commons.schema.XmlSchemaUnique;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaXPath;
-import org.apache.ws.commons.schema.XmlSchemaUnique;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java Thu Mar 29 19:00:17 2007
@@ -1,20 +1,12 @@
package tests;
import junit.framework.TestCase;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Document;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaParticle;
-import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.constants.Constants;
+import org.w3c.dom.Document;
+import javax.xml.parsers.DocumentBuilderFactory;
import java.util.Map;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java Thu Mar 29 19:00:17 2007
@@ -17,38 +17,16 @@
*/
package tests;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
import java.io.FileInputStream;
import java.io.InputStream;
-
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.HashSet;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaPatternFacet;
-import org.apache.ws.commons.schema.XmlSchemaLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaTotalDigitsFacet;
-import org.apache.ws.commons.schema.XmlSchemaFractionDigitsFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxInclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinInclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxExclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinExclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaWhiteSpaceFacet;
-import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
-
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
-
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
public class FacetsTest extends TestCase {
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java Thu Mar 29 19:00:17 2007
@@ -1,29 +1,15 @@
package tests;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
import java.io.FileInputStream;
import java.io.InputStream;
-
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.HashSet;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaGroupRef;
-import org.apache.ws.commons.schema.XmlSchemaGroup;
-import org.apache.ws.commons.schema.XmlSchemaChoice;
-import org.apache.ws.commons.schema.XmlSchemaGroupBase;
-import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaObjectTable;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java Thu Mar 29 19:00:17 2007
@@ -1,22 +1,15 @@
package tests;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
+import org.xml.sax.InputSource;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.xml.sax.InputSource;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java Thu Mar 29 19:00:17 2007
@@ -1,27 +1,12 @@
package tests;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeList;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeContent;
-import org.apache.ws.commons.schema.XmlSchemaElement;
+import java.io.FileInputStream;
+import java.io.InputStream;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java Thu Mar 29 19:00:17 2007
@@ -1,16 +1,15 @@
package tests;
import junit.framework.TestCase;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaType;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-import java.io.InputStream;
import java.io.FileInputStream;
-
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
+import java.io.InputStream;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java Thu Mar 29 19:00:17 2007
@@ -1,31 +1,17 @@
package tests;
-import org.w3c.dom.NodeList;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
import java.io.FileInputStream;
import java.io.InputStream;
-
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.HashSet;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaObjectTable;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
-import org.apache.ws.commons.schema.XmlSchemaNotation;
-import org.apache.ws.commons.schema.XmlSchemaDocumentation;
-import org.apache.ws.commons.schema.XmlSchemaAnnotation;
-import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java Thu Mar 29 19:00:17 2007
@@ -1,38 +1,15 @@
package tests;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
import java.io.FileInputStream;
import java.io.InputStream;
-
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.HashSet;
-
-import javax.xml.namespace.QName;
-
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaObjectTable;
-import org.apache.ws.commons.schema.XmlSchemaRedefine;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaParticle;
-import org.apache.ws.commons.schema.XmlSchemaContentModel;
-import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
-import org.apache.ws.commons.schema.XmlSchemaMinInclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxInclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaGroup;
-import org.apache.ws.commons.schema.XmlSchemaGroupRef;
-import org.apache.ws.commons.schema.XmlSchemaAttributeGroup;
-import org.apache.ws.commons.schema.XmlSchemaAttribute;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java Thu Mar 29 19:00:17 2007
@@ -1,27 +1,14 @@
package tests;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleContent;
-import org.apache.ws.commons.schema.XmlSchemaSimpleContentExtension;
-import org.apache.ws.commons.schema.XmlSchemaAttribute;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java Thu Mar 29 19:00:17 2007
@@ -1,26 +1,14 @@
package tests;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleContent;
-import org.apache.ws.commons.schema.XmlSchemaSimpleContentRestriction;
-import org.apache.ws.commons.schema.XmlSchemaAttribute;
-import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java Thu Mar 29 19:00:17 2007
@@ -16,18 +16,12 @@
package tests;
import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
-import java.io.InputStream;
-import java.io.FileInputStream;
-
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-
-import javax.xml.transform.stream.StreamSource;
import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
+import java.io.FileInputStream;
+import java.io.InputStream;
/**
* TestElementForm
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementRefs.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementRefs.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementRefs.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementRefs.java Thu Mar 29 19:00:17 2007
@@ -1,21 +1,14 @@
package tests;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
+
+import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java Thu Mar 29 19:00:17 2007
@@ -17,18 +17,12 @@
package tests;
import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
-import java.io.InputStream;
-import java.io.FileInputStream;
-
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-
-import javax.xml.transform.stream.StreamSource;
import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
+import java.io.FileInputStream;
+import java.io.InputStream;
/**
*/
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java Thu Mar 29 19:00:17 2007
@@ -1,32 +1,15 @@
package tests;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchema;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-import java.io.InputStream;
import java.io.FileInputStream;
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * 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.
- */
-import junit.framework.TestCase;
+import java.io.InputStream;
public class TestSimpleRestriction extends TestCase {
public void testSimpleRestriction() throws Exception {
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java Thu Mar 29 19:00:17 2007
@@ -1,18 +1,11 @@
package tests;
import junit.framework.TestCase;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.ws.commons.schema.*;
import org.w3c.dom.Document;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
import java.util.Iterator;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java Thu Mar 29 19:00:17 2007
@@ -1,19 +1,15 @@
package tests;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import junit.framework.TestCase;
-
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.Iterator;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java Thu Mar 29 19:00:17 2007
@@ -1,15 +1,14 @@
package tests;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import junit.framework.TestCase;
-
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java Thu Mar 29 19:00:17 2007
@@ -1,23 +1,14 @@
package tests;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
+import junit.framework.TestCase;
+import org.apache.ws.commons.schema.*;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeUnion;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeDeserializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeDeserializer.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeDeserializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeDeserializer.java Thu Mar 29 19:00:17 2007
@@ -1,13 +1,11 @@
package tests.customext.attrib;
-import org.apache.ws.commons.schema.extensions.ExtensionDeserializer;
import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.w3c.dom.Node;
+import org.apache.ws.commons.schema.extensions.ExtensionDeserializer;
import org.w3c.dom.Attr;
+import org.w3c.dom.Node;
import javax.xml.namespace.QName;
-
-import tests.customext.attrib.CustomAttribute;
/**
* Custome attribute deserializer for our test custom attribute
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java Thu Mar 29 19:00:17 2007
@@ -1,7 +1,7 @@
package tests.customext.attrib;
-import org.apache.ws.commons.schema.extensions.ExtensionSerializer;
import org.apache.ws.commons.schema.XmlSchemaObject;
+import org.apache.ws.commons.schema.extensions.ExtensionSerializer;
import org.w3c.dom.Node;
/**
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java Thu Mar 29 19:00:17 2007
@@ -1,17 +1,14 @@
package tests.customext.attrib;
import junit.framework.TestCase;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.constants.Constants;
+import org.w3c.dom.Document;
import tests.Resources;
-import tests.customext.attrib.CustomAttribute;
+import javax.xml.parsers.DocumentBuilderFactory;
import java.util.Iterator;
import java.util.Map;
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtensionRegistry.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtensionRegistry.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtensionRegistry.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtensionRegistry.java Thu Mar 29 19:00:17 2007
@@ -1,9 +1,6 @@
package tests.customext.attrib;
import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
-import tests.customext.attrib.CustomAttribute;
-import tests.customext.attrib.CustomAttributeDeserializer;
-import tests.customext.attrib.CustomAttributeSerializer;
/**
* Custom extension registry to test the functionality
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementDeserializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementDeserializer.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementDeserializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementDeserializer.java Thu Mar 29 19:00:17 2007
@@ -1,9 +1,9 @@
package tests.customext.elt;
-import org.apache.ws.commons.schema.extensions.ExtensionDeserializer;
import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.w3c.dom.Node;
+import org.apache.ws.commons.schema.extensions.ExtensionDeserializer;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import javax.xml.namespace.QName;
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementSerializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementSerializer.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementSerializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementSerializer.java Thu Mar 29 19:00:17 2007
@@ -1,7 +1,7 @@
package tests.customext.elt;
-import org.apache.ws.commons.schema.extensions.ExtensionSerializer;
import org.apache.ws.commons.schema.XmlSchemaObject;
+import org.apache.ws.commons.schema.extensions.ExtensionSerializer;
import org.w3c.dom.Node;
/**
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java Thu Mar 29 19:00:17 2007
@@ -1,16 +1,14 @@
package tests.customext.elt;
import junit.framework.TestCase;
-import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.constants.Constants;
import org.w3c.dom.Document;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
import tests.Resources;
+import javax.xml.parsers.DocumentBuilderFactory;
import java.util.Iterator;
import java.util.Map;
@@ -45,7 +43,7 @@
assertNotNull(elt);
Map metaInfoMap = elt.getMetaInfoMap();
assertNotNull(metaInfoMap);
-
+
CustomElement customElt = (CustomElement)metaInfoMap.get(CustomElement.CUSTOM_ELT_QNAME);
assertNotNull(customElt);
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestRoundTripXSD.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestRoundTripXSD.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestRoundTripXSD.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestRoundTripXSD.java Thu Mar 29 19:00:17 2007
@@ -15,23 +15,14 @@
*/
package tests.w3c;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileReader;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ListIterator;
-
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.custommonkey.xmlunit.DetailedDiff;
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.Difference;
-import org.custommonkey.xmlunit.DifferenceConstants;
-import org.custommonkey.xmlunit.IgnoreTextAndAttributeValuesDifferenceListener;
-import org.custommonkey.xmlunit.XMLTestCase;
+import org.custommonkey.xmlunit.*;
import org.w3c.dom.Element;
+
+import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ListIterator;
/**
* Class to test a single schema by roundtripping it using XMLUnit
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java Thu Mar 29 19:00:17 2007
@@ -15,13 +15,13 @@
*/
package tests.w3c;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* Class to represent a bucket of tests described by a set of .testSet files.
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java?view=diff&rev=523906&r1=523905&r2=523906
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java Thu Mar 29 19:00:17 2007
@@ -15,18 +15,8 @@
*/
package tests.w3c;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -34,8 +24,13 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import tests.w3c.SchemaTest;
-import tests.w3c.TestRoundTripXSD;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org