Author: hqm
Date: 2007-11-02 18:53:26 -0700 (Fri, 02 Nov 2007)
New Revision: 7110
Removed:
openlaszlo/trunk/WEB-INF/lib/ftp.jar
openlaszlo/trunk/WEB-INF/lib/iso-relax.jar
openlaszlo/trunk/WEB-INF/lib/jing.jar
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/url/FTPUrl.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/SchemaValidator.java
Modified:
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/url/IVUrl.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Parser.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2Doc_Test.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/Main.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/Schema_Test.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/WholeFile_Test.java
Log:
Change 20071102-hqm-2 by [EMAIL PROTECTED] on 2007-11-02 21:49:05 EDT
in /cygdrive/c/users/hqm/openlaszlo/trunk3
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: remove jing validator jar files
New Features:
Bugs Fixed: LPP-4832
Technical Reviewer: ben
QA Reviewer: jcrowley
Doc Reviewer:
Documentation:
Release Notes:
Details:
removed the jing.jar library, and iso-relax (the abstract interface to
schema validators)
also took the opportunity to remove ftp.jar, the only caller was in
jgenerator, and we don't
support ftp files.
Tests:
ant build
smokecheck
ant doc
Deleted: openlaszlo/trunk/WEB-INF/lib/ftp.jar
Deleted: openlaszlo/trunk/WEB-INF/lib/iso-relax.jar
Deleted: openlaszlo/trunk/WEB-INF/lib/jing.jar
Deleted:
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/url/FTPUrl.java
Modified:
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/url/IVUrl.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/url/IVUrl.java
2007-11-03 01:22:55 UTC (rev 7109)
+++
openlaszlo/trunk/WEB-INF/lps/server/jgenerator-2.2/src/org/openlaszlo/iv/flash/url/IVUrl.java
2007-11-03 01:53:26 UTC (rev 7110)
@@ -5,7 +5,7 @@
*
* The JGenerator Software License, Version 1.0
*
- * Copyright (c) 2000 Dmitry Skavish ([EMAIL PROTECTED]). All rights reserved.
+ * Copyright (c) 2000-2007 Dmitry Skavish ([EMAIL PROTECTED]). All rights
reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -111,15 +111,6 @@
}
} else if( surl.startsWith("fgfilter:///") ) {
return new FilterUrl( surl, flashFile );
- } else if ( surl.startsWith("ftp://";) || surl.startsWith("fgftp://";) )
{
- try {
- return (IVUrl) Util.newInstance(
- "org.openlaszlo.iv.flash.url.FTPUrl",
- new Class[] { String.class, Boolean.class },
- new Object[] { surl, new
Boolean(surl.startsWith("fgftp://";)) });
- } catch( Exception e ) {
- throw new IVException(e);
- }
} else {
try {
URL url = new URL(surl);
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
2007-11-03 01:22:55 UTC (rev 7109)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
2007-11-03 01:53:26 UTC (rev 7110)
@@ -78,9 +78,6 @@
*/
private CompilerMediaCache mMediaCache = null;
- /** A cache of a compiled validator */
- private org.iso_relax.verifier.Verifier cachedVerifier = null;
-
/** {canonical filenames} for libraries that have been imported;
* used to prevent recursive processing and including the same
* library more than once. */
@@ -501,16 +498,6 @@
}
}
- /** Holds the cached schema verifier */
- org.iso_relax.verifier.Verifier getCachedVerifier () {
- return cachedVerifier;
- }
-
- /** Use this to cache the schema verifier (call with null to flush the
cache) */
- void setCachedVerifier (org.iso_relax.verifier.Verifier verifier) {
- cachedVerifier = verifier;
- }
-
/**
* @return a unique name in the SWF
*/
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Parser.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Parser.java
2007-11-03 01:22:55 UTC (rev 7109)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Parser.java
2007-11-03 01:53:26 UTC (rev 7110)
@@ -12,7 +12,6 @@
import java.lang.*;
import java.util.*;
import org.apache.log4j.Logger;
-import org.iso_relax.verifier.*;
import org.jdom.Attribute;
import org.jdom.Document;
import org.jdom.Content;
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
2007-11-03 01:22:55 UTC (rev 7109)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
2007-11-03 01:53:26 UTC (rev 7110)
@@ -80,56 +80,7 @@
}
}
- public static boolean validateAndCompare(Document test, String result,
SchemaValidator validator) throws RuntimeException {
-
- boolean status = true;
-
- boolean savedWhitespace = XMLUnit.getIgnoreWhitespace();
-
- try {
- XMLUnit.setIgnoreWhitespace(true);
-
- Document control = XMLUnit.buildControlDocument(result);
-
- Diff diff = new Diff(control, test);
-
- String testString = JS2DocUtils.xmlToString(test);
-
- boolean testValid = validator.validates(testString),
- expectValid = validator.validates(result);
- if (diff.similar() == false || testValid == false || expectValid
== false) {
- System.out.println("identical: " + diff.identical());
- System.out.println("test valid: " + testValid);
- System.out.println("expect valid: " + expectValid);
- System.out.println("output: " + testString);
- System.out.println("expect: " + result);
- }
-
- status = status && validator.validates(testString);
- status = status && validator.validates(result);
-
- // use 'similar' rather than 'identical' here so we can put a
copyright comment and line endings
- // in the expected result file.
- status = status && diff.similar();
-
- } catch (org.xml.sax.SAXException exc) {
- exc.printStackTrace();
- status = false;
- } catch (java.io.IOException exc) {
- exc.printStackTrace();
- status = false;
- } catch (javax.xml.parsers.ParserConfigurationException exc) {
- exc.printStackTrace();
- status = false;
- } finally {
- if (XMLUnit.getIgnoreWhitespace() != savedWhitespace)
- XMLUnit.setIgnoreWhitespace(savedWhitespace);
- }
-
- return status;
- }
-
static public void setXMLContent(org.w3c.dom.Element node, String content)
{
// Wrap the fragment in an arbitrary element
@@ -331,4 +282,4 @@
}
}
-}
\ No newline at end of file
+}
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2Doc_Test.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2Doc_Test.java
2007-11-03 01:22:55 UTC (rev 7109)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2Doc_Test.java
2007-11-03 01:53:26 UTC (rev 7110)
@@ -22,14 +22,11 @@
public class JS2Doc_Test extends XMLTestCase {
- SchemaValidator validator;
-
public JS2Doc_Test (String name) {
super(name);
}
public void setUp () {
- validator = new SchemaValidator(System.getProperty("JS2DOC_RNG"));
}
public void testComments () {
@@ -741,22 +738,13 @@
String testString = JS2DocUtils.xmlToString(test);
- boolean testValid = validator.validates(testString),
- expectValid = validator.validates(result);
-
- if (diff.identical() == false || testValid == false ||
expectValid == false) {
+ if (diff.identical() == false) {
System.out.println("identical: " + diff.identical());
- System.out.println("test valid: " + testValid);
- System.out.println("expect valid: " + expectValid);
System.out.println("input: " + source);
System.out.println("output: " + testString);
System.out.println("expect: " + result);
}
- assertTrue("JS2Doc.toXML(\"" + source + "\") valid",
testValid);
-
- assertTrue("JS2Doc.toXML(\"" + result + "\") expect valid",
expectValid);
-
assertXMLIdentical(diff, true, "JS2Doc.toXML(\"" + source +
"\")");
} catch (org.xml.sax.SAXException exc) {
@@ -771,4 +759,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/Main.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/Main.java
2007-11-03 01:22:55 UTC (rev 7109)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/Main.java
2007-11-03 01:53:26 UTC (rev 7110)
@@ -248,10 +248,6 @@
File expectFile = new File(expectName);
String expect = FileUtils.readFileString(expectFile);
- SchemaValidator validator = new SchemaValidator(schemaName);
-
- result = JS2DocUtils.validateAndCompare(test, expect, validator);
-
} catch (java.io.IOException exc) {
exc.printStackTrace();
}
Deleted:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/SchemaValidator.java
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/Schema_Test.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/Schema_Test.java
2007-11-03 01:22:55 UTC (rev 7109)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/Schema_Test.java
2007-11-03 01:53:26 UTC (rev 7110)
@@ -16,14 +16,11 @@
public class Schema_Test extends XMLTestCase {
- SchemaValidator validator;
-
public Schema_Test (String name) {
super(name);
}
public void setUp () {
- validator = new SchemaValidator(System.getProperty("JS2DOC_RNG"));
}
public void testSchema () {
@@ -64,9 +61,7 @@
String result = (String) iter.next();
assertTrue(result == "true" || result == "false");
boolean shouldPass = (result == "true") ? true : false;
- boolean testValid = validator.validates(source);
- assertEquals(source, shouldPass, testValid);
}
}
-}
\ No newline at end of file
+}
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/WholeFile_Test.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/WholeFile_Test.java
2007-11-03 01:22:55 UTC (rev 7109)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/WholeFile_Test.java
2007-11-03 01:53:26 UTC (rev 7110)
@@ -21,15 +21,12 @@
public class WholeFile_Test extends XMLTestCase {
- SchemaValidator validator;
-
public WholeFile_Test (String name) {
super(name);
XMLUnit.setIgnoreWhitespace(true);
}
public void setUp () {
- validator = new SchemaValidator(System.getProperty("JS2DOC_RNG"));
}
private class FilenameSuffixFilter implements FilenameFilter {
@@ -89,21 +86,12 @@
String testString = JS2DocUtils.xmlToString(test);
- boolean testValid = validator.validates(testString),
- expectValid = validator.validates(result);
-
- if (diff.similar() == false || testValid == false ||
expectValid == false) {
+ if (diff.similar() == false ) {
System.out.println("identical: " + diff.identical());
- System.out.println("test valid: " + testValid);
- System.out.println("expect valid: " + expectValid);
System.out.println("output: " + testString);
System.out.println("expect: " + result);
}
- assertTrue("JS2Doc.toXML(\"" + sourceFilename + "\") valid",
testValid);
-
- assertTrue("JS2Doc.toXML(\"" + resultFile.getPath() + "\")
expect valid", expectValid);
-
// use 'similar' rather than 'identical' here so we can put a
copyright comment and line endings
// in the expected result file.
assertXMLEqual(diff, true, "JS2Doc.toXML(\"" + sourceFilename
+ "\")");
@@ -121,4 +109,4 @@
}
}
-}
\ No newline at end of file
+}
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
