svn commit: r739326 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/parse/ main/java/org/apache/shindig/gadgets/parse/caja/ main/java/org/apache/shindig/gadgets/rewrite/lexer/ test/java/org/apache/shindig/gadgets/pa...

[lryan]

Author: lryan
Date: Fri Jan 30 16:38:15 2009
New Revision: 739326

URL: http://svn.apache.org/viewvc?rev=739326&view=rev
Log:
Remove old parsing and rewriting code. Css parser will be replaced by DOM 
version soon

Removed:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetCssParser.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetCssRule.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParsedCssDeclaration.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParsedCssRule.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/lexer/DefaultContentRewriter.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java
Modified:
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java?rev=739326&r1=739325&r2=739326&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
 Fri Jan 30 16:38:15 2009
@@ -19,7 +19,6 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.parse.caja.CajaHtmlParser;
 import org.apache.shindig.gadgets.parse.nekohtml.NekoHtmlParser;
 import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
 
@@ -43,9 +42,6 @@
   private int numRuns;
   private String content;
 
-  private GadgetHtmlParser cajaParser = new CajaHtmlParser(
-      DOCUMENT_PROVIDER);
-
   private GadgetHtmlParser nekoParser = new NekoHtmlParser(
       DOCUMENT_PROVIDER);
 
@@ -80,14 +76,6 @@
     runNekoSimple();
   }
 
-  private void runCaja() throws Exception {
-    output("Caja-----------------");
-    // Some warmup runs with wait. Enough iterations to trigger the JIT
-    // Wait to allow it to swap execution paths etc...
-    timeParseDom(cajaParser);
-    timeParseDomSerialize(cajaParser);
-  }
-
   private void runNeko() throws Exception {
     output("Neko-----------------");
     timeParseDom(nekoParser);

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java?rev=739326&r1=739325&r2=739326&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
 Fri Jan 30 16:38:15 2009
@@ -24,13 +24,12 @@
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-
+import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.Assert;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -39,9 +38,6 @@
 
   @Before
   public void setUp() throws Exception {
-    // Note dependency on CajaHtmlParser - this isn't particularly ideal but is
-    // sufficient given that this test doesn't exercise the parser extensively 
at all,
-    // instead focusing on the additional utility provided by 
MutableHtmlContent
     Injector injector = Guice.createInjector(new ParseModule(), new 
PropertiesModule());
     mhc = new MutableContent(injector.getInstance(GadgetHtmlParser.class), 
"DEFAULT VIEW");
   }