Author: bimargulies
Date: Sun Oct 24 15:59:29 2010
New Revision: 1026828
URL: http://svn.apache.org/viewvc?rev=1026828&view=rev
Log:
Get structure set up.
Added:
webservices/xmlschema/trunk/etc/
- copied from r1026699, webservices/xmlschema/trunk/xmlschema-core/etc/
webservices/xmlschema/trunk/w3c-testcases/pom.xml (with props)
webservices/xmlschema/trunk/w3c-testcases/src/
webservices/xmlschema/trunk/w3c-testcases/src/test/
webservices/xmlschema/trunk/w3c-testcases/src/test/java/
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/
- copied from r1026699,
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/w3c/
webservices/xmlschema/trunk/w3c-testcases/w3c-testcases.jar (with props)
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/
- copied from r1026699,
webservices/xmlschema/trunk/xmlschema-core/src/test/test-resources/
Removed:
webservices/xmlschema/trunk/w3c-testcases/testcases.jar
webservices/xmlschema/trunk/xmlschema-core/etc/
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/w3c/
webservices/xmlschema/trunk/xmlschema-core/src/test/test-resources/
Modified:
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/ParameterizedW3CTestsTest.java
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/SchemaCase.java
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/W3CTestCaseCollector.java
webservices/xmlschema/trunk/xmlschema-core/pom.xml
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/Resources.java
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/include.xsd
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/includingWithNamespace.xsd
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine10.xsd
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine2.xsd
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine4.xsd
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine6.xsd
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine8.xsd
Added: webservices/xmlschema/trunk/w3c-testcases/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/w3c-testcases/pom.xml?rev=1026828&view=auto
==============================================================================
--- webservices/xmlschema/trunk/w3c-testcases/pom.xml (added)
+++ webservices/xmlschema/trunk/w3c-testcases/pom.xml Sun Oct 24 15:59:29 2010
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>w3c-testcases</artifactId>
+ <packaging>jar</packaging>
+ <name>XmlSchema W3C tests</name>
+ <version>2.0-SNAPSHOT</version>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <systemPropertyVariables>
+
<org.apache.ws.xmlschema.w3c-testcases>file://${basedir}/w3c-testcases.jar</org.apache.ws.xmlschema.w3c-testcases>
+
<org.apache.ws.commons.schema.protectReadOnlyCollections>true</org.apache.ws.commons.schema.protectReadOnlyCollections>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: webservices/xmlschema/trunk/w3c-testcases/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/xmlschema/trunk/w3c-testcases/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/ParameterizedW3CTestsTest.java
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/ParameterizedW3CTestsTest.java?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
---
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/ParameterizedW3CTestsTest.java
(original)
+++
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/ParameterizedW3CTestsTest.java
Sun Oct 24 15:59:29 2010
@@ -23,7 +23,10 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileReader;
+import java.io.InputStream;
import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -46,6 +49,7 @@ import org.junit.runners.Parameterized.P
*/
@RunWith(Parameterized.class)
public class ParameterizedW3CTestsTest extends XMLAssert {
+ private static final Charset UTF8 = Charset.forName("utf-8");
private SchemaCase currentTest;
public ParameterizedW3CTestsTest(SchemaCase test) {
@@ -62,10 +66,16 @@ public class ParameterizedW3CTestsTest e
return results;
}
- public XmlSchema loadSchema(File f) throws Exception {
+ public XmlSchema loadSchema(InputStream caseStream, String basePath)
throws Exception {
XmlSchemaCollection col = new XmlSchemaCollection();
- col.setBaseUri(f.getPath());
- return col.read(new FileReader(f));
+ col.setBaseUri(basePath);
+ InputStreamReader inputStreamReader = new
InputStreamReader(caseStream, UTF8);
+ /*
+ * We would expect to need a resolver here, since the input stream is
a JAR stream
+ * and the base pathname relative to the jar. I'm not sure why we
don't. Perhaps none of the
+ * cases have any interesting base relative references in them.
+ */
+ return col.read(inputStreamReader);
}
@Test
@@ -75,7 +85,7 @@ public class ParameterizedW3CTestsTest e
DetailedDiff detaileddiffs = null;
try {
- schema = loadSchema(currentTest.getTestCaseFile());
+ schema = loadSchema(currentTest.getTestCase(),
currentTest.getBaseFilePathname());
// TODO: if we get here and the input was meant to be invalid
perhaps
// should fail. Depends on whether XmlSchema is doing validation.
For
@@ -83,8 +93,10 @@ public class ParameterizedW3CTestsTest e
ByteArrayOutputStream baos = new ByteArrayOutputStream();
schema.write(baos);
- Diff diff = new Diff(new FileReader(currentTest.getTestCaseFile()),
- new InputStreamReader(new
ByteArrayInputStream(baos.toByteArray())));
+ InputStreamReader inputStreamReader = new
InputStreamReader(currentTest.getTestCase(),
+ UTF8);
+ Diff diff = new Diff(inputStreamReader,
+ new InputStreamReader(new
ByteArrayInputStream(baos.toByteArray()), UTF8));
detaileddiffs = new DetailedDiff(diff);
detaileddiffs.overrideDifferenceListener(new SchemaAttrDiff());
@@ -94,10 +106,11 @@ public class ParameterizedW3CTestsTest e
}
assertTrue("Serialized out schema not similar to original",
result);
} catch (Exception e) {
+ System.err.println(currentTest.getSchemaDocumentLink());
if (currentTest.isValid()) {
printFailureDetail(schema, detaileddiffs);
}
- throw new Exception(currentTest.getTestCaseFile().getPath(), e);
+ throw e;
}
}
Modified:
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/SchemaCase.java
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/SchemaCase.java?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
---
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/SchemaCase.java
(original)
+++
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/SchemaCase.java
Sun Oct 24 15:59:29 2010
@@ -18,7 +18,10 @@
*/
package tests.w3c;
-import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -37,10 +40,12 @@ public class SchemaCase {
private String expectedValidity;
private String currentStatus;
private String currentDate;
-
- private File baseFilePathname;
- public SchemaCase(Element n) throws Exception {
+ private String baseFilePathname;
+ private URL setUrl;
+
+ public SchemaCase(URL setUrl, Element n) {
+ this.setUrl = setUrl;
NodeList nl = n.getChildNodes();
for (int i = 0; i < nl.getLength(); i++) {
Node c = nl.item(i);
@@ -94,27 +99,46 @@ public class SchemaCase {
public String getCurrentStatus() {
return currentStatus;
}
-
+
public void setSchemaDocumentLink(String schemaDocumentLink) {
this.schemaDocumentLink = schemaDocumentLink;
}
-
+
public String getSchemaDocumentLink() {
return schemaDocumentLink;
}
-
- public File getBaseFilePathname() {
+
+ public String getBaseFilePathname() {
return baseFilePathname;
}
- public void setBaseFilePathname(File baseFilePathname) {
+ public void setBaseFilePathname(String baseFilePathname) {
this.baseFilePathname = baseFilePathname;
}
-
- public File getTestCaseFile() {
- return new File(baseFilePathname, schemaDocumentLink);
+
+ private String resolveRelativeJarURI(URI baseURI, String relative) throws
URISyntaxException {
+ // a bit of syntactic cheating
+ String baseInjarPath = baseURI.toString();
+ int bang = baseInjarPath.indexOf('!');
+ String front = baseInjarPath.substring(0, bang + 1); // out to the !
+ String back = baseInjarPath.substring(bang + 1); // after the bang
+ /* we can pretend that this is a file path */
+ URI trickyUri = new URI("file:" + back + "/../" + relative);
+ String resolved = trickyUri.normalize().toString();
+ return front + resolved.substring(5); // remove file:
+
}
+ public InputStream getTestCase() {
+ URI caseUri;
+ try {
+ String resolvedUriString = resolveRelativeJarURI(setUrl.toURI(),
schemaDocumentLink);
+ caseUri = new URI(resolvedUriString);
+ return caseUri.toURL().openStream();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
}
Modified:
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/W3CTestCaseCollector.java
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/W3CTestCaseCollector.java?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
---
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/W3CTestCaseCollector.java
(original)
+++
webservices/xmlschema/trunk/w3c-testcases/src/test/java/tests/w3c/W3CTestCaseCollector.java
Sun Oct 24 15:59:29 2010
@@ -22,8 +22,10 @@ package tests.w3c;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
@@ -39,33 +41,49 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
- *
+ *
*/
public final class W3CTestCaseCollector {
- private static final String[] TEST_SUITE_PATHS =
+ private static final String[] TEST_SUITE_PATHS =
{"w3c/xmlschema2006-11-06/nistMeta/NISTXMLSchemaDatatypes.testSet"
};
-
+ private static final String[] TEST_SUITE_BASE_PATHS =
+ {"w3c/xmlschema2006-11-06/nistMeta/"
+ };
+
+ private static final String TEST_SUITE_JAR =
+ System.getProperty("org.apache.ws.xmlschema.w3c-testcases",
"file:w3c-testcases.jar");
+
+ private static final ClassLoader TC_LOADER;
+
+ static {
+ try {
+ TC_LOADER = new URLClassLoader(new URL[] { new
URL(TEST_SUITE_JAR)});
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
private W3CTestCaseCollector() {
}
-
+
/**
* Return all the tests to be used in automated testing.
* @return a list of SchemaTest objects.
* @throws ParserConfigurationException
* @throws SAXException
* @throws IOException
- * @throws URISyntaxException
+ * @throws URISyntaxException
*/
- public static List<SchemaCase> getSchemaTests()
+ public static List<SchemaCase> getSchemaTests()
throws ParserConfigurationException, SAXException, IOException,
URISyntaxException {
List<SchemaCase> results = new ArrayList<SchemaCase>();
- for (String path : TEST_SUITE_PATHS) {
- results.addAll(getSchemaTests(path));
+ for (int x = 0; x < TEST_SUITE_PATHS.length; x++) {
+ results.addAll(getSchemaTests(TEST_SUITE_PATHS[x],
TEST_SUITE_BASE_PATHS[x]));
}
return results;
}
-
+
/**
* Return a list of tests as specified by some specific XML file.
* @param testSet
@@ -73,14 +91,16 @@ public final class W3CTestCaseCollector
* @throws ParserConfigurationException
* @throws SAXException
* @throws IOException
- * @throws URISyntaxException
+ * @throws URISyntaxException
*/
- public static List<SchemaCase> getSchemaTests(String testSet) throws
ParserConfigurationException,
- SAXException,
+ public static List<SchemaCase> getSchemaTests(String testSet, String
basePath)
+ throws ParserConfigurationException,
+ SAXException,
IOException, URISyntaxException {
- URL setURL =
W3CTestCaseCollector.class.getClassLoader().getResource(testSet);
- InputStream setXmlStream = setURL.openStream();
- File basePath = new File(setURL.toURI()).getParentFile();
+
+
+ URL setUrl = TC_LOADER.getResource(testSet);
+ InputStream setXmlStream = setUrl.openStream();
List<SchemaCase> schemaTests = new ArrayList<SchemaCase>();
Document doc = getDocument(new InputSource(setXmlStream));
NodeList testGroups = doc.getElementsByTagName("testGroup");
@@ -101,7 +121,7 @@ public final class W3CTestCaseCollector
if (schemaTestElem != null) {
try {
- SchemaCase schemaTest = new SchemaCase(schemaTestElem);
+ SchemaCase schemaTest = new SchemaCase(setUrl,
schemaTestElem);
schemaTest.setBaseFilePathname(basePath);
if (schemaTest.getSchemaDocumentLink() != null) {
schemaTests.add(schemaTest);
@@ -117,7 +137,7 @@ public final class W3CTestCaseCollector
/**
* Returns a DOM Document of the file passed in as the inputsource
parameter
- *
+ *
* @param inputSource input to read in as DOM Document
* @return DOM Document of the input source
* @throws Exception can be IOException or SAXException
Added: webservices/xmlschema/trunk/w3c-testcases/w3c-testcases.jar
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/w3c-testcases/w3c-testcases.jar?rev=1026828&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/xmlschema/trunk/w3c-testcases/w3c-testcases.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/xmlschema/trunk/xmlschema-core/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/pom.xml?rev=1026828&r1=1026827&r2=1026828&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/pom.xml (original)
+++ webservices/xmlschema/trunk/xmlschema-core/pom.xml Sun Oct 24 15:59:29 2010
@@ -20,60 +20,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>7</version>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
<packaging>bundle</packaging>
- <name>XmlSchema</name>
+ <name>XmlSchema Core</name>
<version>2.0-SNAPSHOT</version>
<description>Commons XMLSchema is a light weight schema object model that
can be used to manipulate or
generate XML schema.</description>
- <url>http://ws.apache.org/commons/XmlSchema</url>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/WSCOMMONS</url>
- </issueManagement>
- <mailingLists>
- <mailingList>
- <name>WS Commons Developers</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/ws-commons-dev/</archive>
- </mailingList>
- </mailingLists>
- <inceptionYear>2004</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/XmlSchema</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/XmlSchema</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/branches/trunk/XmlSchema</url>
- </scm>
- <distributionManagement>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- <site>
- <id>apache.cxf.site</id>
-
<url>scpexe://people.apache.org/www/ws.apache.org/commons/xmlschema20/</url>
- </site>
- </distributionManagement>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
<build>
<!-- adding relevant resources to the jar files -->
<resources>
@@ -82,44 +39,7 @@
<filtering>true</filtering>
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test/test-resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
- <configuration>
-
<outputDirectory>${eclipse.outputDirectory}</outputDirectory>
- <buildcommands>
-
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
-
<java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
-
<java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
- </buildcommands>
- <projectnatures>
- <nature>org.eclipse.jdt.core.javanature</nature>
-
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-
<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
- </projectnatures>
- <additionalConfig>
- <file>
- <name>.checkstyle</name>
-
<location>etc/xmlschema-eclipse-checkstyle</location>
- </file>
- <file>
- <name>.pmd</name>
- <location>etc/xmlschema-eclipse-pmd</location>
- </file>
- <file>
- <name>.ruleset</name>
- <location>etc/xmlschema-pmd-ruleset.xml</location>
- </file>
- </additionalConfig>
- </configuration>
- </plugin>
+ <plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0</version>
@@ -151,444 +71,29 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+
<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
<defaultGoal>install</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
- <configuration>
-
<tagBase>https://svn.apache.org/repos/asf/webservices/commons/tags/XmlSchema</tagBase>
- <useReleaseProfiles>false</useReleaseProfiles>
- <goals>deploy</goals>
- <arguments>-Prelease</arguments>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>${basedir}/etc/xmlschema-checkstyle.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- <linkXRef>false</linkXRef>
-
<suppressionsLocation>${basedir}/etc/xmlschema-checkstyle-suppressions.xml</suppressionsLocation>
-
<sourceDirectory>${basedir}/src</sourceDirectory>
- </configuration>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <forkMode>never</forkMode>
- <additionalClasspathElements>
-
<additionalClasspathElement>w3c-testcases</additionalClasspathElement>
- </additionalClasspathElements>
- <systemPropertyVariables>
-
<org.apache.ws.commons.schema.protectReadOnlyCollections>true</org.apache.ws.commons.schema.protectReadOnlyCollections>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- <descriptor>src/main/assembly/doc.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-2</version>
- <executions>
- <execution>
- <id>site</id>
- <phase>package</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
- <profiles>
- <profile>
- <id>release</id>
- <activation>
- <property>
- <name>release</name>
- <value/>
- </property>
- </activation>
- <build>
- <plugins>
- <!--
- We want to sign the artifact, the POM, and all attached artifacts
--->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--
- We want to deploy the artifact to a staging location for perusal
--->
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>site</id>
- <phase>validate</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>single</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
-
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
-
<encoding>${project.build.sourceEncoding}</encoding>
- <attach>true</attach>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>DefaultTest</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>IBMTest</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>5.2</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <!--
- The default xalan TransformerFactory on the ibm jdk is
- org.apache.xalan.processor.TransformerFactoryImpl which has
a
- known issue with implicit namespaces. Set this property to
use
- the xsltc TransformerFactory (which the sun jdk seems to
- default to). -->
-
<javax.xml.transform.TransformerFactory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</javax.xml.transform.TransformerFactory>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>setup.eclipse</id>
- <properties>
-
<eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>
- </properties>
- <build>
- <defaultGoal>process-test-sources</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>setup.eclipse.workspace</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>configure-workspace</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <workspace>${eclipse.workspace.dir}</workspace>
-
<workspaceCodeStylesURL>file:${basedir}/etc/eclipse/XmlSchemaCodeFormatter.xml</workspaceCodeStylesURL>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>setup.workspace</id>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <path id="ecp.ws.path"
location="${eclipse.workspace.dir}"/>
- <property
name="full.eclipse.workspace" refid="ecp.ws.path"/>
- <property name="checkstyle.url"
location="etc/xmlschema-checkstyle.xml"/>
- <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings"/>
- <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle"/>
- <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse"/>
- <get src="file:${checkstyle.url}"
dest="${full.eclipse.workspace}/xmlschema-checkstyle.xml"/>
- <!-- Add checkstyle config -->
- <copy
file="${basedir}/etc/eclipse/template.checkstyle-config.xml"
tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
overwrite="no">
- <filterset>
- <filter
token="CHECKSTYLE_CONFIG_FILE"
value="${full.eclipse.workspace}/xmlschema-checkstyle.xml"/>
- </filterset>
- </copy>
- <xslt
style="${basedir}/etc/eclipse/addcheckstyle.xsl"
in="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
out="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new">
- <param name="checkstyleconfig"
expression="${full.eclipse.workspace}/xmlschema-checkstyle.xml"/>
- </xslt>
- <copy
file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new"
tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
overwrite="yes"/>
- <!-- Add warning flags that we want -->
- <propertyfile
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs">
- <entry
key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion"
value="ignore"/>
- <entry
key="org.eclipse.jdt.core.compiler.problem.unusedImport" value="ignore"/>
- <entry
key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface"
value="ignore"/>
- <entry
key="org.eclipse.jdt.core.compiler.problem.rawTypeReference" value="ignore"/>
- </propertyfile>
- <!-- Add code format rules -->
- <loadfile
property="eclipse.code.cleanup"
srcFile="${basedir}/etc/eclipse/XmlSchemaCleanUp.xml"/>
- <loadfile
property="eclipse.code.templates"
srcFile="${basedir}/etc/eclipse/codetemplates.xml"/>
- <loadfile
property="eclipse.xml.templates"
srcFile="${basedir}/etc/eclipse/xmltemplates.xml"/>
- <propertyfile
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
- <entry key="cleanup_profile"
value="XmlSchema"/>
- <entry
key="org.eclipse.jdt.ui.cleanupprofiles" value="${eclipse.code.cleanup}"/>
- <entry
key="org.eclipse.jdt.ui.text.custom_code_templates"
value="${eclipse.code.templates}"/>
- <!-- Add import order -->
- <entry
key="org.eclipse.jdt.ui.importorder"
value="java;javax;org.w3c;org.xml;org.junit;#org.junit"/>
- <!-- Sort order -->
- <entry
key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V,"/>
- <entry key="outlinesortoption"
value="T,SF,F,SI,I,C,SM,M,"/>
- <entry
key="org.eclipse.jdt.ui.enable.visibility.order" value="true"/>
- </propertyfile>
- <propertyfile
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs">
- <entry
key="eclipse.preferences.version" value="1"/>
- <entry
key="org.eclipse.wst.sse.ui.custom_templates" value="${eclipse.xml.templates}"/>
- </propertyfile>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>sourcecheck</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
-
<compilerArgument>${compile.flags}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.2</version>
<scope>test</scope>
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>summary</report>
- <report>index</report>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <reportSets>
- <reportSet>
- <id>html</id>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java?rev=1026828&r1=1026827&r2=1026828&view=diff
==============================================================================
---
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java
(original)
+++
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/RedefineTest.java
Sun Oct 24 15:59:29 2010
@@ -74,7 +74,7 @@ public class RedefineTest extends Assert
* ----------------- <schema xmlns="http://www.w3.org/2001/XMLSchema";
* xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://soapinterop.org/types";
* targetNamespace="http://soapinterop.org/types";> <redefine
- * schemaLocation="src/test/test-resources/redefine1.xsd">
<complexType name="person">
+ * schemaLocation="src/test/resources/redefine1.xsd"> <complexType
name="person">
* <complexContent> <extension base="tns:person"> <sequence> <element
name="id" type="string"/>
* </sequence> </extension> </complexContent> </complexType>
</redefine> <element name="vip"
* type="tns:person"/> </schema>
@@ -149,7 +149,7 @@ public class RedefineTest extends Assert
* ----------------- <schema xmlns="http://www.w3.org/2001/XMLSchema";
* xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://soapinterop.org/types";
* targetNamespace="http://soapinterop.org/types";> <redefine
- * schemaLocation="test-resources/redefine3.xsd"> <simpleType
name="drinksize"> <restriction
+ * schemaLocation="resources/redefine3.xsd"> <simpleType
name="drinksize"> <restriction
* base="tns:drinksize"> <minInclusive value="1"/> <maxInclusive
value="3"/> </restriction>
* </simpleType> </redefine> <element name="childsizedrink"
type="tns:drinksize"/> </schema>
*/
@@ -364,7 +364,7 @@ public class RedefineTest extends Assert
* ----------------- <schema xmlns="http://www.w3.org/2001/XMLSchema";
* xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://soapinterop.org/types";
* targetNamespace="http://soapinterop.org/types";> <redefine
- * schemaLocation="src/test/test-resources/redefine9.xsd">
<complexType name="person">
+ * schemaLocation="src/test/resources/redefine9.xsd"> <complexType
name="person">
* <complexContent> <extension base="tns:person"> <sequence> <element
name="id" type="string"/>
* </sequence> </extension> </complexContent> </complexType>
</redefine> <element name="vip"
* type="tns:person"/> </schema>
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/Resources.java
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/Resources.java?rev=1026828&r1=1026827&r2=1026828&view=diff
==============================================================================
---
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/Resources.java
(original)
+++
webservices/xmlschema/trunk/xmlschema-core/src/test/java/tests/Resources.java
Sun Oct 24 15:59:29 2010
@@ -23,7 +23,7 @@ public final class Resources {
/**
* Location of the test resources.
*/
- public static final String TEST_RESOURCES = "src/test/test-resources";
+ public static final String TEST_RESOURCES = "src/test/resources";
private Resources() {
}
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/include.xsd
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/resources/include.xsd?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/resources/include.xsd
(original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/resources/include.xsd
Sun Oct 24 15:59:29 2010
@@ -21,7 +21,7 @@
xmlns:tns="http://soapinterop.org/types";
targetNamespace="http://soapinterop.org/types";>
- <include schemaLocation="src/test/test-resources/include2.xsd"/>
- <include schemaLocation="src/test/test-resources/include3.xsd"/>
+ <include schemaLocation="src/test/resources/include2.xsd"/>
+ <include schemaLocation="src/test/resources/include3.xsd"/>
</schema>
\ No newline at end of file
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/includingWithNamespace.xsd
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/resources/includingWithNamespace.xsd?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
---
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/includingWithNamespace.xsd
(original)
+++
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/includingWithNamespace.xsd
Sun Oct 24 15:59:29 2010
@@ -24,7 +24,7 @@
targetNamespace="http://tns.demo.org";
attributeFormDefault="unqualified"
elementFormDefault="qualified">
- <xs:include
schemaLocation="src/test/test-resources/includedWithoutNamespace.xsd"/>
+ <xs:include
schemaLocation="src/test/resources/includedWithoutNamespace.xsd"/>
<xs:element name="foo" type="tns:XdwsGroupId"/>
</xs:schema>
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine10.xsd
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine10.xsd?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
---
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine10.xsd
(original)
+++
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine10.xsd
Sun Oct 24 15:59:29 2010
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types";
targetNamespace="http://soapinterop.org/types";>
- <redefine schemaLocation="src/test/test-resources/redefine9.xsd">
+ <redefine schemaLocation="src/test/resources/redefine9.xsd">
<complexType name="person">
<complexContent>
<extension base="tns:person">
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine2.xsd
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine2.xsd?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine2.xsd
(original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine2.xsd
Sun Oct 24 15:59:29 2010
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types";
targetNamespace="http://soapinterop.org/types";>
- <redefine schemaLocation="src/test/test-resources/redefine1.xsd">
+ <redefine schemaLocation="src/test/resources/redefine1.xsd">
<complexType name="person">
<complexContent>
<extension base="tns:person">
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine4.xsd
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine4.xsd?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine4.xsd
(original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine4.xsd
Sun Oct 24 15:59:29 2010
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types";
targetNamespace="http://soapinterop.org/types";>
- <redefine schemaLocation="src/test/test-resources/redefine3.xsd">
+ <redefine schemaLocation="src/test/resources/redefine3.xsd">
<simpleType name="drinksize">
<restriction base="tns:drinksize">
<minInclusive value="1"/>
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine6.xsd
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine6.xsd?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine6.xsd
(original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine6.xsd
Sun Oct 24 15:59:29 2010
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types";
targetNamespace="http://soapinterop.org/types";>
- <redefine schemaLocation="src/test/test-resources/redefine5.xsd">
+ <redefine schemaLocation="src/test/resources/redefine5.xsd">
<group name="PrologGroup">
<sequence>
<group ref="tns:PrologGroup"/>
Modified:
webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine8.xsd
URL:
http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine8.xsd?rev=1026828&r1=1026699&r2=1026828&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine8.xsd
(original)
+++ webservices/xmlschema/trunk/xmlschema-core/src/test/resources/redefine8.xsd
Sun Oct 24 15:59:29 2010
@@ -22,7 +22,7 @@
xmlns:tns="http://soapinterop.org/types";
targetNamespace="http://soapinterop.org/types";>
- <redefine schemaLocation="src/test/test-resources/redefine7.xsd">
+ <redefine schemaLocation="src/test/resources/redefine7.xsd">
<attributeGroup name="AttribGroup">
<attribute name="type" type="string"/>
<attribute name="units" type="string"/>
