Author: etnu
Date: Fri Sep 26 08:09:21 2008
New Revision: 699356
URL: http://svn.apache.org/viewvc?rev=699356&view=rev
Log:
Fixed cajoling behavior.
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/render/RenderingContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistry.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.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=699356&r1=699355&r2=699356&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
Fri Sep 26 08:09:21 2008
@@ -210,12 +210,12 @@
@Inject
public ContentRewritersProvider(DefaultContentRewriter optimizingRewriter,
- RenderingContentRewriter renderingRewriter,
- CajaContentRewriter cajaRewriter) {
+ CajaContentRewriter cajaRewriter,
+ RenderingContentRewriter
renderingRewriter) {
rewriters = Lists.newArrayList();
rewriters.add(optimizingRewriter);
- rewriters.add(renderingRewriter);
rewriters.add(cajaRewriter);
+ rewriters.add(renderingRewriter);
}
public List<ContentRewriter> get() {
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=699356&r1=699355&r2=699356&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 26 08:09:21 2008
@@ -349,11 +349,11 @@
* Produces GadgetContent by parsing the document into 3 pieces (head, body,
and tail). If the
*/
private GadgetContent createGadgetContent(Gadget gadget, MutableContent
mutableContent) {
- GadgetContent content = new GadgetContent();
String doc = mutableContent.getContent();
if (doc.contains("<html>") && doc.contains("</html>")) {
Matcher matcher = DOCUMENT_SPLIT_PATTERN.matcher(doc);
if (matcher.matches()) {
+ GadgetContent content = new GadgetContent();
content.appendHead(matcher.group(BEFORE_HEAD_GROUP))
.appendHead("<head>")
.appendHead(matcher.group(HEAD_GROUP));
@@ -363,25 +363,26 @@
.appendBody(matcher.group(BODY_GROUP));
content.appendTail("</body></html>");
+ return content;
} else {
- makeDefaultContent(gadget, content);
+ return makeDefaultContent(gadget, mutableContent);
}
- } else {
- makeDefaultContent(gadget, content);
}
- return content;
+ return makeDefaultContent(gadget, mutableContent);
}
/**
* Inserts basic content for a gadget. Used when the content does not
contain a valid html doc.
*/
- private void makeDefaultContent(Gadget gadget, GadgetContent content) {
+ private GadgetContent makeDefaultContent(Gadget gadget, MutableContent
mutableContent) {
+ GadgetContent content = new GadgetContent();
content.appendHead("<html><head>");
content.appendHead(DEFAULT_HEAD_CONTENT);
content.appendBody("</head>");
content.appendBody(createBodyTag(gadget, ""));
- content.appendBody(gadget.getContent());
+ content.appendBody(mutableContent.getContent());
content.appendTail("</body></html>");
+ return content;
}
/**
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistry.java?rev=699356&r1=699355&r2=699356&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistry.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistry.java
Fri Sep 26 08:09:21 2008
@@ -61,6 +61,7 @@
MutableContent mc = getMutableContent(originalContent);
for (ContentRewriter rewriter : rewriters) {
+ mc.getContent();
rewriter.rewrite(gadget, mc);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=699356&r1=699355&r2=699356&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
Fri Sep 26 08:09:21 2008
@@ -102,8 +102,7 @@
} catch (IOException e) {
throwCajolingException(e, mq);
return RewriterResults.notCacheable();
- }
-
+ }
content.setContent(output.toString());
}
return RewriterResults.notCacheable();
