Thread: [bvalid-codewatch] SF.net SVN: bvalid: [6] trunk
Status: Beta
Brought to you by:
cwilper
|
From: <cw...@us...> - 2006-03-09 08:08:00
|
Revision: 6 Author: cwilper Date: 2006-03-09 00:07:51 -0800 (Thu, 09 Mar 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=6&view=rev Log Message: ----------- started junit tests Modified Paths: -------------- trunk/build.xml trunk/src/java/net/sf/bvalid/SchemaLanguage.java Added Paths: ----------- trunk/src/testjava/ trunk/src/testjava/net/ trunk/src/testjava/net/sf/ trunk/src/testjava/net/sf/bvalid/ trunk/src/testjava/net/sf/bvalid/SchemaLanguageTest.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-03-08 09:03:57 UTC (rev 5) +++ trunk/build.xml 2006-03-09 08:07:51 UTC (rev 6) @@ -17,11 +17,12 @@ <path id="test.path"> <path refid="compile.path"/> <pathelement location="build/classes"/> + <pathelement location="build/testclasses"/> </path> <target name="classes" depends="prep" - description="build all java classes into build/"> + description="build all java classes into build/classes"> <mkdir dir="build/classes"/> <javac srcdir="src/java" destdir="build/classes" includes="**" @@ -32,6 +33,16 @@ </copy> </target> + <target name="testclasses" + depends="classes" + description="build all test classes into build/testclasses"> + <mkdir dir="build/testclasses"/> + <javac srcdir="src/testjava" destdir="build/testclasses" + includes="**" + classpathref="test.path" + optimize="${optimize}" debug="${debug}"/> + </target> + <target name="dist" depends="classes" description="Build the distribution in dist/"> <mkdir dir="dist/lib"/> <copy todir="dist/lib"> @@ -53,6 +64,18 @@ </javadoc> </target> + <target name="test" description="Run tests" depends="testclasses"> + <!-- + For this task to run, prior to running ant, set CLASSPATH=lib\junit.jar + --> + <junit printsummary="yes" haltonfailure="yes" showoutput="true"> + <formatter type="plain" usefile="false"/> + <classpath refid="test.path"/> + <sysproperty key="propname" value="propvalue"/> + <test name="net.sf.bvalid.SchemaLanguageTest"/> + </junit> + </target> + <target name="prep" description="prepare for a build"> <mkdir dir="build"/> Modified: trunk/src/java/net/sf/bvalid/SchemaLanguage.java =================================================================== --- trunk/src/java/net/sf/bvalid/SchemaLanguage.java 2006-03-08 09:03:57 UTC (rev 5) +++ trunk/src/java/net/sf/bvalid/SchemaLanguage.java 2006-03-09 08:07:51 UTC (rev 6) @@ -39,4 +39,4 @@ } } -} \ No newline at end of file +} Added: trunk/src/testjava/net/sf/bvalid/SchemaLanguageTest.java =================================================================== --- trunk/src/testjava/net/sf/bvalid/SchemaLanguageTest.java (rev 0) +++ trunk/src/testjava/net/sf/bvalid/SchemaLanguageTest.java 2006-03-09 08:07:51 UTC (rev 6) @@ -0,0 +1,63 @@ +package net.sf.bvalid; + +import junit.framework.TestCase; +import junit.textui.TestRunner; + +public class SchemaLanguageTest extends TestCase { + + public SchemaLanguageTest(String name) { super (name); } + + public void setUp() { + } + + public void tearDown() { + } + + //---------------------------------------------------------[ Test methods ] + + public void testForNameXSD() throws ValidatorException { + + SchemaLanguage xsdLower = SchemaLanguage.forName("xsd"); + assertEquals(xsdLower, SchemaLanguage.XSD); + + SchemaLanguage xsdUpper = SchemaLanguage.forName("XSD"); + assertEquals(xsdUpper, SchemaLanguage.XSD); + } + + public void testForNameUnrecognized() { + boolean recognized = false; + try { + SchemaLanguage.forName("unrecognized"); + recognized = true; + } catch (ValidatorException e) { + } finally { + assertFalse(recognized); + } + } + + public void testGetNameXSD() { + assertEquals(SchemaLanguage.XSD.getName(), "XSD"); + } + + public void testGetURIXSD() { + assertEquals(SchemaLanguage.XSD.getURI(), "http://www.w3.org/2001/XMLSchema"); + } + + public void testSupportedListContainsXSD() { + + boolean foundXSD = false; + SchemaLanguage[] langs = SchemaLanguage.getSupportedList(); + for (int i = 0; i < langs.length; i++) { + if (langs[i] == SchemaLanguage.XSD) { + foundXSD = true; + } + } + + assertTrue(foundXSD); + } + + public static void main(String[] args) { + TestRunner.run(SchemaLanguageTest.class); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-03-10 08:58:40
|
Revision: 7 Author: cwilper Date: 2006-03-10 00:58:29 -0800 (Fri, 10 Mar 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=7&view=rev Log Message: ----------- added test case, started rename Modified Paths: -------------- trunk/build.xml trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java Added Paths: ----------- trunk/src/java/net/sf/bvalid/Validator.java trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java Removed Paths: ------------- trunk/src/java/net/sf/bvalid/XMLValidator.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-03-09 08:07:51 UTC (rev 6) +++ trunk/build.xml 2006-03-10 08:58:29 UTC (rev 7) @@ -73,6 +73,7 @@ <classpath refid="test.path"/> <sysproperty key="propname" value="propvalue"/> <test name="net.sf.bvalid.SchemaLanguageTest"/> + <test name="net.sf.bvalid.XMLValidatorFactoryTest"/> </junit> </target> Copied: trunk/src/java/net/sf/bvalid/Validator.java (from rev 4, trunk/src/java/net/sf/bvalid/XMLValidator.java) =================================================================== --- trunk/src/java/net/sf/bvalid/Validator.java (rev 0) +++ trunk/src/java/net/sf/bvalid/Validator.java 2006-03-10 08:58:29 UTC (rev 7) @@ -0,0 +1,45 @@ +package net.sf.bvalid; + +import java.io.*; +import java.util.*; + +import net.sf.bvalid.locator.SchemaLocator; + +public interface XMLValidator { + + /** + * Set the <code>SchemaLocator</code> for this validator. + */ + public void setSchemaLocator(SchemaLocator locator); + + /** + * Set whether validation should fail if a referenced schema could + * not be found with the locator. This defaults to true. + */ + public void setFailOnMissingReferencedSchema(boolean value); + + /** + * Validate the document according to the given schema. + * + * Validation will fail if: + * - The indicated schema cannot be located + * - The document is not well-formed XML + * - failOnMissingReferencedSchema is true and at least one referenced + * schema cannot be located. + */ + public void validate(InputStream xmlStream, + String schemaURI) throws ValidationException; + + /** + * Validate the document according to the schema(s) referenced within, + * if any. + * + * Validation will fail if: + * - The document is not well-formed XML + * - failOnMissingReferencedSchema is true and at least one referenced + * schema cannot be located. + */ + public void validate(InputStream xmlStream) + throws ValidationException; + +} \ No newline at end of file Deleted: trunk/src/java/net/sf/bvalid/XMLValidator.java =================================================================== --- trunk/src/java/net/sf/bvalid/XMLValidator.java 2006-03-09 08:07:51 UTC (rev 6) +++ trunk/src/java/net/sf/bvalid/XMLValidator.java 2006-03-10 08:58:29 UTC (rev 7) @@ -1,45 +0,0 @@ -package net.sf.bvalid; - -import java.io.*; -import java.util.*; - -import net.sf.bvalid.locator.SchemaLocator; - -public interface XMLValidator { - - /** - * Set the <code>SchemaLocator</code> for this validator. - */ - public void setSchemaLocator(SchemaLocator locator); - - /** - * Set whether validation should fail if a referenced schema could - * not be found with the locator. This defaults to true. - */ - public void setFailOnMissingReferencedSchema(boolean value); - - /** - * Validate the document according to the given schema. - * - * Validation will fail if: - * - The indicated schema cannot be located - * - The document is not well-formed XML - * - failOnMissingReferencedSchema is true and at least one referenced - * schema cannot be located. - */ - public void validate(InputStream xmlStream, - String schemaURI) throws ValidationException; - - /** - * Validate the document according to the schema(s) referenced within, - * if any. - * - * Validation will fail if: - * - The document is not well-formed XML - * - failOnMissingReferencedSchema is true and at least one referenced - * schema cannot be located. - */ - public void validate(InputStream xmlStream) - throws ValidationException; - -} \ No newline at end of file Modified: trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java =================================================================== --- trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java 2006-03-09 08:07:51 UTC (rev 6) +++ trunk/src/java/net/sf/bvalid/XMLValidatorFactory.java 2006-03-10 08:58:29 UTC (rev 7) @@ -8,7 +8,7 @@ public static XMLValidator getValidator(SchemaLanguage lang) throws ValidatorException { - return getValidator(lang, new WebSchemaLocator(), true); + return getValidator(lang, new WebSchemaLocator()); } public static XMLValidator getValidator(SchemaLanguage lang, Added: trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java =================================================================== --- trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java (rev 0) +++ trunk/src/testjava/net/sf/bvalid/XMLValidatorFactoryTest.java 2006-03-10 08:58:29 UTC (rev 7) @@ -0,0 +1,42 @@ +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. |
|
From: <cw...@us...> - 2006-05-01 06:58:01
|
Revision: 18 Author: cwilper Date: 2006-04-30 23:57:49 -0700 (Sun, 30 Apr 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=18&view=rev Log Message: ----------- command-line interface works Modified Paths: -------------- trunk/build.xml trunk/src/java/net/sf/bvalid/BValid.java trunk/src/java/net/sf/bvalid/catalog/FileSchemaIndex.java trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java Added Paths: ----------- trunk/src/bin/ trunk/src/bin/bvalid trunk/src/bin/bvalid.bat trunk/src/java/net/sf/bvalid/BValid.properties Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-04-28 05:07:57 UTC (rev 17) +++ trunk/build.xml 2006-05-01 06:57:49 UTC (rev 18) @@ -31,6 +31,15 @@ <copy todir="build/classes"> <fileset dir="src/config"/> </copy> + <copy file="src/java/net/sf/bvalid/BValid.properties" tofile="build/classes/net/sf/bvalid/BValid.properties"/> + <propertyfile file="build/version.properties"> + <entry key="buildDate" type="date" value="now"/> + </propertyfile> + <replace file="build/classes/net/sf/bvalid/BValid.properties" + value="value not found in version.properties" + propertyFile="build/version.properties"> + <replacefilter token="@buildDate@" property="buildDate"/> + </replace> </target> <target name="testclasses" @@ -48,6 +57,10 @@ <copy todir="dist/lib"> <fileset dir="lib"/> </copy> + <copy todir="dist"> + <fileset dir="src/bin"/> + </copy> + <chmod dir="dist" perm="ugo+x" includes="bvalid"/> <jar jarfile="dist/bvalid.jar" basedir="build/classes"/> </target> Added: trunk/src/bin/bvalid =================================================================== --- trunk/src/bin/bvalid (rev 0) +++ trunk/src/bin/bvalid 2006-05-01 06:57:49 UTC (rev 18) @@ -0,0 +1,20 @@ +#!/bin/sh + +if [ -z "$BVALID_HOME" ]; then + BVALID_HOME=. +fi + +if [ ! -f "$BVALID_HOME/bvalid.jar" ]; then + echo "ERROR: $BVALID_HOME/bvalid.jar was not found." + echo "NOTE : To run bvalid from any directory, BVALID_HOME must be defined." + exit 1 +fi + +(exec java -Xms64m -Xmx96m \ + -cp "$BVALID_HOME/bvalid.jar" \ + -Djava.endorsed.dirs="$BVALID_HOME/lib" \ + -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \ + -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \ + net.sf.bvalid.BValid $1 $2 $3 $4 $5 $6 $7 $8 $9) + +exit $? Property changes on: trunk/src/bin/bvalid ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/bin/bvalid.bat =================================================================== --- trunk/src/bin/bvalid.bat (rev 0) +++ trunk/src/bin/bvalid.bat 2006-05-01 06:57:49 UTC (rev 18) @@ -0,0 +1,28 @@ +@echo off + +goto checkEnv + +:envOk +java -Xms64m -Xmx96m -cp "%BVALID_HOME%\bvalid.jar" -Djava.endorsed.dirs="%BVALID_HOME%\lib" -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl net.sf.bvalid.BValid %1 %2 %3 %4 %5 %6 %7 %8 %9 +if errorlevel 1 goto endWithError +goto end + +:checkEnv +if "%BVALID_HOME%" == "" goto setHome + +:checkJarExists +if not exist "%BVALID_HOME%\bvalid.jar" goto jarNotFound +goto envOk + +:setHome +set BVALID_HOME=. +goto checkJarExists + +:jarNotFound +echo ERROR: %BVALID_HOME%\bvalid.jar was not found. +echo NOTE: To run bvalid from any directory, BVALID_HOME must be defined. + +:endWithError +exit /B 1 + +:end Modified: trunk/src/java/net/sf/bvalid/BValid.java =================================================================== --- trunk/src/java/net/sf/bvalid/BValid.java 2006-04-28 05:07:57 UTC (rev 17) +++ trunk/src/java/net/sf/bvalid/BValid.java 2006-05-01 06:57:49 UTC (rev 18) @@ -3,53 +3,290 @@ import java.io.*; import java.util.*; -import net.sf.bvalid.catalog.DiskSchemaCatalog; -import net.sf.bvalid.catalog.FileSchemaIndex; -import net.sf.bvalid.catalog.MemorySchemaCatalog; -import net.sf.bvalid.catalog.SchemaIndex; -import net.sf.bvalid.locator.CachingSchemaLocator; -import net.sf.bvalid.locator.SchemaLocator; -import net.sf.bvalid.locator.URLSchemaLocator; +import org.apache.log4j.Logger; /** - * Test class. + * Command-line utility for validating instance documents. * * @author cw...@cs... */ public class BValid { - public static void main(String[] args) throws Exception { + private static Logger _LOG = Logger.getLogger(BValid.class.getName()); + private Options _opts; + private String _version; + private String _buildDate; + + public BValid(String[] args) throws ArgException { + + // get version and buildDate from properties + Properties props = new Properties(); + InputStream in = BValid.class.getClassLoader().getResourceAsStream("net/sf/bvalid/BValid.properties"); + try { + props.load(in); + _version = props.getProperty("bvalid.version"); + _buildDate = props.getProperty("bvalid.buildDate"); + } catch (Exception e) { + throw new RuntimeException("Error loading bvalid.properties"); + } finally { + try { in.close(); } catch (Exception e) { } + } + + _opts = new Options(args); + } + + private String getVersionLine() { + return "BValid version " + _version + " (build date: " + _buildDate + ")"; + } + + private void showVersion() { + System.out.println(getVersionLine()); + } + + private void showUsage() { + System.out.println("Usage: bvalid [OPTIONS] LANG XMLFILE"); + System.out.println(" Or: bvalid --version"); + System.out.println(" Or: bvalid --help"); + System.out.println(""); + System.out.println("Where:"); + System.out.println(" LANG a supported schema language, such as xsd"); + System.out.println(" XMLFILE the path to the instance file to validate"); + System.out.println(""); + System.out.println("Options:"); + System.out.println(" -cf, --cache-files Cache schema files locally"); + System.out.println(" -co, --cache-objects Cache parsed grammar objects in memory"); + System.out.println(" -am, --allow-missing Allow missing referenced schemas. If the instance"); + System.out.println(" includes references to schemas that can't be found,"); + System.out.println(" this will skip them rather than failing validation."); + System.out.println(" --repeat=n Repeat the validation n times (for testing)"); + System.out.println(" --schema=file Use the given schema file (url or filename)"); + System.out.println(" -v, --version Print version and exit (exclusive option)"); + System.out.println(" -h, --help Print help and exit (exclusive option)"); + System.out.println(""); + } + + public void run() throws Exception { + + if (_opts.showVersion()) { + showVersion(); + } else if (_opts.showUsage()) { + showVersion(); + System.out.println(); + showUsage(); + } else { + _LOG.info(getVersionLine()); + + // construct our validator + Validator validator; + Map vopts = new HashMap(); + if (_opts.cacheObjects()) { + vopts.put(ValidatorOption.CACHE_PARSED_GRAMMARS, "true"); + } + if (_opts.allowMissing()) { + vopts.put(ValidatorOption.FAIL_ON_MISSING_REFERENCED, "false"); + } + File cacheDir = null; + if (_opts.cacheFiles()) { + cacheDir = File.createTempFile("bvalid-schemaCache", ""); + cacheDir.delete(); + cacheDir.mkdir(); + validator = ValidatorFactory.getValidator(_opts.getLang(), + cacheDir, + vopts); + } else { + validator = ValidatorFactory.getValidator(_opts.getLang(), + vopts); + } + + try { + runValidation(validator, + _opts.getXMLFile(), + _opts.getSchema(), + _opts.getRepeat()); + } finally { + + // if we created cache dir, clean it up + if (cacheDir != null && cacheDir.isDirectory()) { + try { + File[] files = cacheDir.listFiles(); + for (int i = 0; i < files.length; i++) { + files[i].delete(); + } + cacheDir.delete(); + } catch (Exception e) { } + } + } + } + } + + private void runValidation(Validator validator, + File xmlFile, + String schema, + int times) throws Exception { + + long startTime = System.currentTimeMillis(); + for (int i = 0; i < times; i++) { + + long st = System.currentTimeMillis(); + try { + InputStream in = new FileInputStream(xmlFile); + if (schema != null) { + validator.validate(in, schema); + } else { + validator.validate(in); + } + long ms = System.currentTimeMillis() - st; + _LOG.info("Validation of " + xmlFile.getPath() + " succeeded in " + ms + "ms."); + } catch (ValidationException e) { + long ms = System.currentTimeMillis() - st; + _LOG.error("Validation of " + xmlFile.getPath() + " failed in " + ms + "ms.\n" + e.getMessage()); + } + } + long total = System.currentTimeMillis() - startTime; + long msPerDoc = total / times; + _LOG.info("Overall validation rate: " + msPerDoc + "ms/doc"); + } + + public static void main(String[] args) { + // tell commons-logging to use log4j 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"); - Map options = new HashMap(); - options.put(ValidatorOption.CACHE_PARSED_GRAMMARS, "true"); + int errorLevel = 1; + try { + BValid bvalid = new BValid(args); + bvalid.run(); + errorLevel = 0; + } catch (ArgException e) { + System.out.println("bvalid: " + e.getMessage() + " ( -h to show usage )"); + } catch (Exception e) { + _LOG.fatal("Unexpected error", e); + } + System.exit(errorLevel); + } - Validator validator = - ValidatorFactory.getValidator(SchemaLanguage.XSD, - options); + public class Options { - try { - int num = 2; - long now = System.currentTimeMillis(); - for (int i = 0; i < num; i++) { - validator.validate(new FileInputStream(new File(args[0]))); + private SchemaLanguage _lang; + private File _xmlFile; + private boolean _cacheFiles; + private boolean _cacheObjects; + private boolean _allowMissing; + private int _repeat = 1; + private String _schema; + + private boolean _showVersion; + private boolean _showUsage; + + public Options(String[] args) throws ArgException { + + for (int i = 0; i < args.length; i++) { + if (args[i].startsWith("-")) { + if (args[i].equals("-cf") || args[i].equals("--cache-files")) { + _cacheFiles = true; + } else if (args[i].equals("-co") || args[i].equals("--cache-objects")) { + _cacheObjects = true; + } else if (args[i].equals("-am") || args[i].equals("--allow-missing")) { + _allowMissing=true; + } else if (args[i].startsWith("--repeat=")) { + String value = args[i].substring(9); + try { + _repeat = Integer.parseInt(value); + } catch (Exception e) { + throw new ArgException("must specify integer value for repeat option"); + } + } else if (args[i].startsWith("--schema=")) { + String value = args[i].substring(9); + if (!value.startsWith("/") && value.indexOf(":") != -1) { + _schema = value; // assume they gave uri + } else { + try { + _schema = new File(value).toURI().toString(); + } catch (Exception e) { + throw new RuntimeException("cannot get URI for local schema file: " + value, e); + } + } + } else if (args[i].equals("-h") || args[i].equals("--help")) { + _showUsage = true; + if (args.length > 1) { + throw new ArgException("option is exclusive: " + args[i]); + } + } else if (args[i].equals("-v") || args[i].equals("--version")) { + _showVersion = true; + if (args.length > 1) { + throw new ArgException("option is exclusive: " + args[i]); + } + } else { + throw new ArgException("unrecognized argument: " + args[i]); + } + } else { + System.out.println("Naked arg: " + args[i]); + if (_lang == null) { + try { + _lang = SchemaLanguage.forName(args[i]); + } catch (Exception e) { + throw new ArgException(e.getMessage()); + } + } else if (_xmlFile == null) { + _xmlFile = new File(args[i]); + } else { + throw new ArgException("Too many arguments"); + } + } + } - long dur = System.currentTimeMillis() - now; - long msPerDoc = dur / num; - System.out.println("Avg time/doc = " + msPerDoc); - System.out.println("OK"); - System.exit(0); - } catch (ValidationException e) { - System.out.println(e.getMessage()); - if (e.getCause() != null) { - System.out.println("Underlying error:"); - e.getCause().printStackTrace(); + + if (!_showVersion && !_showUsage && _xmlFile == null) { + throw new ArgException("Too few arguments"); } - System.exit(1); } + + public SchemaLanguage getLang() { + return _lang; + } + + public File getXMLFile() { + return _xmlFile; + } + + public boolean cacheFiles() { + return _cacheFiles; + } + + public boolean cacheObjects() { + return _cacheObjects; + } + + public boolean allowMissing() { + return _allowMissing; + } + + public int getRepeat() { + return _repeat; + } + + public String getSchema() { + return _schema; + } + + public boolean showVersion() { + return _showVersion; + } + + public boolean showUsage() { + return _showUsage; + } + } + public class ArgException extends Exception { + + public ArgException(String message) { + super(message); + } + + } + } Added: trunk/src/java/net/sf/bvalid/BValid.properties =================================================================== --- trunk/src/java/net/sf/bvalid/BValid.properties (rev 0) +++ trunk/src/java/net/sf/bvalid/BValid.properties 2006-05-01 06:57:49 UTC (rev 18) @@ -0,0 +1,2 @@ +bvalid.version = 1.0 +bvalid.buildDate = @buildDate@ Modified: trunk/src/java/net/sf/bvalid/catalog/FileSchemaIndex.java =================================================================== --- trunk/src/java/net/sf/bvalid/catalog/FileSchemaIndex.java 2006-04-28 05:07:57 UTC (rev 17) +++ trunk/src/java/net/sf/bvalid/catalog/FileSchemaIndex.java 2006-05-01 06:57:49 UTC (rev 18) @@ -120,6 +120,7 @@ protected static Map loadIndex(File indexFile) throws IOException { + if (!indexFile.exists()) return new HashMap(); InputStream in = new FileInputStream(indexFile); try { Modified: trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java 2006-04-28 05:07:57 UTC (rev 17) +++ trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java 2006-05-01 06:57:49 UTC (rev 18) @@ -1,9 +1,11 @@ package net.sf.bvalid; +import java.util.*; + import junit.framework.TestCase; import junit.textui.TestRunner; -import net.sf.bvalid.locator.WebSchemaLocator; +import net.sf.bvalid.locator.URLSchemaLocator; public class ValidatorFactoryTest extends TestCase { @@ -17,25 +19,48 @@ //---------------------------------------------------------[ Test methods ] - public void testGetValidatorDefaultLocator() + public void testGetValidatorDefault() throws ValidatorException { - ValidatorFactory.getValidator(SchemaLanguage.XSD); + + ValidatorFactory.getValidator(SchemaLanguage.XSD, null); } - public void testGetValidatorSpecificLocator() + public void testGetValidatorCustom() throws ValidatorException { - ValidatorFactory.getValidator(SchemaLanguage.XSD, - new WebSchemaLocator()); + + ValidatorFactory.getValidator(SchemaLanguage.XSD, + new URLSchemaLocator(), + null); } - public void testGetValidatorNoFailOnMissingSchema() + public void testGetValidatorCustomWithGoodOptions() throws ValidatorException { - ValidatorFactory.getValidator(SchemaLanguage.XSD, - new WebSchemaLocator(), - false); + + Map options = new HashMap(); + options.put(ValidatorOption.CACHE_PARSED_GRAMMARS, "false"); + ValidatorFactory.getValidator(SchemaLanguage.XSD, + new URLSchemaLocator(), + options); } + public void testGetValidatorCustomWithBadOptions() + throws ValidatorException { + + Map options = new HashMap(); + options.put(ValidatorOption.CACHE_PARSED_GRAMMARS, "faults"); + boolean threwException = false; + try { + ValidatorFactory.getValidator(SchemaLanguage.XSD, + new URLSchemaLocator(), + options); + } catch (ValidatorException e) { + threwException = true; + } + assertEquals("Should have thrown exception due to bad option", true, threwException); + } + public static void main(String[] args) { + TestRunner.run(ValidatorFactoryTest.class); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-01 09:10:08
|
Revision: 19 Author: cwilper Date: 2006-05-01 02:09:54 -0700 (Mon, 01 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=19&view=rev Log Message: ----------- logging config via log4j.configuration instead of in-jar log4j.xml, also reduced default log level Modified Paths: -------------- trunk/build.xml trunk/src/bin/bvalid trunk/src/bin/bvalid.bat trunk/src/config/log4j.xml trunk/src/java/net/sf/bvalid/BValid.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-01 06:57:49 UTC (rev 18) +++ trunk/build.xml 2006-05-01 09:09:54 UTC (rev 19) @@ -28,9 +28,6 @@ includes="**" classpathref="compile.path" optimize="${optimize}" debug="${debug}"/> - <copy todir="build/classes"> - <fileset dir="src/config"/> - </copy> <copy file="src/java/net/sf/bvalid/BValid.properties" tofile="build/classes/net/sf/bvalid/BValid.properties"/> <propertyfile file="build/version.properties"> <entry key="buildDate" type="date" value="now"/> @@ -59,6 +56,7 @@ </copy> <copy todir="dist"> <fileset dir="src/bin"/> + <fileset dir="src/config"/> </copy> <chmod dir="dist" perm="ugo+x" includes="bvalid"/> <jar jarfile="dist/bvalid.jar" basedir="build/classes"/> Modified: trunk/src/bin/bvalid =================================================================== --- trunk/src/bin/bvalid 2006-05-01 06:57:49 UTC (rev 18) +++ trunk/src/bin/bvalid 2006-05-01 09:09:54 UTC (rev 19) @@ -15,6 +15,7 @@ -Djava.endorsed.dirs="$BVALID_HOME/lib" \ -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \ -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \ + -Dlog4j.configuration="file://$BVALID_HOME/log4j.xml" \ net.sf.bvalid.BValid $1 $2 $3 $4 $5 $6 $7 $8 $9) exit $? Modified: trunk/src/bin/bvalid.bat =================================================================== --- trunk/src/bin/bvalid.bat 2006-05-01 06:57:49 UTC (rev 18) +++ trunk/src/bin/bvalid.bat 2006-05-01 09:09:54 UTC (rev 19) @@ -3,7 +3,7 @@ goto checkEnv :envOk -java -Xms64m -Xmx96m -cp "%BVALID_HOME%\bvalid.jar" -Djava.endorsed.dirs="%BVALID_HOME%\lib" -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl net.sf.bvalid.BValid %1 %2 %3 %4 %5 %6 %7 %8 %9 +java -Xms64m -Xmx96m -cp "%BVALID_HOME%\bvalid.jar" -Djava.endorsed.dirs="%BVALID_HOME%\lib" -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Dlog4j.configuration="file:/%BVALID_HOME%\log4j.xml" net.sf.bvalid.BValid %1 %2 %3 %4 %5 %6 %7 %8 %9 if errorlevel 1 goto endWithError goto end Modified: trunk/src/config/log4j.xml =================================================================== --- trunk/src/config/log4j.xml 2006-05-01 06:57:49 UTC (rev 18) +++ trunk/src/config/log4j.xml 2006-05-01 09:09:54 UTC (rev 19) @@ -15,7 +15,7 @@ </layout> </appender> - <category name="net.sf.bvalid"> + <category name="net.sf.bvalid.BValid"> <priority value="INFO" /> </category> Modified: trunk/src/java/net/sf/bvalid/BValid.java =================================================================== --- trunk/src/java/net/sf/bvalid/BValid.java 2006-05-01 06:57:49 UTC (rev 18) +++ trunk/src/java/net/sf/bvalid/BValid.java 2006-05-01 09:09:54 UTC (rev 19) @@ -140,7 +140,11 @@ _LOG.info("Validation of " + xmlFile.getPath() + " succeeded in " + ms + "ms."); } catch (ValidationException e) { long ms = System.currentTimeMillis() - st; - _LOG.error("Validation of " + xmlFile.getPath() + " failed in " + ms + "ms.\n" + e.getMessage()); + if (e.getCause() != null) { + _LOG.error("Validation of " + xmlFile.getPath() + " failed in " + ms + "ms.", e.getCause()); + } else { + _LOG.error("Validation of " + xmlFile.getPath() + " failed in " + ms + "ms.\n" + e.getMessage()); + } } } long total = System.currentTimeMillis() - startTime; @@ -222,7 +226,6 @@ throw new ArgException("unrecognized argument: " + args[i]); } } else { - System.out.println("Naked arg: " + args[i]); if (_lang == null) { try { _lang = SchemaLanguage.forName(args[i]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-08 23:14:04
|
Revision: 33 Author: cwilper Date: 2006-05-08 13:26:30 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=33&view=rev Log Message: ----------- test forks jetty by default, but not for junit task Modified Paths: -------------- trunk/build.xml trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-08 20:18:28 UTC (rev 32) +++ trunk/build.xml 2006-05-08 20:26:30 UTC (rev 33) @@ -121,7 +121,7 @@ <junit printsummary="no" haltonfailure="yes" showoutput="true" filtertrace="true"> <formatter type="plain" usefile="false"/> <classpath refid="test.path"/> - <sysproperty key="propname" value="propvalue"/> + <sysproperty key="jetty.fork" value="false"/> <test name="net.sf.bvalid.BValidPackageTestSuite"/> </junit> </target> Modified: trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-08 20:18:28 UTC (rev 32) +++ trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-08 20:26:30 UTC (rev 33) @@ -22,7 +22,12 @@ // sub-packages suite.addTest(CatalogPackageTestSuite.suite()); - return new JettyTestSetup(suite, 7357, "/", ".", true); + boolean fork = true; + String forkValue = System.getProperty("jetty.fork"); + if (forkValue != null) { + fork = !(forkValue.equalsIgnoreCase("false") || forkValue.equalsIgnoreCase("no")); + } + return new JettyTestSetup(suite, 7357, "/", ".", fork); } public static void main(String[] args) throws Exception { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-08 23:47:27
|
Revision: 32 Author: cwilper Date: 2006-05-08 13:18:28 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=32&view=rev Log Message: ----------- embedded jetty for testing Modified Paths: -------------- trunk/build.properties trunk/build.xml trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java Added Paths: ----------- trunk/lib/jasper-compiler.jar trunk/lib/jasper-runtime.jar trunk/lib/javax.servlet.jar trunk/lib/org.mortbay.jetty.jar trunk/src/test/net/sf/bvalid/util/ trunk/src/test/net/sf/bvalid/util/JettyRunner.java trunk/src/test/net/sf/bvalid/util/JettyTestSetup.java Modified: trunk/build.properties =================================================================== --- trunk/build.properties 2006-05-05 07:15:44 UTC (rev 31) +++ trunk/build.properties 2006-05-08 20:18:28 UTC (rev 32) @@ -18,3 +18,9 @@ # JUnit 3.8.1 from http://junit.org/ lib.junit = lib/junit.jar + +# Jetty 5.1.11 from http://www.mortbay.com/jetty/ +lib.jetty = lib/org.mortbay.jetty.jar +lib.servlet = lib/javax.servlet.jar +lib.jasper-runtime = lib/jasper-runtime.jar +lib.jasper-compiler = lib/jasper-compiler.jar Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-05 07:15:44 UTC (rev 31) +++ trunk/build.xml 2006-05-08 20:18:28 UTC (rev 32) @@ -6,19 +6,20 @@ <!-- defines bvalid.version --> <loadproperties srcFile="src/java/net/sf/bvalid/BValid.properties"/> - <path id="base.path"> + <path id="compile.path"> <pathelement location="${lib.xml-apis}"/> <pathelement location="${lib.xerces}"/> <pathelement location="${lib.log4j}"/> <pathelement location="${lib.httpclient}"/> <pathelement location="${lib.logging}"/> </path> - <path id="compile.path"> - <path refid="base.path"/> - <pathelement location="${lib.junit}"/> - </path> <path id="test.path"> <path refid="compile.path"/> + <pathelement location="${lib.junit}"/> + <pathelement location="${lib.jetty}"/> + <pathelement location="${lib.servlet}"/> + <pathelement location="${lib.jasper-runtime}"/> + <pathelement location="${lib.jasper-compiler}"/> <pathelement location="build/classes"/> <pathelement location="build/testclasses"/> <pathelement location="src/config"/> @@ -56,7 +57,13 @@ <target name="dist" depends="classes" description="Build the distribution in dist/"> <mkdir dir="dist/lib"/> <copy todir="dist/lib"> - <fileset dir="lib"/> + <fileset dir="lib"> + <exclude name="junit.jar"/> + <exclude name="org.mortbay.jetty.jar"/> + <exclude name="javax.servlet.jar"/> + <exclude name="jasper-runtime.jar"/> + <exclude name="jasper-compiler.jar"/> + </fileset> </copy> <copy todir="dist"> <fileset dir="src/bin"/> @@ -120,8 +127,7 @@ </target> <target name="itest" description="Run tests interactively" depends="testclasses"> - <java classname="net.sf.bvalid.BValidPackageTestSuite" - fork="yes"> + <java classname="net.sf.bvalid.BValidPackageTestSuite" fork="yes"> <classpath refid="test.path"/> <sysproperty key="org.apache.commons.logging.LogFactory" value="org.apache.commons.logging.impl.Log4jFactory"/> @@ -131,16 +137,13 @@ </java> </target> - <target name="otest" description="Run tests interactively" depends="testclasses"> - <java classname="net.sf.bvalid.BValidPackageTestSuite" - fork="yes"> + <target name="jtest" depends="testclasses"> + <java classname="net.sf.bvalid.util.JettyRunner" fork="yes"> <classpath refid="test.path"/> - <sysproperty key="org.apache.commons.logging.LogFactory" - value="org.apache.commons.logging.impl.Log4jFactory"/> - <sysproperty key="org.apache.commons.logging.Log" - value="org.apache.commons.logging.impl.Log4JLogger"/> - <sysproperty key="log4j.ignoreTCL" value="true"/> - <sysproperty key="text" value="true"/> + <arg value="7357"/> + <arg value="/"/> + <arg value="."/> + <arg value="fork"/> </java> </target> Added: trunk/lib/jasper-compiler.jar =================================================================== (Binary files differ) Property changes on: trunk/lib/jasper-compiler.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lib/jasper-runtime.jar =================================================================== (Binary files differ) Property changes on: trunk/lib/jasper-runtime.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lib/javax.servlet.jar =================================================================== (Binary files differ) Property changes on: trunk/lib/javax.servlet.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/lib/org.mortbay.jetty.jar =================================================================== (Binary files differ) Property changes on: trunk/lib/org.mortbay.jetty.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-05 07:15:44 UTC (rev 31) +++ trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-08 20:18:28 UTC (rev 32) @@ -1,15 +1,17 @@ package net.sf.bvalid; import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; import junit.swingui.TestRunner; import net.sf.bvalid.catalog.CatalogPackageTestSuite; +import net.sf.bvalid.util.JettyTestSetup; -public class BValidPackageTestSuite { - - public static Test suite() { +public class BValidPackageTestSuite extends TestCase { + public static Test suite() throws Exception { + TestSuite suite = new TestSuite(BValidPackageTestSuite.class.getName()); // classes in this package @@ -20,10 +22,10 @@ // sub-packages suite.addTest(CatalogPackageTestSuite.suite()); - return suite; + return new JettyTestSetup(suite, 7357, "/", ".", true); } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { if (System.getProperty("text") != null && System.getProperty("text").equals("true")) { junit.textui.TestRunner.run(BValidPackageTestSuite.suite()); } else { Added: trunk/src/test/net/sf/bvalid/util/JettyRunner.java =================================================================== --- trunk/src/test/net/sf/bvalid/util/JettyRunner.java (rev 0) +++ trunk/src/test/net/sf/bvalid/util/JettyRunner.java 2006-05-08 20:18:28 UTC (rev 32) @@ -0,0 +1,154 @@ +package net.sf.bvalid.util; + +import java.io.*; + +import org.mortbay.jetty.Server; +import org.mortbay.util.InetAddrPort; + +/** + * Runs a Jetty instance for testing. + * + * With this utility, Jetty can be run within the current VM or + * in a subprocess. Running it within a subprocess is useful + * when classloader conflicts arise (as is the case with JUnit's + * GUI test runner). + * + * FIXME: Currently, error reporting is weak in forked mode -- only + * the top-level error message is reported. + * + * cw...@cs... + */ +public class JettyRunner { + + private Server _server; + + private Process _runnerProcess; + private BufferedReader _stdout; + private PrintWriter _stdin; + + private boolean _running; + + /** + * Create a <code>JettyRunner</code>. + * + * If <code>fork</code> is true, it will be launched in a subprocess. + */ + public JettyRunner(int port, + String contextPath, + String webappPath, + boolean fork) throws IOException { + + if (fork) { + + String cmd = "java -cp " + System.getProperty("java.class.path") + + " " + getClass().getName() + " " + + port + " " + contextPath + " " + webappPath + ""; + + _runnerProcess = Runtime.getRuntime().exec(cmd, null, new File(".")); + + _stdout = new BufferedReader(new InputStreamReader(_runnerProcess.getInputStream())); + _stdin = new PrintWriter(new OutputStreamWriter(_runnerProcess.getOutputStream())); + + } else { + _server = new Server(); + _server.addListener(new InetAddrPort(port)); + _server.addWebApplication(contextPath, webappPath); + } + } + + /** + * Start the Jetty instance. + */ + public void start() throws Exception { + if (_runnerProcess != null) { + readUntil("[Press ENTER"); + _stdin.println(); + _stdin.flush(); + readUntil("STARTED"); + } else { + _server.start(); + } + _running = true; + } + + private void readUntil(String lineStart) throws Exception { + + String line = _stdout.readLine(); + while (!line.startsWith(lineStart)) { + if (line.startsWith("ERROR: ")) { + _runnerProcess.waitFor(); + throw new Exception("Error from subprocess: " + line.substring(7)); + } + line = _stdout.readLine(); + } + } + + /** + * Stop the Jetty instance. + */ + public void stop() throws Exception { + if (_running) { + if (_runnerProcess != null) { + readUntil("[Press ENTER"); + _stdin.println(); + _stdin.flush(); + readUntil("STOPPED"); + _runnerProcess.waitFor(); + } else { + _server.stop(); + } + _running = false; + } + } + + /** + * Ensure Jetty is stopped at GC time. + */ + public void finalize() { + if (_running) try { stop(); } catch (Exception e) { } + } + + /** + * Command-line entry point. + * + * This is used to support forking. It can also be used for testing. + */ + public static void main(String[] args) { + + try { + if (args.length < 3 || args.length > 4) { + System.out.println("ERROR: Wrong number of arguments, need port contextPath webappPath [fork]"); + System.exit(1); + } + int port = Integer.parseInt(args[0]); + boolean fork = false; + if (args.length == 4) { + if (args[3].equalsIgnoreCase("true") + || args[3].equalsIgnoreCase("yes") + || args[3].equalsIgnoreCase("fork")) { + fork = true; + } + } + System.out.println("Server Port : " + port); + System.out.println("Context Path : " + args[1]); + System.out.println("Webapp Path : " + args[2]); + JettyRunner runner = new JettyRunner(port, args[1], args[2], fork); + + System.out.println("[Press ENTER to start]"); + new BufferedReader(new InputStreamReader(System.in)).readLine(); + runner.start(); + System.out.println("STARTED"); + System.out.println("[Press ENTER to stop]"); + new BufferedReader(new InputStreamReader(System.in)).readLine(); + runner.stop(); + System.out.println("STOPPED"); + System.exit(0); + } catch (Exception e) { + String msg = e.getClass().getName(); + if (e.getMessage() != null) msg += ": " + e.getMessage(); + System.out.println("ERROR: " + e.getMessage()); + System.exit(1); + } + } + +} Added: trunk/src/test/net/sf/bvalid/util/JettyTestSetup.java =================================================================== --- trunk/src/test/net/sf/bvalid/util/JettyTestSetup.java (rev 0) +++ trunk/src/test/net/sf/bvalid/util/JettyTestSetup.java 2006-05-08 20:18:28 UTC (rev 32) @@ -0,0 +1,27 @@ +package net.sf.bvalid.util; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +public class JettyTestSetup extends TestSetup { + + private JettyRunner _jetty; + + public JettyTestSetup(Test test, + int port, + String contextPath, + String webappPath, + boolean fork) throws Exception { + super(test); + _jetty = new JettyRunner(port, contextPath, webappPath, fork); + } + + protected void setUp() throws Exception { + _jetty.start(); + } + + protected void tearDown() throws Exception { + _jetty.stop(); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-10 20:57:29
|
Revision: 39 Author: cwilper Date: 2006-05-10 13:57:22 -0700 (Wed, 10 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=39&view=rev Log Message: ----------- changed readme, moving license stuff around, and putting version info in based on prop file Modified Paths: -------------- trunk/README.txt trunk/build.xml trunk/src/doc/index.html Removed Paths: ------------- trunk/LICENSE.txt Deleted: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2006-05-10 17:01:06 UTC (rev 38) +++ trunk/LICENSE.txt 2006-05-10 20:57:22 UTC (rev 39) @@ -1,51 +0,0 @@ -The Educational Community License - -This Educational Community License (the "License") applies to any -original work of authorship (the "Original Work") whose owner (the -"Licensor") has placed the following notice immediately following the -copyright notice for the Original Work: - -Copyright (c) <year> <copyright holders> - -Licensed under the Educational Community License version 1.0 - -This Original Work, including software, source code, documents, or -other related items, is being provided by the copyright holder(s) -subject to the terms of the Educational Community License. By -obtaining, using and/or copying this Original Work, you agree that you -have read, understand, and will comply with the following terms and -conditions of the Educational Community License: - -Permission to use, copy, modify, merge, publish, distribute, and -sublicense this Original Work and its documentation, with or without -modification, for any purpose, and without fee or royalty to the -copyright holder(s) is hereby granted, provided that you include the -following on ALL copies of the Original Work or portions thereof, -including modifications or derivatives, that you make: - -- The full text of the Educational Community License in a location -viewable to users of the redistributed or derivative work. - -- Any pre-existing intellectual property disclaimers, notices, or terms -and conditions. - -- Notice of any changes or modifications to the Original Work, -including the date the changes were made. - -- Any modifications of the Original Work must be distributed in such a -manner as to avoid any confusion with the Original Work of the -copyright holders. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -The name and trademarks of copyright holder(s) may NOT be used in -advertising or publicity pertaining to the Original or Derivative Works -without specific, written prior permission. Title to copyright in the -Original Work and any associated documentation will at all times remain -with the copyright holders. Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2006-05-10 17:01:06 UTC (rev 38) +++ trunk/README.txt 2006-05-10 20:57:22 UTC (rev 39) @@ -1,11 +1,42 @@ -This is a source distribution of BValid, a Java library for XML validation. -To build, make sure ant is in your path and type: + BValid XML Validation API -ant dist + Version @bvalid.version@ -Then, to run the command-line validation utility, cd to dist and type: + http://bvalid.sf.net/ -bvalid --help + Copyright (c) 2006, Cornell University -For more information, see http://bvalid.sf.net/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +LICENSE +======= + +BValid is distributed under the Educational Community License (ECL), v1.0. +Use of this software indicates your acceptance of the terms of this license. +The distribution includes several third-party, open-source libraries with +thier own license terms. Specific terms of the ECL and all third-party +licenses can be found in this distribution, in the license/ directory. + + +DOCUMENTATION +============= + +Online documentation for the latest version of BValid can be found at +http://bvalid.sf.net/ + +Offline documentation for this version of BValid can be found in the +dist/doc/ directory after doing a documentation build. (see below) + + +BUILDING +======== + +To compile BValid, make sure you have Ant installed, and type: + ant dist + +To build the documentation, type: + ant doc + +For other useful build targets, type: + ant -p Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-10 17:01:06 UTC (rev 38) +++ trunk/build.xml 2006-05-10 20:57:22 UTC (rev 39) @@ -79,6 +79,11 @@ <exclude name="dist/**"/> </fileset> </copy> + <replace file="dist/release/bvalid-${bvalid.version}-src/README.txt" + value="value not found in version.properties" + propertyFile="src/java/net/sf/bvalid/BValid.properties"> + <replacefilter token="@bvalid.version@" property="bvalid.version"/> + </replace> <zip zipfile="dist/release/bvalid-${bvalid.version}-src.zip" basedir="dist/release" includes="bvalid-${bvalid.version}-src/**"/> <delete dir="dist/release/bvalid-${bvalid.version}-src"/> </target> @@ -107,6 +112,11 @@ <copy todir="dist/doc"> <fileset dir="src/doc"/> </copy> + <replace file="dist/doc/index.html" + value="value not found in version.properties" + propertyFile="src/java/net/sf/bvalid/BValid.properties"> + <replacefilter token="@bvalid.version@" property="bvalid.version"/> + </replace> <javadoc packagenames="net.sf.bvalid, net.sf.bvalid.locator, net.sf.bvalid.catalog, net.sf.bvalid.util" classpathref="compile.path" sourcepath="src/java" Modified: trunk/src/doc/index.html =================================================================== --- trunk/src/doc/index.html 2006-05-10 17:01:06 UTC (rev 38) +++ trunk/src/doc/index.html 2006-05-10 20:57:22 UTC (rev 39) @@ -12,7 +12,7 @@ <div id="header"> <div id="title"> <h1>BValid XML Validation API<br/> - Version 0.8</h1> + Version @bvalid.version@</h1> </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-11 17:32:38
|
Revision: 40 Author: cwilper Date: 2006-05-11 10:32:28 -0700 (Thu, 11 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=40&view=rev Log Message: ----------- prep for first distribution Modified Paths: -------------- trunk/README.txt trunk/src/config/log4j.xml trunk/src/doc/index.html trunk/src/doc/style.css Added Paths: ----------- trunk/src/doc/license/ trunk/src/doc/license/asl-1.1.txt trunk/src/doc/license/asl-2.0.txt trunk/src/doc/license/cpl-1.0.txt trunk/src/doc/license/ecl-1.0.txt trunk/src/doc/license/index.html trunk/src/doc/license/jing-license.html trunk/src/doc/license/mpl-1.0.txt trunk/src/doc/license/schematron-license.txt Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2006-05-10 20:57:22 UTC (rev 39) +++ trunk/README.txt 2006-05-11 17:32:28 UTC (rev 40) @@ -1,6 +1,8 @@ BValid XML Validation API + Source Distribution + Version @bvalid.version@ http://bvalid.sf.net/ @@ -11,17 +13,15 @@ LICENSE ======= - BValid is distributed under the Educational Community License (ECL), v1.0. Use of this software indicates your acceptance of the terms of this license. The distribution includes several third-party, open-source libraries with thier own license terms. Specific terms of the ECL and all third-party -licenses can be found in this distribution, in the license/ directory. +licenses can be found in the src/doc/license/ directory. DOCUMENTATION ============= - Online documentation for the latest version of BValid can be found at http://bvalid.sf.net/ @@ -31,7 +31,6 @@ BUILDING ======== - To compile BValid, make sure you have Ant installed, and type: ant dist Modified: trunk/src/config/log4j.xml =================================================================== --- trunk/src/config/log4j.xml 2006-05-10 20:57:22 UTC (rev 39) +++ trunk/src/config/log4j.xml 2006-05-11 17:32:28 UTC (rev 40) @@ -19,10 +19,6 @@ <priority value="INFO" /> </category> - <category name="net.sf.bvalid.TestConfig"> - <priority value="INFO" /> - </category> - <root> <priority value="WARN" /> <appender-ref ref="STDOUT"/> Modified: trunk/src/doc/index.html =================================================================== --- trunk/src/doc/index.html 2006-05-10 20:57:22 UTC (rev 39) +++ trunk/src/doc/index.html 2006-05-11 17:32:28 UTC (rev 40) @@ -22,6 +22,7 @@ <ol> <li><a href="#intro">Introduction</a></li> + <li><a href="#license">License</a></li> <li><a href="#inst">Downloading and Installing</a></li> <li><a href="#api">API Documentation</a></li> <li><a href="#cmdline">Command-Line Utility</a></li> @@ -48,8 +49,23 @@ </div> <div class="sec2"> - <h2><a name="inst">2. Downloading and Installing</a></h2> + <h2><a name="license">2. License</a></h2> <p> +BValid is distributed under the Educational Community License (ECL), v1.0. +</p> +<p> +The distribution also includes several third-party, open-source libraries, each with +it's own license terms. +</p> +<p> +See the <a href="license/index.html">License Page</a> for specific terms of the +all relevant licenses. + </p> +</div> + +<div class="sec2"> + <h2><a name="inst">3. Downloading and Installing</a></h2> + <p> The latest distribution (source and binary) can be downloaded from <a href="http://www.sf.net/projects/bvalid">http://www.sf.net/projects/bvalid</a> </p> @@ -72,7 +88,7 @@ </div> <div class="sec2"> - <h2><a name="api">3. API Documentation</a></h2> + <h2><a name="api">4. API Documentation</a></h2> <p> The main interface you work with is the <a href="api/net/sf/bvalid/Validator.html">Validator</a>. Once you have obtained an instance from the <a href="api/net/sf/bvalid/ValidatorFactory.html">ValidatorFactory</a>, you can use it to validate any number of XML documents from any number of concurrent threads. </p> @@ -169,7 +185,7 @@ </div> <div class="sec2"> - <h2><a name="cmdline">4. Command-Line Utility</a></h2> + <h2><a name="cmdline">5. Command-Line Utility</a></h2> <p> The <code>bvalid</code> command-line utility is a simple application of the API that can be used to validate a single XML document at a time. @@ -209,7 +225,7 @@ </div> <div class="sec2"> - <h2><a name="issues">5. Known Issues</a></h2> + <h2><a name="issues">6. Known Issues</a></h2> <ul> <li> The present version only performs <a href="http://www.w3.org/XML/Schema">W3C Schema</a> validation. Future @@ -224,7 +240,7 @@ <div id="footer"> <div id="copyright"> - Copyright © 2006 + Copyright © 2006, Cornell University </div> <div id="lastModified"> Added: trunk/src/doc/license/asl-1.1.txt =================================================================== --- trunk/src/doc/license/asl-1.1.txt (rev 0) +++ trunk/src/doc/license/asl-1.1.txt 2006-05-11 17:32:28 UTC (rev 40) @@ -0,0 +1,48 @@ +/* + * ============================================================================ + * The Apache Software License, Version 1.1 + * ============================================================================ + * + * Copyright (C) 1999 The Apache Software Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modifica- + * tion, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. The end-user documentation included with the redistribution, if any, must + * include the following acknowledgment: "This product includes software + * developed by the Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, if + * and wherever such third-party acknowledgments normally appear. + * + * 4. The names "log4j" and "Apache Software Foundation" must not be used to + * endorse or promote products derived from this software without prior + * written permission. For written permission, please contact + * ap...@ap.... + * + * 5. Products derived from this software may not be called "Apache", nor may + * "Apache" appear in their name, without prior written permission of the + * Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation. For more information on the + * Apache Software Foundation, please see <http://www.apache.org/>. + * + */ Property changes on: trunk/src/doc/license/asl-1.1.txt ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/doc/license/asl-2.0.txt =================================================================== --- trunk/src/doc/license/asl-2.0.txt (rev 0) +++ trunk/src/doc/license/asl-2.0.txt 2006-05-11 17:32:28 UTC (rev 40) @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS Property changes on: trunk/src/doc/license/asl-2.0.txt ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/doc/license/cpl-1.0.txt =================================================================== --- trunk/src/doc/license/cpl-1.0.txt (rev 0) +++ trunk/src/doc/license/cpl-1.0.txt 2006-05-11 17:32:28 UTC (rev 40) @@ -0,0 +1,213 @@ +Common Public License Version 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial code and +documentation distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + + c) Recipient understands that although each Contributor grants the licenses +to its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + + d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license set +forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + + i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + + ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + + iii) states that any provisions which differ from this Agreement are offered +by that Contributor alone and not by any other party; and + + iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on or +through a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor to +control, and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may participate in +any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement, including but not limited to the risks and costs of +program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with respect to +a patent applicable to software (including a cross-claim or counterclaim in a +lawsuit), then any patent licenses granted by that Contributor to such Recipient +under this Agreement shall terminate as of the date such litigation is filed. In +addition, if Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the Program +itself (excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +IBM is the initial Agreement Steward. IBM may assign the responsibility to serve +as the Agreement Steward to a suitable separate entity. Each new version of the +Agreement will be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the Agreement +under which it was received. In addition, after a new version of the Agreement +is published, Contributor may elect to distribute the Program (including its +Contributions) under the new version. Except as expressly stated in Sections +2(a) and 2(b) above, Recipient receives n... [truncated message content] |
|
From: <cw...@us...> - 2006-05-11 21:34:14
|
Revision: 41 Author: cwilper Date: 2006-05-11 14:34:06 -0700 (Thu, 11 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=41&view=rev Log Message: ----------- more cleaning before release Modified Paths: -------------- trunk/README.txt trunk/src/doc/index.html trunk/src/doc/license/index.html trunk/src/doc/style.css Added Paths: ----------- trunk/src/doc/checkmark.png trunk/src/doc/license/sun-binary-servlet-license.txt Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2006-05-11 17:32:28 UTC (rev 40) +++ trunk/README.txt 2006-05-11 21:34:06 UTC (rev 41) @@ -1,12 +1,11 @@ BValid XML Validation API + Version @bvalid.version@ Source Distribution - Version @bvalid.version@ + Written by Chris Wilper - http://bvalid.sf.net/ - Copyright (c) 2006, Cornell University +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Added: trunk/src/doc/checkmark.png =================================================================== (Binary files differ) Property changes on: trunk/src/doc/checkmark.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/doc/index.html =================================================================== --- trunk/src/doc/index.html 2006-05-11 17:32:28 UTC (rev 40) +++ trunk/src/doc/index.html 2006-05-11 21:34:06 UTC (rev 41) @@ -9,34 +9,31 @@ </head> <body> -<div id="header"> - <div id="title"> - <h1>BValid XML Validation API<br/> - Version @bvalid.version@</h1> - </div> -</div> <div class="toc"> - <h2>Contents</h2> + <h1> + <img src="checkmark.png"/> + BValid @bvalid.version@ + </h1> <div class="tocbox"> <ol> - <li><a href="#intro">Introduction</a></li> - <li><a href="#license">License</a></li> - <li><a href="#inst">Downloading and Installing</a></li> + <li><a href="#intro">What is BValid?</a></li> + <li><a href="#inst">How to Download</a></li> <li><a href="#api">API Documentation</a></li> <li><a href="#cmdline">Command-Line Utility</a></li> - <li><a href="#issues">Known Issues</a></li> + <li><a href="#issues">Known Issues / Bugs</a></li> + <li><a href="#license">License Information</a></li> </ol> </div> </div> <div class="sec2"> - <h2><a name="intro">1. Introduction</a></h2> + <h2><a name="intro">1. What is BValid?</a></h2> <p> - BValid is a Java API designed for high-performance validation of XML documents. - It defines and implements several interfaces to make validation flexible - and consistent across schema languages. + BValid is a Java API designed for fast, easy-to-use validation of XML documents. + It defines and implements a couple high-level Java interfaces to make + the validation process simple, yet flexible. </p> <p> Distinguishing features: @@ -48,23 +45,9 @@ </p> </div> -<div class="sec2"> - <h2><a name="license">2. License</a></h2> - <p> -BValid is distributed under the Educational Community License (ECL), v1.0. -</p> -<p> -The distribution also includes several third-party, open-source libraries, each with -it's own license terms. -</p> -<p> -See the <a href="license/index.html">License Page</a> for specific terms of the -all relevant licenses. - </p> -</div> <div class="sec2"> - <h2><a name="inst">3. Downloading and Installing</a></h2> + <h2><a name="inst">2. How to Download</a></h2> <p> The latest distribution (source and binary) can be downloaded from <a href="http://www.sf.net/projects/bvalid">http://www.sf.net/projects/bvalid</a> @@ -74,21 +57,13 @@ <code>bvalid</code> <a href="#cmdline">command-line utility</a> right away. </p> <p> - To begin using bvalid in your own projects, you'll need the - following jars (included) in your CLASSPATH: - <ul> - <li> <b>bvalid.jar</b> - the BValid API</li> - <li> lib/<b>commons-httpclient-2.0.1.jar</b> - for resolving schemas via http</li> - <li> lib/<b>commons-logging.jar</b> - for logging (required by commons-httpclient)</li> - <li> lib/<b>log4j-1.2.8.jar</b> - for logging</li> - <li> lib/<b>xercesImpl.jar</b> - for XML parsing and XSD validation</li> - <li> lib/<b>xml-apis.jar</b> - for XML parsing</li> - </ul> + To begin using bvalid in your own projects, you'll need the required + jars (included in the lib/ directory) in your CLASSPATH. </p> </div> <div class="sec2"> - <h2><a name="api">4. API Documentation</a></h2> + <h2><a name="api">3. API Documentation</a></h2> <p> The main interface you work with is the <a href="api/net/sf/bvalid/Validator.html">Validator</a>. Once you have obtained an instance from the <a href="api/net/sf/bvalid/ValidatorFactory.html">ValidatorFactory</a>, you can use it to validate any number of XML documents from any number of concurrent threads. </p> @@ -185,7 +160,7 @@ </div> <div class="sec2"> - <h2><a name="cmdline">5. Command-Line Utility</a></h2> + <h2><a name="cmdline">4. Command-Line Utility</a></h2> <p> The <code>bvalid</code> command-line utility is a simple application of the API that can be used to validate a single XML document at a time. @@ -225,7 +200,7 @@ </div> <div class="sec2"> - <h2><a name="issues">6. Known Issues</a></h2> + <h2><a name="issues">5. Known Issues / Bugs</a></h2> <ul> <li> The present version only performs <a href="http://www.w3.org/XML/Schema">W3C Schema</a> validation. Future @@ -238,6 +213,21 @@ </ul> </div> +<div class="sec2"> + <h2><a name="license">6. License Information</a></h2> + <p> +BValid is distributed under the Educational Community License (ECL), v1.0. +</p> +<p> +The distribution also includes several third-party, open-source libraries, each with +it's own license terms. +</p> +<p> +See the <a href="license/index.html">License Information Page</a> for specific terms of +all relevant licenses. + </p> +</div> + <div id="footer"> <div id="copyright"> Copyright © 2006, Cornell University Modified: trunk/src/doc/license/index.html =================================================================== --- trunk/src/doc/license/index.html 2006-05-11 17:32:28 UTC (rev 40) +++ trunk/src/doc/license/index.html 2006-05-11 21:34:06 UTC (rev 41) @@ -7,24 +7,20 @@ <title>BValid License Information</title> <link rel="stylesheet" type="text/css" href="../style.css" /> <style type="text/css"> - ol li { font-weight: bold; } - .copyright { font-weight: normal; margin-left: 10px; margin-right: 10px; } - .license { background-color: #e0e0e0; font-weight: normal; margin-left: 10px; margin-right: 10px; } - ol .license { white-space: normal; margin-top: 5px; @@ -41,24 +37,39 @@ </head> <body> - <center> - <h2 style="border:none;">BValid XML Validation API</h2> - <p> - Copyright © 2006, Cornell University. - </p> - <p> - Licensed under the <a href="ecl-1.0.txt">Educational Community License 1.0</a> - </p> - <p> - Use of this software indicates your acceptance of the terms of this license. - </p> - <p>This product includes software developed by the Apache Software Foundation - (http://www.apache.org/).</p> - </center> +<div class="toc"> + <h1>BValid License Information</h1> + <div class="tocbox"> - <h2>Third-Party Packages</h2> + <ul> + <li><a href="#this">Original Work</a></li> + <li><a href="#inc">Included Software</a></li> + <li><a href="#add">Optional Software</a></li> + <li><a href="#req">Additional Required Attributions</a></li> + </ul> + </div> +</div> + + <h2><a name="this">Original Work</a></h2> <ol> + <li>BValid XML Validation API + <div class="copyright"> + Written by Chris Wilper, Copyright © 2006, Cornell University + </div> + <div class="license"> + Licensed under the <a href="ecl-1.0.txt">Educational Community License 1.0</a><br/> + USE OF THIS SOFTWARE INDICATES YOUR ACCEPTANCE OF THE TERMS OF THIS LICENSE. + </div> + </li> + </ol> + + <h2><a name="inc">Included Software</a></h2> + <p> + The following software is included with BValid and is instrumental + to its operation. + </p> + <ol> <li>Apache Jakarta Commons HttpClient <div class="copyright"> Copyright © 1999-2004 The Apache Software Foundation. @@ -95,15 +106,6 @@ </div> </li> - <li>Jetty HTTP Server - <div class="copyright"> - Copyright © Mort Bay Consulting Pty. Ltd. - </div> - <div class="license"> - Licensed under the <a href="asl-2.0.txt">Apache Software License 2.0.</a> - </div> - </li> - <li>Jing RELAX NG Validator <div class="copyright"> Copyright © 2001-2003 Thai Open Source Software Center Ltd. @@ -112,14 +114,6 @@ Licensed under the <a href="jing-license.html">Jing License</a> </div> </li> - <li>JUnit - <div class="copyright"> - Copyright © 2001-2006 JUnit.org - </div> - <div class="license"> - Licensed under the <a href="cpl-1.0.txt">Common Public License 1.0.</a> - </div> - </li> <li>SAXON XSLT Processor from Michael Kay <div class="copyright"> Copyright © 2001 by Michael Kay.<br/> @@ -141,7 +135,55 @@ Licensed under the <a href="schematron-license.txt">Schematron License</a>. </div> </li> -</ol> - + </ol> + + <h2><a name="add">Optional Software</a></h2> + <p> + The following software is used exclusively for testing / compiling BValid and + is included with the source distribution for convenience only. + </p> + <ol> + <li>Jasper 2 JSP Engine + <div class="copyright"> + Copyright © 1999-2004 The Apache Software Foundation. + All rights reserved. + </div> + <div class="license"> + Licensed under the <a href="asl-2.0.txt">Apache Software License 2.0.</a> + </div> + </li> + <li>Jetty HTTP Server + <div class="copyright"> + Copyright © Mort Bay Consulting Pty. Ltd. + </div> + <div class="license"> + Licensed under the <a href="asl-2.0.txt">Apache Software License 2.0.</a> + </div> + </li> + <li>JUnit + <div class="copyright"> + Copyright © 2001-2006 JUnit.org + </div> + <div class="license"> + Licensed under the <a href="cpl-1.0.txt">Common Public License 1.0.</a> + </div> + </li> + <li>Java™ Servlet API Specification Interface Classes 2.3 + <div class="copyright"> + Copyright © 1994-2006 Sun Microsystems, Inc. + </div> + <div class="license"> + Licensed under the <a href="sun-binary-servlet-license.txt">Sun Binary Code License (with supplemental terms)</a> + </div> + </li> + </ol> + + <h2><a name="req">Additional Required Attributions</a></h2> + <ol> + <li> This product includes software developed by the Apache Software Foundation + (http://www.apache.org/).</li> + </ol> + + </body> </html> Added: trunk/src/doc/license/sun-binary-servlet-license.txt =================================================================== --- trunk/src/doc/license/sun-binary-servlet-license.txt (rev 0) +++ trunk/src/doc/license/sun-binary-servlet-license.txt 2006-05-11 21:34:06 UTC (rev 41) @@ -0,0 +1,237 @@ + Sun Microsystems, Inc. + Binary Code License Agreement + + READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED + SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY + "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE + MEDIA PACKAGE. BY OPENING THE SOFTWARE MEDIA + PACKAGE, YOU AGREE TO THE TERMS OF THIS + AGREEMENT. IF YOU ARE ACCESSING THE SOFTWARE + ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE + TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END + OF THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL + THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE + TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE + SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE + "DECLINE" BUTTON AT THE END OF THIS AGREEMENT. + + 1. LICENSE TO USE. Sun grants you a + non-exclusive and non-transferable license for the + internal use only of the accompanying software and + documentation and any error corrections provided + by Sun (collectively "Software"), by the number of + users and the class of computer hardware for which + the corresponding fee has been paid. + + 2. RESTRICTIONS. Software is confidential and + copyrighted. Title to Software and all associated + intellectual property rights is retained by Sun + and/or its licensors. Except as specifically + authorized in any Supplemental License Terms, you + may not make copies of Software, other than a + single copy of Software for archival purposes. + Unless enforcement is prohibited by applicable + law, you may not modify, decompile, or reverse + engineer Software. You acknowledge that Software + is not designed, licensed or intended for use in + the design, construction, operation or maintenance + of any nuclear facility. Sun disclaims any + express or implied warranty of fitness for such + uses. No right, title or interest in or to any + trademark, service mark, logo or trade name of Sun + or its licensors is granted under this Agreement. + + 3. LIMITED WARRANTY. Sun warrants to you that for + a period of ninety (90) days from the date of + purchase, as evidenced by a copy of the receipt, + the media on which Software is furnished (if any) + will be free of defects in materials and + workmanship under normal use. Except for the + foregoing, Software is provided "AS IS". Your + exclusive remedy and Sun's entire liability under + this limited warranty will be at Sun's option to + replace Software media or refund the fee paid for + Software. + + 4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN + THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, + REPRESENTATIONS AND WARRANTIES, INCLUDING ANY + IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE + DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE + DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. + + 5. LIMITATION OF LIABILITY. TO THE EXTENT NOT + PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS + LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT + OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, + INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED + REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT + OF OR RELATED TO THE USE OF OR INABILITY TO USE + SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. In no event will + Sun's liability to you, whether in contract, tort + (including negligence), or otherwise, exceed the + amount paid by you for Software under this + Agreement. The foregoing limitations will apply + even if the above stated warranty fails of its + essential purpose. + + 6. Termination. This Agreement is effective + until terminated. You may terminate this + Agreement at any time by destroying all copies of + Software. This Agreement will terminate + immediately without notice from Sun if you fail to + comply with any provision of this Agreement. Upon + Termination, you must destroy all copies of + Software. + + 7. Export Regulations. All Software and technical + data delivered under this Agreement are subject to + US export control laws and may be subject to + export or import regulations in other countries. + You agree to comply strictly with all such laws + and regulations and acknowledge that you have the + responsibility to obtain such licenses to export, + re-export, or import as may be required after + delivery to you. + + 8. U.S. Government Restricted Rights. If + Software is being acquired by or on behalf of the + U.S. Government or by a U.S. Government prime + contractor or subcontractor (at any tier), then + the Government's rights in Software and + accompanying documentation will be only as set + forth in this Agreement; this is in accordance + with 48 CFR 227.7201 through 227.7202-4 (for + Department of Defense (DOD) acquisitions) and with + 48 CFR 2.101 and 12.212 (for non-DOD + acquisitions). + + 9. Governing Law. Any action related to this + Agreement will be governed by California law and + controlling U.S. federal law. No choice of law + rules of any jurisdiction will apply. + + 10. Severability. If any provision of this + Agreement is held to be unenforceable, this + Agreement will remain in effect with the provision + omitted, unless omission would frustrate the + intent of the parties, in which case this + Agreement will immediately terminate. + + 11. Integration. This Agreement is the entire + agreement between you and Sun relating to its + subject matter. It supersedes all prior or + contemporaneous oral or written communications, + proposals, representations and warranties and + prevails over any conflicting or additional terms + of any quote, order, acknowledgment, or other + communication between the parties relating to its + subject matter during the term of this Agreement. + No modification of this Agreement will be binding, + unless in writing and signed by an authorized + representative of each party. + + JAVA^(TM) INTERFACE CLASSES + JAVASERVLET, VERSION 2.3 + SUPPLEMENTAL LICENSE TERMS + + These supplemental license terms ("Supplemental + Terms") add to or modify the terms of the Binary + Code License Agreement (collectively, the + "Agreement"). Capitalized terms not defined in + these Supplemental Terms shall have the same + meanings ascribed to them in the Agreement. These + Supplemental Terms shall supersede any + inconsistent or conflicting terms in the + Agreement, or in any license contained within the + Software. + + 1. Software Internal Use and Development License + Grant. Subject to the terms and conditions of this + Agreement, including, but not limited to Section 3 + (Java(TM) Technology Restrictions) of these + Supplemental Terms, Sun grants you a + non-exclusive, non-transferable, limited license + to reproduce internally and use internally the + binary form of the Software, complete and + unmodified, for the sole purpose of designing, + developing and testing your Java applets and + applications ("Programs"). + + 2. License to Distribute Software. In addition to + the license granted in Section 1 (Software + Internal Use and Development License Grant) of + these Supplemental Terms, subject to the terms and + conditions of this Agreement, including but not + limited to Section 3 (Java Technology + Restrictions), Sun grants you a non-exclusive, + non-transferable, limited license to reproduce and + distribute the Software in binary form only, + provided that you (i) distribute the Software + complete and unmodified and only bundled as part + of your Programs, (ii) do not distribute + additional software intended to replace any + component(s) of the Software, (iii) do not remove + or alter any proprietary legends or notices + contained in the Software, (iv) only distribute + the Software subject to a license agreement that + protects Sun's interests consistent with the terms + contained in this Agreement, and (v) agree to + defend and indemnify Sun and its licensors from + and against any damages, costs, liabilities, + settlement amounts and/or expenses (including + attorneys' fees) incurred in connection with any + claim, lawsuit or action by any third party that + arises or results from the use or distribution of + any and all Programs and/or Software. + + 3. Java Technology Restrictions. You may not + modify the Java Platform Interface ("JPI", + identified as classes contained within the "java" + package or any subpackages of the "java" package), + by creating additional classes within the JPI or + otherwise causing the addition to or modification + of the classes in the JPI. In the event that you + create an additional class and associated API(s) + which (i) extends the functionality of the Java + Platform, and (ii) is exposed to third party + software developers for the purpose of developing + additional software which invokes such additional + API, you must promptly publish broadly an accurate + specification for such API for free use by all + developers. You may not create, or authorize your + licensees to create additional classes, + interfaces, or subpackages that are in any way + identified as "java", "javax", "sun" or similar + convention as specified by Sun in any naming + convention designation. + + 4. Trademarks and Logos. You acknowledge and agree + as between you and Sun that Sun owns the SUN, + SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks + and all SUN, SOLARIS, JAVA, JINI, FORTE, and + iPLANET-related trademarks, service marks, logos + and other brand designations ("Sun Marks"), and + you agree to comply with the Sun Trademark and + Logo Usage Requirements currently located at + http://www.sun.com/policies/trademarks. Any use + you make of the Sun Marks inures to Sun's benefit. + + 5. Source Code. Software may contain source code + that is provided solely for reference purposes + pursuant to the terms of this Agreement. Source + code may not be redistributed unless expressly + provided for in this Agreement. + + 6. Termination for Infringement. Either party + may terminate this Agreement immediately should + any Software become, or in either party's opinion + be likely to become, the subject of a claim of + infringement of any intellectual property right. + + For inquiries please contact: Sun Microsystems, + Inc. 901 San Antonio Road, Palo Alto, California + 94303 + (LFI#95907/Form ID#011801) Modified: trunk/src/doc/style.css =================================================================== --- trunk/src/doc/style.css 2006-05-11 17:32:28 UTC (rev 40) +++ trunk/src/doc/style.css 2006-05-11 21:34:06 UTC (rev 41) @@ -6,7 +6,7 @@ background-color: #ffffff; margin: 20px; font-family: Arial, Helvetica, sans-serif; - font-size: 12pt; + font-size: 10pt; line-height: 15pt; color: #000000; } @@ -95,11 +95,18 @@ float: right; } +h1 { + color: darkblue; + margin-top: 36px; + margin-bottom: 4px; + border-bottom: solid 3px #000000; +} + h2, h3 { color: darkblue; margin-top: 36px; margin-bottom: 4px; - border-bottom: dashed 1px #000000; + border-bottom: solid 1px #000000; } h4, h5 { @@ -111,11 +118,10 @@ h1 { font-size: 18pt; - line-height: 110%; } h2 { - font-size: 18pt; + font-size: 16pt; } h3 { @@ -130,7 +136,7 @@ font-size: 12pt; } -h2, h3, h4, h5 { +h1, h2, h3, h4, h5 { padding-top: 4px; padding-bottom: 4px; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-12-22 21:00:51
|
Revision: 47
http://svn.sourceforge.net/bvalid/?rev=47&view=rev
Author: cwilper
Date: 2006-12-22 13:00:52 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
upped log4j to 1.2.14 (TRACE support)
Modified Paths:
--------------
trunk/build.properties
Added Paths:
-----------
trunk/lib/log4j-1.2.14.jar
Removed Paths:
-------------
trunk/lib/log4j-1.2.8.jar
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2006-12-22 20:58:00 UTC (rev 46)
+++ trunk/build.properties 2006-12-22 21:00:52 UTC (rev 47)
@@ -14,7 +14,7 @@
# Various Apache projects/sub-projects
lib.httpclient = lib/commons-httpclient-2.0.1.jar
lib.logging = lib/commons-logging.jar
-lib.log4j = lib/log4j-1.2.8.jar
+lib.log4j = lib/log4j-1.2.14.jar
lib.xerces = lib/xercesImpl.jar
lib.xml-apis = lib/xml-apis.jar
Added: trunk/lib/log4j-1.2.14.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/log4j-1.2.14.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/log4j-1.2.8.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2006-12-22 21:20:54
|
Revision: 48
http://svn.sourceforge.net/bvalid/?rev=48&view=rev
Author: cwilper
Date: 2006-12-22 13:20:55 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
upgraded to commons-httpclient-3.1-beta1,
and upgraded relevent calls to non-deprecated ones.
Modified Paths:
--------------
trunk/build.properties
trunk/build.xml
trunk/src/java/net/sf/bvalid/util/WebClient.java
Added Paths:
-----------
trunk/lib/commons-codec-1.3.jar
trunk/lib/commons-httpclient-3.1-beta1.jar
Removed Paths:
-------------
trunk/lib/commons-httpclient-2.0.1.jar
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2006-12-22 21:00:52 UTC (rev 47)
+++ trunk/build.properties 2006-12-22 21:20:55 UTC (rev 48)
@@ -12,7 +12,8 @@
#
# Various Apache projects/sub-projects
-lib.httpclient = lib/commons-httpclient-2.0.1.jar
+lib.httpclient = lib/commons-httpclient-3.1-beta1.jar
+lib.codec = lib/commons-codec-1.3.jar
lib.logging = lib/commons-logging.jar
lib.log4j = lib/log4j-1.2.14.jar
lib.xerces = lib/xercesImpl.jar
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-12-22 21:00:52 UTC (rev 47)
+++ trunk/build.xml 2006-12-22 21:20:55 UTC (rev 48)
@@ -11,6 +11,7 @@
<pathelement location="${lib.xerces}"/>
<pathelement location="${lib.log4j}"/>
<pathelement location="${lib.httpclient}"/>
+ <pathelement location="${lib.codec}"/>
<pathelement location="${lib.logging}"/>
</path>
<path id="test.path">
@@ -34,7 +35,9 @@
classpathref="compile.path"
source="${source}"
target="${target}"
- optimize="${optimize}" debug="${debug}"/>
+ optimize="${optimize}" debug="${debug}">
+ <compilerarg line="-Xlint:deprecation"/>
+ </javac>
<copy file="src/java/net/sf/bvalid/BValid.properties" tofile="build/classes/net/sf/bvalid/BValid.properties"/>
<propertyfile file="build/version.properties">
<entry key="buildDate" type="date" value="now"/>
Added: trunk/lib/commons-codec-1.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/commons-codec-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/commons-httpclient-2.0.1.jar
===================================================================
(Binary files differ)
Added: trunk/lib/commons-httpclient-3.1-beta1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/commons-httpclient-3.1-beta1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/java/net/sf/bvalid/util/WebClient.java
===================================================================
--- trunk/src/java/net/sf/bvalid/util/WebClient.java 2006-12-22 21:00:52 UTC (rev 47)
+++ trunk/src/java/net/sf/bvalid/util/WebClient.java 2006-12-22 21:20:55 UTC (rev 48)
@@ -6,6 +6,7 @@
import java.util.*;
import java.util.regex.*;
+import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
@@ -71,14 +72,14 @@
}
}
- _cManager.setMaxConnectionsPerHost(MAX_CONNECTIONS_PER_HOST);
- _cManager.setMaxTotalConnections(MAX_TOTAL_CONNECTIONS);
+ _cManager.getParams().setDefaultMaxConnectionsPerHost(MAX_CONNECTIONS_PER_HOST);
+ _cManager.getParams().setMaxTotalConnections(MAX_TOTAL_CONNECTIONS);
+ _cManager.getParams().setConnectionTimeout(TIMEOUT_SECONDS * 1000);
+ _cManager.getParams().setSoTimeout(SOCKET_TIMEOUT_SECONDS * 1000);
HttpClient client = new HttpClient(_cManager);
- client.setConnectionTimeout(TIMEOUT_SECONDS * 1000);
- client.setTimeout(SOCKET_TIMEOUT_SECONDS * 1000);
if (host != null && creds != null) {
- client.getState().setCredentials(null, host, creds);
- client.getState().setAuthenticationPreemptive(true);
+ client.getState().setCredentials(new AuthScope(host, AuthScope.ANY_PORT), creds);
+ client.getParams().setAuthenticationPreemptive(true);
}
return client;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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. |
|
From: <cw...@us...> - 2006-04-26 00:25:31
|
Revision: 14 Author: cwilper Date: 2006-04-25 17:25:17 -0700 (Tue, 25 Apr 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=14&view=rev Log Message: ----------- moved test stuff Modified Paths: -------------- trunk/build.xml Added Paths: ----------- trunk/src/test/ Removed Paths: ------------- trunk/src/testjava/ Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-04-25 23:45:29 UTC (rev 13) +++ trunk/build.xml 2006-04-26 00:25:17 UTC (rev 14) @@ -37,8 +37,8 @@ depends="classes" description="build all test classes into build/testclasses"> <mkdir dir="build/testclasses"/> - <javac srcdir="src/testjava" destdir="build/testclasses" - includes="**" + <javac srcdir="src/test" destdir="build/testclasses" + includes="net/sf/bvalid/**" classpathref="test.path" optimize="${optimize}" debug="${debug}"/> </target> Copied: trunk/src/test (from rev 8, trunk/src/testjava) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-01 10:18:04
|
Revision: 20 Author: cwilper Date: 2006-05-01 03:17:53 -0700 (Mon, 01 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=20&view=rev Log Message: ----------- changed version to 0.8, added license, and added release target Modified Paths: -------------- trunk/build.xml trunk/src/java/net/sf/bvalid/BValid.properties Added Paths: ----------- trunk/LICENSE.txt trunk/README.txt Added: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt (rev 0) +++ trunk/LICENSE.txt 2006-05-01 10:17:53 UTC (rev 20) @@ -0,0 +1,51 @@ +The Educational Community License + +This Educational Community License (the "License") applies to any +original work of authorship (the "Original Work") whose owner (the +"Licensor") has placed the following notice immediately following the +copyright notice for the Original Work: + +Copyright (c) <year> <copyright holders> + +Licensed under the Educational Community License version 1.0 + +This Original Work, including software, source code, documents, or +other related items, is being provided by the copyright holder(s) +subject to the terms of the Educational Community License. By +obtaining, using and/or copying this Original Work, you agree that you +have read, understand, and will comply with the following terms and +conditions of the Educational Community License: + +Permission to use, copy, modify, merge, publish, distribute, and +sublicense this Original Work and its documentation, with or without +modification, for any purpose, and without fee or royalty to the +copyright holder(s) is hereby granted, provided that you include the +following on ALL copies of the Original Work or portions thereof, +including modifications or derivatives, that you make: + +- The full text of the Educational Community License in a location +viewable to users of the redistributed or derivative work. + +- Any pre-existing intellectual property disclaimers, notices, or terms +and conditions. + +- Notice of any changes or modifications to the Original Work, +including the date the changes were made. + +- Any modifications of the Original Work must be distributed in such a +manner as to avoid any confusion with the Original Work of the +copyright holders. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +The name and trademarks of copyright holder(s) may NOT be used in +advertising or publicity pertaining to the Original or Derivative Works +without specific, written prior permission. Title to copyright in the +Original Work and any associated documentation will at all times remain +with the copyright holders. Added: trunk/README.txt =================================================================== --- trunk/README.txt (rev 0) +++ trunk/README.txt 2006-05-01 10:17:53 UTC (rev 20) @@ -0,0 +1,11 @@ +This is a source distribution of BValid, a Java library for XML validation. + +To build, make sure ant is in your path and type: + +ant dist + +Then, to run the command-line validation utility, cd to dist and type: + +bvalid --help + +For more information, see http://bvalid.sf.net/ Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-01 09:09:54 UTC (rev 19) +++ trunk/build.xml 2006-05-01 10:17:53 UTC (rev 20) @@ -3,6 +3,9 @@ <loadproperties srcFile="build.properties"/> + <!-- defines bvalid.version --> + <loadproperties srcFile="src/java/net/sf/bvalid/BValid.properties"/> + <path id="base.path"> <pathelement location="${lib.xml-apis}"/> <pathelement location="${lib.xerces}"/> @@ -62,6 +65,34 @@ <jar jarfile="dist/bvalid.jar" basedir="build/classes"/> </target> + <target name="srcrelease" depends="clean"> + <copy todir="dist/release/bvalid-${bvalid.version}-src"> + <fileset dir="."> + <exclude name="dist/**"/> + </fileset> + </copy> + <zip zipfile="dist/release/bvalid-${bvalid.version}-src.zip" basedir="dist/release" includes="bvalid-${bvalid.version}-src/**"/> + <delete dir="dist/release/bvalid-${bvalid.version}-src"/> + </target> + + <target name="binrelease" depends="dist"> + <copy todir="dist/release/bvalid-${bvalid.version}"> + <fileset dir="dist"> + <exclude name="release/**"/> + </fileset> + </copy> + <zip zipfile="dist/release/bvalid-${bvalid.version}.zip" basedir="dist/release" includes="bvalid-${bvalid.version}/**"/> + <delete dir="dist/release/bvalid-${bvalid.version}"/> + </target> + + <target name="release" depends="srcrelease,binrelease" description="Build the source and binary distributions in dist/release"> + <checksum fileext=".md5"> + <fileset dir="dist/release"> + <include name="*.zip"/> + </fileset> + </checksum> + </target> + <target name="doc" depends="prep" description="Build the documentation in dist/doc"> Modified: trunk/src/java/net/sf/bvalid/BValid.properties =================================================================== --- trunk/src/java/net/sf/bvalid/BValid.properties 2006-05-01 09:09:54 UTC (rev 19) +++ trunk/src/java/net/sf/bvalid/BValid.properties 2006-05-01 10:17:53 UTC (rev 20) @@ -1,2 +1,2 @@ -bvalid.version = 1.0 +bvalid.version = 0.8 bvalid.buildDate = @buildDate@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-01 12:15:21
|
Revision: 21 Author: cwilper Date: 2006-05-01 05:15:11 -0700 (Mon, 01 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=21&view=rev Log Message: ----------- added doc target + docs Modified Paths: -------------- trunk/build.xml Added Paths: ----------- trunk/src/doc/ trunk/src/doc/index.html trunk/src/doc/style.css Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-01 10:17:53 UTC (rev 20) +++ trunk/build.xml 2006-05-01 12:15:11 UTC (rev 21) @@ -96,13 +96,16 @@ <target name="doc" depends="prep" description="Build the documentation in dist/doc"> - <javadoc packagenames="net.sf.bvalid.*" + <copy todir="dist/doc"> + <fileset dir="src/doc"/> + </copy> + <javadoc packagenames="net.sf.bvalid, net.sf.bvalid.locator, net.sf.bvalid.catalog, net.sf.bvalid.util" classpathref="compile.path" sourcepath="src/java" defaultexcludes="yes" destdir="dist/doc/api" - windowtitle="BValid Javadocs"> - <doctitle><![CDATA[<h1>BValid Javadocs</h1>]]></doctitle> + windowtitle="BValid Java API"> + <doctitle><![CDATA[<h1>BValid Java API</h1>]]></doctitle> </javadoc> </target> Added: trunk/src/doc/index.html =================================================================== --- trunk/src/doc/index.html (rev 0) +++ trunk/src/doc/index.html 2006-05-01 12:15:11 UTC (rev 21) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"> +<head> + <title>BValid XML Validation API</title> + <link rel="stylesheet" type="text/css" href="style.css" /> +</head> + +<body> +<div id="header"> + <div id="title"> + <h2>BValid XML Validation API</h2> + <h2>User Guide</h2> + </div> +</div> + +<div class="toc"> + <h2>Contents</h2> + <div class="tocbox"> + + <ol> + <li><a href="#intro">Introduction</a></li> + <li><a href="#api">The Java API</a></li> + <li><a href="#cmdline">The Unix/Windows Command-Line Utility</a></li> + </ol> + </div> +</div> + +<div class="sec2"> + <h2><a name="intro">1. Introduction</a></h2> + <p> + BValid is a Java API designed for high-performance validation of XML documents. + It defines and implements several interfaces to make validation flexible + and consistent across schema languages. + </p> +<!-- <div class="code"><pre>C:\fedora-2.1.1><b> fedora-setup no-ssl-authenticate-apim</b></pre></div> --> +</div> + +<div class="sec2"> + <h2><a name="api">2. The Java API</a></h2> + <p> + The main interface you work with is the <code>Validator</code>. + </p> +</div> + +<div class="sec2"> + <h2><a name="cmdline">3. The Unix/Windows Command-Line Utility</a></h2> + <p> + The <code>bvalid</code> command-line utility is a simple application of the API that + can be used for validating a single XML document at a time. + </p> + <div class="code"><pre>Usage: bvalid [OPTIONS] LANG XMLFILE + Or: bvalid --version + Or: bvalid --help + +Where: + LANG a supported schema language, such as xsd + XMLFILE the path to the instance file to validate + +Options: + -cf, --cache-files Cache schema files locally + -co, --cache-objects Cache parsed grammar objects in memory + -am, --allow-missing Allow missing referenced schemas. If the instance + includes references to schemas that can't be found, + this will skip them rather than failing validation. + --repeat=n Repeat the validation n times (for testing) + --schema=file Use the given schema file (url or filename) + -v, --version Print version and exit (exclusive option) + -h, --help Print help and exit (exclusive option)</pre></div> +</div> + +<div id="footer"> + <div id="copyright"> + Copyright © 2006 + </div> + + <div id="lastModified"> + Last Modified <script type="text/javascript"> + //<![CDATA[ + var cvsDate = "$Date: 2006/05/01 01:11:27 $"; + var parts = cvsDate.split(" "); + var modifiedDate = parts[1]; + document.write(modifiedDate); + //]]> + </script> + </div> +</div> +</body> +</html> Property changes on: trunk/src/doc/index.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/doc/style.css =================================================================== --- trunk/src/doc/style.css (rev 0) +++ trunk/src/doc/style.css 2006-05-01 12:15:11 UTC (rev 21) @@ -0,0 +1,183 @@ +/* + * Stylesheet for documentation. + */ + +body { + background-color: #ffffff; + margin: 20px; + font-family: Arial, Helvetica, sans-serif; + font-size: 12pt; + line-height: 15pt; + color: #000000; +} + +#header { + border-bottom: 1px solid; + clear: both; + margin-bottom: 10px; + min-height: 70px; + width: 100%; +} + +#logo { + background-image: url(images/logo_44x60.gif); + background-repeat: no-repeat; + background-position: top left; + + float: left; + height: 60px; + width: 44px; + visibility: visible; +} + +#title { + text-align: center; +} + +#toc { + width: 50%; + margin-bottom: 10px; +} + +#tocbox { + border: 1px solid; + padding-left: 4px; + padding-right: 4px; +} + +#tocbox ol { + list-style: decimal outside none; +} + +#tocbox ol ol { + list-style: upper-alpha outside none; +} + +#tocbox ol ol ol{ + list-style: decimal outside none; +} + +#introduction, #references, .sect { + margin-bottom: 5px; +} + +.sect .subsect { + margin-left: 20px; + margin-bottom: 5px; +} + +#references dl { + margin-left: 20px; + margin-right: 20px; +} + +#references dt { + margin-top: 10px; +} + +#footer { + border-top: 1px solid; + margin-top: 20px; + padding-top: 8px; +} + +#footer #copyright, #lastModified { + color: #4C7C8E; +} + +#footer #copyright { + float: left; +} + +#footer #lastModified { + float: right; +} + +/* FIXME: Make these sort of match the Category4 stuff, + but still be appropriate for documentation */ + +h1, h2, h3 { + color: #4C7C8E; + margin-top: 4px; + margin-bottom: 4px; +} + +h4, h5 { + color: #4C7C8E; + margin-top: 2px; + margin-bottom: 2px; + text-decoration: underline; +} + +h1 { + font-size: 24pt; + line-height: 110%; + padding-top: 8px; + padding-bottom: 4px; +} + +h2 { + font-size: 18pt; +} + +h3 { + font-size: 14pt; +} + +h4 { + font-size: 13pt; +} + +h5 { + font-size: 12pt; +} + +h2, h3, h4, h5 { + padding-top: 4px; + padding-bottom: 4px; +} + +p { + padding-top: 4px; + padding-bottom: 4px; + margin: 0px; +} + +.code { + background: #ddddff; + border: thin solid #000000; + font-family: Lucida Console, Courier New, Courier, monospace; + margin: 5px 5px 5px 5px; + min-width: 600px; + padding: 5px; + white-space: pre; +} + +.reference { + text-decoration: none; +} + + + +#relnotes ol { + margin-left: 20px; + padding-left: 0px; +} + +#relnotes ol li { + margin-top: 10px; + color: #4C7C8E; + font-size: 18pt; +} + +#relnotes ol li p { + color: #000000; + font-size: 12pt; +} + +#relnotes ol li ul li { + margin-top: 2px; + color: #000000; + font-size: 12pt; +} + Property changes on: trunk/src/doc/style.css ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-04 17:57:22
|
Revision: 28 Author: cwilper Date: 2006-05-04 10:57:09 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=28&view=rev Log Message: ----------- more tests Modified Paths: -------------- trunk/build.xml trunk/src/doc/style.css trunk/src/java/net/sf/bvalid/ValidatorOption.java trunk/src/test/net/sf/bvalid/SchemaLanguageTest.java trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java trunk/src/test/net/sf/bvalid/ValidatorOptionTest.java Added Paths: ----------- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java trunk/src/test/net/sf/bvalid/catalog/ trunk/src/test/net/sf/bvalid/catalog/CatalogPackageTestSuite.java trunk/src/test/net/sf/bvalid/catalog/FileSchemaIndexTest.java Removed Paths: ------------- trunk/src/test/net/sf/bvalid/BValidTestSuite.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/build.xml 2006-05-04 17:57:09 UTC (rev 28) @@ -21,6 +21,7 @@ <path refid="compile.path"/> <pathelement location="build/classes"/> <pathelement location="build/testclasses"/> + <pathelement location="src/config"/> </path> <target name="classes" @@ -110,18 +111,26 @@ </target> <target name="test" description="Run tests" depends="testclasses"> - <!-- - For this task to run, prior to running ant, set CLASSPATH=lib\junit.jar - --> <junit printsummary="yes" haltonfailure="yes" showoutput="true"> <formatter type="plain" usefile="false"/> <classpath refid="test.path"/> <sysproperty key="propname" value="propvalue"/> - <test name="net.sf.bvalid.SchemaLanguageTest"/> - <test name="net.sf.bvalid.ValidatorFactoryTest"/> + <test name="net.sf.bvalid.BValidPackageTestSuite"/> </junit> </target> + <target name="itest" description="Run tests interactively" depends="testclasses"> + <java classname="net.sf.bvalid.BValidPackageTestSuite" + fork="yes"> + <classpath refid="test.path"/> + <sysproperty key="org.apache.commons.logging.LogFactory" + value="org.apache.commons.logging.impl.Log4jFactory"/> + <sysproperty key="org.apache.commons.logging.Log" + value="org.apache.commons.logging.impl.Log4JLogger"/> + <sysproperty key="log4j.ignoreTCL" value="true"/> + </java> + </target> + <target name="prep" description="prepare for a build"> <mkdir dir="build"/> Modified: trunk/src/doc/style.css =================================================================== --- trunk/src/doc/style.css 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/doc/style.css 2006-05-04 17:57:09 UTC (rev 28) @@ -152,7 +152,7 @@ min-width: 600px; padding: 5px; white-space: pre; - font-size: 10pt; + font-size: 12pt; } .reference { Modified: trunk/src/java/net/sf/bvalid/ValidatorOption.java =================================================================== --- trunk/src/java/net/sf/bvalid/ValidatorOption.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/java/net/sf/bvalid/ValidatorOption.java 2006-05-04 17:57:09 UTC (rev 28) @@ -100,6 +100,7 @@ if (_validValues == null) { return true; } else { + if (value == null) return false; for (int i = 0; i < _validValues.length; i++) { if (value.equals(_validValues[i])) { return true; Copied: trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java (from rev 27, trunk/src/test/net/sf/bvalid/BValidTestSuite.java) =================================================================== --- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java (rev 0) +++ trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-04 17:57:09 UTC (rev 28) @@ -0,0 +1,29 @@ +package net.sf.bvalid; + +import junit.framework.Test; +import junit.framework.TestSuite; +import junit.swingui.TestRunner; + +import net.sf.bvalid.catalog.CatalogPackageTestSuite; + +public class BValidPackageTestSuite { + + public static Test suite() { + + TestSuite suite = new TestSuite(BValidPackageTestSuite.class.getName()); + + // classes in this package + suite.addTestSuite(SchemaLanguageTest.class); + suite.addTestSuite(ValidatorFactoryTest.class); + suite.addTestSuite(ValidatorOptionTest.class); + + // sub-packages + suite.addTest(CatalogPackageTestSuite.suite()); + + return suite; + } + + public static void main(String[] args) { + TestRunner.run(BValidPackageTestSuite.class); + } +} Deleted: trunk/src/test/net/sf/bvalid/BValidTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/BValidTestSuite.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/test/net/sf/bvalid/BValidTestSuite.java 2006-05-04 17:57:09 UTC (rev 28) @@ -1,27 +0,0 @@ -package net.sf.bvalid; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class BValidTestSuite { - - public static Test suite() { - - TestSuite suite = new TestSuite(); - - suite.addTestSuite(SchemaLanguageTest.class); - suite.addTestSuite(ValidatorFactoryTest.class); - suite.addTestSuite(ValidatorOptionTest.class); - - // - // Another example test suite of tests. - // -// suite.addTest(CreditCardTestSuite.suite()); - - return suite; - } - - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } -} Modified: trunk/src/test/net/sf/bvalid/SchemaLanguageTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/SchemaLanguageTest.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/test/net/sf/bvalid/SchemaLanguageTest.java 2006-05-04 17:57:09 UTC (rev 28) @@ -1,7 +1,7 @@ package net.sf.bvalid; import junit.framework.TestCase; -import junit.textui.TestRunner; +import junit.swingui.TestRunner; public class SchemaLanguageTest extends TestCase { Modified: trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java 2006-05-04 17:57:09 UTC (rev 28) @@ -3,7 +3,7 @@ import java.util.*; import junit.framework.TestCase; -import junit.textui.TestRunner; +import junit.swingui.TestRunner; import net.sf.bvalid.locator.URLSchemaLocator; Modified: trunk/src/test/net/sf/bvalid/ValidatorOptionTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/ValidatorOptionTest.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/test/net/sf/bvalid/ValidatorOptionTest.java 2006-05-04 17:57:09 UTC (rev 28) @@ -1,7 +1,7 @@ package net.sf.bvalid; import junit.framework.TestCase; -import junit.textui.TestRunner; +import junit.swingui.TestRunner; public class ValidatorOptionTest extends TestCase { Added: trunk/src/test/net/sf/bvalid/catalog/CatalogPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/catalog/CatalogPackageTestSuite.java (rev 0) +++ trunk/src/test/net/sf/bvalid/catalog/CatalogPackageTestSuite.java 2006-05-04 17:57:09 UTC (rev 28) @@ -0,0 +1,21 @@ +package net.sf.bvalid.catalog; + +import junit.framework.Test; +import junit.framework.TestSuite; +import junit.swingui.TestRunner; + +public class CatalogPackageTestSuite { + + public static Test suite() { + + TestSuite suite = new TestSuite(CatalogPackageTestSuite.class.getName()); + + suite.addTestSuite(FileSchemaIndexTest.class); + + return suite; + } + + public static void main(String[] args) { + TestRunner.run(CatalogPackageTestSuite.class); + } +} Added: trunk/src/test/net/sf/bvalid/catalog/FileSchemaIndexTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/catalog/FileSchemaIndexTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/catalog/FileSchemaIndexTest.java 2006-05-04 17:57:09 UTC (rev 28) @@ -0,0 +1,60 @@ +package net.sf.bvalid.catalog; + +import java.io.*; +import java.util.*; + +import junit.framework.TestCase; +import junit.swingui.TestRunner; + +import net.sf.bvalid.ValidatorException; + +public class FileSchemaIndexTest extends TestCase { + + private File _file; + private FileSchemaIndex _index; + + public FileSchemaIndexTest(String name) { super (name); } + + public void setUp() throws Exception { + + _file = File.createTempFile("bvalid-test", ".dat"); + _index = new FileSchemaIndex(_file); + } + + public void tearDown() { + + _file.delete(); + } + + //---------------------------------------------------------[ Test methods ] + + public void testPutFilename() throws ValidatorException { + + _index.putFilename("urn:example:1", "file1"); + + Set uris = _index.getURISet(); + assertEquals("After putting, URI set had size " + uris.size() + ", not 1 as expected", + uris.size(), + 1); + + assertEquals("Set did not contain expected uri", uris.contains("urn:example:1"), true); + + String filename = _index.getFilename("urn:example:1"); + assertEquals("Got wrong filename", filename, "file1"); + } + + public void testRemoveMapping() throws ValidatorException { + + testPutFilename(); + + _index.removeMapping("urn:example:1"); + + int size = _index.getURISet().size(); + assertEquals("After removal, set was not empty as expected", size, 0); + } + + public static void main(String[] args) { + TestRunner.run(FileSchemaIndexTest.class); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-05 07:15:50
|
Revision: 31 Author: cwilper Date: 2006-05-05 00:15:44 -0700 (Fri, 05 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=31&view=rev Log Message: ----------- small testing mods Modified Paths: -------------- trunk/build.xml trunk/src/java/net/sf/bvalid/catalog/DiskSchemaCatalog.java trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-05 05:41:33 UTC (rev 30) +++ trunk/build.xml 2006-05-05 07:15:44 UTC (rev 31) @@ -111,7 +111,7 @@ </target> <target name="test" description="Run tests" depends="testclasses"> - <junit printsummary="yes" haltonfailure="yes" showoutput="true"> + <junit printsummary="no" haltonfailure="yes" showoutput="true" filtertrace="true"> <formatter type="plain" usefile="false"/> <classpath refid="test.path"/> <sysproperty key="propname" value="propvalue"/> @@ -131,6 +131,19 @@ </java> </target> + <target name="otest" description="Run tests interactively" depends="testclasses"> + <java classname="net.sf.bvalid.BValidPackageTestSuite" + fork="yes"> + <classpath refid="test.path"/> + <sysproperty key="org.apache.commons.logging.LogFactory" + value="org.apache.commons.logging.impl.Log4jFactory"/> + <sysproperty key="org.apache.commons.logging.Log" + value="org.apache.commons.logging.impl.Log4JLogger"/> + <sysproperty key="log4j.ignoreTCL" value="true"/> + <sysproperty key="text" value="true"/> + </java> + </target> + <target name="prep" description="prepare for a build"> <mkdir dir="build"/> Modified: trunk/src/java/net/sf/bvalid/catalog/DiskSchemaCatalog.java =================================================================== --- trunk/src/java/net/sf/bvalid/catalog/DiskSchemaCatalog.java 2006-05-05 05:41:33 UTC (rev 30) +++ trunk/src/java/net/sf/bvalid/catalog/DiskSchemaCatalog.java 2006-05-05 07:15:44 UTC (rev 31) @@ -141,8 +141,6 @@ if (!deleted) { if (file.exists()) { _LOG.warn("Cannot remove schema file: " + file.getPath()); - } else { - _LOG.warn("Schema file already deleted: " + file.getPath()); } } } Modified: trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-05 05:41:33 UTC (rev 30) +++ trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-05 07:15:44 UTC (rev 31) @@ -24,6 +24,10 @@ } public static void main(String[] args) { - TestRunner.run(BValidPackageTestSuite.class); + if (System.getProperty("text") != null && System.getProperty("text").equals("true")) { + junit.textui.TestRunner.run(BValidPackageTestSuite.suite()); + } else { + TestRunner.run(BValidPackageTestSuite.class); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-12-22 20:58:00
|
Revision: 46
http://svn.sourceforge.net/bvalid/?rev=46&view=rev
Author: cwilper
Date: 2006-12-22 12:58:00 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
upped version, and including version number in jar.
also building specifically for java 1.4
Modified Paths:
--------------
trunk/build.properties
trunk/build.xml
trunk/src/bin/bvalid
trunk/src/bin/bvalid.bat
trunk/src/java/net/sf/bvalid/BValid.properties
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2006-10-08 09:17:15 UTC (rev 45)
+++ trunk/build.properties 2006-12-22 20:58:00 UTC (rev 46)
@@ -4,6 +4,8 @@
optimize = off
debug = on
+source = 1.4
+target = 1.4
#
# Libraries
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-10-08 09:17:15 UTC (rev 45)
+++ trunk/build.xml 2006-12-22 20:58:00 UTC (rev 46)
@@ -32,6 +32,8 @@
<javac srcdir="src/java" destdir="build/classes"
includes="**"
classpathref="compile.path"
+ source="${source}"
+ target="${target}"
optimize="${optimize}" debug="${debug}"/>
<copy file="src/java/net/sf/bvalid/BValid.properties" tofile="build/classes/net/sf/bvalid/BValid.properties"/>
<propertyfile file="build/version.properties">
@@ -70,7 +72,7 @@
<fileset dir="src/config"/>
</copy>
<chmod dir="dist" perm="ugo+x" includes="bvalid"/>
- <jar jarfile="dist/bvalid.jar" basedir="build/classes"/>
+ <jar jarfile="dist/bvalid-${bvalid.version}.jar" basedir="build/classes"/>
</target>
<target name="srcrelease" depends="clean">
Modified: trunk/src/bin/bvalid
===================================================================
--- trunk/src/bin/bvalid 2006-10-08 09:17:15 UTC (rev 45)
+++ trunk/src/bin/bvalid 2006-12-22 20:58:00 UTC (rev 46)
@@ -4,14 +4,14 @@
BVALID_HOME=.
fi
-if [ ! -f "$BVALID_HOME/bvalid.jar" ]; then
- echo "ERROR: $BVALID_HOME/bvalid.jar was not found."
+if [ ! -f "$BVALID_HOME/bvalid-0.8.1.jar" ]; then
+ echo "ERROR: $BVALID_HOME/bvalid-0.8.1.jar was not found."
echo "NOTE : To run bvalid from any directory, BVALID_HOME must be defined."
exit 1
fi
(exec java -Xms64m -Xmx96m \
- -cp "$BVALID_HOME/bvalid.jar" \
+ -cp "$BVALID_HOME/bvalid-0.8.1.jar" \
-Djava.endorsed.dirs="$BVALID_HOME/lib" \
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
Modified: trunk/src/bin/bvalid.bat
===================================================================
--- trunk/src/bin/bvalid.bat 2006-10-08 09:17:15 UTC (rev 45)
+++ trunk/src/bin/bvalid.bat 2006-12-22 20:58:00 UTC (rev 46)
@@ -3,7 +3,7 @@
goto checkEnv
:envOk
-java -Xms64m -Xmx96m -cp "%BVALID_HOME%\bvalid.jar" -Djava.endorsed.dirs="%BVALID_HOME%\lib" -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Dlog4j.configuration="file:/%BVALID_HOME%\log4j.xml" net.sf.bvalid.BValid %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -Xms64m -Xmx96m -cp "%BVALID_HOME%\bvalid-0.8.1.jar" -Djava.endorsed.dirs="%BVALID_HOME%\lib" -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Dlog4j.configuration="file:/%BVALID_HOME%\log4j.xml" net.sf.bvalid.BValid %1 %2 %3 %4 %5 %6 %7 %8 %9
if errorlevel 1 goto endWithError
goto end
@@ -11,7 +11,7 @@
if "%BVALID_HOME%" == "" goto setHome
:checkJarExists
-if not exist "%BVALID_HOME%\bvalid.jar" goto jarNotFound
+if not exist "%BVALID_HOME%\bvalid-0.8.1.jar" goto jarNotFound
goto envOk
:setHome
@@ -19,7 +19,7 @@
goto checkJarExists
:jarNotFound
-echo ERROR: %BVALID_HOME%\bvalid.jar was not found.
+echo ERROR: %BVALID_HOME%\bvalid-0.8.1.jar was not found.
echo NOTE: To run bvalid from any directory, BVALID_HOME must be defined.
:endWithError
Modified: trunk/src/java/net/sf/bvalid/BValid.properties
===================================================================
--- trunk/src/java/net/sf/bvalid/BValid.properties 2006-10-08 09:17:15 UTC (rev 45)
+++ trunk/src/java/net/sf/bvalid/BValid.properties 2006-12-22 20:58:00 UTC (rev 46)
@@ -1,2 +1,2 @@
-bvalid.version = 0.8
+bvalid.version = 0.8.1
bvalid.buildDate = @buildDate@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|