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/06/02 10:19:40 UTC
svn commit: r950413 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/render/
main/java/org/apache/shindig/gadgets/rewrite/
test/java/org/apache/shindig/gadgets/render/
test/java/org/apache/shindig/gadgets/rewrite/
Author: johnh
Date: Wed Jun 2 08:19:39 2010
New Revision: 950413
URL: http://svn.apache.org/viewvc?rev=950413&view=rev
Log:
Rename remaining RequestRewriter classes to ResponseRewriter.
Added:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
- copied, changed from r950226, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
- copied, changed from r950226, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java
- copied, changed from r950226, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java
- copied, changed from r950226, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriterTest.java
Removed:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriterTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
Copied: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java (from r950226, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriter.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java?p2=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java&p1=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriter.java&r1=950226&r2=950413&rev=950413&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java Wed Jun 2 08:19:39 2010
@@ -39,16 +39,16 @@ import com.google.inject.Inject;
/**
* Rewriter that sanitizes CSS and image content.
*/
-public class SanitizingRequestRewriter implements ResponseRewriter {
+public class SanitizingResponseRewriter implements ResponseRewriter {
private static final Logger logger =
- Logger.getLogger(SanitizingRequestRewriter.class.getName());
+ Logger.getLogger(SanitizingResponseRewriter.class.getName());
private final ContentRewriterFeature.Factory featureConfigFactory;
private final CajaCssSanitizer cssSanitizer;
private final ProxyUriManager proxyUriManager;
@Inject
- public SanitizingRequestRewriter(ContentRewriterFeature.Factory featureConfigFactory,
+ public SanitizingResponseRewriter(ContentRewriterFeature.Factory featureConfigFactory,
CajaCssSanitizer cssSanitizer,
ProxyUriManager proxyUriManager) {
this.featureConfigFactory = featureConfigFactory;
Copied: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java (from r950226, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java?p2=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java&p1=shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java&r1=950226&r2=950413&rev=950413&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java Wed Jun 2 08:19:39 2010
@@ -45,16 +45,16 @@ import com.google.inject.Inject;
/**
* Rewrite links to referenced content in a stylesheet
*/
-public class CssRequestRewriter implements ResponseRewriter {
+public class CssResponseRewriter implements ResponseRewriter {
- private static final Logger logger = Logger.getLogger(CssRequestRewriter.class.getName());
+ private static final Logger logger = Logger.getLogger(CssResponseRewriter.class.getName());
private final CajaCssLexerParser cssParser;
private final ProxyUriManager proxyUriManager;
private final ContentRewriterFeature.Factory rewriterFeatureFactory;
@Inject
- public CssRequestRewriter(CajaCssLexerParser cssParser,
+ public CssResponseRewriter(CajaCssLexerParser cssParser,
ProxyUriManager proxyUriManager, ContentRewriterFeature.Factory rewriterFeatureFactory) {
this.cssParser = cssParser;
this.proxyUriManager = proxyUriManager;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java?rev=950413&r1=950412&r2=950413&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java Wed Jun 2 08:19:39 2010
@@ -33,12 +33,12 @@ import java.util.List;
public class StyleTagExtractorContentRewriter extends DomWalker.Rewriter {
private final ContentRewriterFeature.Factory featureConfigFactory;
private final ProxyUriManager proxyUriManager;
- private final CssRequestRewriter cssRewriter;
+ private final CssResponseRewriter cssRewriter;
@Inject
public StyleTagExtractorContentRewriter(ContentRewriterFeature.Factory featureConfigFactory,
ConcatUriManager concatUriManager, ProxyUriManager proxyUriManager,
- CssRequestRewriter cssRewriter) {
+ CssResponseRewriter cssRewriter) {
this.featureConfigFactory = featureConfigFactory;
this.proxyUriManager = proxyUriManager;
this.cssRewriter = cssRewriter;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java?rev=950413&r1=950412&r2=950413&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java Wed Jun 2 08:19:39 2010
@@ -31,11 +31,11 @@ import org.w3c.dom.Node;
public class StyleTagExtractorVisitor implements Visitor {
private final ContentRewriterFeature.Config config;
- private final CssRequestRewriter cssRewriter;
+ private final CssResponseRewriter cssRewriter;
private final ProxyUriManager proxyUriManager;
public StyleTagExtractorVisitor(ContentRewriterFeature.Config config,
- CssRequestRewriter cssRewriter, ProxyUriManager proxyUriManager) {
+ CssResponseRewriter cssRewriter, ProxyUriManager proxyUriManager) {
this.config = config;
this.cssRewriter = cssRewriter;
this.proxyUriManager = proxyUriManager;
@@ -74,7 +74,7 @@ public class StyleTagExtractorVisitor im
// Guaranteed safe cast due to reservation logic.
Element elem = (Element)node;
List<String> extractedUrls = cssRewriter.rewrite(
- elem, contentBase, CssRequestRewriter.uriMaker(proxyUriManager, config), true);
+ elem, contentBase, CssResponseRewriter.uriMaker(proxyUriManager, config), true);
for (String extractedUrl : extractedUrls) {
// Add extracted urls as link elements to head
Element newLink = head.getOwnerDocument().createElement("link");
Copied: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java (from r950226, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java?p2=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java&p1=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java&r1=950226&r2=950413&rev=950413&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingRequestRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java Wed Jun 2 08:19:39 2010
@@ -37,7 +37,7 @@ import org.junit.Test;
import java.util.Collections;
import java.util.Set;
-public class SanitizingRequestRewriterTest extends RewriterTestBase {
+public class SanitizingResponseRewriterTest extends RewriterTestBase {
private static final Uri CONTENT_URI = Uri.parse("www.example.org/content");
private String rewrite(HttpRequest request, HttpResponse response) throws Exception {
@@ -58,7 +58,7 @@ public class SanitizingRequestRewriterTe
new ContentRewriterFeature.Factory(null,
new ContentRewriterFeature.DefaultConfig(
".*", "", "HTTP", "embed,img,script,link,style", "false", "false"));
- return new SanitizingRequestRewriter(rewriterFeatureFactory,
+ return new SanitizingResponseRewriter(rewriterFeatureFactory,
new CajaCssSanitizer(new CajaCssParser()), new PassthruManager());
}
Copied: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java (from r950226, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriterTest.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java?p2=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java&p1=shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriterTest.java&r1=950226&r2=950413&rev=950413&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java Wed Jun 2 08:19:39 2010
@@ -40,9 +40,9 @@ import com.google.common.collect.Lists;
/**
*
*/
-public class CssRequestRewriterTest extends RewriterTestBase {
- private CssRequestRewriter rewriter;
- private CssRequestRewriter rewriterNoOverrideExpires;
+public class CssResponseRewriterTest extends RewriterTestBase {
+ private CssResponseRewriter rewriter;
+ private CssResponseRewriter rewriterNoOverrideExpires;
private Uri dummyUri;
private ProxyUriManager proxyUriManager;
private ContentRewriterFeature.Factory factory;
@@ -61,7 +61,7 @@ public class CssRequestRewriterTest exte
}
};
proxyUriManager = new PassthruManager("www.test.com", "/dir/proxy");
- rewriterNoOverrideExpires = new CssRequestRewriter(new CajaCssLexerParser(),
+ rewriterNoOverrideExpires = new CssResponseRewriter(new CajaCssLexerParser(),
proxyUriManager, factoryNoOverrideExpires);
final ContentRewriterFeature.Config overrideFeature =
rewriterFeatureFactory.get(createSpecWithRewrite(".*", ".*exclude.*", "3600", tags));
@@ -72,7 +72,7 @@ public class CssRequestRewriterTest exte
}
};
- rewriter = new CssRequestRewriter(new CajaCssLexerParser(),
+ rewriter = new CssResponseRewriter(new CajaCssLexerParser(),
proxyUriManager, factory);
dummyUri = Uri.parse("http://www.w3c.org");
}
@@ -142,7 +142,7 @@ public class CssRequestRewriterTest exte
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css"));
expected = replaceDefaultWithMockServer(expected);
proxyUriManager = new PassthruManager("www.mock.com", "/dir/proxy");
- rewriter = new CssRequestRewriter(new CajaCssLexerParser(),
+ rewriter = new CssResponseRewriter(new CajaCssLexerParser(),
proxyUriManager, factory);
HttpRequest request = new HttpRequest(Uri.parse("http://www.example.org/path/rewritebasic.css"));
@@ -210,7 +210,7 @@ public class CssRequestRewriterTest exte
StringWriter sw = new StringWriter();
List<String> stringList = rewriter
.rewrite(new StringReader(original), dummyUri,
- CssRequestRewriter.uriMaker(proxyUriManager, defaultRewriterFeature), sw, true);
+ CssResponseRewriter.uriMaker(proxyUriManager, defaultRewriterFeature), sw, true);
assertEquals(expected, sw.toString());
assertEquals(stringList, Lists.newArrayList("www.example.org/some.css",
"www.example.org/someother.css", "www.example.org/another.css"));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java?rev=950413&r1=950412&r2=950413&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java Wed Jun 2 08:19:39 2010
@@ -34,7 +34,7 @@ import com.google.inject.internal.Immuta
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.rewrite.CssRequestRewriter.UriMaker;
+import org.apache.shindig.gadgets.rewrite.CssResponseRewriter.UriMaker;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor.VisitStatus;
import org.apache.shindig.gadgets.uri.PassthruManager;
import org.apache.shindig.gadgets.uri.ProxyUriManager;
@@ -99,7 +99,7 @@ public class StyleTagExtractorVisitorTes
@Test
public void revisitNothingExtracted() throws Exception {
Gadget gadget = gadget();
- CssRequestRewriter cssRewriter = createMock(CssRequestRewriter.class);
+ CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
replay(cssRewriter);
// Tag name isn't inspected since visit() filters this.
@@ -115,7 +115,7 @@ public class StyleTagExtractorVisitorTes
public void revisitExtractSpecRelative() throws Exception {
Uri base = GADGET_URI;
Gadget gadget = gadget();
- CssRequestRewriter cssRewriter = createMock(CssRequestRewriter.class);
+ CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
Element elem1 = elem("elem1");
Element elem2 = elem("elem2");
String urlStr1 = "http://foo.com/1.css";
@@ -153,7 +153,7 @@ public class StyleTagExtractorVisitorTes
public void revisitExtractViewHrefRelative() throws Exception {
Uri base = Uri.parse("http://view.com/viewbase.xml");
Gadget gadget = gadget(true, true, base);
- CssRequestRewriter cssRewriter = createMock(CssRequestRewriter.class);
+ CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
Element elem1 = elem("elem1");
Element elem2 = elem("elem2");
String urlStr1 = "http://foo.com/1.css";
@@ -191,7 +191,7 @@ public class StyleTagExtractorVisitorTes
public void revisitExtractSpecRelativeDisabled() throws Exception {
Uri base = GADGET_URI;
Gadget gadget = gadget();
- CssRequestRewriter cssRewriter = createMock(CssRequestRewriter.class);
+ CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
Element elem1 = elem("elem1");
Element elem2 = elem("elem2");
List<String> extractedUrls1 = ImmutableList.of();
@@ -222,7 +222,7 @@ public class StyleTagExtractorVisitorTes
}
private boolean getRevisitStatus(
- Gadget gadget, boolean shouldRewriteUrl, CssRequestRewriter cssRewriter, List<Node> nodes)
+ Gadget gadget, boolean shouldRewriteUrl, CssResponseRewriter cssRewriter, List<Node> nodes)
throws Exception {
return new StyleTagExtractorVisitor(
config(true, true, shouldRewriteUrl), cssRewriter, proxyUriManager)