bvalid-codewatch Mailing List for BValid XML Validation API
Status: Beta
Brought to you by:
cwilper
Menu
▾
▴
bvalid-codewatch — Notification of code commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(5) |
Apr
(9) |
May
(26) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(7) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <cw...@us...> - 2010-12-13 14:31:06
|
Revision: 56
http://bvalid.svn.sourceforge.net/bvalid/?rev=56&view=rev
Author: cwilper
Date: 2010-12-13 14:31:00 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
State of tags at the time of migration
Added Paths:
-----------
moved-to-github/tags/
Removed Paths:
-------------
tags/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2010-12-13 14:30:58
|
Revision: 55
http://bvalid.svn.sourceforge.net/bvalid/?rev=55&view=rev
Author: cwilper
Date: 2010-12-13 14:30:52 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
State of trunk at the time of migration
Added Paths:
-----------
moved-to-github/trunk/
Removed Paths:
-------------
trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2010-12-13 14:30:31
|
Revision: 54
http://bvalid.svn.sourceforge.net/bvalid/?rev=54&view=rev
Author: cwilper
Date: 2010-12-13 14:30:24 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
Latest code is at https://github.com/fcrepo/bvalid
Added Paths:
-----------
moved-to-github/MOVED-README.txt
Added: moved-to-github/MOVED-README.txt
===================================================================
--- moved-to-github/MOVED-README.txt (rev 0)
+++ moved-to-github/MOVED-README.txt 2010-12-13 14:30:24 UTC (rev 54)
@@ -0,0 +1,10 @@
+ NOTICE -- THIS REPOSITORY IS OUT OF DATE!
+ -----------------------------------------
+
+This project's source code (and all commit history) has been migrated
+to github. As of December 2010, it can be found here:
+
+ https://github.com/fcrepo/bvalid
+
+The state of this project's source code AT THE TIME OF MIGRATION
+is preserved here and will not change.
Property changes on: moved-to-github/MOVED-README.txt
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2010-12-13 14:20:05
|
Revision: 53
http://bvalid.svn.sourceforge.net/bvalid/?rev=53&view=rev
Author: cwilper
Date: 2010-12-13 14:19:59 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
.
Added Paths:
-----------
moved-to-github/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2006-12-22 22:01:31
|
Revision: 52
http://svn.sourceforge.net/bvalid/?rev=52&view=rev
Author: cwilper
Date: 2006-12-22 14:01:31 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
removed last modified date from doc
Modified Paths:
--------------
trunk/src/doc/index.html
Modified: trunk/src/doc/index.html
===================================================================
--- trunk/src/doc/index.html 2006-12-22 21:54:42 UTC (rev 51)
+++ trunk/src/doc/index.html 2006-12-22 22:01:31 UTC (rev 52)
@@ -245,16 +245,6 @@
Copyright © 2006, Cornell University
</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>
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:54:45
|
Revision: 51
http://svn.sourceforge.net/bvalid/?rev=51&view=rev
Author: cwilper
Date: 2006-12-22 13:54:42 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
added tag for release 0.8.1
Added Paths:
-----------
tags/release-0.8.1/
Copied: tags/release-0.8.1 (from rev 50, trunk)
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:35:05
|
Revision: 50
http://svn.sourceforge.net/bvalid/?rev=50&view=rev
Author: cwilper
Date: 2006-12-22 13:34:58 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
added asl-1.1 back; it's the xerces license
Added Paths:
-----------
trunk/src/doc/license/asl-1.1.txt
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-12-22 21:34:58 UTC (rev 50)
@@ -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
+ *
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:33:14
|
Revision: 49
http://svn.sourceforge.net/bvalid/?rev=49&view=rev
Author: cwilper
Date: 2006-12-22 13:33:14 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
updated license and release note info in prep for release
Modified Paths:
--------------
trunk/src/doc/index.html
trunk/src/doc/license/index.html
Removed Paths:
-------------
trunk/src/doc/license/asl-1.1.txt
Modified: trunk/src/doc/index.html
===================================================================
--- trunk/src/doc/index.html 2006-12-22 21:20:55 UTC (rev 48)
+++ trunk/src/doc/index.html 2006-12-22 21:33:14 UTC (rev 49)
@@ -49,6 +49,10 @@
<div class="sec2">
<h2><a name="inst">2. Downloading and Installing</a></h2>
<p>
+ Read the <a href="release-notes.txt">release notes</a> to determine
+ what has changed for this release.
+ </p>
+ <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>
Deleted: trunk/src/doc/license/asl-1.1.txt
===================================================================
--- trunk/src/doc/license/asl-1.1.txt 2006-12-22 21:20:55 UTC (rev 48)
+++ trunk/src/doc/license/asl-1.1.txt 2006-12-22 21:33:14 UTC (rev 49)
@@ -1,48 +0,0 @@
-/*
- * ============================================================================
- * 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/>.
- *
- */
Modified: trunk/src/doc/license/index.html
===================================================================
--- trunk/src/doc/license/index.html 2006-12-22 21:20:55 UTC (rev 48)
+++ trunk/src/doc/license/index.html 2006-12-22 21:33:14 UTC (rev 49)
@@ -70,9 +70,17 @@
to its operation.
</p>
<ol>
+ <li>Apache Jakarta Commons Codec Library
+ <div class="copyright">
+ Copyright © 2002-2004 The Apache Software Foundation.
+ </div>
+ <div class="license">
+ Licensed under the <a href="asl-2.0.txt">Apache Software License 2.0.</a>
+ </div>
+ </li>
<li>Apache Jakarta Commons HttpClient
<div class="copyright">
- Copyright © 1999-2004 The Apache Software Foundation.
+ Copyright © 1999-2006 The Apache Software Foundation.
</div>
<div class="license">
Licensed under the <a href="asl-2.0.txt">Apache Software License 2.0.</a>
@@ -88,11 +96,11 @@
</li>
<li>Apache Log4J
<div class="copyright">
- Copyright © 1999 The Apache Software Foundation.
+ Copyright © 1998-2006 The Apache Software Foundation.
All rights reserved.
</div>
<div class="license">
- Licensed under the <a href="asl-1.1.txt">Apache Software License 1.1.</a>
+ Licensed under the <a href="asl-2.0.txt">Apache Software License 2.0.</a>
</div>
</li>
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-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 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.
|
|
From: <cw...@us...> - 2006-10-08 09:17:21
|
Revision: 45
http://svn.sourceforge.net/bvalid/?rev=45&view=rev
Author: cwilper
Date: 2006-10-08 02:17:15 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
tag for 0.8
Added Paths:
-----------
tags/
tags/release-0.8/
Copied: tags/release-0.8 (from rev 44, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2006-05-15 15:14:44
|
Revision: 44 Author: cwilper Date: 2006-05-15 08:14:41 -0700 (Mon, 15 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=44&view=rev Log Message: ----------- clarify re: multiple msgs Modified Paths: -------------- trunk/src/java/net/sf/bvalid/ValidationException.java Modified: trunk/src/java/net/sf/bvalid/ValidationException.java =================================================================== --- trunk/src/java/net/sf/bvalid/ValidationException.java 2006-05-15 15:12:11 UTC (rev 43) +++ trunk/src/java/net/sf/bvalid/ValidationException.java 2006-05-15 15:14:41 UTC (rev 44) @@ -3,6 +3,9 @@ /** * Signals that validation failed. * + * If there were multiple error messages, they'll be separated + * by newlines in the message. + * * @author cw...@cs... */ public class ValidationException extends ValidatorException { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-15 15:12:16
|
Revision: 43 Author: cwilper Date: 2006-05-15 08:12:11 -0700 (Mon, 15 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=43&view=rev Log Message: ----------- smaller Modified Paths: -------------- trunk/README.txt Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2006-05-15 15:11:20 UTC (rev 42) +++ trunk/README.txt 2006-05-15 15:12:11 UTC (rev 43) @@ -4,8 +4,6 @@ Source Distribution - Written by Chris Wilper - Copyright (c) 2006, Cornell University +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-15 15:11:32
|
Revision: 42 Author: cwilper Date: 2006-05-15 08:11:20 -0700 (Mon, 15 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=42&view=rev Log Message: ----------- doc updates Modified Paths: -------------- trunk/src/doc/index.html trunk/src/doc/license/index.html Added Paths: ----------- trunk/src/java/net/sf/bvalid/catalog/package.html trunk/src/java/net/sf/bvalid/locator/package.html trunk/src/java/net/sf/bvalid/package.html trunk/src/java/net/sf/bvalid/util/package.html trunk/src/java/net/sf/bvalid/xsd/package.html Modified: trunk/src/doc/index.html =================================================================== --- trunk/src/doc/index.html 2006-05-11 21:34:06 UTC (rev 41) +++ trunk/src/doc/index.html 2006-05-15 15:11:20 UTC (rev 42) @@ -19,7 +19,7 @@ <ol> <li><a href="#intro">What is BValid?</a></li> - <li><a href="#inst">How to Download</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> <li><a href="#issues">Known Issues / Bugs</a></li> @@ -47,7 +47,7 @@ <div class="sec2"> - <h2><a name="inst">2. How to Download</a></h2> + <h2><a name="inst">2. 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> @@ -60,6 +60,10 @@ To begin using bvalid in your own projects, you'll need the required jars (included in the lib/ directory) in your CLASSPATH. </p> + <p> + Note: The binary distribution is compiled for Java 1.4. + Currently, BValid will compile and run with Java 1.4 and Java 1.5. + </p> </div> <div class="sec2"> @@ -207,7 +211,11 @@ versions will also support <a href="http://www.schematron.com/">Schematron</a> and <a href="http://www.relaxng.org/">Relax NG</a> validation. </li> - <li> <code>ValidationException</code> isn't clear about how multiple validation errors are reported.</li> + <li> <code>ValidationException</code> currently only reports multiple errors as a multi-line string. An alternate method (getErrorList?) would be nice.</li> + <li> Javadocs are incomplete (params, returns, throws, and some fields).</li> + <li> Some unit tests still need to be written. In particular, multithreaded + validation tests and whitebox tests for SchemaCatalog and SchemaLocator + implementations.</li> <li> Should the API include more direct support for schema whitelisting? Currently this is possible by writing your own SchemaLocator.</li> </ul> Modified: trunk/src/doc/license/index.html =================================================================== --- trunk/src/doc/license/index.html 2006-05-11 21:34:06 UTC (rev 41) +++ trunk/src/doc/license/index.html 2006-05-15 15:11:20 UTC (rev 42) @@ -106,6 +106,7 @@ </div> </li> +<!-- <li>Jing RELAX NG Validator <div class="copyright"> Copyright © 2001-2003 Thai Open Source Software Center Ltd. @@ -135,6 +136,7 @@ Licensed under the <a href="schematron-license.txt">Schematron License</a>. </div> </li> +--> </ol> <h2><a name="add">Optional Software</a></h2> Added: trunk/src/java/net/sf/bvalid/catalog/package.html =================================================================== --- trunk/src/java/net/sf/bvalid/catalog/package.html (rev 0) +++ trunk/src/java/net/sf/bvalid/catalog/package.html 2006-05-15 15:11:20 UTC (rev 42) @@ -0,0 +1,10 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +</head> +<body bgcolor="white"> + +<code>SchemaCatalog</code> interface and implementations. + +</body> +</html> Added: trunk/src/java/net/sf/bvalid/locator/package.html =================================================================== --- trunk/src/java/net/sf/bvalid/locator/package.html (rev 0) +++ trunk/src/java/net/sf/bvalid/locator/package.html 2006-05-15 15:11:20 UTC (rev 42) @@ -0,0 +1,10 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +</head> +<body bgcolor="white"> + +<code>SchemaLocator</code> interface and implementations. + +</body> +</html> Added: trunk/src/java/net/sf/bvalid/package.html =================================================================== --- trunk/src/java/net/sf/bvalid/package.html (rev 0) +++ trunk/src/java/net/sf/bvalid/package.html 2006-05-15 15:11:20 UTC (rev 42) @@ -0,0 +1,33 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +</head> +<body bgcolor="white"> + +Main package of the BValid API. + +<p> +To use this API, an application will typically: + +<ol> + <li> Get an appropriate <a href="Validator.html">Validator</a> from the + <a href="ValidatorFactory.html">ValidatorFactory</a>.</li> + <li> Call one of the <code>validate(...)</code> methods + on that object (multiple times, from multiple threads, + if needed)</li> + <li> Catch and handle + <a href="ValidationException.html">ValidationException</a>, + as appropriate.</li> +</ol> + +<h2>Related Documentation</h2> + +For additional documentation, please see: +<ul> + <li><a target="_blank" href="../../../../index.html">The BValid User Guide</a> +</ul> + +<!-- Put @see and @since tags down here. --> + +</body> +</html> Added: trunk/src/java/net/sf/bvalid/util/package.html =================================================================== --- trunk/src/java/net/sf/bvalid/util/package.html (rev 0) +++ trunk/src/java/net/sf/bvalid/util/package.html 2006-05-15 15:11:20 UTC (rev 42) @@ -0,0 +1,12 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +</head> +<body bgcolor="white"> + +Miscellaneous utility classes. + +<!-- Put @see and @since tags down here. --> + +</body> +</html> Added: trunk/src/java/net/sf/bvalid/xsd/package.html =================================================================== --- trunk/src/java/net/sf/bvalid/xsd/package.html (rev 0) +++ trunk/src/java/net/sf/bvalid/xsd/package.html 2006-05-15 15:11:20 UTC (rev 42) @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +</head> +<body bgcolor="white"> + +Implementation of the <code>Validator</code> interface for XSD, +and related classes. + +<!-- Put @see and @since tags down here. --> + +</body> +</html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
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-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 no rights or licenses to the +intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. Added: trunk/src/doc/license/ecl-1.0.txt =================================================================== --- trunk/src/doc/license/ecl-1.0.txt (rev 0) +++ trunk/src/doc/license/ecl-1.0.txt 2006-05-11 17:32:28 UTC (rev 40) @@ -0,0 +1,43 @@ +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/src/doc/license/index.html =================================================================== --- trunk/src/doc/license/index.html (rev 0) +++ trunk/src/doc/license/index.html 2006-05-11 17:32:28 UTC (rev 40) @@ -0,0 +1,147 @@ +<?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 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; + margin-bottom: 5px; + margin-left: 10px; + margin-right: 50px; + padding-left: 10px; + padding-right: 10px; + padding-top: 5px; + padding-bottom: 5px; + background-color: #e0e0e0; + } + </style> +</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> + + + <h2>Third-Party Packages</h2> + <ol> + <li>Apache Jakarta Commons HttpClient + <div class="copyright"> + Copyright © 1999-2004 The Apache Software Foundation. + </div> + <div class="license"> + Licensed under the <a href="asl-2.0.txt">Apache Software License 2.0.</a> + </div> + </li> + <li>Apache Jakarta Commons Logging + <div class="copyright"> + Copyright © 2001-2004 The Apache Software Foundation. + </div> + <div class="license"> + Licensed under the <a href="asl-2.0.txt">Apache Software License 2.0.</a> + </div> + </li> + <li>Apache Log4J + <div class="copyright"> + Copyright © 1999 The Apache Software Foundation. + All rights reserved. + </div> + <div class="license"> + Licensed under the <a href="asl-1.1.txt">Apache Software License 1.1.</a> + </div> + + </li> + <li>Apache Xerces2 Java Parser + <div class="copyright"> + Copyright © 1999-2004 The Apache Software Foundation. + All rights reserved. + </div> + <div class="license"> + Licensed under the <a href="asl-1.1.txt">Apache Software License 1.1.</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>Jing RELAX NG Validator + <div class="copyright"> + Copyright © 2001-2003 Thai Open Source Software Center Ltd. + </div> + <div class="license"> + 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/> + Portions Copyright © 1997, 1998 by Microstar Software Ltd.<br /> + Portions Copyright © 1999-2000 by David Brownell. All Rights Reserved.<br /> + </div> + + <div class="license"> + Licensed under the <a href="mpl-1.0.txt">Mozilla Public License 1.0.</a><br/> + <!-- http://saxon.sourceforge.net/saxon6.5.3/conditions.html --> + </div> + </li> + <li>Schematron + <div class="copyright"> + Copyright © 2000,2001 Rick Jelliffe and Academia Sinica Computing Center, Taiwan + </div> + + <div class="license"> + Licensed under the <a href="schematron-license.txt">Schematron License</a>. + </div> + </li> +</ol> + +</body> +</html> Property changes on: trunk/src/doc/license/index.html ___________________________________________________________________ Name: svn:executable + * Added: trunk/src/doc/license/jing-license.html =================================================================== --- trunk/src/doc/license/jing-license.html (rev 0) +++ trunk/src/doc/license/jing-license.html 2006-05-11 17:32:28 UTC (rev 40) @@ -0,0 +1,39 @@ +<html xmlns="http://www.w3.org/1999/xhtml"><head><title>Jing Copying Conditions</title></head><body> +<h1>Jing Copying Conditions</h1> + +<p>Copyright (c) 2001-2003 Thai Open Source Software Center Ltd<br> +All rights reserved.</p> + +<p>Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met:</p> + +<ul> + <li>Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.</li> + + <li>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.</li> + + <li>Neither the name of the Thai Open Source Software Center Ltd nor + the names of its contributors may be used to endorse or promote + products derived from this software without specific prior written + permission.</li> +</ul> + +<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS 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 REGENTS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.</p> + + +</body></html> \ No newline at end of file Added: trunk/src/doc/license/mpl-1.0.txt =================================================================== --- trunk/src/doc/license/mpl-1.0.txt (rev 0) +++ trunk/src/doc/license/mpl-1.0.txt 2006-05-11 17:32:28 UTC (rev 40) @@ -0,0 +1,361 @@ + MOZILLA PUBLIC LICENSE + Version 1.0 + + ---------------- + +1. Definitions. + + 1.1. ``Contributor'' means each entity that creates or contributes to + the creation of Modifications. + + 1.2. ``Contributor Version'' means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. ``Covered Code'' means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. ``Electronic Distribution Mechanism'' means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. ``Executable'' means Covered Code in any form other than Source + Code. + + 1.6. ``Initial Developer'' means the individual or entity identified as + the Initial Developer in the Source Code notice required by Exhibit A. + + 1.7. ``Larger Work'' means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. ``License'' means this document. + + 1.9. ``Modifications'' means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. ``Original Code'' means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this License + is not already Covered Code governed by this License. + + 1.11. ``Source Code'' means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus any + associated interface definition files, scripts used to control + compilation and installation of an Executable, or a list of source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. ``You'' means an individual or a legal entity exercising rights + under, and complying with all of the terms of, this License or a future + version of this License issued under Section 6.1. For legal entities, + ``You'' includes any entity which controls, is controlled by, or is + under common control with You. For purposes of this definition, + ``control'' means (a) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (b) ownership of fifty percent (50%) or more of the + outstanding shares or beneficial ownership of such entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + + (a) to use, reproduce, modify, display, perform, sublicense and + distribute the Original Code (or portions thereof) with or without + Modifications, or as part of a Larger Work; and + + (b) under patents now or hereafter owned or controlled by Initial + Developer, to make, have made, use and sell (``Utilize'') the + Original Code (or portions thereof), but solely to the extent that + any such patent is reasonably necessary to enable You to Utilize + the Original Code (or portions thereof) and not to any greater + extent that may be necessary to Utilize further Modifications or + combinations. + + 2.2. Contributor Grant. + Each Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + + (a) to use, reproduce, modify, display, perform, sublicense and + distribute the Modifications created by such Contributor (or + portions thereof) either on an unmodified basis, with other + Modifications, as Covered Code or as part of a Larger Work; and + + (b) under patents now or hereafter owned or controlled by + Contributor, to Utilize the Contributor Version (or portions + thereof), but solely to the extent that any such patent is + reasonably necessary to enable You to Utilize the Contributor + Version (or portions thereof), and not to any greater extent that + may be necessary to Utilize further Modifications or combinations. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be distributed + only under the terms of this License or a future version of this + License released under Section 6.1, and You must include a copy of this + License with every copy of the Source Code You distribute. You may not + offer or impose any terms on any Source Code version that alters or + restricts the applicable version of this License or the recipients' + rights hereunder. However, You may include an additional document + offering the additional rights described in Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which you contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that the + Modification is derived, directly or indirectly, from Original Code + provided by the Initial Developer and including the name of the Initial + Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + + (a) Third Party Claims. + If You have knowledge that a party claims an intellectual property + right in particular functionality or code (or its utilization + under this License), you must include a text file with the source + code distribution titled ``LEGAL'' which describes the claim and + the party making the claim in sufficient detail that a recipient + will know whom to contact. If you obtain such knowledge after You + make Your Modification available as described in Section 3.2, You + shall promptly modify the LEGAL file in all copies You make + available thereafter and shall take other steps (such as notifying + appropriate mailing lists or newsgroups) reasonably calculated to + inform those who received the Covered Code that new knowledge has + been obtained. + + (b) Contributor APIs. + If Your Modification is an application programming interface and + You own or control patents which are reasonably necessary to + implement that API, you must also include this information in the + LEGAL file. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code, and this License in any documentation for the Source Code, where + You describe recipients' rights relating to Covered Code. If You + created one or more Modification(s), You may add your name as a + Contributor to the notice described in Exhibit A. If it is not possible + to put such notice in a particular Source Code file due to its + structure, then you must include such notice in a location (such as a + relevant directory file) where a user would be likely to look for such + a notice. You may choose to offer, and to charge a fee for, warranty, + support, indemnity or liability obligations to one or more recipients + of Covered Code. However, You may do so only on Your own behalf, and + not on behalf of the Initial Developer or any Contributor. You must + make it absolutely clear than any such warranty, support, indemnity or + liability obligation is offered by You alone, and You hereby agree to + indemnify the Initial Developer and every Contributor for any liability + incurred by the Initial Developer or such Contributor as a result of + warranty, support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of the + Covered Code is available under the terms of this License, including a + description of how and where You have fulfilled the obligations of + Section 3.2. The notice must be conspicuously included in any notice in + an Executable version, related documentation or collateral in which You + describe recipients' rights relating to the Covered Code. You may + distribute the Executable version of Covered Code under a license of + Your choice, which may contain terms different from this License, + provided that You are in compliance with the terms of this License and + that the license for the Executable version does not attempt to limit + or alter the recipient's rights in the Source Code version from the + rights set forth in this License. If You distribute the Executable + version under a different license You must make it absolutely clear + that any terms which differ from this License are offered by You alone, + not by the Initial Developer or any Contributor. You hereby agree to + indemnify the Initial Developer and every Contributor for any liability + incurred by the Initial Developer or such Contributor as a result of + any such terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to statute + or regulation then You must: (a) comply with the terms of this License + to the maximum extent possible; and (b) describe the limitations and + the code they affect. Such description must be included in the LEGAL + file described in Section 3.4 and must be included with all + distributions of the Source Code. Except to the extent prohibited by + statute or regulation, such description must be sufficiently detailed + for a recipient of ordinary skill to be able to understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A, and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation (``Netscape'') may publish revised + and/or new versions of the License from time to time. Each version will + be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If you create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), you must (a) rename Your license so that the + phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or + any confusingly similar phrase do not appear anywhere in your license + and (b) otherwise make it clear that your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial Developer, + Original Code or Contributor in the notice described in Exhibit A shall + not of themselves be deemed to be modifications of this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER + PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF + GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND + ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE + BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT + EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a ``commercial item,'' as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer + software'' and ``commercial computer software documentation,'' as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if any, + provides otherwise), excluding its conflict-of-law provisions. With + respect to disputes in which at least one party is a citizen of, or an + entity chartered or registered to do business in, the United States of + America: (a) unless otherwise agreed in writing, all disputes relating + to this License (excepting any dispute relating to intellectual + property rights) shall be subject to final and binding arbitration, + with the losing party paying all costs of arbitration; (b) any + arbitration relating to this Agreement shall be held in Santa Clara + County, California, under the auspices of JAMS/EndDispute; and (c) any + litigation relating to this Agreement shall be subject to the + jurisdiction of the Federal Courts of the Northern District of + California, with venue lying in Santa Clara County, California, with + the losing party responsible for costs, including without limitation, + court costs and reasonable attorneys fees and expenses. The application + of the United Nations Convention on Contracts for the International + Sale of Goods is expressly excluded. Any law or regulation which + provides that the language of a contract shall be construed against the + drafter shall not apply to this License. + +12. RESPONSIBILITY FOR CLAIMS. + + Except in cases where another Contributor has failed to comply with + Section 3.4, You are responsible for damages arising, directly or + indirectly, out of Your utilization of rights under this License, based + on the number of copies of Covered Code you made available, the + revenues you received from utilizing such rights, and other relevant + factors. You agree to work with affected parties to distribute + responsibility on an equitable basis. + +EXHIBIT A. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.0 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original ... [truncated message content] |
|
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-10 05:14:00
|
Revision: 35 Author: cwilper Date: 2006-05-09 13:10:49 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=35&view=rev Log Message: ----------- Added locator unit tests Modified Paths: -------------- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java trunk/src/test/net/sf/bvalid/catalog/SchemaCatalogTest.java Added Paths: ----------- trunk/src/test/data/ trunk/src/test/data/existing-schema.xsd trunk/src/test/net/sf/bvalid/TestConfig.java trunk/src/test/net/sf/bvalid/locator/ trunk/src/test/net/sf/bvalid/locator/CachingSchemaLocatorTest.java trunk/src/test/net/sf/bvalid/locator/CatalogSchemaLocatorTest.java trunk/src/test/net/sf/bvalid/locator/ChainingSchemaLocatorTest.java trunk/src/test/net/sf/bvalid/locator/LocatorPackageTestSuite.java trunk/src/test/net/sf/bvalid/locator/SchemaLocatorTest.java trunk/src/test/net/sf/bvalid/locator/URLSchemaLocatorTest.java Added: trunk/src/test/data/existing-schema.xsd =================================================================== --- trunk/src/test/data/existing-schema.xsd (rev 0) +++ trunk/src/test/data/existing-schema.xsd 2006-05-09 20:10:49 UTC (rev 35) @@ -0,0 +1,14 @@ +<schema targetNamespace="http://example.org/sample/" + xmlns:this="http://example.org/sample/" + xmlns="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + + <element name="sample" type="this:rootType"/> + + <complexType name="rootType"> + <sequence> + <element name="sample-element" type="string" maxOccurs="unbounded"/> + </sequence> + </complexType> +</schema> Modified: trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-09 20:08:57 UTC (rev 34) +++ trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-09 20:10:49 UTC (rev 35) @@ -6,6 +6,7 @@ import junit.swingui.TestRunner; import net.sf.bvalid.catalog.CatalogPackageTestSuite; +import net.sf.bvalid.locator.LocatorPackageTestSuite; import net.sf.bvalid.util.JettyTestSetup; public class BValidPackageTestSuite extends TestCase { @@ -19,15 +20,15 @@ suite.addTestSuite(ValidatorFactoryTest.class); suite.addTestSuite(ValidatorOptionTest.class); - // sub-packages + // sub-package suites suite.addTest(CatalogPackageTestSuite.suite()); + suite.addTest(LocatorPackageTestSuite.suite()); - 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); + return new JettyTestSetup(suite, + TestConfig.TEST_PORT, + "/", + TestConfig.TEST_DATADIR, + TestConfig.JETTY_FORK); } public static void main(String[] args) throws Exception { Added: trunk/src/test/net/sf/bvalid/TestConfig.java =================================================================== --- trunk/src/test/net/sf/bvalid/TestConfig.java (rev 0) +++ trunk/src/test/net/sf/bvalid/TestConfig.java 2006-05-09 20:10:49 UTC (rev 35) @@ -0,0 +1,83 @@ +package net.sf.bvalid; + +import java.util.*; + +import org.apache.log4j.Logger; + +public abstract class TestConfig { + + public final static String EXISTING_SCHEMA = "existing-schema.xsd"; + public final static String MISSING_SCHEMA = "missing-schema.xsd"; + + // jetty.fork + public static boolean JETTY_FORK = true; + + // test.datadir + public static String TEST_DATADIR = "src/test/data/"; + + // test.port + public static int TEST_PORT = 7375; + + public static String BASE_URL; + public static String EXISTING_SCHEMA_PATH; + public static String EXISTING_SCHEMA_URL; + public static String MISSING_SCHEMA_PATH; + public static String MISSING_SCHEMA_URL; + + private static final Logger _LOG = Logger.getLogger(TestConfig.class.getName()); + + static { + + String jettyFork = System.getProperty("jetty.fork"); + if (jettyFork != null) { + boolean wasInvalid = false; + if (jettyFork.equalsIgnoreCase("true") + || jettyFork.equalsIgnoreCase("yes")) { + JETTY_FORK = true; + } else if (jettyFork.equalsIgnoreCase("false") + || jettyFork.equalsIgnoreCase("no")) { + JETTY_FORK = false; + } else { + _LOG.warn("Specified jetty.fork was invalid, using default: " + JETTY_FORK); + wasInvalid = true; + } + if (!wasInvalid) { + _LOG.info("Using specified jetty.fork: " + JETTY_FORK); + } + } else { + _LOG.info("Using default jetty.fork: " + JETTY_FORK); + } + + String testDatadir = System.getProperty("test.datadir"); + if (testDatadir != null) { + TEST_DATADIR = testDatadir; + if (!TEST_DATADIR.endsWith("/")) { + TEST_DATADIR += "/"; + } + _LOG.info("Using specified test.datadir: " + TEST_DATADIR); + } else { + _LOG.info("Using default test.datadir: " + TEST_DATADIR); + } + + String testPort = System.getProperty("test.port"); + if (testPort != null) { + try { + TEST_PORT = Integer.parseInt(testPort); + _LOG.info("Using specified test.port: " + TEST_PORT); + } catch (Exception e) { + _LOG.warn("Specified test.port was invalid, using default: " + TEST_PORT); + } + } else { + _LOG.info("Using default test.port: " + TEST_PORT); + } + + BASE_URL = "http://localhost:" + TEST_PORT + "/"; + + EXISTING_SCHEMA_PATH = TEST_DATADIR + EXISTING_SCHEMA; + EXISTING_SCHEMA_URL = BASE_URL + EXISTING_SCHEMA; + MISSING_SCHEMA_PATH = TEST_DATADIR + MISSING_SCHEMA; + MISSING_SCHEMA_URL = BASE_URL + MISSING_SCHEMA; + + } + +} Modified: trunk/src/test/net/sf/bvalid/catalog/SchemaCatalogTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/catalog/SchemaCatalogTest.java 2006-05-09 20:08:57 UTC (rev 34) +++ trunk/src/test/net/sf/bvalid/catalog/SchemaCatalogTest.java 2006-05-09 20:10:49 UTC (rev 35) @@ -18,24 +18,27 @@ InputStream in = new ByteArrayInputStream(_CONTENT.getBytes()); - getCatalog().put(_URI, in); + SchemaCatalog catalog = getCatalog(); + String testClass = catalog.getClass().getName(); + catalog.put(_URI, in); + int i = 0; String uri = "undefined"; - Iterator iter = getCatalog().listURIs(); + Iterator iter = catalog.listURIs(); while (iter.hasNext()) { - assertEquals("Catalog should only contain one URI at this point", + assertEquals(testClass + " should only contain one URI at this point", i, 0); uri = (String) iter.next(); i++; } - assertEquals("Catalog contains wrong URI", + assertEquals(testClass + " contains wrong URI", uri, _URI); - assertEquals("Catalog.contains should have returned true after put", - getCatalog().contains(_URI), + assertEquals(testClass + ".contains should have returned true after put", + catalog.contains(_URI), true); } @@ -43,10 +46,14 @@ public void testGet() throws Exception { InputStream in = new ByteArrayInputStream(_CONTENT.getBytes()); - getCatalog().put(_URI, in); - InputStream gotIn = getCatalog().get(_URI); + SchemaCatalog catalog = getCatalog(); + String testClass = catalog.getClass().getName(); + catalog.put(_URI, in); + + InputStream gotIn = catalog.get(_URI); + try { BufferedReader reader = new BufferedReader(new InputStreamReader(gotIn)); StringBuffer buf = new StringBuffer(); @@ -60,7 +67,7 @@ if (_CONTENT.endsWith("\n")) { buf.append(_CONTENT); } - assertEquals("Got different schema content than what was put", + assertEquals(testClass + " gave different schema content than what was put", buf.toString(), _CONTENT); } finally { @@ -72,17 +79,21 @@ public void testRemove() throws Exception { InputStream in = new ByteArrayInputStream(_CONTENT.getBytes()); - getCatalog().put(_URI, in); - getCatalog().remove(_URI); + SchemaCatalog catalog = getCatalog(); + String testClass = catalog.getClass().getName(); - Iterator iter = getCatalog().listURIs(); - assertEquals("Catalog should be empty after remove", + catalog.put(_URI, in); + + catalog.remove(_URI); + + Iterator iter = catalog.listURIs(); + assertEquals(testClass + " should be empty after remove", iter.hasNext(), false); - in = getCatalog().get(_URI); - assertNull("Catalog.get should have returned null after removal", + in = catalog.get(_URI); + assertNull(testClass + ".get should have returned null after removal", in); } Added: trunk/src/test/net/sf/bvalid/locator/CachingSchemaLocatorTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/locator/CachingSchemaLocatorTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/locator/CachingSchemaLocatorTest.java 2006-05-09 20:10:49 UTC (rev 35) @@ -0,0 +1,39 @@ +package net.sf.bvalid.locator; + +import java.io.*; + +import junit.framework.TestCase; +import junit.swingui.TestRunner; + +import net.sf.bvalid.TestConfig; +import net.sf.bvalid.catalog.MemorySchemaCatalog; +import net.sf.bvalid.catalog.SchemaCatalog; + +public class CachingSchemaLocatorTest extends SchemaLocatorTest { + + private SchemaLocator _locator; + private SchemaCatalog _catalog; + + public CachingSchemaLocatorTest(String name) { super (name); } + + public void setUp() throws Exception { + _catalog = new MemorySchemaCatalog(); + _catalog.put(TestConfig.EXISTING_SCHEMA_URL, + new FileInputStream(new File(TestConfig.EXISTING_SCHEMA_PATH))); + _locator = new CachingSchemaLocator(new MemorySchemaCatalog(), + new MemorySchemaCatalog(), + new CatalogSchemaLocator(_catalog)); + } + + public void tearDown() { + } + + protected SchemaLocator getTestLocator() { + return _locator; + } + + public static void main(String[] args) { + TestRunner.run(CachingSchemaLocatorTest.class); + } + +} Added: trunk/src/test/net/sf/bvalid/locator/CatalogSchemaLocatorTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/locator/CatalogSchemaLocatorTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/locator/CatalogSchemaLocatorTest.java 2006-05-09 20:10:49 UTC (rev 35) @@ -0,0 +1,37 @@ +package net.sf.bvalid.locator; + +import java.io.*; + +import junit.framework.TestCase; +import junit.swingui.TestRunner; + +import net.sf.bvalid.TestConfig; +import net.sf.bvalid.catalog.MemorySchemaCatalog; +import net.sf.bvalid.catalog.SchemaCatalog; + +public class CatalogSchemaLocatorTest extends SchemaLocatorTest { + + private SchemaLocator _locator; + private SchemaCatalog _catalog; + + public CatalogSchemaLocatorTest(String name) { super (name); } + + public void setUp() throws Exception { + _catalog = new MemorySchemaCatalog(); + _catalog.put(TestConfig.EXISTING_SCHEMA_URL, + new FileInputStream(new File(TestConfig.EXISTING_SCHEMA_PATH))); + _locator = new CatalogSchemaLocator(_catalog); + } + + public void tearDown() { + } + + protected SchemaLocator getTestLocator() { + return _locator; + } + + public static void main(String[] args) { + TestRunner.run(CatalogSchemaLocatorTest.class); + } + +} Added: trunk/src/test/net/sf/bvalid/locator/ChainingSchemaLocatorTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/locator/ChainingSchemaLocatorTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/locator/ChainingSchemaLocatorTest.java 2006-05-09 20:10:49 UTC (rev 35) @@ -0,0 +1,46 @@ +package net.sf.bvalid.locator; + +import java.io.*; +import java.util.*; + +import junit.framework.TestCase; +import junit.swingui.TestRunner; + +import net.sf.bvalid.TestConfig; +import net.sf.bvalid.catalog.MemorySchemaCatalog; +import net.sf.bvalid.catalog.SchemaCatalog; + +public class ChainingSchemaLocatorTest extends SchemaLocatorTest { + + private SchemaLocator _locator; + private SchemaCatalog _catalog1; + private SchemaCatalog _catalog2; + + public ChainingSchemaLocatorTest(String name) { super (name); } + + public void setUp() throws Exception { + + _catalog1 = new MemorySchemaCatalog(); + _catalog2 = new MemorySchemaCatalog(); + _catalog2.put(TestConfig.EXISTING_SCHEMA_URL, + new FileInputStream(new File(TestConfig.EXISTING_SCHEMA_PATH))); + + List locators = new ArrayList(); + locators.add(new CatalogSchemaLocator(_catalog1)); + locators.add(new CatalogSchemaLocator(_catalog2)); + + _locator = new ChainingSchemaLocator(locators); + } + + public void tearDown() { + } + + protected SchemaLocator getTestLocator() { + return _locator; + } + + public static void main(String[] args) { + TestRunner.run(ChainingSchemaLocatorTest.class); + } + +} Added: trunk/src/test/net/sf/bvalid/locator/LocatorPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/locator/LocatorPackageTestSuite.java (rev 0) +++ trunk/src/test/net/sf/bvalid/locator/LocatorPackageTestSuite.java 2006-05-09 20:10:49 UTC (rev 35) @@ -0,0 +1,24 @@ +package net.sf.bvalid.locator; + +import junit.framework.Test; +import junit.framework.TestSuite; +import junit.swingui.TestRunner; + +public class LocatorPackageTestSuite { + + public static Test suite() { + + TestSuite suite = new TestSuite(LocatorPackageTestSuite.class.getName()); + + suite.addTestSuite(CachingSchemaLocatorTest.class); + suite.addTestSuite(CatalogSchemaLocatorTest.class); + suite.addTestSuite(ChainingSchemaLocatorTest.class); + suite.addTestSuite(URLSchemaLocatorTest.class); + + return suite; + } + + public static void main(String[] args) { + TestRunner.run(LocatorPackageTestSuite.class); + } +} Added: trunk/src/test/net/sf/bvalid/locator/SchemaLocatorTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/locator/SchemaLocatorTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/locator/SchemaLocatorTest.java 2006-05-09 20:10:49 UTC (rev 35) @@ -0,0 +1,73 @@ +package net.sf.bvalid.locator; + +import java.io.*; + +import junit.framework.TestCase; + +import net.sf.bvalid.TestConfig; +import net.sf.bvalid.ValidatorException; + +public abstract class SchemaLocatorTest extends TestCase { + + public SchemaLocatorTest(String name) { super(name); } + + /** + * Get a locator that can resolve EXISTING_SCHEMA_LOCATION but + * but cannot resolve MISSING_SCHEMA_LOCATION + */ + protected abstract SchemaLocator getTestLocator(); + + public void testGetExisting() throws Exception { + + SchemaLocator locator = getTestLocator(); + String testMethod = locator.getClass().getName() + ".get"; + + InputStream in = null; + try { + in = locator.get(TestConfig.EXISTING_SCHEMA_URL, true); + assertNotNull(testMethod + "(..) should never return null if required is true", in); + } catch (ValidatorException e) { + fail(testMethod + "(..) for existing schema threw ValidatorException"); + } finally { + try { in.close(); } catch (Exception e) { } + } + } + + public void testGetMissingRequired() throws Exception { + + SchemaLocator locator = getTestLocator(); + String testMethod = locator.getClass().getName() + ".get"; + + boolean threwException = false; + InputStream in = null; + try { + in = locator.get(TestConfig.MISSING_SCHEMA_URL, true); + } catch (ValidatorException e) { + threwException = true; + } finally { + try { in.close(); } catch (Exception e) { } + } + assertEquals(testMethod + "(..) should have thrown exception for missing required schema", + threwException, + true); + } + + + public void testGetMissingOptional() throws Exception { + + SchemaLocator locator = getTestLocator(); + String testMethod = locator.getClass().getName() + ".get"; + + InputStream in = null; + try { + in = locator.get(TestConfig.MISSING_SCHEMA_URL, false); + assertNull(testMethod + "(..) returned non-null value for missing optional schema", + in); + } catch (ValidatorException e) { + fail(testMethod + "(..) threw exception for missing optional schema"); + } finally { + try { in.close(); } catch (Exception e) { } + } + } + +} Added: trunk/src/test/net/sf/bvalid/locator/URLSchemaLocatorTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/locator/URLSchemaLocatorTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/locator/URLSchemaLocatorTest.java 2006-05-09 20:10:49 UTC (rev 35) @@ -0,0 +1,31 @@ +package net.sf.bvalid.locator; + +import java.io.*; + +import junit.framework.TestCase; +import junit.swingui.TestRunner; + +import net.sf.bvalid.TestConfig; + +public class URLSchemaLocatorTest extends SchemaLocatorTest { + + private SchemaLocator _locator; + + public URLSchemaLocatorTest(String name) { super (name); } + + public void setUp() throws Exception { + _locator = new URLSchemaLocator(); + } + + public void tearDown() { + } + + protected SchemaLocator getTestLocator() { + return _locator; + } + + public static void main(String[] args) { + TestRunner.run(URLSchemaLocatorTest.class); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-10 05:13:47
|
Revision: 37 Author: cwilper Date: 2006-05-09 15:29:41 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=37&view=rev Log Message: ----------- removed old jettytestsetup target Modified Paths: -------------- trunk/build.xml Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-09 22:26:00 UTC (rev 36) +++ trunk/build.xml 2006-05-09 22:29:41 UTC (rev 37) @@ -137,16 +137,6 @@ </java> </target> - <target name="jtest" depends="testclasses"> - <java classname="net.sf.bvalid.util.JettyRunner" fork="yes"> - <classpath refid="test.path"/> - <arg value="7357"/> - <arg value="/"/> - <arg value="."/> - <arg value="fork"/> - </java> - </target> - <target name="prep" description="prepare for a build"> <mkdir dir="build"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-09 22:26:17
|
Revision: 36 Author: cwilper Date: 2006-05-09 15:26:00 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=36&view=rev Log Message: ----------- Added xsd unit tests. Modified Paths: -------------- trunk/src/config/log4j.xml trunk/src/java/net/sf/bvalid/xsd/URLBasedGrammarPool.java trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java trunk/src/test/net/sf/bvalid/TestConfig.java Added Paths: ----------- trunk/src/test/data/bad-instance.xsd trunk/src/test/data/bad-schema.xsd trunk/src/test/data/existing-schema.xyz trunk/src/test/data/good-instance.xsd trunk/src/test/data/good-schema.xsd trunk/src/test/net/sf/bvalid/ValidatorTest.java trunk/src/test/net/sf/bvalid/xsd/ trunk/src/test/net/sf/bvalid/xsd/XSDPackageTestSuite.java trunk/src/test/net/sf/bvalid/xsd/XercesXSDValidatorTest.java Removed Paths: ------------- trunk/src/test/data/existing-schema.xsd Modified: trunk/src/config/log4j.xml =================================================================== --- trunk/src/config/log4j.xml 2006-05-09 20:10:49 UTC (rev 35) +++ trunk/src/config/log4j.xml 2006-05-09 22:26:00 UTC (rev 36) @@ -19,6 +19,10 @@ <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/java/net/sf/bvalid/xsd/URLBasedGrammarPool.java =================================================================== --- trunk/src/java/net/sf/bvalid/xsd/URLBasedGrammarPool.java 2006-05-09 20:10:49 UTC (rev 35) +++ trunk/src/java/net/sf/bvalid/xsd/URLBasedGrammarPool.java 2006-05-09 22:26:00 UTC (rev 36) @@ -12,7 +12,7 @@ * An implementation of <code>XMLGrammarPool</code>, keyed by source URL. * * Keying by location, rather than root element name or target namespace, - * is necessary in order to support multiple (possibly conflict!) grammar + * is necessary in order to support multiple (possibly conflicting!) grammar * definitions for the same namespace. * * @author cw...@cs... Added: trunk/src/test/data/bad-instance.xsd =================================================================== --- trunk/src/test/data/bad-instance.xsd (rev 0) +++ trunk/src/test/data/bad-instance.xsd 2006-05-09 22:26:00 UTC (rev 36) @@ -0,0 +1,4 @@ +<sample xmlns="http://example.org/sample/"> + <sample-element>value</sample-element> + <bad-element>value</bad-element> +</sample> Added: trunk/src/test/data/bad-schema.xsd =================================================================== --- trunk/src/test/data/bad-schema.xsd (rev 0) +++ trunk/src/test/data/bad-schema.xsd 2006-05-09 22:26:00 UTC (rev 36) @@ -0,0 +1,14 @@ +<schema targetNamespace="http://example.org/sample/" + xmlns:this="http://example.org/sample/" + xmlns="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + + <element name="sample" type="this:rootType"/> + + <complexType name="misspelledRootType"> + <sequence> + <element name="sample-element" type="string" maxOccurs="unbounded"/> + </sequence> + </complexType> +</schema> Deleted: trunk/src/test/data/existing-schema.xsd =================================================================== --- trunk/src/test/data/existing-schema.xsd 2006-05-09 20:10:49 UTC (rev 35) +++ trunk/src/test/data/existing-schema.xsd 2006-05-09 22:26:00 UTC (rev 36) @@ -1,14 +0,0 @@ -<schema targetNamespace="http://example.org/sample/" - xmlns:this="http://example.org/sample/" - xmlns="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - attributeFormDefault="unqualified"> - - <element name="sample" type="this:rootType"/> - - <complexType name="rootType"> - <sequence> - <element name="sample-element" type="string" maxOccurs="unbounded"/> - </sequence> - </complexType> -</schema> Copied: trunk/src/test/data/existing-schema.xyz (from rev 35, trunk/src/test/data/existing-schema.xsd) =================================================================== --- trunk/src/test/data/existing-schema.xyz (rev 0) +++ trunk/src/test/data/existing-schema.xyz 2006-05-09 22:26:00 UTC (rev 36) @@ -0,0 +1,2 @@ +This file is for testing the existence of a schema. +The content doesn't matter because it's not parsed. Added: trunk/src/test/data/good-instance.xsd =================================================================== --- trunk/src/test/data/good-instance.xsd (rev 0) +++ trunk/src/test/data/good-instance.xsd 2006-05-09 22:26:00 UTC (rev 36) @@ -0,0 +1,3 @@ +<sample xmlns="http://example.org/sample/"> + <sample-element>value</sample-element> +</sample> Added: trunk/src/test/data/good-schema.xsd =================================================================== --- trunk/src/test/data/good-schema.xsd (rev 0) +++ trunk/src/test/data/good-schema.xsd 2006-05-09 22:26:00 UTC (rev 36) @@ -0,0 +1,14 @@ +<schema targetNamespace="http://example.org/sample/" + xmlns:this="http://example.org/sample/" + xmlns="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + + <element name="sample" type="this:rootType"/> + + <complexType name="rootType"> + <sequence> + <element name="sample-element" type="string" maxOccurs="unbounded"/> + </sequence> + </complexType> +</schema> Modified: trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-09 20:10:49 UTC (rev 35) +++ trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-09 22:26:00 UTC (rev 36) @@ -8,6 +8,7 @@ import net.sf.bvalid.catalog.CatalogPackageTestSuite; import net.sf.bvalid.locator.LocatorPackageTestSuite; import net.sf.bvalid.util.JettyTestSetup; +import net.sf.bvalid.xsd.XSDPackageTestSuite; public class BValidPackageTestSuite extends TestCase { @@ -23,6 +24,7 @@ // sub-package suites suite.addTest(CatalogPackageTestSuite.suite()); suite.addTest(LocatorPackageTestSuite.suite()); + suite.addTest(XSDPackageTestSuite.suite()); return new JettyTestSetup(suite, TestConfig.TEST_PORT, Modified: trunk/src/test/net/sf/bvalid/TestConfig.java =================================================================== --- trunk/src/test/net/sf/bvalid/TestConfig.java 2006-05-09 20:10:49 UTC (rev 35) +++ trunk/src/test/net/sf/bvalid/TestConfig.java 2006-05-09 22:26:00 UTC (rev 36) @@ -6,9 +6,14 @@ public abstract class TestConfig { - public final static String EXISTING_SCHEMA = "existing-schema.xsd"; - public final static String MISSING_SCHEMA = "missing-schema.xsd"; + public final static String EXISTING_SCHEMA = "existing-schema.xyz"; + public final static String MISSING_SCHEMA = "missing-schema.xyz"; + public final static String BAD_INSTANCE_XSD = "bad-instance.xsd"; + public final static String BAD_SCHEMA_XSD = "bad-schema.xsd"; + public final static String GOOD_INSTANCE_XSD = "good-instance.xsd"; + public final static String GOOD_SCHEMA_XSD = "good-schema.xsd"; + // jetty.fork public static boolean JETTY_FORK = true; Added: trunk/src/test/net/sf/bvalid/ValidatorTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/ValidatorTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/ValidatorTest.java 2006-05-09 22:26:00 UTC (rev 36) @@ -0,0 +1,165 @@ +package net.sf.bvalid; + +import java.io.*; + +import junit.framework.TestCase; + +import net.sf.bvalid.catalog.MemorySchemaCatalog; +import net.sf.bvalid.catalog.SchemaCatalog; +import net.sf.bvalid.locator.CatalogSchemaLocator; +import net.sf.bvalid.locator.SchemaLocator; + +public abstract class ValidatorTest extends TestCase { + + public ValidatorTest(String name) { super(name); } + + /** + * Get a Validator with the given configuration. + */ + protected abstract Validator getValidator(SchemaLocator locator, + boolean failOnMissingReferenced, + boolean cacheParsedGrammars) + throws ValidatorException; + + /** + * Get the filename of the bad instance document. + */ + protected abstract String getBadInstance(); + + /** + * Get the filename of the bad schema file. + */ + protected abstract String getBadSchema(); + + /** + * Get the filename of the good instance document. + */ + protected abstract String getGoodInstance(); + + /** + * Get the filename of the good schema file. + */ + protected abstract String getGoodSchema(); + + + /** + * Get a memory catalog containing the good and bad schema. + */ + private final SchemaCatalog getSimpleCatalog() throws Exception { + + SchemaCatalog catalog = new MemorySchemaCatalog(); + + String fn = getGoodSchema(); + File goodSchemaFile = new File(TestConfig.TEST_DATADIR + fn); + catalog.put(TestConfig.BASE_URL + fn, new FileInputStream(goodSchemaFile)); + + fn = getBadSchema(); + File badSchemaFile = new File(TestConfig.TEST_DATADIR + fn); + catalog.put(TestConfig.BASE_URL + fn, new FileInputStream(badSchemaFile)); + + return catalog; + } + + /** + * Get a validator that fails on missing referenced schemas, does not + * cache parsed grammars, and uses a CatalogSchemaLocator backed by + * the simple catalog (above). + */ + private final Validator getSimpleValidator() throws Exception { + return getValidator(new CatalogSchemaLocator(getSimpleCatalog()), + true, + false); + } + + /** + * Do validation for a test. + */ + private static final void validate(Validator validator, + String schemaFilename, + String instanceFilename) throws Exception { + + String schemaURI = TestConfig.BASE_URL + schemaFilename; + File instanceFile = new File(TestConfig.TEST_DATADIR + instanceFilename); + + validator.validate(new FileInputStream(instanceFile), schemaURI); + } + + public void testValidateGoodSchemaGoodInstance() throws Exception { + + Validator validator = getSimpleValidator(); + String testMethod = validator.getClass().getName() + ".validate(..)"; + + try { + validate(validator, getGoodSchema(), getGoodInstance()); + } catch (ValidatorException e) { + fail(testMethod + " threw ValidatorException with good schema, good instance"); + } + } + + public void testValidateGoodSchemaBadInstance() throws Exception { + + Validator validator = getSimpleValidator(); + String testMethod = validator.getClass().getName() + ".validate(..)"; + + try { + validate(validator, getGoodSchema(), getBadInstance()); + fail(testMethod + " did not throw ValidationException with good schema, bad instance"); + } catch (ValidationException e) { + // expected + } catch (ValidatorException e) { + fail(testMethod + " threw ValidatorException (not ValidationException) with good schema, bad instance"); + } + } + + public void testValidateBadSchemaGoodInstance() throws Exception { + + Validator validator = getSimpleValidator(); + String testMethod = validator.getClass().getName() + ".validate(..)"; + + try { + validate(validator, getBadSchema(), getGoodInstance()); + fail(testMethod + " did not throw ValidatorException with bad schema, good instance"); + } catch (ValidatorException e) { + // expected + } + } + + public void testValidateBadSchemaBadInstance() throws Exception { + + Validator validator = getSimpleValidator(); + String testMethod = validator.getClass().getName() + ".validate(..)"; + + try { + validate(validator, getBadSchema(), getBadInstance()); + fail(testMethod + " did not throw ValidatorException with bad schema, bad instance"); + } catch (ValidatorException e) { + // expected + } + } + + public void testValidateMissingSchemaGoodInstance() throws Exception { + + Validator validator = getSimpleValidator(); + String testMethod = validator.getClass().getName() + ".validate(..)"; + + try { + validate(validator, TestConfig.MISSING_SCHEMA, getGoodInstance()); + fail(testMethod + " did not throw ValidatorException with missing schema, good instance"); + } catch (ValidatorException e) { + // expected + } + } + + public void testValidateMissingSchemaBadInstance() throws Exception { + + Validator validator = getSimpleValidator(); + String testMethod = validator.getClass().getName() + ".validate(..)"; + + try { + validate(validator, TestConfig.MISSING_SCHEMA, getBadInstance()); + fail(testMethod + " did not throw ValidatorException with missing schema, bad instance"); + } catch (ValidatorException e) { + // expected + } + } +} Added: trunk/src/test/net/sf/bvalid/xsd/XSDPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/xsd/XSDPackageTestSuite.java (rev 0) +++ trunk/src/test/net/sf/bvalid/xsd/XSDPackageTestSuite.java 2006-05-09 22:26:00 UTC (rev 36) @@ -0,0 +1,21 @@ +package net.sf.bvalid.xsd; + +import junit.framework.Test; +import junit.framework.TestSuite; +import junit.swingui.TestRunner; + +public class XSDPackageTestSuite { + + public static Test suite() { + + TestSuite suite = new TestSuite(XSDPackageTestSuite.class.getName()); + + suite.addTestSuite(XercesXSDValidatorTest.class); + + return suite; + } + + public static void main(String[] args) { + TestRunner.run(XSDPackageTestSuite.class); + } +} Added: trunk/src/test/net/sf/bvalid/xsd/XercesXSDValidatorTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/xsd/XercesXSDValidatorTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/xsd/XercesXSDValidatorTest.java 2006-05-09 22:26:00 UTC (rev 36) @@ -0,0 +1,52 @@ +package net.sf.bvalid.xsd; + +import java.io.*; + +import junit.swingui.TestRunner; + +import net.sf.bvalid.TestConfig; +import net.sf.bvalid.Validator; +import net.sf.bvalid.ValidatorException; +import net.sf.bvalid.ValidatorTest; +import net.sf.bvalid.locator.SchemaLocator; + +public class XercesXSDValidatorTest extends ValidatorTest { + + public XercesXSDValidatorTest(String name) { super (name); } + + public void setUp() throws Exception { + } + + public void tearDown() { + } + + protected Validator getValidator(SchemaLocator locator, + boolean failOnMissingReferenced, + boolean cacheParsedGrammars) + throws ValidatorException { + + return new XercesXSDValidator(locator, failOnMissingReferenced, cacheParsedGrammars); + } + + protected String getBadInstance() { + return TestConfig.BAD_INSTANCE_XSD; + } + + protected String getBadSchema() { + return TestConfig.BAD_SCHEMA_XSD; + } + + protected String getGoodInstance() { + return TestConfig.GOOD_INSTANCE_XSD; + } + + protected String getGoodSchema() { + return TestConfig.GOOD_SCHEMA_XSD; + } + + + public static void main(String[] args) { + TestRunner.run(XercesXSDValidatorTest.class); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cw...@us...> - 2006-05-09 20:09:54
|
Revision: 34 Author: cwilper Date: 2006-05-09 13:08:57 -0700 (Tue, 09 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=34&view=rev Log Message: ----------- bugfix: wasn't incrementing counter, caused infinite loop! Modified Paths: -------------- trunk/src/java/net/sf/bvalid/locator/ChainingSchemaLocator.java Modified: trunk/src/java/net/sf/bvalid/locator/ChainingSchemaLocator.java =================================================================== --- trunk/src/java/net/sf/bvalid/locator/ChainingSchemaLocator.java 2006-05-08 20:26:30 UTC (rev 33) +++ trunk/src/java/net/sf/bvalid/locator/ChainingSchemaLocator.java 2006-05-09 20:08:57 UTC (rev 34) @@ -29,6 +29,7 @@ while (i < (_locators.size() - 1)) { InputStream in = ((SchemaLocator) _locators.get(i)).get(uri, false); if (in != null) return in; + i++; } return ((SchemaLocator) _locators.get(i)).get(uri, required); 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-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-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. |