Revision: 3716
Author: mikesamuel
Date: Wed Sep  9 14:06:12 2009
Log: Bug 1121: Default schemas in Config did not match those used in tests
http://codereview.appspot.com/115081

Updated the schemas in Config.java which are used by command line tools
like cajole_html, etc.

[email protected]

http://code.google.com/p/google-caja/source/detail?r=3716

Modified:
 /trunk/src/com/google/caja/plugin/Config.java

=======================================
--- /trunk/src/com/google/caja/plugin/Config.java       Fri Jun 19 12:47:27 2009
+++ /trunk/src/com/google/caja/plugin/Config.java       Wed Sep  9 14:06:12 2009
@@ -165,7 +165,8 @@
     return new CssSchema(
         whitelist(cssPropertyWhitelistUri, mq),
         whitelist(URI.create(
-            "resource:///com/google/caja/lang/css/css21-fns.json"), mq));
+            "resource:///com/google/caja/lang/css/css-extensions-fns.json"),
+            mq));
   }

   public HtmlSchema getHtmlSchema(MessageQueue mq) {
@@ -262,13 +263,15 @@
       try {
         cssPropertyWhitelistUri = new URI(cl.getOptionValue(
             CSS_PROPERTY_WHITELIST.getOpt(),
-            "resource:///com/google/caja/lang/css/css21.json"));
+            "resource:///com/google/caja/lang/css/css-extensions.json"));
         htmlAttributeWhitelistUri = new URI(cl.getOptionValue(
             HTML_ATTRIBUTE_WHITELIST.getOpt(),
-            "resource:///com/google/caja/lang/html/html4-attributes.json"));
+            "resource:///com/google/caja/lang/html"
+            + "/html4-attributes-extensions.json"));
         htmlElementWhitelistUri = new URI(cl.getOptionValue(
             HTML_ELEMENT_WHITELIST.getOpt(),
-            "resource:///com/google/caja/lang/html/html4-elements.json"));
+            "resource:///com/google/caja/lang/html"
+            + "/html4-elements-extensions.json"));

         if (cl.getOptionValue(BASE_URI.getOpt()) != null) {
           baseUri = new URI(cl.getOptionValue(BASE_URI.getOpt()));

Reply via email to