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/07/08 04:10:56 UTC
svn commit: r961556 - in
/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets:
rewrite/AccelResponseRewriterRegistry.java rewrite/RewriteModule.java
servlet/AccelHandler.java
Author: johnh
Date: Thu Jul 8 02:10:55 2010
New Revision: 961556
URL: http://svn.apache.org/viewvc?rev=961556&view=rev
Log:
Adds separate injection for response rewriters of accel content.
Added:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AccelResponseRewriterRegistry.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java
Added: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AccelResponseRewriterRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AccelResponseRewriterRegistry.java?rev=961556&view=auto
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AccelResponseRewriterRegistry.java (added)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AccelResponseRewriterRegistry.java Thu Jul 8 02:10:55 2010
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.gadgets.rewrite;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
+
+import java.util.List;
+
+/**
+ * Response rewriter registry for accel servlet. Encapsulates response rewriters
+ * that should be applied for Accel servlet.
+ */
+public class AccelResponseRewriterRegistry extends DefaultResponseRewriterRegistry {
+ @Inject
+ public AccelResponseRewriterRegistry(@Named("shindig.accelerate.response.rewriters")
+ List<ResponseRewriter> rewriters,
+ GadgetHtmlParser htmlParser) {
+ super(rewriters, htmlParser);
+ }
+}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java?rev=961556&r1=961555&r2=961556&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java Thu Jul 8 02:10:55 2010
@@ -19,12 +19,11 @@
package org.apache.shindig.gadgets.rewrite;
import com.google.common.collect.ImmutableList;
-
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
-
+import com.google.inject.name.Names;
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.render.OpenSocialI18NGadgetRewriter;
import org.apache.shindig.gadgets.render.RenderingGadgetRewriter;
@@ -44,6 +43,9 @@ public class RewriteModule extends Abstr
@Override
protected void configure() {
+ bind(ResponseRewriterRegistry.class)
+ .annotatedWith(Names.named("shindig.accelerate.response.rewriter.registry"))
+ .to(AccelResponseRewriterRegistry.class);
}
@Provides
@@ -98,4 +100,12 @@ public class RewriteModule extends Abstr
SanitizingRequestRewriter sanitizedRewriter) {
return ImmutableList.of(optimizingRewriter, cssRewriter, sanitizedRewriter);
}
+
+ @Provides
+ @Singleton
+ @Named("shindig.accelerate.response.rewriters")
+ protected List<ResponseRewriter> provideAccelResponseRewriters(
+ ProxyingContentRewriter proxyingContentRewriter) {
+ return ImmutableList.of((ResponseRewriter) proxyingContentRewriter);
+ }
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java?rev=961556&r1=961555&r2=961556&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java Thu Jul 8 02:10:55 2010
@@ -19,7 +19,7 @@ package org.apache.shindig.gadgets.servl
import com.google.inject.Inject;
import com.google.inject.Singleton;
-
+import com.google.inject.name.Named;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
@@ -37,11 +37,10 @@ import org.apache.shindig.gadgets.uri.Pr
import org.apache.shindig.gadgets.uri.UriCommon;
import org.apache.shindig.gadgets.uri.UriUtils;
-import java.io.IOException;
-import java.util.logging.Logger;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.logging.Logger;
/**
* Handles requests for accel servlet.
@@ -63,6 +62,7 @@ public class AccelHandler extends ProxyB
@Inject
public AccelHandler(RequestPipeline requestPipeline,
+ @Named("shindig.accelerate.response.rewriter.registry")
ResponseRewriterRegistry contentRewriterRegistry,
AccelUriManager accelUriManager) {
this.requestPipeline = requestPipeline;