Author: bimargulies
Date: Tue Oct 12 00:49:04 2010
New Revision: 1021555
URL: http://svn.apache.org/viewvc?rev=1021555&view=rev
Log:
Flush some warnings.
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ImportTest.java
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java?rev=1021555&r1=1021554&r2=1021555&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequenceMember.java
Tue Oct 12 00:49:04 2010
@@ -19,9 +19,11 @@
package org.apache.ws.commons.schema;
+import org.apache.ws.commons.schema.utils.XmlSchemaObjectBase;
+
/**
* Common type for all items that can occur in a sequence.
*/
-public interface XmlSchemaSequenceMember {
+public interface XmlSchemaSequenceMember extends XmlSchemaObjectBase {
}
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?rev=1021555&r1=1021554&r2=1021555&view=diff
==============================================================================
---
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
Tue Oct 12 00:49:04 2010
@@ -37,7 +37,7 @@ public class DefaultURIResolver implemen
/**
* Try to resolve a schema location to some data.
- *
+ *
* @param namespace target namespace.
* @param schemaLocation system ID.
* @param baseUri base URI for the schema.
@@ -70,7 +70,7 @@ public class DefaultURIResolver implemen
/**
* Find whether a given uri is relative or not
- *
+ *
* @param uri
* @return boolean
*/
@@ -82,7 +82,7 @@ public class DefaultURIResolver implemen
/**
* This is essentially a call to "new URL(contextURL, spec)" with extra
handling in case spec is a file.
- *
+ *
* @param contextURL
* @param spec
* @throws java.io.IOException
@@ -122,7 +122,7 @@ public class DefaultURIResolver implemen
/**
* Method getFileURL
- *
+ *
* @param contextURL
* @param path
* @throws IOException
@@ -149,7 +149,7 @@ public class DefaultURIResolver implemen
}
if (parentFile != null) {
- parent = parentFile.toURL();
+ parent = parentFile.toURI().toURL();
}
if (parent != null) {
return new URL(parent, path);
@@ -161,7 +161,7 @@ public class DefaultURIResolver implemen
/**
* Get the base URI derived from a schema collection. It serves as a
fallback from the specified base.
- *
+ *
* @return URI
*/
public String getCollectionBaseURI() {
@@ -170,7 +170,7 @@ public class DefaultURIResolver implemen
/**
* set the collection base URI, which serves as a fallback from the base
of the immediate schema.
- *
+ *
* @param collectionBaseURI the URI.
*/
public void setCollectionBaseURI(String collectionBaseURI) {
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?rev=1021555&r1=1021554&r2=1021555&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java
Tue Oct 12 00:49:04 2010
@@ -35,7 +35,7 @@ public class CircularSchemaTest extends
XmlSchemaCollection schemas = new XmlSchemaCollection();
File file = new File(Resources.asURI("circular/a.xsd"));
InputSource source = new InputSource(new FileInputStream(file));
- source.setSystemId(file.toURL().toString());
+ source.setSystemId(file.toURI().toURL().toString());
schemas.read(source);
Modified:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ImportTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ImportTest.java?rev=1021555&r1=1021554&r2=1021555&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ImportTest.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ImportTest.java
Tue Oct 12 00:49:04 2010
@@ -54,7 +54,7 @@ public class ImportTest extends Assert {
/**
* variation of above don't set the base uri.
- *
+ *
* @throws Exception
*/
@Test
@@ -63,17 +63,17 @@ public class ImportTest extends Assert {
// create a DOM document
DocumentBuilderFactory documentBuilderFactory =
DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
- Document doc =
documentBuilderFactory.newDocumentBuilder().parse(file.toURL().toString());
+ Document doc =
documentBuilderFactory.newDocumentBuilder().parse(file.toURI().toURL().toString());
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(doc, file.toURL().toString());
+ XmlSchema schema = schemaCol.read(doc,
file.toURI().toURL().toString());
assertNotNull(schema);
}
/**
* see whether we can reach the types of the imported schemas.
- *
+ *
* @throws Exception
*/
@Test
@@ -82,10 +82,10 @@ public class ImportTest extends Assert {
// create a DOM document
DocumentBuilderFactory documentBuilderFactory =
DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
- Document doc =
documentBuilderFactory.newDocumentBuilder().parse(file.toURL().toString());
+ Document doc =
documentBuilderFactory.newDocumentBuilder().parse(file.toURI().toURL().toString());
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(doc, file.toURL().toString());
+ XmlSchema schema = schemaCol.read(doc,
file.toURI().toURL().toString());
assertNotNull(schema);
assertNotNull(schema.getTypeByName(new
QName("http://soapinterop.org/xsd2";, "SOAPStruct")));
