LGTM
http://codereview.appspot.com/427041/diff/1/3 File java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java (right): http://codereview.appspot.com/427041/diff/1/3#newcode185 java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java:185: int endIx = fullProxyUri.indexOf(endToken, startIx + startToken.length()); Maybe put some explanation/example here I will test you about this logic in a month ;-) http://codereview.appspot.com/427041/show