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 jo...@apache.org on 2006/08/13 04:46:28 UTC
svn commit: r431136 - in /webservices/commons/trunk/modules/XmlSchema: ./
src/main/assembly/ src/test/java/tests/ src/test/test-resources/
test-resources/
Author: jochen
Date: Sat Aug 12 19:46:26 2006
New Revision: 431136
URL: http://svn.apache.org/viewvc?rev=431136&view=rev
Log:
Moved the test-resources directory to src/test, in order to meet the Maven 2 standards.
Added:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/Resources.java
webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/
- copied from r431128, webservices/commons/trunk/modules/XmlSchema/test-resources/
Removed:
webservices/commons/trunk/modules/XmlSchema/test-resources/
Modified:
webservices/commons/trunk/modules/XmlSchema/.classpath
webservices/commons/trunk/modules/XmlSchema/project.xml
webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml
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/ImportTest.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/test-resources/include.xsd
webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine2.xsd
webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine4.xsd
webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine6.xsd
webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine8.xsd
Modified: webservices/commons/trunk/modules/XmlSchema/.classpath
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/.classpath?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/.classpath (original)
+++ webservices/commons/trunk/modules/XmlSchema/.classpath Sat Aug 12 19:46:26 2006
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="src" output="target/classes" path="src"/>
- <classpathentry kind="src" output="target/test-classes" path="test"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: webservices/commons/trunk/modules/XmlSchema/project.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/project.xml?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/project.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/project.xml Sat Aug 12 19:46:26 2006
@@ -207,9 +207,6 @@
<resources>
<resource>
- <directory>${basedir}/test-resources</directory>
- </resource>
- <resource>
<directory>conf</directory>
<includes>
<include>**/*.properties</include>
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml Sat Aug 12 19:46:26 2006
@@ -19,8 +19,5 @@
<fileSet>
<directory>src</directory>
</fileSet>
- <fileSet>
- <directory>test-resources</directory>
- </fileSet>
</fileSets>
</assembly>
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java Sat Aug 12 19:46:26 2006
@@ -34,7 +34,7 @@
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse("test-resources/allSimpleTypes.xsd");
+ parse(Resources.asURI("allSimpleTypes.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(doc,null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java Sat Aug 12 19:46:26 2006
@@ -70,7 +70,7 @@
QName TYPE_QNAME = new QName("http://soapinterop.org/types",
"emptyAppinfo");
- InputStream is = new FileInputStream("test-resources/annotation.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -136,7 +136,7 @@
QName TYPE_QNAME = new QName("http://soapinterop.org/types",
"emptyDocumentation");
- InputStream is = new FileInputStream("test-resources/annotation.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -200,7 +200,7 @@
QName TYPE_QNAME = new QName("http://soapinterop.org/types",
"emptyAppinfoDocumentation");
- InputStream is = new FileInputStream("test-resources/annotation.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -238,7 +238,7 @@
QName TYPE_QNAME = new QName("http://soapinterop.org/types",
"annotationTest");
- InputStream is = new FileInputStream("test-resources/annotation.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -302,7 +302,7 @@
</annotation>
*/
- InputStream is = new FileInputStream("test-resources/annotation.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java Sat Aug 12 19:46:26 2006
@@ -41,7 +41,7 @@
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse("test-resources/anyAttTest.xsd");
+ parse(Resources.asURI("anyAttTest.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema s = schemaCol.read(doc.getDocumentElement());
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java Sat Aug 12 19:46:26 2006
@@ -77,7 +77,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"department");
- InputStream is = new FileInputStream("test-resources/any.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("any.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java Sat Aug 12 19:46:26 2006
@@ -71,7 +71,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"member");
- InputStream is = new FileInputStream("test-resources/attributegroup.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("attributegroup.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java Sat Aug 12 19:46:26 2006
@@ -33,7 +33,7 @@
"complexElt");
- InputStream is = new FileInputStream("test-resources/block.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("block.xsd"));
XmlSchemaCollection schema = new XmlSchemaCollection();
XmlSchema s = schema.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java Sat Aug 12 19:46:26 2006
@@ -66,7 +66,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"computer");
- InputStream is = new FileInputStream("test-resources/choice.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("choice.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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=431136&r1=431135&r2=431136&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 Sat Aug 12 19:46:26 2006
@@ -14,7 +14,7 @@
{
public void testCircular() throws Exception {
XmlSchemaCollection schemas = new XmlSchemaCollection();
- File file = new File("test-resources/circular/a.xsd");
+ File file = new File(Resources.asURI("circular/a.xsd"));
InputSource source = new InputSource(new FileInputStream(file));
source.setSystemId(file.toURL().toString());
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java Sat Aug 12 19:46:26 2006
@@ -80,7 +80,7 @@
QName TYPE_QNAME = new QName("http://soapinterop.org/types",
"NoAssemblyRequiredProduct");
- InputStream is = new FileInputStream("test-resources/deriverestriction.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("deriverestriction.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java Sat Aug 12 19:46:26 2006
@@ -123,7 +123,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"constraintTest");
- InputStream is = new FileInputStream("test-resources/constraints.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("constraints.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java Sat Aug 12 19:46:26 2006
@@ -40,7 +40,7 @@
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse("test-resources/externalAttributes.xsd");
+ parse(Resources.asURI("externalAttributes.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema s = schemaCol.read(doc.getDocumentElement());
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java Sat Aug 12 19:46:26 2006
@@ -72,7 +72,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"myZipCode");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -138,7 +138,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"myCreditCardNumber");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -200,7 +200,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"myAge");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -263,7 +263,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"myDistance");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -330,7 +330,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"myWeight");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -396,7 +396,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"myWhiteSpace");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -459,7 +459,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"myHeight");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -526,7 +526,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"myYardLength");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -593,7 +593,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"layoutComponent");
- InputStream is = new FileInputStream("test-resources/facets.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("facets.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java Sat Aug 12 19:46:26 2006
@@ -86,7 +86,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"price");
- InputStream is = new FileInputStream("test-resources/group.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("group.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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=431136&r1=431135&r2=431136&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 Sat Aug 12 19:46:26 2006
@@ -30,16 +30,16 @@
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse("test-resources/importBase.xsd");
+ parse(Resources.asURI("importBase.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- schemaCol.setBaseUri("test-resources");
+ schemaCol.setBaseUri(Resources.TEST_RESOURCES);
XmlSchema schema = schemaCol.read(doc,null);
assertNotNull(schema);
// attempt with slash now
schemaCol = new XmlSchemaCollection();
- schemaCol.setBaseUri("test-resources/");
+ schemaCol.setBaseUri(Resources.TEST_RESOURCES + "/");
schema = schemaCol.read(doc,null);
assertNotNull(schema);
}
@@ -49,7 +49,7 @@
* @throws Exception
*/
public void testSchemaImport2() throws Exception{
- File file = new File("test-resources/importBase.xsd");
+ File file = new File(Resources.asURI("importBase.xsd"));
//create a DOM document
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java Sat Aug 12 19:46:26 2006
@@ -78,7 +78,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"test1include");
- InputStream is = new FileInputStream("test-resources/include.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("include.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -86,22 +86,22 @@
assertEquals(2, c.getCount());
Set set = new HashSet();
- set.add("test-resources/include2.xsd");
- set.add("test-resources/include3.xsd");
+ set.add(Resources.asURI("include2.xsd"));
+ set.add(Resources.asURI("include3.xsd"));
for (int i = 0; i < c.getCount(); i++) {
XmlSchemaInclude include = (XmlSchemaInclude)c.getItem(i);
assertNotNull(include);
XmlSchema s = include.getSchema();
assertNotNull(s);
String schemaLocation = include.getSchemaLocation();
- if (schemaLocation.equals("test-resources/include2.xsd")) {
+ if (schemaLocation.equals(Resources.asURI("include2.xsd"))) {
XmlSchemaElement xse =
s.getElementByName(new
QName("http://soapinterop.org/types", "test1include"));
assertEquals("test1include", xse.getName());
assertEquals(new QName("http://www.w3.org/2001/XMLSchema", "string"),
xse.getSchemaTypeName());
- } else if (schemaLocation.equals("test-resources/include3.xsd")) {
+ } else if (schemaLocation.equals(Resources.asURI("include3.xsd"))) {
XmlSchemaElement xse =
s.getElementByName(new
QName("http://soapinterop.org/types", "test2include"));
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java Sat Aug 12 19:46:26 2006
@@ -72,7 +72,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"workDays");
- InputStream is = new FileInputStream("test-resources/list.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("list.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java Sat Aug 12 19:46:26 2006
@@ -33,7 +33,7 @@
"complexElt");
- InputStream is = new FileInputStream("test-resources/mixedContent.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("mixedContent.xsd"));
XmlSchemaCollection schema = new XmlSchemaCollection();
XmlSchema s = schema.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java Sat Aug 12 19:46:26 2006
@@ -92,7 +92,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"demoNotation");
- InputStream is = new FileInputStream("test-resources/notation.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("notation.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java Sat Aug 12 19:46:26 2006
@@ -90,7 +90,7 @@
xmlns:tns="http://soapinterop.org/types"
targetNamespace="http://soapinterop.org/types">
- <redefine schemaLocation="test-resources/redefine1.xsd">
+ <redefine schemaLocation="src/test/test-resources/redefine1.xsd">
<complexType name="person">
<complexContent>
<extension base="tns:person">
@@ -107,7 +107,7 @@
</schema>
*/
- InputStream is = new FileInputStream("test-resources/redefine2.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("redefine2.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -215,7 +215,7 @@
</schema>
*/
- InputStream is = new FileInputStream("test-resources/redefine4.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("redefine4.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -327,7 +327,7 @@
</schema>
*/
- InputStream is = new FileInputStream("test-resources/redefine6.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("redefine6.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
@@ -419,7 +419,7 @@
</schema>
*/
- InputStream is = new FileInputStream("test-resources/redefine8.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("redefine8.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
Added: webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/Resources.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/Resources.java?rev=431136&view=auto
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/Resources.java (added)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/Resources.java Sat Aug 12 19:46:26 2006
@@ -0,0 +1,31 @@
+package tests;
+
+/*
+ * 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.
+ */
+
+public class Resources {
+ /**
+ * Location of the test resources.
+ */
+ public static final String TEST_RESOURCES = "src/test/test-resources";
+
+ /**
+ * Returns a files location as a string.
+ */
+ public static String asURI(String pURI) {
+ return TEST_RESOURCES + "/" + pURI;
+ }
+}
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java Sat Aug 12 19:46:26 2006
@@ -72,7 +72,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"height");
- InputStream is = new FileInputStream("test-resources/simplecontentextension.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("simplecontentextension.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java Sat Aug 12 19:46:26 2006
@@ -78,7 +78,7 @@
QName TYPE_QNAME = new QName("http://soapinterop.org/types",
"dietdrinksize");
- InputStream is = new FileInputStream("test-resources/screstriction.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("screstriction.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java Sat Aug 12 19:46:26 2006
@@ -38,7 +38,7 @@
private XmlSchemaCollection schema;
protected void setUp() throws Exception {
- InputStream is = new FileInputStream("test-resources/elementForm.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("elementForm.xsd"));
schema = new XmlSchemaCollection();
schema.read(new StreamSource(is), null);
}
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementRefs.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementRefs.java Sat Aug 12 19:46:26 2006
@@ -36,7 +36,7 @@
public void testElementRefs() throws Exception {
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"attTests");
- InputStream is = new FileInputStream("test-resources/elementreferences.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("elementreferences.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java Sat Aug 12 19:46:26 2006
@@ -37,7 +37,7 @@
public void testForwardRefs() throws Exception {
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"attrTest");
- InputStream is = new FileInputStream("test-resources/forwardRef.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("forwardRef.xsd"));
XmlSchemaCollection schema = new XmlSchemaCollection();
schema.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java Sat Aug 12 19:46:26 2006
@@ -35,7 +35,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"foo");
- InputStream is = new FileInputStream("test-resources/SimpleContentRestriction.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("SimpleContentRestriction.xsd"));
XmlSchemaCollection schema = new XmlSchemaCollection();
XmlSchema s = schema.read(new StreamSource(is), null);
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java Sat Aug 12 19:46:26 2006
@@ -37,7 +37,7 @@
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse("test-resources/unqualifiedTypes.xsd");
+ parse(Resources.asURI("unqualifiedTypes.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema s = schemaCol.read(doc.getDocumentElement());
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java Sat Aug 12 19:46:26 2006
@@ -36,7 +36,7 @@
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse("test-resources/twoSchemas-ref.wsdl");
+ parse(Resources.asURI("twoSchemas-ref.wsdl"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
NodeList schemaNodes = doc.getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema","schema");
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java Sat Aug 12 19:46:26 2006
@@ -32,7 +32,7 @@
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse("test-resources/twoSchemas.wsdl");
+ parse(Resources.asURI("twoSchemas.wsdl"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
NodeList schemaNodes = doc.getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema","schema");
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?rev=431136&r1=431135&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java Sat Aug 12 19:46:26 2006
@@ -62,7 +62,7 @@
QName ELEMENT_QNAME = new QName("http://soapinterop.org/types",
"unionTest");
- InputStream is = new FileInputStream("test-resources/union.xsd");
+ InputStream is = new FileInputStream(Resources.asURI("union.xsd"));
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
XmlSchema schema = schemaCol.read(new StreamSource(is), null);
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/include.xsd
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/include.xsd?rev=431136&r1=431128&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/include.xsd (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/include.xsd Sat Aug 12 19:46:26 2006
@@ -20,7 +20,7 @@
xmlns:tns="http://soapinterop.org/types"
targetNamespace="http://soapinterop.org/types">
- <include schemaLocation="test-resources/include2.xsd"/>
- <include schemaLocation="test-resources/include3.xsd"/>
+ <include schemaLocation="src/test/test-resources/include2.xsd"/>
+ <include schemaLocation="src/test/test-resources/include3.xsd"/>
</schema>
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine2.xsd
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine2.xsd?rev=431136&r1=431128&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine2.xsd (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine2.xsd Sat Aug 12 19:46:26 2006
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types"
targetNamespace="http://soapinterop.org/types">
- <redefine schemaLocation="test-resources/redefine1.xsd">
+ <redefine schemaLocation="src/test/test-resources/redefine1.xsd">
<complexType name="person">
<complexContent>
<extension base="tns:person">
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine4.xsd
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine4.xsd?rev=431136&r1=431128&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine4.xsd (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine4.xsd Sat Aug 12 19:46:26 2006
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types"
targetNamespace="http://soapinterop.org/types">
- <redefine schemaLocation="test-resources/redefine3.xsd">
+ <redefine schemaLocation="src/test/test-resources/redefine3.xsd">
<simpleType name="drinksize">
<restriction base="tns:drinksize">
<minInclusive value="1"/>
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine6.xsd
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine6.xsd?rev=431136&r1=431128&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine6.xsd (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine6.xsd Sat Aug 12 19:46:26 2006
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types"
targetNamespace="http://soapinterop.org/types">
- <redefine schemaLocation="test-resources/redefine5.xsd">
+ <redefine schemaLocation="src/test/test-resources/redefine5.xsd">
<group name="PrologGroup">
<sequence>
<group ref="tns:PrologGroup"/>
Modified: webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine8.xsd
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine8.xsd?rev=431136&r1=431128&r2=431136&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine8.xsd (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/test/test-resources/redefine8.xsd Sat Aug 12 19:46:26 2006
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types"
targetNamespace="http://soapinterop.org/types">
- <redefine schemaLocation="test-resources/redefine7.xsd">
+ <redefine schemaLocation="src/test/test-resources/redefine7.xsd">
<attributeGroup name="AttribGroup">
<attribute name="type" type="string"/>
<attribute name="units" type="string"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org