You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2010/03/10 02:51:38 UTC
svn commit: r921206 -
/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
Author: johnh
Date: Wed Mar 10 01:51:38 2010
New Revision: 921206
URL: http://svn.apache.org/viewvc?rev=921206&view=rev
Log:
Rolling back accidental (early) submission switching to use of new optimizing rewriters in RewriteModule.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java?rev=921206&r1=921205&r2=921206&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java Wed Mar 10 01:51:38 2010
@@ -23,6 +23,7 @@ import org.apache.shindig.gadgets.render
import org.apache.shindig.gadgets.render.old.SanitizingGadgetRewriter;
import org.apache.shindig.gadgets.render.old.SanitizingRequestRewriter;
import org.apache.shindig.gadgets.rewrite.old.CssRequestRewriter;
+import org.apache.shindig.gadgets.rewrite.old.HTMLContentRewriter;
import org.apache.shindig.gadgets.servlet.CajaContentRewriter;
import java.util.List;
@@ -56,11 +57,7 @@ public class RewriteModule extends Abstr
@Inject
public GadgetRewritersProvider(PipelineDataGadgetRewriter pipelineRewriter,
TemplateRewriter templateRewriter,
- StyleTagExtractorContentRewriter styleExtractorRewriter,
- StyleAdjacencyContentRewriter styleAdjacentRewriter,
- StyleConcatContentRewriter styleConcatRewriter,
- ScriptConcatContentRewriter scriptConcatRewriter,
- ProxyingContentRewriter proxyingRewriter,
+ HTMLContentRewriter optimizingRewriter,
CssRequestRewriter cssRewriter,
CajaContentRewriter cajaRewriter,
SanitizingGadgetRewriter sanitizedRewriter,
@@ -69,14 +66,7 @@ public class RewriteModule extends Abstr
rewriters = Lists.newArrayList();
rewriters.add(pipelineRewriter);
rewriters.add(templateRewriter);
-
- // Optimizing rewriters.
- rewriters.add(styleExtractorRewriter);
- rewriters.add(styleAdjacentRewriter);
- rewriters.add(styleConcatRewriter);
- rewriters.add(scriptConcatRewriter);
- rewriters.add(proxyingRewriter);
-
+ rewriters.add(optimizingRewriter);
rewriters.add(cajaRewriter);
rewriters.add(sanitizedRewriter);
rewriters.add(renderingRewriter);
@@ -93,21 +83,10 @@ public class RewriteModule extends Abstr
@Inject
public AccelRewritersProvider(
- StyleTagExtractorContentRewriter styleExtractorRewriter,
- StyleAdjacencyContentRewriter styleAdjacentRewriter,
- StyleConcatContentRewriter styleConcatRewriter,
- ScriptConcatContentRewriter scriptConcatRewriter,
- ProxyingContentRewriter proxyingRewriter,
+ HTMLContentRewriter optimizingRewriter,
CajaContentRewriter cajaRewriter) {
rewriters = Lists.newArrayList();
-
- // Optimizing rewriters.
- rewriters.add(styleExtractorRewriter);
- rewriters.add(styleAdjacentRewriter);
- rewriters.add(styleConcatRewriter);
- rewriters.add(scriptConcatRewriter);
- rewriters.add(proxyingRewriter);
-
+ rewriters.add(optimizingRewriter);
rewriters.add(cajaRewriter);
}
@@ -120,23 +99,11 @@ public class RewriteModule extends Abstr
private final List<RequestRewriter> rewriters;
@Inject
- public RequestRewritersProvider(
- StyleTagExtractorContentRewriter styleExtractorRewriter,
- StyleAdjacencyContentRewriter styleAdjacentRewriter,
- StyleConcatContentRewriter styleConcatRewriter,
- ScriptConcatContentRewriter scriptConcatRewriter,
- ProxyingContentRewriter proxyingRewriter,
+ public RequestRewritersProvider(HTMLContentRewriter optimizingRewriter,
CssRequestRewriter cssRewriter,
SanitizingRequestRewriter sanitizedRewriter) {
rewriters = Lists.newArrayList();
-
- // Optimizing rewriters.
- rewriters.add(styleExtractorRewriter);
- rewriters.add(styleAdjacentRewriter);
- rewriters.add(styleConcatRewriter);
- rewriters.add(scriptConcatRewriter);
- rewriters.add(proxyingRewriter);
-
+ rewriters.add(optimizingRewriter);
rewriters.add(cssRewriter);
rewriters.add(sanitizedRewriter);
}