svn commit: r933347 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java

[li...@apache.org]

Author: lindner
Date: Mon Apr 12 18:18:58 2010
New Revision: 933347

URL: http://svn.apache.org/viewvc?rev=933347&view=rev
Log:
Patch from Ziv Horesh | add ProxyHandler to concat servlet

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java

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=933347&r1=933346&r2=933347&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 Mon Apr 12 18:18:58 2010
@@ -30,6 +30,8 @@ import org.apache.shindig.gadgets.Gadget
 import org.apache.shindig.gadgets.http.HttpRequest;
 import org.apache.shindig.gadgets.http.HttpResponse;
 import org.apache.shindig.gadgets.http.RequestPipeline;
+import org.apache.shindig.gadgets.rewrite.RequestRewriterRegistry;
+import org.apache.shindig.gadgets.rewrite.RewritingException;
 import org.apache.shindig.gadgets.uri.ConcatUriManager;
 import org.apache.shindig.gadgets.uri.UriCommon.Param;
 
@@ -61,6 +63,7 @@ public class ConcatProxyServlet extends 
 
   private RequestPipeline requestPipeline;
   private ConcatUriManager concatUriManager;
+  private RequestRewriterRegistry contentRewriterRegistry;
 
   @Inject
   public void setRequestPipeline(RequestPipeline requestPipeline) {
@@ -72,6 +75,11 @@ public class ConcatProxyServlet extends 
     this.concatUriManager = concatUriManager;
   }
 
+  @Inject
+  public void setContentRewriterRegistry(RequestRewriterRegistry contentRewriterRegistry) {
+    this.contentRewriterRegistry = contentRewriterRegistry;
+  }
+
   @SuppressWarnings("boxing")
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
@@ -126,6 +134,14 @@ public class ConcatProxyServlet extends 
       try {
         HttpRequest httpReq = concatUri.makeHttpRequest(resourceUri);
         HttpResponse httpResp = requestPipeline.execute(httpReq);
+        if (contentRewriterRegistry != null) {
+          try {
+            httpResp = contentRewriterRegistry.rewriteHttpResponse(httpReq, httpResp);
+          } catch (RewritingException e) {
+            throw new GadgetException(GadgetException.Code.INTERNAL_SERVER_ERROR, e,
+                e.getHttpStatusCode());
+          }
+        }
         cos.output(resourceUri, httpResp);
       } catch (GadgetException ge) {
         response.setStatus(HttpResponse.SC_BAD_REQUEST);