/*
 * 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 org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.rewrite.DomWalker;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor;
import org.apache.shindig.gadgets.uri.ProxyUriManager;

import java.util.Arrays;
import java.util.List;

public class ProxyingContentRewriter extends DomWalker.Rewriter {
  private final ContentRewriterFeature.Factory featureConfigFactory;
  private final ProxyUriManager proxyUriManager;
  
  @Inject
  public ProxyingContentRewriter(ContentRewriterFeature.Factory featureConfigFactory,
      ProxyUriManager proxyUriManager) {
    this.featureConfigFactory = featureConfigFactory;
    this.proxyUriManager = proxyUriManager;
  }
  
  @Override
  protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
    ContentRewriterFeature.Config config = featureConfigFactory.get(gadgetUri);
    return Arrays.<Visitor>asList(new ProxyingVisitor(config, proxyUriManager));
  }
}

@@ -1015,16 +1015,24 @@
 omWalker
+.Visitor
 ;%0Aimport
@@ -1063,32 +1063,27 @@
 ets.
-rewrite.DomWalker.Visito
+uri.ConcatUriManage
 r;%0Ai
@@ -1370,16 +1370,67 @@
 anager;%0A
+  private final ConcatUriManager concatUriManager;%0A
   %0A  @In
@@ -1557,16 +1557,51 @@
 iManager
+, ConcatUriManager concatUriManager
 ) %7B%0A    
@@ -1694,16 +1694,62 @@
 anager;%0A
+    this.concatUriManager = concatUriManager;%0A
   %7D%0A  %0A 
@@ -1919,38 +1919,335 @@
     
-return Arrays.%3CVisitor%3EasList(
+// Note that concat is including with proxy in order to prevent %0A    // proxying the rewritten concat url%0A    // Basically Url rewritters should all be in one dom walker.%0A    return Arrays.%3CVisitor%3EasList(%0A        new ConcatVisitor.Js(config, concatUriManager),%0A        new ConcatVisitor.Css(config, concatUriManager),%0A        
 new 

Add concat rewriters to ProxyingContentRewriter. Concat takes precedence; "simple" proxying second.