Author: etnu
Date: Fri Sep 19 04:45:18 2008
New Revision: 697064
URL: http://svn.apache.org/viewvc?rev=697064&view=rev
Log:
Fixing build (broken by revision 696856).
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java?rev=697064&r1=697063&r2=697064&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
Fri Sep 19 04:45:18 2008
@@ -26,6 +26,7 @@
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.rewrite.ContentRewriter;
+import org.apache.shindig.gadgets.rewrite.RewriterResults;
import org.apache.shindig.gadgets.spec.LocaleSpec;
import org.apache.shindig.gadgets.spec.MessageBundle;
@@ -68,17 +69,19 @@
this.messageBundleFactory = messageBundleFactory;
}
- public void rewrite(HttpRequest request, HttpResponse original,
MutableContent content) {
+ public RewriterResults rewrite(HttpRequest request, HttpResponse original,
+ MutableContent content) {
throw new UnsupportedOperationException();
}
- public void rewrite(Gadget gadget) {
+ public RewriterResults rewrite(Gadget gadget) {
try {
GadgetContent content = createGadgetContent(gadget);
insertJavascriptLibraries(gadget, content);
injectMessageBundles(gadget, content);
// TODO: Use preloads when RenderedGadget gets promoted to Gadget.
finalizeDocument(gadget, content);
+ return RewriterResults.notCacheable();
} catch (GadgetException e) {
// TODO: Rewriter interface needs to be modified to handle
GadgetException or
// RewriterException or something along those lines.
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java?rev=697064&r1=697063&r2=697064&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
Fri Sep 19 04:45:18 2008
@@ -67,7 +67,7 @@
control.replay();
- rewriter.rewrite(gadget);
+ assertEquals(0, rewriter.rewrite(gadget).getCacheTtl());
Matcher matcher = EXPECTED_DOCUMENT_PATTERN.matcher(gadget.getContent());
assertTrue("Output is not valid HTML.", matcher.matches());