Author: ajith
Date: Mon Dec 3 10:37:12 2007
New Revision: 600626
URL: http://svn.apache.org/viewvc?rev=600626&view=rev
Log:
1. Applying the patch at Jira 272
(https://issues.apache.org/jira/browse/WSCOMMONS-272). All the standard tests
are successful
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/ValidationEvent.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/constants/Enum.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnnotationTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnyTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AppInfoMarkupTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ChoiceTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ComplexContentRestrictionTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ConstraintsTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/EncodingTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/FacetsTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/GroupTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/IncludeTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ListTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/SequenceTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/TestSimpleRestriction.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/UnionTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ext/PlainExtensionSerializerTest.java
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
Mon Dec 3 10:37:12 2007
@@ -69,7 +69,7 @@
this.extReg = collection.getExtReg();
}
- schema = new XmlSchema(collection);
+ schema = new XmlSchema();
}
/**
@@ -99,6 +99,9 @@
schema.logicalTargetNamespace, uri);
if (!collection.containsSchema(schemaKey)) {
collection.addSchema(schemaKey, schema);
+ schema.parent = collection; // establish parentage now.
+ } else {
+ throw new XmlSchemaException("Schema name conflict in
collection. Namespace: " + schema.logicalTargetNamespace);
}
schema.setElementFormDefault(this.getFormDefault(schemaEl,
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/ValidationEvent.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/ValidationEvent.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/ValidationEvent.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/ValidationEvent.java
Mon Dec 3 10:37:12 2007
@@ -24,6 +24,11 @@
public class ValidationEvent extends EventObject {
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* Creates new ValidationEvent
*/
public ValidationEvent(Object source) {
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchema.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
Mon Dec 3 10:37:12 2007
@@ -76,8 +76,35 @@
}
/**
* Creates new XmlSchema
+ * Create a new XmlSchema. The schema is <i>not</i> added to the parent
collection,
+ * since it has no target namespace when created through this constructor.
+ * Call [EMAIL PROTECTED] XmlSchema#XmlSchema(String,
XmlSchemaCollection)} instead.
+ *
+ * @param parent the parent XmlSchemaCollection
+ * @deprecated
+ */
+ public XmlSchema(XmlSchemaCollection parent) {
+ this(null, null, parent);
+ }
+
+ /**
+ * Create a schema that is not a member of a collection.
+ */
+ public XmlSchema() {
+ this(null, null, null);
+ }
+
+ /**
+ * Create a new schema and record it as a member of a schema collection.
+ * @param namespace the target namespace.
+ * @param systemId the system ID for the schema.
+ * @param parent the parent collection.
*/
- public XmlSchema(XmlSchemaCollection parent) {
+ public XmlSchema(String namespace, String systemId, XmlSchemaCollection
parent) {
+ this.parent = parent;
+ if (namespace == null) {
+ namespace = "";
+ }
this.parent = parent;
attributeFormDefault = new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
elementFormDefault = new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
@@ -91,11 +118,22 @@
groups = new XmlSchemaObjectTable();
notations = new XmlSchemaObjectTable();
schemaTypes = new XmlSchemaObjectTable();
+
+ syntacticalTargetNamespace = logicalTargetNamespace = namespace;
+ if(parent != null) {
+ XmlSchemaCollection.SchemaKey schemaKey =
+ new
XmlSchemaCollection.SchemaKey(this.logicalTargetNamespace, systemId);
+ if (parent.containsSchema(schemaKey)) {
+ throw new XmlSchemaException("Schema name conflict in
collection");
+ } else {
+ parent.addSchema(schemaKey, this);
+ }
+ }
}
public XmlSchema(String namespace, XmlSchemaCollection parent) {
- this(parent);
- syntacticalTargetNamespace = logicalTargetNamespace = namespace;
+ this(namespace, namespace, parent);
+
}
public XmlSchemaForm getAttributeFormDefault() {
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
Mon Dec 3 10:37:12 2007
@@ -269,8 +269,8 @@
addSimpleType(xsd, Constants.XSD_LANGUAGE.getLocalPart());
addSimpleType(xsd, Constants.XSD_TOKEN.getLocalPart());
- SchemaKey key = new SchemaKey(XmlSchema.SCHEMA_NS, null);
- addSchema(key, xsd);
+ //SchemaKey key = new SchemaKey(XmlSchema.SCHEMA_NS, null);
+ //addSchema(key, xsd);
// look for a system property to see whether we have a registered
// extension registry class. if so we'll instantiate a new one
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java
Mon Dec 3 10:37:12 2007
@@ -27,6 +27,11 @@
public class XmlSchemaException extends RuntimeException {
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* Creates new XmlSchemaException
*/
public XmlSchemaException() {
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
Mon Dec 3 10:37:12 2007
@@ -2688,7 +2688,12 @@
public static class XmlSchemaSerializerException extends Exception {
- public XmlSchemaSerializerException(String msg) {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public XmlSchemaSerializerException(String msg) {
super(msg);
}
}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/constants/Enum.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/constants/Enum.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/constants/Enum.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/constants/Enum.java
Mon Dec 3 10:37:12 2007
@@ -65,7 +65,12 @@
}
public static class EnumValueException extends RuntimeException {
- public EnumValueException(String mesg) {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public EnumValueException(String mesg) {
super(mesg);
}
}
@@ -78,4 +83,5 @@
return -1;
}
}
+
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
Mon Dec 3 10:37:12 2007
@@ -18,15 +18,14 @@
*/
package org.apache.ws.commons.schema.resolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
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 org.xml.sax.InputSource;
/**
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
Mon Dec 3 10:37:12 2007
@@ -22,7 +22,6 @@
import org.w3c.dom.*;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
/**
* Some useful utility methods.
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
Mon Dec 3 10:37:12 2007
@@ -22,7 +22,12 @@
public class NamespaceMap extends HashMap implements NamespacePrefixList {
- public NamespaceMap() {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public NamespaceMap() {
}
public NamespaceMap(Map map) {
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnnotationTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnnotationTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnnotationTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnnotationTest.java
Mon Dec 3 10:37:12 2007
@@ -59,7 +59,7 @@
"emptyAppinfo");
InputStream is = new
FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)schemaCol.getTypeByQName(TYPE_QNAME);
@@ -125,7 +125,7 @@
"emptyDocumentation");
InputStream is = new
FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)schemaCol.getTypeByQName(TYPE_QNAME);
@@ -189,7 +189,7 @@
"emptyAppinfoDocumentation");
InputStream is = new
FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)schemaCol.getTypeByQName(TYPE_QNAME);
@@ -227,7 +227,7 @@
"annotationTest");
InputStream is = new
FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)schemaCol.getTypeByQName(TYPE_QNAME);
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnyTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnyTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnyTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AnyTest.java
Mon Dec 3 10:37:12 2007
@@ -79,7 +79,7 @@
"department");
InputStream is = new FileInputStream(Resources.asURI("any.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -130,4 +130,4 @@
}
-}
\ No newline at end of file
+}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AppInfoMarkupTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AppInfoMarkupTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AppInfoMarkupTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/AppInfoMarkupTest.java
Mon Dec 3 10:37:12 2007
@@ -18,24 +18,20 @@
*/
package tests;
-import junit.framework.TestCase;
-
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.custommonkey.xmlunit.XMLTestCase;
-import org.w3c.dom.Document;
-
-import javax.xml.transform.stream.StreamSource;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.stream.StreamSource;
-import sun.management.counter.ByteArrayCounter;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.custommonkey.xmlunit.XMLTestCase;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.w3c.dom.Document;
public class AppInfoMarkupTest extends XMLTestCase {
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ChoiceTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ChoiceTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ChoiceTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ChoiceTest.java
Mon Dec 3 10:37:12 2007
@@ -81,7 +81,7 @@
InputStream is = new FileInputStream(Resources.asURI("choice.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
QName WRONG_QNAME = new QName("http://soapinterop.org/types";,
"machine");
@@ -142,4 +142,4 @@
}
-}
\ No newline at end of file
+}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ComplexContentRestrictionTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ComplexContentRestrictionTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ComplexContentRestrictionTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ComplexContentRestrictionTest.java
Mon Dec 3 10:37:12 2007
@@ -89,7 +89,7 @@
"NoAssemblyRequiredProduct");
InputStream is = new
FileInputStream(Resources.asURI("deriverestriction.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaComplexType cType =
(XmlSchemaComplexType)schemaCol.getTypeByQName(TYPE_QNAME);
@@ -150,4 +150,4 @@
}
-}
\ No newline at end of file
+}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ConstraintsTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ConstraintsTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ConstraintsTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ConstraintsTest.java
Mon Dec 3 10:37:12 2007
@@ -132,7 +132,7 @@
"constraintTest");
InputStream is = new
FileInputStream(Resources.asURI("constraints.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -214,4 +214,4 @@
}
-}
\ No newline at end of file
+}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/EncodingTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/EncodingTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/EncodingTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/EncodingTest.java
Mon Dec 3 10:37:12 2007
@@ -22,7 +22,6 @@
import junit.framework.TestCase;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.constants.Constants;
import org.w3c.dom.Document;
import javax.xml.parsers.DocumentBuilder;
@@ -59,8 +58,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
s1.write(baos,options);
-
-
+ schemaCol = new XmlSchemaCollection();
Document doc2 = newDocumentBuilder.parse(new
ByteArrayInputStream(baos.toByteArray()));
XmlSchema s2 = schemaCol.read(doc2.getDocumentElement());
assertNotNull(s2);
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/FacetsTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/FacetsTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/FacetsTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/FacetsTest.java
Mon Dec 3 10:37:12 2007
@@ -52,7 +52,7 @@
"myZipCode");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -126,7 +126,7 @@
"myCreditCardNumber");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -192,7 +192,7 @@
"myAge");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -259,7 +259,7 @@
"myDistance");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -334,7 +334,7 @@
"myWeight");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -408,7 +408,7 @@
"myWhiteSpace");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -475,7 +475,7 @@
"myHeight");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -550,7 +550,7 @@
"myYardLength");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -625,7 +625,7 @@
"layoutComponent");
InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/GroupTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/GroupTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/GroupTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/GroupTest.java
Mon Dec 3 10:37:12 2007
@@ -111,8 +111,6 @@
XmlSchemaObjectTable t = schema.getGroups();
assertEquals(1, t.getCount());
- XmlSchemaObject o = t.getItem(ref.getRefName());
-
Set s = new HashSet();
s.add("priceGroup");
for (Iterator i = t.getNames(); i.hasNext(); ) {
@@ -173,4 +171,4 @@
}
-}
\ No newline at end of file
+}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/IncludeTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/IncludeTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/IncludeTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/IncludeTest.java
Mon Dec 3 10:37:12 2007
@@ -88,8 +88,6 @@
</schema>
*/
- QName ELEMENT_QNAME = new QName("http://soapinterop.org/types";,
- "test1include");
InputStream is = new FileInputStream(Resources.asURI("include.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -170,4 +168,4 @@
XmlSchema schema = schemaCol.read(isource, null);
assertNotNull(schema);
}
-}
\ No newline at end of file
+}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ListTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ListTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ListTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ListTest.java
Mon Dec 3 10:37:12 2007
@@ -78,7 +78,7 @@
"workDays");
InputStream is = new FileInputStream(Resources.asURI("list.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
assertNotNull(elem);
@@ -104,4 +104,4 @@
}
-}
\ No newline at end of file
+}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/SequenceTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/SequenceTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/SequenceTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/SequenceTest.java
Mon Dec 3 10:37:12 2007
@@ -19,17 +19,18 @@
package tests;
-import junit.framework.TestCase;
+import java.io.FileInputStream;
+import java.io.InputStream;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
-import org.apache.ws.commons.schema.*;
+import junit.framework.TestCase;
+
+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.XmlSchemaSequence;
/*
* Copyright 2004,2007 The Apache Software Foundation.
@@ -81,7 +82,7 @@
InputStream is = new FileInputStream(Resources.asURI("sequence.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
QName WRONG_QNAME = new QName("http://soapinterop.org/types";,
"machine");
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/TestSimpleRestriction.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/TestSimpleRestriction.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/TestSimpleRestriction.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/TestSimpleRestriction.java
Mon Dec 3 10:37:12 2007
@@ -19,7 +19,6 @@
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;
@@ -38,7 +37,7 @@
InputStream is = new
FileInputStream(Resources.asURI("SimpleContentRestriction.xsd"));
XmlSchemaCollection schema = new XmlSchemaCollection();
- XmlSchema s = schema.read(new StreamSource(is), null);
+ schema.read(new StreamSource(is), null);
XmlSchemaType simpleType = schema.getTypeByQName(TYPE_QNAME);
assertNotNull(simpleType);
@@ -53,7 +52,7 @@
public void testSimpleTypeRestrictionWithoutNamespace() throws Exception {
InputStream is = new
FileInputStream(Resources.asURI("includedWithoutNamespace.xsd"));
XmlSchemaCollection schema = new XmlSchemaCollection();
- XmlSchema s = schema.read(new StreamSource(is), null);
+ schema.read(new StreamSource(is), null);
XmlSchemaType principalId = schema.getTypeByQName(new QName("",
"XdwsPrincipalId"));
assertNotNull(principalId);
XmlSchemaType groupId = schema.getTypeByQName(new QName("",
"XdwsGroupId"));
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/UnionTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/UnionTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/UnionTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/UnionTest.java
Mon Dec 3 10:37:12 2007
@@ -74,7 +74,7 @@
"unionTest");
InputStream is = new FileInputStream(Resources.asURI("union.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ schemaCol.read(new StreamSource(is), null);
XmlSchemaElement elem = schemaCol.getElementByQName(ELEMENT_QNAME);
@@ -105,4 +105,4 @@
}
-}
\ No newline at end of file
+}
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java
Mon Dec 3 10:37:12 2007
@@ -61,6 +61,7 @@
Document doc2 = documentBuilderFactory.newDocumentBuilder().
parse(new ByteArrayInputStream(baos.toByteArray()));
+ schemaCol = new XmlSchemaCollection();
schema = schemaCol.read(doc2,null);
assertNotNull(schema);
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java
Mon Dec 3 10:37:12 2007
@@ -60,6 +60,8 @@
Document doc2 = documentBuilderFactory.newDocumentBuilder().
parse(new ByteArrayInputStream(baos.toByteArray()));
+ // we can't have two copies in the same collection.
+ schemaCol = new XmlSchemaCollection();
schema = schemaCol.read(doc2,null);
assertNotNull(schema);
Modified:
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ext/PlainExtensionSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ext/PlainExtensionSerializerTest.java?rev=600626&r1=600625&r2=600626&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ext/PlainExtensionSerializerTest.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1.3.3/src/test/java/tests/ext/PlainExtensionSerializerTest.java
Mon Dec 3 10:37:12 2007
@@ -18,19 +18,17 @@
*/
package tests.ext;
-import junit.framework.TestCase;
+import java.io.ByteArrayOutputStream;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
+import junit.framework.TestCase;
+
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import tests.Resources;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.w3c.dom.Document;
-import java.util.Iterator;
-import java.util.Map;
-import java.io.ByteArrayOutputStream;
+import tests.Resources;
/**
* try writing the schemas after they are built
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
