Author: lresende
Date: Mon Mar 2 08:02:54 2009
New Revision: 749225
URL: http://svn.apache.org/viewvc?rev=749225&view=rev
Log:
Fixing tuscany-xsd path in unit tests
Modified:
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
Modified:
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java?rev=749225&r1=749224&r2=749225&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
Mon Mar 2 08:02:54 2009
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.io.File;
import java.net.URI;
import java.net.URL;
@@ -58,6 +59,7 @@
* @version $Rev$ $Date$
*/
public class ReadDocumentTestCase {
+ private static final String TUSCANY_10_XSD = "sca-10" + File.separator
+ "tuscany-sca.xsd";
private static URLArtifactProcessor<Object> documentProcessor;
private static ModelResolver resolver;
@@ -90,7 +92,7 @@
// Some old JDKs don't support XMLSchema validation
return;
}
- Schema schema =
schemaFactory.newSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd"));
+ Schema schema =
schemaFactory.newSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD));
ValidatorHandler handler = schema.newValidatorHandler();
SAXParserFactory parserFactory = SAXParserFactory.newInstance();
@@ -115,7 +117,7 @@
// Some old JDKs don't support XMLSchema validation
return;
}
- Schema schema =
schemaFactory.newSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd"));
+ Schema schema =
schemaFactory.newSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD));
ValidatorHandler handler = schema.newValidatorHandler();
SAXParserFactory parserFactory = SAXParserFactory.newInstance();
@@ -130,7 +132,7 @@
public void testReadImplementation() throws Exception {
ValidationSchemaExtensionPoint schemas = new
DefaultValidationSchemaExtensionPoint();
-
schemas.addSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd").toString());
+
schemas.addSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD).toString());
XMLInputFactory validatingInputFactory = new
DefaultValidatingXMLInputFactory(inputFactory, schemas, null);
DefaultFactoryExtensionPoint factories = new
DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry());
factories.addFactory(validatingInputFactory);
@@ -156,7 +158,7 @@
// Some old JDKs don't support XMLSchema validation
return;
}
- Schema schema =
schemaFactory.newSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd"));
+ Schema schema =
schemaFactory.newSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD));
ValidatorHandler handler = schema.newValidatorHandler();
SAXParserFactory parserFactory = SAXParserFactory.newInstance();
@@ -171,7 +173,7 @@
public void testReadBinding() throws Exception {
ValidationSchemaExtensionPoint schemas = new
DefaultValidationSchemaExtensionPoint();
-
schemas.addSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd").toString());
+
schemas.addSchema(getClass().getClassLoader().getResource(TUSCANY_10_XSD).toString());
XMLInputFactory validatingInputFactory = new
DefaultValidatingXMLInputFactory(inputFactory, schemas, null);
DefaultFactoryExtensionPoint factories = new
DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry());
factories.addFactory(validatingInputFactory);