svn commit: r752266 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets: DefaultGuiceModule.java parse/ParseModule.java rewrite/RewriteModule.java

[awiner]

Author: awiner
Date: Tue Mar 10 21:15:17 2009
New Revision: 752266

URL: http://svn.apache.org/viewvc?rev=752266&view=rev
Log:
Turn on server-side templating and server-side pipelining by default.

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=752266&r1=752265&r2=752266&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
 Tue Mar 10 21:15:17 2009
@@ -23,6 +23,7 @@
 import org.apache.shindig.gadgets.preload.PreloadModule;
 import org.apache.shindig.gadgets.render.RenderModule;
 import org.apache.shindig.gadgets.rewrite.RewriteModule;
+import org.apache.shindig.gadgets.templates.TemplateModule;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
@@ -47,6 +48,7 @@
     install(new PreloadModule());
     install(new RenderModule());
     install(new RewriteModule());
+    install(new TemplateModule());
 
     // We perform static injection on HttpResponse for cache TTLs.
     requestStaticInjection(HttpResponse.class);

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java?rev=752266&r1=752265&r2=752266&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
 Tue Mar 10 21:15:17 2009
@@ -17,14 +17,13 @@
  */
 package org.apache.shindig.gadgets.parse;
 
-import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
+import org.apache.shindig.gadgets.parse.nekohtml.SocialMarkupHtmlParser;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.bootstrap.DOMImplementationRegistry;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provider;
 
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-
 /**
  * Provide parse bindings
  */
@@ -35,7 +34,7 @@
    */
   @Override
   protected void configure() {
-    bind(GadgetHtmlParser.class).to(NekoSimplifiedHtmlParser.class);
+    bind(GadgetHtmlParser.class).to(SocialMarkupHtmlParser.class);
     bind(DOMImplementation.class).toProvider(DOMImplementationProvider.class);
   }
 

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java?rev=752266&r1=752265&r2=752266&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
 Tue Mar 10 21:15:17 2009
@@ -44,12 +44,16 @@
     private final List<ContentRewriter> rewriters;
 
     @Inject
-    public ContentRewritersProvider(HTMLContentRewriter optimizingRewriter,
-                                    CSSContentRewriter cssRewriter,
-                                    CajaContentRewriter cajaRewriter,
-                                    SanitizedRenderingContentRewriter 
sanitizedRewriter,
-                                    RenderingContentRewriter 
renderingRewriter) {
+    public ContentRewritersProvider(PipelineDataContentRewriter 
pipelineRewriter,
+        TemplateRewriter templateRewriter,
+        HTMLContentRewriter optimizingRewriter,
+        CSSContentRewriter cssRewriter,
+        CajaContentRewriter cajaRewriter,
+        SanitizedRenderingContentRewriter sanitizedRewriter,
+        RenderingContentRewriter renderingRewriter) {
       rewriters = Lists.newArrayList();
+      rewriters.add(pipelineRewriter);
+      rewriters.add(templateRewriter);
       rewriters.add(optimizingRewriter);
       rewriters.add(cssRewriter);
       rewriters.add(cajaRewriter);