[bvalid-codewatch] SF.net SVN: bvalid: [8] trunk
Status: Beta
Brought to you by:
cwilper
Menu
▾
▴
[bvalid-codewatch] SF.net SVN: bvalid: [8] trunk
|
From: <cw...@us...> - 2006-03-10 09:04:29
|
Revision: 8 Author: cwilper Date: 2006-03-10 01:04:13 -0800 (Fri, 10 Mar 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=8&view=rev Log Message: ----------- finished rename (XMLValidator => Validator) Modified Paths: -------------- trunk/build.xml trunk/src/java/net/sf/bvalid/BValid.java trunk/src/java/net/sf/bvalid/Validator.java trunk/src/java/net/sf/bvalid/xsd/xerces/XercesXSDValidator.java Added Paths: ----------- trunk/src/java/net/sf/bvalid/ValidatorFactory.java trunk/src/testjava/net/sf/bvalid/ValidatorFactoryTest.java Removed Paths: ------------- trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-03-10 08:58:29 UTC (rev 7) +++ trunk/build.xml 2006-03-10 09:04:13 UTC (rev 8) @@ -73,7 +73,7 @@ <classpath refid="test.path"/> <sysproperty key="propname" value="propvalue"/> <test name="net.sf.bvalid.SchemaLanguageTest"/> - <test name="net.sf.bvalid.XMLValidatorFactoryTest"/> + <test name="net.sf.bvalid.ValidatorFactoryTest"/> </junit> </target> Modified: trunk/src/java/net/sf/bvalid/BValid.java =================================================================== --- trunk/src/java/net/sf/bvalid/BValid.java 2006-03-10 08:58:29 UTC (rev 7) +++ trunk/src/java/net/sf/bvalid/BValid.java 2006-03-10 09:04:13 UTC (rev 8) @@ -10,11 +10,11 @@ System.setProperty("org.apache.commons.logging.LogFactory", "org.apache.commons.logging.impl.Log4jFactory"); System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.Log4JLogger"); - XMLValidator validator = XMLValidatorFactory.getValidator( + Validator validator = ValidatorFactory.getValidator( SchemaLanguage.XSD); validator.validate(new FileInputStream(new File(args[0]))); System.out.println("OK"); } -} \ No newline at end of file +} Modified: trunk/src/java/net/sf/bvalid/Validator.java =================================================================== --- trunk/src/java/net/sf/bvalid/Validator.java 2006-03-10 08:58:29 UTC (rev 7) +++ trunk/src/java/net/sf/bvalid/Validator.java 2006-03-10 09:04:13 UTC (rev 8) @@ -5,7 +5,7 @@ import net.sf.bvalid.locator.SchemaLocator; -public interface XMLValidator { +public interface Validator { /** * Set the <code>SchemaLocator</code> for this validator. @@ -42,4 +42,4 @@ public void validate(InputStream xmlStream) throws ValidationException; -} \ No newline at end of file +} Copied: trunk/src/java/net/sf/bvalid/ValidatorFactory.java (from rev 7, trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java) =================================================================== --- trunk/src/java/net/sf/bvalid/ValidatorFactory.java (rev 0) +++ trunk/src/java/net/sf/bvalid/ValidatorFactory.java 2006-03-10 09:04:13 UTC (rev 8) @@ -0,0 +1,40 @@ +package net.sf.bvalid; + +import net.sf.bvalid.locator.SchemaLocator; +import net.sf.bvalid.locator.WebSchemaLocator; +import net.sf.bvalid.xsd.xerces.XercesXSDValidator; + +public abstract class ValidatorFactory { + + public static Validator getValidator(SchemaLanguage lang) + throws ValidatorException { + return getValidator(lang, new WebSchemaLocator()); + } + + public static Validator getValidator(SchemaLanguage lang, + SchemaLocator locator) + throws ValidatorException { + return getValidator(lang, locator, true); + } + + public static Validator getValidator(SchemaLanguage lang, + SchemaLocator locator, + boolean failOnMissingReferencedSchema) + throws ValidatorException { + + Validator validator = null; + if (lang == SchemaLanguage.XSD) { + validator = new XercesXSDValidator(); + } + + if (validator == null) { + throw new ValidatorException("No validator found for schema " + + "language: " + lang.getName()); + } else { + validator.setSchemaLocator(locator); + validator.setFailOnMissingReferencedSchema(failOnMissingReferencedSchema); + return validator; + } + } + +} Deleted: trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java =================================================================== --- trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java 2006-03-10 08:58:29 UTC (rev 7) +++ trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java 2006-03-10 09:04:13 UTC (rev 8) @@ -1,40 +0,0 @@ -package net.sf.bvalid; - -import net.sf.bvalid.locator.SchemaLocator; -import net.sf.bvalid.locator.WebSchemaLocator; -import net.sf.bvalid.xsd.xerces.XercesXSDValidator; - -public abstract class XMLValidatorFactory { - - public static XMLValidator getValidator(SchemaLanguage lang) - throws ValidatorException { - return getValidator(lang, new WebSchemaLocator()); - } - - public static XMLValidator getValidator(SchemaLanguage lang, - SchemaLocator locator) - throws ValidatorException { - return getValidator(lang, locator, true); - } - - public static XMLValidator getValidator(SchemaLanguage lang, - SchemaLocator locator, - boolean failOnMissingReferencedSchema) - throws ValidatorException { - - XMLValidator validator = null; - if (lang == SchemaLanguage.XSD) { - validator = new XercesXSDValidator(); - } - - if (validator == null) { - throw new ValidatorException("No validator found for schema " - + "language: " + lang.getName()); - } else { - validator.setSchemaLocator(locator); - validator.setFailOnMissingReferencedSchema(failOnMissingReferencedSchema); - return validator; - } - } - -} Modified: trunk/src/java/net/sf/bvalid/xsd/xerces/XercesXSDValidator.java =================================================================== --- trunk/src/java/net/sf/bvalid/xsd/xerces/XercesXSDValidator.java 2006-03-10 08:58:29 UTC (rev 7) +++ trunk/src/java/net/sf/bvalid/xsd/xerces/XercesXSDValidator.java 2006-03-10 09:04:13 UTC (rev 8) @@ -16,10 +16,10 @@ import net.sf.bvalid.SchemaLanguage; import net.sf.bvalid.ValidatorException; import net.sf.bvalid.ValidationException; -import net.sf.bvalid.XMLValidator; +import net.sf.bvalid.Validator; import net.sf.bvalid.locator.SchemaLocator; -public class XercesXSDValidator implements EntityResolver, XMLValidator { +public class XercesXSDValidator implements EntityResolver, Validator { private static Logger _LOG = Logger.getLogger(XercesXSDValidator.class.getName()); @@ -116,4 +116,4 @@ */ } -} \ No newline at end of file +} Copied: trunk/src/testjava/net/sf/bvalid/ValidatorFactoryTest.java (from rev 7, trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java) =================================================================== --- trunk/src/testjava/net/sf/bvalid/ValidatorFactoryTest.java (rev 0) +++ trunk/src/testjava/net/sf/bvalid/ValidatorFactoryTest.java 2006-03-10 09:04:13 UTC (rev 8) @@ -0,0 +1,42 @@ +package net.sf.bvalid; + +import junit.framework.TestCase; +import junit.textui.TestRunner; + +import net.sf.bvalid.locator.WebSchemaLocator; + +public class ValidatorFactoryTest extends TestCase { + + public ValidatorFactoryTest(String name) { super (name); } + + public void setUp() { + } + + public void tearDown() { + } + + //---------------------------------------------------------[ Test methods ] + + public void testGetValidatorDefaultLocator() + throws ValidatorException { + ValidatorFactory.getValidator(SchemaLanguage.XSD); + } + + public void testGetValidatorSpecificLocator() + throws ValidatorException { + ValidatorFactory.getValidator(SchemaLanguage.XSD, + new WebSchemaLocator()); + } + + public void testGetValidatorNoFailOnMissingSchema() + throws ValidatorException { + ValidatorFactory.getValidator(SchemaLanguage.XSD, + new WebSchemaLocator(), + false); + } + + public static void main(String[] args) { + TestRunner.run(ValidatorFactoryTest.class); + } + +} Deleted: trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java =================================================================== --- trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java 2006-03-10 08:58:29 UTC (rev 7) +++ trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java 2006-03-10 09:04:13 UTC (rev 8) @@ -1,42 +0,0 @@ -package net.sf.bvalid; - -import junit.framework.TestCase; -import junit.textui.TestRunner; - -import net.sf.bvalid.locator.WebSchemaLocator; - -public class XMLValidatorFactoryTest extends TestCase { - - public XMLValidatorFactoryTest(String name) { super (name); } - - public void setUp() { - } - - public void tearDown() { - } - - //---------------------------------------------------------[ Test methods ] - - public void testGetValidatorDefaultLocator() - throws ValidatorException { - XMLValidatorFactory.getValidator(SchemaLanguage.XSD); - } - - public void testGetValidatorSpecificLocator() - throws ValidatorException { - XMLValidatorFactory.getValidator(SchemaLanguage.XSD, - new WebSchemaLocator()); - } - - public void testGetValidatorNoFailOnMissingSchema() - throws ValidatorException { - XMLValidatorFactory.getValidator(SchemaLanguage.XSD, - new WebSchemaLocator(), - false); - } - - public static void main(String[] args) { - TestRunner.run(XMLValidatorFactoryTest.class); - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
