You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2012/02/27 00:43:33 UTC
svn commit: r1293966 [5/12] - in /shindig/trunk:
extras/src/main/java/org/apache/shindig/extras/
java/common/src/main/java/org/apache/shindig/auth/
java/common/src/main/java/org/apache/shindig/common/
java/common/src/main/java/org/apache/shindig/common...
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java Sun Feb 26 23:43:20 2012
@@ -73,7 +73,7 @@ public class PipelinedDataPreloader {
public Collection<Callable<PreloadedData>> createPreloadTasks(GadgetContext context,
PipelinedData.Batch batch) {
List<Callable<PreloadedData>> preloadList = Lists.newArrayList();
-
+
Collection<Object> socialRequest = Lists.newArrayList();
// Gather all the preload entries; all social requests in one batch, each HTTP
// in its own
@@ -96,7 +96,7 @@ public class PipelinedDataPreloader {
throw new IllegalArgumentException("Unknown pipeline type");
}
}
-
+
if (!socialRequest.isEmpty()) {
preloadList.add(new SocialPreloadTask(context, socialRequest));
}
@@ -121,7 +121,7 @@ public class PipelinedDataPreloader {
public VariableTask(String key, Object data) {
this.result = (data == null) ? ImmutableMap.of("id", (Object) key)
- : ImmutableMap.of("id", key, "result", data);
+ : ImmutableMap.of("id", key, "result", data);
}
public PreloadedData call() throws Exception {
@@ -132,7 +132,7 @@ public class PipelinedDataPreloader {
};
}
}
-
+
/**
* Callable for issuing HttpRequests to JsonRpcServlet.
*/
@@ -148,7 +148,7 @@ public class PipelinedDataPreloader {
public PreloadedData call() throws Exception {
HttpResponse response;
-
+
String token = context.getParameter("st");
if (token == null) {
response = new HttpResponseBuilder()
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/ProcessingException.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/ProcessingException.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/ProcessingException.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/ProcessingException.java Sun Feb 26 23:43:20 2012
@@ -37,7 +37,7 @@ public class ProcessingException extends
super(message, t);
statusCode = httpStatusCode;
}
-
+
public int getHttpStatusCode() {
return statusCode;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java Sun Feb 26 23:43:20 2012
@@ -78,7 +78,7 @@ public class CajaResponseRewriter implem
//class name for logging purpose
private static final String classname = CajaResponseRewriter.class.getName();
private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
-
+
private final RequestPipeline requestPipeline;
@Inject
@@ -95,7 +95,7 @@ public class CajaResponseRewriter implem
resp.setHttpStatusCode(HttpResponse.SC_BAD_REQUEST);
return;
}
-
+
boolean passed = false;
MessageQueue mq = new SimpleMessageQueue();
@@ -124,7 +124,7 @@ public class CajaResponseRewriter implem
return;
}
- try {
+ try {
if (RewriterUtils.isJavascript(req, resp)) {
compiler.setGoals(
compiler.getGoals().without(PipelineMaker.HTML_SAFE_STATIC));
@@ -187,7 +187,7 @@ public class CajaResponseRewriter implem
HttpRequest request = new HttpRequest(resourceUri)
.setContainer(req.getContainer())
.setGadget(req.getGadget());
-
+
try {
HttpResponse response = requestPipeline.execute(request);
byte[] responseBytes = IOUtils.toByteArray(response.getResponse());
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java Sun Feb 26 23:43:20 2012
@@ -70,7 +70,7 @@ public class DefaultServiceFetcher {
private final ContainerConfig containerConfig;
private final HttpFetcher fetcher;
-
+
private Authority authority;
/** @param config Container Config for looking up endpoints */
@@ -79,7 +79,7 @@ public class DefaultServiceFetcher {
this.containerConfig = config;
this.fetcher = fetcher;
}
-
+
@Inject(optional = true)
public void setAuthority(Authority authority) {
this.authority = authority;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java Sun Feb 26 23:43:20 2012
@@ -83,11 +83,11 @@ public class HtmlRenderer {
}
MutableContent mc = new MutableContent(htmlParser, content);
- for (GadgetRewriter rewriter :
+ for (GadgetRewriter rewriter :
gadgetRewritersProvider.getRewriters(gadget.getContext())) {
rewriter.rewrite(gadget, mc);
}
-
+
return mc.getContent();
} catch (GadgetException e) {
throw new RenderingException(e.getMessage(), e, e.getHttpStatusCode());
@@ -95,7 +95,7 @@ public class HtmlRenderer {
throw new RenderingException(e.getMessage(), e, e.getHttpStatusCode());
}
}
-
+
protected String getViewContent(Gadget gadget) {
View currentView = gadget.getCurrentView();
return currentView.getContent();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java Sun Feb 26 23:43:20 2012
@@ -61,14 +61,14 @@ public class OpenSocialI18NGadgetRewrite
mutableContent.documentChanged();
} catch (GadgetException e) {
throw new RewritingException(e, e.getHttpStatusCode());
- }
- }
+ }
+ }
private void injectI18NConstants(Gadget gadget, Node headTag) throws GadgetException {
StringBuilder inlineJs = new StringBuilder();
Locale locale = gadget.getContext().getLocale();
if (i18nConstantsCache.containsKey(locale)) {
- inlineJs.append(i18nConstantsCache.get(locale));
+ inlineJs.append(i18nConstantsCache.get(locale));
} else {
// load gadgets.i18n.DateTimeConstants and gadgets.i18n.NumberFormatConstants
String localeName = getLocaleNameForLoadingI18NConstants(locale);
@@ -86,17 +86,17 @@ public class OpenSocialI18NGadgetRewrite
}
Element inlineTag = headTag.getOwnerDocument().createElement("script");
headTag.appendChild(inlineTag);
- inlineTag.appendChild(headTag.getOwnerDocument().createTextNode(inlineJs.toString()));
+ inlineTag.appendChild(headTag.getOwnerDocument().createTextNode(inlineJs.toString()));
}
String getLocaleNameForLoadingI18NConstants(Locale locale) {
- String localeName = "en";
+ String localeName = "en";
String language = locale.getLanguage();
- String country = locale.getCountry();
+ String country = locale.getCountry();
if (!language.equalsIgnoreCase("ALL")) {
try {
attemptToLoadDateConstants(language);
- localeName = language;
+ localeName = language;
} catch (IOException e) {
// ignore
}
@@ -109,18 +109,18 @@ public class OpenSocialI18NGadgetRewrite
} catch (IOException e) {
// ignore
}
- }
+ }
return localeName;
}
protected String attemptToLoadDateConstants(String localeName) throws IOException {
return attemptToLoadResource("DateTimeConstants__" + localeName + ".js");
}
-
+
private String attemptToLoadResource(String i18nRes) throws IOException {
return attemptToLoadResourceFullyQualified(DATA_PATH + i18nRes);
}
-
+
protected String attemptToLoadResourceFullyQualified(String resource) throws IOException {
return ResourceLoader.getContent(resource);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java Sun Feb 26 23:43:20 2012
@@ -159,7 +159,7 @@ public class ProxyRenderer {
request.setHeader("User-Agent", userAgent);
}
}
-
+
/**
* Returns the program name which will be added at the end of the User-Agent
* string, to identify the gadget server.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingException.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingException.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingException.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingException.java Sun Feb 26 23:43:20 2012
@@ -26,7 +26,7 @@ package org.apache.shindig.gadgets.rende
*/
public class RenderingException extends Exception {
private final int httpStatusCode;
-
+
public RenderingException(Throwable t, int httpStatusCode) {
super(t);
this.httpStatusCode = httpStatusCode;
@@ -34,12 +34,12 @@ public class RenderingException extends
public RenderingException(String message, int httpStatusCode) {
super(message);
- this.httpStatusCode = httpStatusCode;
+ this.httpStatusCode = httpStatusCode;
}
public RenderingException(String message, Throwable t, int httpStatusCode) {
super(message, t);
- this.httpStatusCode = httpStatusCode;
+ this.httpStatusCode = httpStatusCode;
}
public int getHttpStatusCode() {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java Sun Feb 26 23:43:20 2012
@@ -41,7 +41,7 @@ public final class RenderingResults {
this.content = content;
this.errorMessage = errorMessage;
this.httpStatusCode = httpStatusCode;
-
+
this.redirect = redirect;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java Sun Feb 26 23:43:20 2012
@@ -68,14 +68,14 @@ public class SanitizingGadgetRewriter ex
public static boolean isSanitizedRenderingRequest(Gadget gadget) {
return "1".equals(gadget.getContext().getParameter("sanitize"));
}
-
+
/**
* Marks that an element and all its attributes are trusted content.
* This status is preserved across {@link Node#cloneNode} calls. Be
* extremely careful when using this, especially with {@code includingChildren}
* set to {@code true}, as untrusted content that gets inserted (e.g, via
* os:RenderAll in templating) would become trusted.
- *
+ *
* @param element the trusted element
* @param includingChildren if true, children of this element will are also
* trusted. Never set this to true on an element that will ever have
@@ -85,7 +85,7 @@ public class SanitizingGadgetRewriter ex
element.setUserData(BYPASS_SANITIZATION_KEY,
includingChildren ? Bypass.ALL : Bypass.ONLY_SELF, copyOnClone);
}
-
+
// Public so it can be used by the old rewriter
public static enum Bypass { ALL, ONLY_SELF, NONE }
@@ -147,14 +147,14 @@ public class SanitizingGadgetRewriter ex
}
return bypass;
}
-
+
private static abstract class SanitizingWalker implements DomWalker.Visitor {
protected abstract boolean removeTag(Gadget gadget, Element elem, Uri ctx);
protected abstract boolean removeAttr(Gadget gadget, Attr attr, Uri ctx);
-
+
public VisitStatus visit(Gadget gadget, Node node) throws RewritingException {
Element elem;
-
+
switch (node.getNodeType()) {
case Node.CDATA_SECTION_NODE:
case Node.TEXT_NODE:
@@ -180,12 +180,12 @@ public class SanitizingGadgetRewriter ex
} else if (bypass == Bypass.ONLY_SELF) {
return VisitStatus.BYPASS;
}
-
+
if (removeTag(gadget, elem, gadget.getSpec().getUrl())) {
// All reserved trees are removed in revisit.
return VisitStatus.RESERVE_TREE;
}
-
+
// Otherwise move on to attributes.
VisitStatus status = VisitStatus.MODIFY;
for (Attr attr : toList(elem.getAttributes())) {
@@ -193,7 +193,7 @@ public class SanitizingGadgetRewriter ex
elem.removeAttributeNode(attr);
}
}
-
+
return status;
}
@@ -215,13 +215,13 @@ public class SanitizingGadgetRewriter ex
static final class BasicElementFilter extends SanitizingWalker {
private final Provider<Set<String>> allowedTags;
private final Provider<Set<String>> allowedAttributes;
-
+
private BasicElementFilter(Provider<Set<String>> allowedTags,
Provider<Set<String>> allowedAttributes) {
this.allowedTags = allowedTags;
this.allowedAttributes = allowedAttributes;
}
-
+
@Override
public boolean removeTag(Gadget gadget, Element elem, Uri context) {
return !allowedTags.get().contains(elem.getNodeName().toLowerCase());
@@ -244,7 +244,7 @@ public class SanitizingGadgetRewriter ex
protected boolean removeTag(Gadget gadget, Element elem, Uri ctx) {
return false;
}
-
+
@Override
protected boolean removeAttr(Gadget gadget, Attr attr, Uri ctx) {
if (URI_ATTRIBUTES.contains(attr.getName().toLowerCase())) {
@@ -272,12 +272,12 @@ public class SanitizingGadgetRewriter ex
private ImageFilter(ProxyUriManager proxyUriManager) {
this.imageRewriter = new SanitizingProxyUriManager(proxyUriManager, "image/*");
}
-
+
@Override
protected boolean removeTag(Gadget gadget, Element elem, Uri ctx) {
return false;
}
-
+
@Override
protected boolean removeAttr(Gadget gadget, Attr attr, Uri ctx) {
if ("img".equalsIgnoreCase(attr.getOwnerElement().getNodeName()) &&
@@ -311,7 +311,7 @@ public class SanitizingGadgetRewriter ex
this.cssImportRewriter = new SanitizingProxyUriManager(proxyUriManager, "text/css");
this.cssSanitizer = cssSanitizer;
}
-
+
public VisitStatus visit(Gadget gadget, Node node) throws RewritingException {
if (node.getNodeType() == Node.ELEMENT_NODE &&
"style".equalsIgnoreCase(node.getNodeName())) {
@@ -321,7 +321,7 @@ public class SanitizingGadgetRewriter ex
}
return VisitStatus.BYPASS;
}
-
+
public boolean revisit(Gadget gadget, List<Node> nodes) throws RewritingException {
return false;
}
@@ -337,7 +337,7 @@ public class SanitizingGadgetRewriter ex
private LinkFilter(ProxyUriManager proxyUriManager) {
this.cssImportRewriter = new SanitizingProxyUriManager(proxyUriManager, "text/css");
}
-
+
@Override
protected boolean removeTag(Gadget gadget, Element elem, Uri ctx) {
if (!elem.getNodeName().equalsIgnoreCase("link")) {
@@ -363,7 +363,7 @@ public class SanitizingGadgetRewriter ex
}
return !hasType;
}
-
+
@Override
protected boolean removeAttr(Gadget gadget, Attr attr, Uri ctx) {
return false;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java Sun Feb 26 23:43:20 2012
@@ -33,7 +33,7 @@ import java.util.List;
public class SanitizingProxyUriManager implements ProxyUriManager {
private final ProxyUriManager wrapped;
private final String expectedMime;
-
+
public SanitizingProxyUriManager(ProxyUriManager wrapped, String expectedMime) {
this.wrapped = wrapped;
this.expectedMime = expectedMime;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java Sun Feb 26 23:43:20 2012
@@ -49,11 +49,11 @@ public class SanitizingResponseRewriter
//class name for logging purpose
private static final String classname = SanitizingResponseRewriter.class.getName();
private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
-
+
private final ContentRewriterFeature.Factory featureConfigFactory;
private final CajaCssSanitizer cssSanitizer;
private final ProxyUriManager proxyUriManager;
-
+
@Inject
public SanitizingResponseRewriter(ContentRewriterFeature.Factory featureConfigFactory,
CajaCssSanitizer cssSanitizer,
@@ -78,7 +78,7 @@ public class SanitizingResponseRewriter
rewriteProxiedImage(request, resp);
} else {
if (LOG.isLoggable(Level.WARNING)) {
- LOG.logp(Level.WARNING, classname, "rewrite",
+ LOG.logp(Level.WARNING, classname, "rewrite",
MessageKeys.REQUEST_TO_SANITIZE_UNKNOW_CONTENT,
new Object[] {request.getRewriteMimeType(),request.getUri()});
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java Sun Feb 26 23:43:20 2012
@@ -256,7 +256,7 @@ public class ConcatVisitor implements Do
if (cur.getNodeType() == Node.TEXT_NODE ||
(cur.getNodeType() == Node.COMMENT_NODE && !isConditionalComment(cur))) {
continue;
- }
+ }
break;
}
if (cur != null && cur.getNodeType() == Node.ELEMENT_NODE) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java Sun Feb 26 23:43:20 2012
@@ -55,7 +55,7 @@ public class DefaultResponseRewriterRegi
for (ResponseRewriter rewriter : rewriters) {
rewriter.rewrite(req, builder);
}
-
+
// Returns the original HttpResponse if no changes have been made.
return builder.create();
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java Sun Feb 26 23:43:20 2012
@@ -58,19 +58,19 @@ public final class DomWalker {
public interface Visitor {
/**
* Returned by the {@code visit(Gadget, Node)} method, signaling:
- *
+ *
* BYPASS = Visitor doesn't care about the node.
* MODIFY = Visitor has modified the node.
* RESERVE_NODE = Visitor reserves exactly the node passed. No other
* Visitor will visit the node.
* RESERVE_TREE = Visitor reserves the node passed and all its descendants
* No other Visitor will visit them.
- *
+ *
* Visitors are expected to be well-behaved in that they do not
* modify unreserved nodes: that is, in revisit(...) they do not access
* adjacent, parent, etc. nodes and modify them. visit(...) may return
* MODIFY to indicate a modification of the given node.
- *
+ *
* Other append and delete operations are acceptable
* but only in revisit(). Reservations are supported in order to support
* "batched" lookups relating to a similar set of data retrieved from a
@@ -82,27 +82,27 @@ public final class DomWalker {
RESERVE_NODE,
RESERVE_TREE
}
-
+
/**
* Visit a particular Node in the DOM.
- *
+ *
* @param gadget Context for the request.
* @param node Node being visited.
* @return Status, see {@code VisitStatus}
*/
VisitStatus visit(Gadget gadget, Node node) throws RewritingException;
-
+
/**
* Revisit a node in the DOM that was marked by the
* {@code visit(Gadget, Node)} as reserved during DOM traversal.
- *
+ *
* @param gadget Context for the request.
* @param nodes Nodes being revisited, previously marked as reserved.
* @return True if any node modified, false otherwise.
*/
boolean revisit(Gadget gadget, List<Node> nodes) throws RewritingException;
}
-
+
/**
* Rewriter that traverses the DOM, passing each node to its
* list of {@code Visitor} instances in order. Each visitor
@@ -112,15 +112,15 @@ public final class DomWalker {
*/
public static class Rewriter implements GadgetRewriter, ResponseRewriter {
private final List<Visitor> visitors;
-
+
public Rewriter(List<Visitor> visitors) {
this.visitors = visitors;
}
-
+
public Rewriter(Visitor... visitors) {
this.visitors = Arrays.asList(visitors);
}
-
+
public Rewriter() {
this.visitors = null;
}
@@ -146,11 +146,11 @@ public final class DomWalker {
rewrite(makeVisitors(context, request.getGadget()), context, builder);
}
}
-
- private boolean rewrite(List<Visitor> visitors, Gadget gadget, MutableContent content)
+
+ private boolean rewrite(List<Visitor> visitors, Gadget gadget, MutableContent content)
throws RewritingException {
Map<Visitor, List<Node>> reservations = Maps.newHashMap();
-
+
LinkedList<Node> toVisit = Lists.newLinkedList();
Document doc = content.getDocument();
if (doc == null) {
@@ -162,7 +162,7 @@ public final class DomWalker {
boolean mutated = false;
while (!toVisit.isEmpty()) {
Node visiting = toVisit.removeFirst();
-
+
// Iterate through all visitors evaluating their visitation status.
boolean treeReserved = false;
boolean nodeReserved = false;
@@ -182,7 +182,7 @@ public final class DomWalker {
// Aka BYPASS - do nothing.
break;
}
-
+
if (nodeReserved || treeReserved) {
// Reservation was made.
if (!reservations.containsKey(visitor)) {
@@ -192,7 +192,7 @@ public final class DomWalker {
break;
}
}
-
+
if (!treeReserved && visiting.hasChildNodes()) {
// Tree wasn't reserved - walk children.
// In order to preserve DFS order, walk children in reverse.
@@ -202,7 +202,7 @@ public final class DomWalker {
}
}
}
-
+
// Run through all reservations, revisiting as needed.
for (Visitor visitor : visitors) {
List<Node> nodesReserved = reservations.get(visitor);
@@ -211,7 +211,7 @@ public final class DomWalker {
mutated = true;
}
}
-
+
return mutated;
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/GadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/GadgetRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/GadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/GadgetRewriter.java Sun Feb 26 23:43:20 2012
@@ -26,7 +26,7 @@ import org.apache.shindig.gadgets.Gadget
public interface GadgetRewriter {
/**
* Rewrite the gadget.
- *
+ *
* @param gadget Gadget to rewrite.
* @param content the content of the gadget to be manipulated.
*/
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java Sun Feb 26 23:43:20 2012
@@ -71,7 +71,7 @@ public class ImageAttributeRewriter exte
public static class ImageAttributeVisitor implements DomWalker.Visitor {
private final RequestPipeline requestPipeline;
private final ExecutorService executor;
-
+
private static final String IMG_ATTR_CLASS_NAME_PREFIX = "__shindig__image";
public ImageAttributeVisitor(RequestPipeline requestPipeline,
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java Sun Feb 26 23:43:20 2012
@@ -44,7 +44,7 @@ import java.util.List;
public class ImageResizeRewriter extends DomWalker.Rewriter {
private final ContentRewriterFeature.Factory featureConfigFactory;
private final ProxyUriManager proxyUriManager;
-
+
@Inject
public ImageResizeRewriter(ProxyUriManager proxyUriManager,
ContentRewriterFeature.Factory featureConfigFactory) {
@@ -57,7 +57,7 @@ public class ImageResizeRewriter extends
ContentRewriterFeature.Config config = featureConfigFactory.get(context.getSpec());
return Arrays.<DomWalker.Visitor>asList(new ImageResizeVisitor(proxyUriManager, config));
}
-
+
public static class ImageResizeVisitor implements DomWalker.Visitor {
protected final ProxyUriManager proxyUriManager;
protected final ContentRewriterFeature.Config featureConfig;
@@ -67,7 +67,7 @@ public class ImageResizeRewriter extends
this.proxyUriManager = proxyUriManager;
this.featureConfig = featureConfig;
}
-
+
public VisitStatus visit(Gadget gadget, Node node) throws RewritingException {
if (node.getNodeType() == Node.ELEMENT_NODE &&
node.getNodeName().equalsIgnoreCase("img")) {
@@ -108,7 +108,7 @@ public class ImageResizeRewriter extends
}
if (null == proxied || proxied.getStatus() == UriStatus.BAD_URI) {
- return VisitStatus.BYPASS;
+ return VisitStatus.BYPASS;
}
VisitStatus status = VisitStatus.BYPASS;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.java Sun Feb 26 23:43:20 2012
@@ -188,7 +188,7 @@ public class MutableContent {
incrementNumChanges();
}
}
-
+
/**
* Sets content to new byte array, with unspecified charset. It is
* recommended to use the {@code setContentBytes(byte[], Charset)} API instead,
@@ -198,7 +198,7 @@ public class MutableContent {
public final void setContentBytes(byte[] newBytes) {
setContentBytes(newBytes, null);
}
-
+
/**
* Sets internal state having to do with content bytes, from the provided
* byte array and charset.
@@ -250,7 +250,7 @@ public class MutableContent {
}
return document;
}
-
+
public GadgetHtmlParser getContentParser() {
return contentParser;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java Sun Feb 26 23:43:20 2012
@@ -50,13 +50,13 @@ public class OsTemplateXmlLoaderRewriter
private static final String PRELOAD_TPL = "gadgets.jsondom.preload_('%s',%s);";
private final Converter converter;
-
+
@Inject
public OsTemplateXmlLoaderRewriter(Converter converter) {
super(new GadgetHtmlVisitor(converter));
this.converter = converter;
}
-
+
// Override the HTTP rewrite method to provide custom type checking.
// The gadget rewrite method remains standard, using the Visitor pattern.
public boolean rewrite(HttpRequest request, HttpResponse original,
@@ -68,14 +68,14 @@ public class OsTemplateXmlLoaderRewriter
}
return false;
}
-
+
public static class GadgetHtmlVisitor implements DomWalker.Visitor {
private final Converter converter;
-
+
public GadgetHtmlVisitor(Converter converter) {
this.converter = converter;
}
-
+
public VisitStatus visit(Gadget gadget, Node node) throws RewritingException {
if (node.getNodeType() == Node.ELEMENT_NODE &&
"div".equalsIgnoreCase(((Element)node).getTagName()) &&
@@ -86,27 +86,27 @@ public class OsTemplateXmlLoaderRewriter
}
return VisitStatus.BYPASS;
}
-
+
public boolean revisit(Gadget gadget, List<Node> nodes) throws RewritingException {
if (!gadget.getAllFeatures().contains(OS_TEMPLATES_FEATURE_NAME)) {
return false;
}
-
+
Document doc = nodes.get(0).getOwnerDocument();
Element docElem = doc.getDocumentElement();
if (docElem == null) {
throw new RewritingException("Unexpected error, missing document element",
HttpResponse.SC_INTERNAL_SERVER_ERROR);
}
-
+
Node head = DomUtil.getFirstNamedChildNode(doc.getDocumentElement(), "head");
if (head == null) {
throw new RewritingException("Unexpected error, could not find <head> node",
HttpResponse.SC_INTERNAL_SERVER_ERROR);
}
-
+
StringBuilder preloadScript = new StringBuilder();
-
+
for (Node node : nodes) {
Element elem = (Element)node;
String value = elem.getTextContent();
@@ -114,34 +114,34 @@ public class OsTemplateXmlLoaderRewriter
if (Strings.isNullOrEmpty(id)) {
id = elem.getAttribute("id");
}
-
+
preloadScript.append(String.format(PRELOAD_TPL, id, converter.domToJson(value)));
}
-
+
Node script = doc.createElement("script");
script.setTextContent(preloadScript.toString());
head.appendChild(script);
-
+
return true;
}
}
-
+
public static class Converter {
public static final String NAME_KEY = "n";
public static final String VALUE_KEY = "v";
public static final String CHILDREN_KEY = "c";
public static final String ATTRIBS_KEY = "a";
public static final String ERROR_KEY = "e";
-
+
private final GadgetHtmlParser parser;
private final DOMImplementation domImpl;
-
+
@Inject
public Converter(GadgetHtmlParser parser, DOMImplementation domImpl) {
this.parser = parser;
this.domImpl = domImpl;
}
-
+
public String domToJson(String xml) {
try {
Document doc = domImpl.createDocument(null, null, null);
@@ -154,11 +154,11 @@ public class OsTemplateXmlLoaderRewriter
return jsonError("JSON Exception: " + e).toString();
}
}
-
+
public JSONObject jsonFromElement(Element elem) throws JSONException {
JSONObject json = new JSONObject();
json.put(NAME_KEY, elem.getTagName());
-
+
JSONArray attribs = new JSONArray();
NamedNodeMap attribMap = elem.getAttributes();
for (int i = 0; i < attribMap.getLength(); ++i) {
@@ -169,7 +169,7 @@ public class OsTemplateXmlLoaderRewriter
attribs.put(attrib);
}
json.put(ATTRIBS_KEY, attribs);
-
+
JSONArray children = new JSONArray();
for (Node child = elem.getFirstChild(); child != null; child = child.getNextSibling()) {
switch (child.getNodeType()) {
@@ -186,10 +186,10 @@ public class OsTemplateXmlLoaderRewriter
}
}
json.put(CHILDREN_KEY, children);
-
+
return json;
}
-
+
private JSONObject jsonError(String err) {
JSONObject json = new JSONObject();
try {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java Sun Feb 26 23:43:20 2012
@@ -44,34 +44,34 @@ import java.util.logging.Logger;
* This rewriter cannot be used currently without the SocialMarkupHtmlParser.
*/
public class PipelineDataGadgetRewriter implements GadgetRewriter {
-
+
//class name for logging purpose
private static final String classname = PipelineDataGadgetRewriter.class.getName();
private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
-
+
private final PipelineExecutor executor;
@Inject
public PipelineDataGadgetRewriter(PipelineExecutor executor) {
this.executor = executor;
}
-
+
public void rewrite(Gadget gadget, MutableContent content) {
// Only bother for gadgets using the opensocial-data feature
if (!gadget.getViewFeatures().containsKey("opensocial-data")) {
return;
}
-
+
Document doc = content.getDocument();
Map<PipelinedData, Node> pipelineNodes = parsePipelinedData(gadget, doc);
-
+
if (pipelineNodes.isEmpty()) {
return;
}
-
+
PipelineExecutor.Results results =
executor.execute(gadget.getContext(), pipelineNodes.keySet());
-
+
// Remove all pipeline entries that were fully evaluated
for (Map.Entry<PipelinedData, Node> nodeEntry : pipelineNodes.entrySet()) {
if (!results.remainingPipelines.contains(nodeEntry.getKey())) {
@@ -86,11 +86,11 @@ public class PipelineDataGadgetRewriter
Element head = (Element) DomUtil.getFirstNamedChildNode(doc.getDocumentElement(), "head");
Element pipelineScript = doc.createElement("script");
pipelineScript.setAttribute("type", "text/javascript");
-
+
StringBuilder script = new StringBuilder();
for (Map.Entry<String, ? extends Object> entry : results.keyedResults.entrySet()) {
String key = entry.getKey();
-
+
// TODO: escape key
content.addPipelinedData(key, entry.getValue());
script.append("opensocial.data.DataContext.putDataSet(\"")
@@ -99,12 +99,12 @@ public class PipelineDataGadgetRewriter
.append(JsonSerializer.serialize(entry.getValue()))
.append(");");
}
-
+
pipelineScript.appendChild(doc.createTextNode(script.toString()));
head.appendChild(pipelineScript);
MutableContent.notifyEdit(doc);
}
-
+
// And if no pipelines remain unexecuted, remove the opensocial-data feature
if (results.remainingPipelines.isEmpty()) {
gadget.addFeature("opensocial-data-context");
@@ -132,9 +132,9 @@ public class PipelineDataGadgetRewriter
}
return pipelineNodes;
}
-
+
static class PipelineState {
public Node node;
- public PipelinedData.Batch batch;
+ public PipelinedData.Batch batch;
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java Sun Feb 26 23:43:20 2012
@@ -37,7 +37,7 @@ public class ProxyingContentRewriter ext
private final ContentRewriterFeature.Factory featureConfigFactory;
private final ProxyUriManager proxyUriManager;
private final ConcatUriManager concatUriManager;
-
+
@Inject
public ProxyingContentRewriter(ContentRewriterFeature.Factory featureConfigFactory,
ProxyUriManager proxyUriManager, ConcatUriManager concatUriManager) {
@@ -45,11 +45,11 @@ public class ProxyingContentRewriter ext
this.proxyUriManager = proxyUriManager;
this.concatUriManager = concatUriManager;
}
-
+
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
ContentRewriterFeature.Config config = featureConfigFactory.get(context.getSpec());
- // Note that concat is including with proxy in order to prevent
+ // Note that concat is including with proxy in order to prevent
// proxying the rewritten concat url
// Basically Url rewritters should all be in one dom walker.
return ImmutableList.of(
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java Sun Feb 26 23:43:20 2012
@@ -44,7 +44,7 @@ public class ProxyingVisitor extends Res
//class name for logging purpose
private static final String classname = ProxyingVisitor.class.getName();
private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
-
+
private final ProxyUriManager uriManager;
public ProxyingVisitor(ContentRewriterFeature.Config featureConfig,
@@ -59,7 +59,7 @@ public class ProxyingVisitor extends Res
List<ProxyUriManager.ProxyUri> reservedUris =
Lists.newArrayListWithCapacity(nodes.size());
List<Node> reservedNodes = Lists.newArrayListWithCapacity(nodes.size());
-
+
for (Node node : nodes) {
Element element = (Element)node;
String nodeName = node.getNodeName().toLowerCase();
@@ -80,18 +80,18 @@ public class ProxyingVisitor extends Res
}
}
}
-
+
List<Uri> resourceUris = uriManager.make(reservedUris, featureConfig.getExpires());
-
+
// By contract, resourceUris matches by index with inbound Uris. Create an easy-access
// List with the results.
List<Pair<Node, Uri>> proxiedUris = Lists.newArrayListWithCapacity(nodes.size());
-
+
Iterator<Uri> uriIt = resourceUris.iterator();
for (Node node : reservedNodes) {
proxiedUris.add(Pair.of(node, uriIt.next()));
}
-
+
return proxiedUris;
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java Sun Feb 26 23:43:20 2012
@@ -31,7 +31,7 @@ import org.apache.shindig.common.Nullabl
*/
public final class RewriterUtils {
private RewriterUtils() {}
-
+
public static boolean isHtml(HttpRequest request, HttpResponse original) {
String mimeType = getMimeType(request, original);
return mimeType != null && (mimeType.contains("html"));
@@ -59,7 +59,7 @@ public final class RewriterUtils {
String mimeType = getMimeType(request, original);
return mimeType != null && mimeType.contains("css");
}
-
+
public static boolean isCss(HttpRequest request, HttpResponseBuilder original) {
String mimeType = getMimeType(request, original);
return mimeType != null && mimeType.contains("css");
@@ -70,7 +70,7 @@ public final class RewriterUtils {
String mimeType = getMimeType(request, original);
return mimeType != null && mimeType.contains("javascript");
}
-
+
public static boolean isJavascript(HttpRequest request, HttpResponseBuilder original) {
String mimeType = getMimeType(request, original);
return mimeType != null && mimeType.contains("javascript");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritingException.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritingException.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritingException.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritingException.java Sun Feb 26 23:43:20 2012
@@ -25,7 +25,7 @@ package org.apache.shindig.gadgets.rewri
*/
public class RewritingException extends Exception {
private final int httpStatusCode;
-
+
public RewritingException(Throwable t, int httpStatusCode) {
super(t);
this.httpStatusCode = httpStatusCode;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java Sun Feb 26 23:43:20 2012
@@ -44,7 +44,7 @@ public class ScriptConcatContentRewriter
private final Executor executor;
private final RequestPipeline requestPipeline;
private final HttpCache cache;
-
+
@Inject
public ScriptConcatContentRewriter(ConcatUriManager concatUriManager,
ContentRewriterFeature.Factory featureConfigFactory,
@@ -57,7 +57,7 @@ public class ScriptConcatContentRewriter
this.cache = cache;
this.requestPipeline = requestPipeline;
}
-
+
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
ContentRewriterFeature.Config config = featureConfigFactory.get(context.getSpec());
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java Sun Feb 26 23:43:20 2012
@@ -39,7 +39,7 @@ import java.util.List;
* @since 2.0.0
*/
public class StyleAdjacencyVisitor implements Visitor {
-
+
public VisitStatus visit(Gadget gadget, Node node) throws RewritingException {
if (node.getNodeType() == Node.ELEMENT_NODE &&
("style".equalsIgnoreCase(node.getNodeName()) ||
@@ -49,15 +49,15 @@ public class StyleAdjacencyVisitor imple
// Reserve <style...>, <link rel="stylesheet"...>, or <link type="text/css"...>
return VisitStatus.RESERVE_TREE;
}
-
+
return VisitStatus.BYPASS;
}
-
+
public boolean revisit(Gadget gadget, List<Node> nodes)
throws RewritingException {
Node head = DomUtil.getFirstNamedChildNode(
nodes.get(0).getOwnerDocument().getDocumentElement(), "head");
-
+
if (head == null) {
// Should never occur; do for paranoia's sake.
return false;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java Sun Feb 26 23:43:20 2012
@@ -43,7 +43,7 @@ public class StyleConcatContentRewriter
private final Executor executor;
private final RequestPipeline requestPipeline;
private final HttpCache cache;
-
+
@Inject
public StyleConcatContentRewriter(ConcatUriManager concatUriManager,
ContentRewriterFeature.Factory featureConfigFactory,
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=1293966&r1=1293965&r2=1293966&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 Sun Feb 26 23:43:20 2012
@@ -37,7 +37,7 @@ public class StyleTagExtractorContentRew
private final ContentRewriterFeature.Factory featureConfigFactory;
private final ProxyUriManager proxyUriManager;
private final CssResponseRewriter cssRewriter;
-
+
@Inject
public StyleTagExtractorContentRewriter(ContentRewriterFeature.Factory featureConfigFactory,
ProxyUriManager proxyUriManager, CssResponseRewriter cssRewriter) {
@@ -45,7 +45,7 @@ public class StyleTagExtractorContentRew
this.proxyUriManager = proxyUriManager;
this.cssRewriter = cssRewriter;
}
-
+
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
ContentRewriterFeature.Config config = featureConfigFactory.get(context.getSpec());
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=1293966&r1=1293965&r2=1293966&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 Sun Feb 26 23:43:20 2012
@@ -37,7 +37,7 @@ public class StyleTagExtractorVisitor im
private final ContentRewriterFeature.Config config;
private final CssResponseRewriter cssRewriter;
private final ProxyUriManager proxyUriManager;
-
+
public StyleTagExtractorVisitor(ContentRewriterFeature.Config config,
CssResponseRewriter cssRewriter, ProxyUriManager proxyUriManager) {
this.config = config;
@@ -49,13 +49,13 @@ public class StyleTagExtractorVisitor im
if (!config.isRewriteEnabled() || !config.getIncludedTags().contains("style")) {
return VisitStatus.BYPASS;
}
-
+
// Only process <style> elements.
if (node.getNodeType() != Node.ELEMENT_NODE ||
!node.getNodeName().equalsIgnoreCase("style")) {
return VisitStatus.BYPASS;
}
-
+
return VisitStatus.RESERVE_NODE;
}
@@ -65,13 +65,13 @@ public class StyleTagExtractorVisitor im
if (nodes.isEmpty()) {
return mutated;
}
-
+
Uri contentBase = gadget.getSpec().getUrl();
View view = gadget.getCurrentView();
if (view != null && view.getHref() != null) {
contentBase = view.getHref();
}
-
+
Element head = (Element)DomUtil.getFirstNamedChildNode(
nodes.get(0).getOwnerDocument().getDocumentElement(), "head");
for (Node node : nodes) {
@@ -89,7 +89,7 @@ public class StyleTagExtractorVisitor im
mutated = true;
}
}
-
+
return mutated;
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java Sun Feb 26 23:43:20 2012
@@ -80,10 +80,10 @@ public class TemplateRewriter implements
/** Set to true to block auto-processing of templates */
static final String DISABLE_AUTO_PROCESSING_PARAM = "disableAutoProcessing";
-
+
/** Specifies what template libraries to load */
static final String REQUIRE_LIBRARY_PARAM = "requireLibrary";
-
+
/** Enable client support? **/
static final String CLIENT_SUPPORT_PARAM = "client";
@@ -91,7 +91,7 @@ public class TemplateRewriter implements
private static final String classname = TemplateRewriter.class.getName();
private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
-
+
/**
* Provider of the processor. TemplateRewriters are stateless and multithreaded,
* processors are not.
@@ -105,7 +105,7 @@ public class TemplateRewriter implements
@Inject
public TemplateRewriter(Provider<TemplateProcessor> processor,
- MessageBundleFactory messageBundleFactory, Expressions expressions,
+ MessageBundleFactory messageBundleFactory, Expressions expressions,
TagRegistry baseTagRegistry, TemplateLibraryFactory libraryFactory,
ContainerTagLibraryFactory containerTagLibraryFactory) {
this.processor = processor;
@@ -123,7 +123,7 @@ public class TemplateRewriter implements
if (feature == null && directFeatures.containsKey(OSML_FEATURE_NAME)) {
feature = directFeatures.get(OSML_FEATURE_NAME);
}
-
+
if (feature != null && isServerTemplatingEnabled(feature)) {
try {
rewriteImpl(gadget, feature, content);
@@ -144,17 +144,17 @@ public class TemplateRewriter implements
}
private void rewriteImpl(Gadget gadget, Feature feature, MutableContent content)
- throws GadgetException {
+ throws GadgetException {
List<TagRegistry> registries = Lists.newArrayList();
List<TemplateLibrary> libraries = Lists.newArrayList();
-
+
// TODO: Add View-specific library as Priority 0
-
+
// Built-in Java-based tags - Priority 1
registries.add(baseTagRegistry);
-
+
TemplateLibrary osmlLibrary = containerTagLibraryFactory.getLibrary(gadget.getContext().getContainer());
-
+
// OSML Built-in tags - Priority 2
registries.add(osmlLibrary.getTagRegistry());
libraries.add(osmlLibrary);
@@ -170,20 +170,20 @@ public class TemplateRewriter implements
// User-defined libraries - Priority 4
loadTemplateLibraries(gadget.getContext(), feature, registries, libraries);
}
-
+
TagRegistry registry = new CompositeTagRegistry(registries);
-
- TemplateContext templateContext = new TemplateContext(gadget, content.getPipelinedData());
+
+ TemplateContext templateContext = new TemplateContext(gadget, content.getPipelinedData());
boolean needsFeature = executeTemplates(templateContext, content, templates, registry);
- // Check if a feature param overrides our guess at whether the client-side
- // feature is needed.
- String clientOverride = feature.getParam(CLIENT_SUPPORT_PARAM);
- if ("true".equalsIgnoreCase(clientOverride)) {
- needsFeature = true;
- } else if ("false".equalsIgnoreCase(clientOverride)) {
- needsFeature = false;
- }
+ // Check if a feature param overrides our guess at whether the client-side
+ // feature is needed.
+ String clientOverride = feature.getParam(CLIENT_SUPPORT_PARAM);
+ if ("true".equalsIgnoreCase(clientOverride)) {
+ needsFeature = true;
+ } else if ("false".equalsIgnoreCase(clientOverride)) {
+ needsFeature = false;
+ }
Element head = (Element) DomUtil.getFirstNamedChildNode(
content.getDocument().getDocumentElement(), "head");
@@ -192,9 +192,9 @@ public class TemplateRewriter implements
/**
* Post-processes the gadget content after rendering templates.
- *
+ *
* @param templateContext TemplateContext to operate on
- * @param needsFeature Should the templates feature be made available to
+ * @param needsFeature Should the templates feature be made available to
* client?
* @param head Head element of the gadget's document
* @param libraries Keeps track of all libraries, and which got used
@@ -231,12 +231,12 @@ public class TemplateRewriter implements
private void loadTemplateLibraries(GadgetContext context, Feature feature,
List<TagRegistry> registries, List<TemplateLibrary> libraries) throws GadgetException {
- Collection<String> urls = feature.getParams().get(REQUIRE_LIBRARY_PARAM);
+ Collection<String> urls = feature.getParams().get(REQUIRE_LIBRARY_PARAM);
if (urls != null) {
for (String url : urls) {
Uri uri = Uri.parse(url.trim());
uri = context.getUrl().resolve(uri);
-
+
try {
TemplateLibrary library = libraryFactory.loadTemplateLibrary(context, uri);
registries.add(library.getTagRegistry());
@@ -251,7 +251,7 @@ public class TemplateRewriter implements
}
}
}
-
+
private void injectTemplateLibraryAssets(TemplateResource resource, Element head) {
Element contentElement;
switch (resource.getType()) {
@@ -264,23 +264,23 @@ public class TemplateRewriter implements
contentElement.setAttribute("type", "text/css");
break;
default:
- throw new IllegalStateException("Unhandled type");
+ throw new IllegalStateException("Unhandled type");
}
if (resource.isSafe()) {
SanitizingGadgetRewriter.bypassSanitization(contentElement, false);
}
contentElement.setTextContent(resource.getContent());
- head.appendChild(contentElement);
+ head.appendChild(contentElement);
}
-
+
private void injectTemplateLibrary(TemplateLibrary library, Element head) {
try {
String libraryContent = library.serialize();
if (Strings.isNullOrEmpty(libraryContent)) {
return;
}
-
+
Element scriptElement = head.getOwnerDocument().createElement("script");
scriptElement.setAttribute("type", "text/javascript");
StringBuilder buffer = new StringBuilder();
@@ -288,14 +288,14 @@ public class TemplateRewriter implements
JsonSerializer.appendString(buffer, library.serialize());
buffer.append(',');
JsonSerializer.appendString(buffer, library.getLibraryUri().toString());
- buffer.append(");");
+ buffer.append(");");
scriptElement.setTextContent(buffer.toString());
head.appendChild(scriptElement);
} catch (IOException ioe) {
// This should never happen.
}
}
-
+
/**
* Register templates with a "tag" attribute.
*/
@@ -306,9 +306,9 @@ public class TemplateRewriter implements
if (template.getAttribute("tag").length() == 0) {
continue;
}
-
+
Iterable<String> nameParts = Splitter.on(':').split(template.getAttribute("tag"));
- // At this time, we only support
+ // At this time, we only support
if (Iterables.size(nameParts) != 2) {
continue;
}
@@ -317,10 +317,10 @@ public class TemplateRewriter implements
handlers.add(new TemplateBasedTagHandler(template, namespaceUri, Iterables.get(nameParts, 1)));
}
}
-
+
return new DefaultTagRegistry(handlers.build());
}
-
+
/**
* Processes and renders inline templates.
* @return Do we think the templates feature is still needed on the client?
@@ -343,15 +343,15 @@ public class TemplateRewriter implements
templates.add(element);
}
}
-
+
if (!templates.isEmpty()) {
Gadget gadget = templateContext.getGadget();
-
+
MessageBundle bundle = messageBundleFactory.getBundle(gadget.getSpec(),
- gadget.getContext().getLocale(), gadget.getContext().getIgnoreCache(),
+ gadget.getContext().getLocale(), gadget.getContext().getIgnoreCache(),
gadget.getContext().getContainer(), gadget.getContext().getView());
MessageELResolver messageELResolver = new MessageELResolver(expressions, bundle);
-
+
int autoUpdateID = 0;
for (Element template : templates) {
DocumentFragment result = processor.get().processTemplate(
@@ -360,22 +360,22 @@ public class TemplateRewriter implements
if ("true".equals(template.getAttribute("autoUpdate"))) {
// autoUpdate requires client-side processing.
needsFeature = true;
- Element span = template.getOwnerDocument().createElement("span");
- String id = "template_auto" + (autoUpdateID++);
- span.setAttribute("id", "_T_" + id);
- template.setAttribute("name", id);
- template.getParentNode().insertBefore(span, template);
- span.appendChild(result);
+ Element span = template.getOwnerDocument().createElement("span");
+ String id = "template_auto" + (autoUpdateID++);
+ span.setAttribute("id", "_T_" + id);
+ template.setAttribute("name", id);
+ template.getParentNode().insertBefore(span, template);
+ span.appendChild(result);
} else {
template.getParentNode().insertBefore(result, template);
template.getParentNode().removeChild(template);
}
}
MutableContent.notifyEdit(content.getDocument());
- }
+ }
return needsFeature;
}
-
+
/**
* Checks that all the required data is available at rewriting time.
* @param requiredData A string of comma-separated data set names
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java Sun Feb 26 23:43:20 2012
@@ -333,7 +333,7 @@ public class BasicImageRewriter implemen
} catch (IOException ioe) {
if (LOG.isLoggable(Level.WARNING)) {
LOG.logp(Level.WARNING, classname, "rewrite", MessageKeys.IO_ERROR_REWRITING_IMG, new Object[] {request.toString(),ioe.getMessage()});
- }
+ }
} catch (RuntimeException re) {
// This is safe to recover from and necessary because the ImageIO/Sanselan calls can
// throw a very wide variety of exceptions
@@ -473,7 +473,7 @@ public class BasicImageRewriter implemen
long imageSizeBits = imagePixels * imageInfo.getBitsPerPixel();
return imageSizeBits > config.getMaxInMemoryBytes() * BITS_PER_BYTE;
}
-
+
protected boolean isSupportedImageResult(HttpResponseBuilder response, Uri uri) {
return isSupportedContent(response) || isImageUri(uri);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizer.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizer.java Sun Feb 26 23:43:20 2012
@@ -75,7 +75,7 @@ public class JPEGOptimizer extends BaseO
// Output the image as PNG
PNGOptimizer pngOptimizer = new PNGOptimizer(pngConfig, response);
pngOptimizer.rewriteImpl(image);
-
+
if (pngOptimizer.getRewrittenImage() != null) {
// PNG was better than original so use it
minBytes = pngOptimizer.getRewrittenImage();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java Sun Feb 26 23:43:20 2012
@@ -104,7 +104,7 @@ public class JpegImageUtils {
return;
}
}
-
+
mode = SamplingModes.UNKNOWN;
LOG.log(Level.WARNING, "Unable to read subsampling information for Jpeg Image");
}
@@ -240,7 +240,7 @@ public class JpegImageUtils {
* The structure of the 'SOF' marker is as follows.
* - data precision (1 byte) in bits/sample,
* - image height (2 bytes, little endian),
- * - image width (2 bytes, little endian),
+ * - image width (2 bytes, little endian),
* - number of components (1 byte), usually 1 = grey scaled, 3 = color YCbCr
* or YIQ, 4 = color CMYK)
* - for each component: 3 bytes
@@ -257,7 +257,7 @@ public class JpegImageUtils {
int toBeProcessed = markerLength - 2;
int numComponents = 0;
InputStream is = new ByteArrayInputStream(segmentData);
-
+
// Skip precision(1 Byte), height(2 Bytes), width(2 bytes) bytes.
if (toBeProcessed > 6) {
binaryParser.skipBytes(is, 5, INVALID_JPEG_ERROR_MSG);
@@ -295,7 +295,7 @@ public class JpegImageUtils {
* object. If segmentData has more bytes after parsing first QT, that means DQT segment has
* multiple quantization tables. We allow multiple quant tables to have same tableIndex,
* and the latter one overrides the previous one. we currently parse upto 2 quantization
- * tables.
+ * tables.
* The structure of the DQT (Define Quantization Table) segment.
* - QT information (1 byte): (bit 0 = LSB and bit 7 = MSB)
* bit 3..0: index of QT (3..0, otherwise error)
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Sun Feb 26 23:43:20 2012
@@ -75,7 +75,7 @@ public class ConcatProxyServlet extends
//class name for logging purpose
private static final String classname = ConcatProxyServlet.class.getName();
private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
-
+
private transient RequestPipeline requestPipeline;
private transient ConcatUriManager concatUriManager;
private transient ResponseRewriterRegistry contentRewriterRegistry;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponse.java Sun Feb 26 23:43:20 2012
@@ -40,10 +40,10 @@ import javax.servlet.http.HttpServletRes
* A class for generating and managing ETags for improved caching.
*
* Objects of this class have two modes: batching mode and streaming mode.
- *
+ *
* In batching mode, the response body is stored in a buffer and, at the end,
* its ETag is calculated and everything is written to the output at once.
- *
+ *
* In streaming mode, however, the response body is output as it's received
* from the servlet, and no ETag is calculated.
*/
@@ -90,7 +90,7 @@ public class ETaggingHttpResponse extend
/**
* {@inheritDoc}
- *
+ *
* The response object is also switched to streaming mode.
*/
@Override
@@ -142,7 +142,7 @@ public class ETaggingHttpResponse extend
/**
* Outputs the response body.
- *
+ *
* In batching mode, it outputs the full contents of the buffer with its
* corresponding ETag, or a NOT_MODIFIED response if the ETag matches the
* request's "If-None-Match" header.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java Sun Feb 26 23:43:20 2012
@@ -28,7 +28,7 @@ import org.apache.shindig.gadgets.render
import org.apache.shindig.gadgets.uri.IframeUriManager;
import org.apache.shindig.gadgets.uri.UriStatus;
import org.apache.shindig.gadgets.uri.UriCommon.Param;
-
+
import com.google.common.base.Strings;
import com.google.inject.Inject;
@@ -62,7 +62,7 @@ public class GadgetRenderingServlet exte
checkInitialized();
this.renderer = renderer;
}
-
+
@Inject
public void setIframeUriManager(IframeUriManager iframeUriManager) {
checkInitialized();
@@ -112,7 +112,7 @@ public class GadgetRenderingServlet exte
/**
* Implementations that extend this class are strongly discouraged from overriding this method.
* To customize the behavior please override the hook methods for each of the
- * RenderingResults.Status enum values instead.
+ * RenderingResults.Status enum values instead.
*/
protected void postGadgetRendering(PostGadgetRenderingParams params) throws IOException {
switch (params.getResults().getStatus()) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java Sun Feb 26 23:43:20 2012
@@ -187,7 +187,7 @@ public class GadgetsHandlerApi {
public interface OAuth2Spec {
public Map<String, OAuth2Service> getServices();
}
-
+
public interface OAuthService {
public EndPoint getRequestUrl();
public EndPoint getAccessUrl();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java Sun Feb 26 23:43:20 2012
@@ -228,7 +228,7 @@ public class HttpRequestHandler {
// TODO: Allow the rewriter to use an externally forced mime type. This is needed
// allows proper rewriting of <script src="x"/> where x is returned with
// a content type like text/html which unfortunately happens all too often
-
+
req.setIgnoreCache(httpApiRequest.noCache);
req.setSanitizationRequested(httpApiRequest.sanitize);
@@ -271,14 +271,14 @@ public class HttpRequestHandler {
// Keys in a request item are always Strings
@SuppressWarnings("unchecked")
Set<String> allParameters = requestItem.getTypedRequest(Map.class).keySet();
-
+
Map<String, String> authSettings = Maps.newHashMap();
for (String paramName : allParameters) {
if (!HttpApiRequest.KNOWN_PARAMETERS.contains(paramName)) {
authSettings.put(paramName, requestItem.getParameter(paramName));
}
}
-
+
return authSettings;
}
@@ -316,7 +316,7 @@ public class HttpRequestHandler {
throw new ProtocolException(HttpServletResponse.SC_NOT_ACCEPTABLE, "Response not valid JSON", e);
}
}
-
+
return body;
}
@@ -354,13 +354,13 @@ public class HttpRequestHandler {
/** Authorization type ("none", "signed", "oauth") */
String authz = "none";
-
+
/** Should the request be signed by owner? */
boolean signOwner = true;
-
+
/** Should the request be signed by viewer? */
boolean signViewer = true;
-
+
// The format type to coerce the response into. Supported values are
// "text", "json", and "feed".
String format;
@@ -437,7 +437,7 @@ public class HttpRequestHandler {
public String getAuthz() {
return authz;
}
-
+
public void setAuthz(String authz) {
this.authz = authz;
}
@@ -445,21 +445,21 @@ public class HttpRequestHandler {
public boolean isSignViewer() {
return signViewer;
}
-
+
@JsonProperty("sign_viewer")
public void setSignViewer(boolean signViewer) {
this.signViewer = signViewer;
}
-
+
public boolean isSignOwner() {
return signOwner;
}
-
+
@JsonProperty("sign_owner")
public void setSignOwner(boolean signOwner) {
this.signOwner = signOwner;
}
-
+
public boolean isSummarize() {
return summarize;
}
@@ -483,7 +483,7 @@ public class HttpRequestHandler {
public static class HttpApiResponse {
// Http status code
int status;
-
+
// Returned headers
Map<String, Collection<String>> headers;
@@ -513,7 +513,7 @@ public class HttpRequestHandler {
if (response.getHeaders().containsKey("location")) {
this.headers.put("location", response.getHeaders("location"));
}
-
+
this.content = content;
this.metadata = response.getMetadata();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Sun Feb 26 23:43:20 2012
@@ -65,7 +65,7 @@ public class JsServlet extends InjectedS
checkInitialized();
this.jsRequestBuilder = jsRequestBuilder;
}
-
+
@Inject
public void setCachingSetter(CachingSetter cachingSetter) {
this.cachingSetter = cachingSetter;
@@ -95,10 +95,10 @@ public class JsServlet extends InjectedS
resp.sendError(e.getStatusCode(), e.getMessage());
return;
}
-
+
emitJsResponse(jsResponse, req, resp);
}
-
+
protected void emitJsResponse(JsResponse jsResponse, HttpServletRequest req,
HttpServletResponse resp) throws IOException {
if (jsResponse.getStatusCode() == 200 && jsResponse.toJsString().length() == 0) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java Sun Feb 26 23:43:20 2012
@@ -77,7 +77,7 @@ public class JsonRpcHandler {
// Process all JSON first so that we don't wind up with hanging threads if
// a JSONException is thrown.
gadgets = Lists.newArrayListWithCapacity(requestedGadgets.length());
-
+
for (int i = 0, j = requestedGadgets.length(); i < j; ++i) {
GadgetContext context = new JsonRpcGadgetContext(
requestContext, requestedGadgets.getJSONObject(i));
@@ -123,7 +123,7 @@ public class JsonRpcHandler {
} finally {
numJobs--;
}
- }
+ }
return response;
}
@@ -147,7 +147,7 @@ public class JsonRpcHandler {
throw new RpcException(context, e);
}
}
-
+
protected JSONObject getGadgetJson(Gadget gadget, GadgetSpec spec)
throws JSONException {
JSONObject gadgetJson = new JSONObject();
@@ -174,9 +174,9 @@ public class JsonRpcHandler {
// Features.
Set<String> feats = prefs.getFeatures().keySet();
String[] features = feats.toArray(new String[feats.size()]);
-
+
// Feature details
- // The following renders an object containing feature details, of the form
+ // The following renders an object containing feature details, of the form
// { <featureName>*: { "required": <boolean>, "parameters": { <paramName>*: <string> } } }
JSONObject featureDetailList = new JSONObject();
for (Feature featureSpec : prefs.getFeatures().values()) {
@@ -190,7 +190,7 @@ public class JsonRpcHandler {
}
featureDetailList.put(featureSpec.getName(), featureDetail);
}
-
+
// Links
JSONObject links = new JSONObject();
for (LinkSpec link : prefs.getLinks().values()) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java Sun Feb 26 23:43:20 2012
@@ -39,7 +39,7 @@ import com.google.inject.Inject;
public class MakeRequestServlet extends InjectedServlet {
private static final long serialVersionUID = -8298705081500283786L;
-
+
private transient MakeRequestHandler makeRequestHandler;
@Inject
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKeys.java Sun Feb 26 23:43:20 2012
@@ -31,7 +31,7 @@ import java.util.Set;
final class ModuleCacheKeys implements JobCache.Keys {
final ImmutableList<ModuleCacheKey> keys;
-
+
ModuleCacheKeys(ModuleCacheKey key) {
this.keys = ImmutableList.of(key);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java Sun Feb 26 23:43:20 2012
@@ -51,11 +51,11 @@ import javax.servlet.http.HttpServletRes
public class OAuthCallbackServlet extends InjectedServlet {
private static final long serialVersionUID = 7126255229334669172L;
-
+
public static final String CALLBACK_STATE_PARAM = "cs";
public static final String REAL_DOMAIN_PARAM = "d";
private static final int ONE_HOUR_IN_SECONDS = 3600;
-
+
// This bit of magic passes the entire callback URL into the opening gadget for later use.
// gadgets.io.makeRequest (or osapi.oauth) will then pick up the callback URL to complete the
// oauth dance.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java Sun Feb 26 23:43:20 2012
@@ -175,7 +175,7 @@ public class ProxyHandler {
/**
* Test for presence of flash
- *
+ *
* @param responseContentType
* the Content-Type header from the HttpResponseBuilder
* @param resultsContentType
@@ -192,7 +192,7 @@ public class ProxyHandler {
* rationale behind it is that errors should be thrown only in case of serious grave errors
* (defined to be un recoverable). It should always be preferred to handle errors and return the
* original content at least.
- *
+ *
* @param results
* The result of rewriting.
* @return True if the error is recoverable, false otherwise.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java Sun Feb 26 23:43:20 2012
@@ -40,9 +40,9 @@ import java.util.logging.Logger;
* Handles RPC metadata requests.
*/
public class RpcServlet extends InjectedServlet {
-
+
private static final long serialVersionUID = 1382573217773582182L;
-
+
static final String GET_REQUEST_REQ_PARAM = "req";
static final String GET_REQUEST_CALLBACK_PARAM = "callback";
@@ -77,7 +77,7 @@ public class RpcServlet extends Injected
? callbackValue + '(' + result.getOutput() + ')'
: result.getOutput());
}
-
+
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException {