Author: johnh
Date: Mon Mar 8 22:22:40 2010
New Revision: 920547
URL: http://svn.apache.org/viewvc?rev=920547&view=rev
Log:
Default bindings for all UriManager classes, with a few EndToEndTest fixes
tossed in. This should clear builds/Hudson.
Added:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java
Modified:
shindig/trunk/config/container.js
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
Modified: shindig/trunk/config/container.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/config/container.js?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
--- shindig/trunk/config/container.js (original)
+++ shindig/trunk/config/container.js Mon Mar 8 22:22:40 2010
@@ -87,6 +87,11 @@
//"gadgets.securityTokenType" : "secure",
//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
+
+// Default concat Uri config; used for testing.
+"gadgets.uri.concat.host" : "localhost:9003",
+"gadgets.uri.concat.path" : "/gadgets/concat",
+
// This config data will be passed down to javascript. Please
// configure your object using the feature name rather than
// the javascript name.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
Mon Mar 8 22:22:40 2010
@@ -26,6 +26,7 @@
import org.apache.shindig.gadgets.rewrite.RewriteModule;
import org.apache.shindig.gadgets.servlet.HttpRequestHandler;
import org.apache.shindig.gadgets.templates.TemplateModule;
+import org.apache.shindig.gadgets.uri.UriModule;
import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
@@ -61,6 +62,7 @@
install(new RenderModule());
install(new RewriteModule());
install(new TemplateModule());
+ install(new UriModule());
// Handlers for /gadgets/rpc
bind(new TypeLiteral<Set<Object>>(){}).annotatedWith(
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ConcatLinkRewriter.java
Mon Mar 8 22:22:40 2010
@@ -80,6 +80,7 @@
if (paramIndex == 1) {
builder = new StringBuilder(concatBase);
+ builder.append("container=").append(container).append("&");
if (debug)
builder.append("debug=1&");
if (ignoreCache)
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
Mon Mar 8 22:22:40 2010
@@ -22,12 +22,10 @@
import org.apache.shindig.gadgets.Gadget;
import com.google.common.collect.Lists;
-import com.google.inject.ImplementedBy;
import java.util.List;
import java.util.Map;
-...@implementedby(DefaultConcatUriManager.class)
public interface ConcatUriManager {
public enum Type {
JS("text/javascript", "src", "js", "script"), // JavaScript
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
Mon Mar 8 22:22:40 2010
@@ -21,6 +21,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
+import com.google.inject.internal.Nullable;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.shindig.common.uri.Uri;
@@ -46,7 +47,7 @@
private final Versioner versioner;
@Inject
- public DefaultConcatUriManager(ContainerConfig config, Versioner versioner) {
+ public DefaultConcatUriManager(ContainerConfig config, @Nullable Versioner
versioner) {
this.config = config;
this.versioner = versioner;
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
Mon Mar 8 22:22:40 2010
@@ -21,6 +21,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
+import com.google.inject.internal.Nullable;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.config.ContainerConfig;
@@ -68,7 +69,7 @@
@Inject
public DefaultProxyUriManager(ContainerConfig config,
- Versioner versioner) {
+ @Nullable Versioner versioner) {
this.config = config;
this.versioner = versioner;
}
Added:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java?rev=920547&view=auto
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java
(added)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java
Mon Mar 8 22:22:40 2010
@@ -0,0 +1,48 @@
+/*
+ * 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.uri;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.util.Providers;
+
+/**
+ * Provides default configuration and bindings for Uri classes.
+ */
+public class UriModule extends AbstractModule {
+
+ @Override
+ protected void configure() {
+ bind(IframeUriManager.class).to(DefaultIframeUriManager.class);
+ bind(IframeUriManager.Versioner.class).to(AllJsIframeVersioner.class);
+
+ bind(JsUriManager.class).to(DefaultJsUriManager.class);
+ bind(JsUriManager.Versioner.class).to(DefaultJsVersioner.class);
+
+ bind(OAuthUriManager.class).to(DefaultOAuthUriManager.class);
+
+ bind(ProxyUriManager.class).to(DefaultProxyUriManager.class);
+ bind(ProxyUriManager.Versioner.class)
+ .toProvider(Providers.<ProxyUriManager.Versioner>of(null));
+
+ bind(ConcatUriManager.class).to(DefaultConcatUriManager.class);
+ bind(ConcatUriManager.Versioner.class)
+ .toProvider(Providers.<ConcatUriManager.Versioner>of(null));
+ }
+
+}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java
Mon Mar 8 22:22:40 2010
@@ -34,9 +34,6 @@
import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature;
import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
import org.apache.shindig.gadgets.rewrite.MutableContent;
-import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature.Config;
-import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature.DefaultConfig;
-import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature.Factory;
import org.apache.shindig.gadgets.rewrite.old.ContentRewriterUris;
import
org.apache.shindig.gadgets.rewrite.old.DefaultProxyingLinkRewriterFactory;
import org.apache.shindig.gadgets.rewrite.old.LinkRewriter;
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java
Mon Mar 8 22:22:40 2010
@@ -73,7 +73,7 @@
public void testScriptsBasic() throws Exception {
String content = IOUtils.toString(this.getClass().getClassLoader().
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritescriptbasic.html"));
- Document doc = rewriteContent(rewriter, content, null).getDocument();
+ Document doc = rewriteContent(rewriter, content, "default").getDocument();
XPathWrapper wrapper = new XPathWrapper(doc);
@@ -93,7 +93,7 @@
assertEquals(wrapper.getValue("/html/body/script[" + (scriptIx++) +
"]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&refresh=3600" +
+ "&fp=1150739864&container=default&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F1.js" +
"&2=http%3A%2F%2Fwww.example.org%2F2.js");
@@ -104,7 +104,7 @@
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript" +
"&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml" +
- "&fp=1150739864&refresh=3600" +
+ "&fp=1150739864&container=default&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F3.js");
// Fifth script should contain a retained comment
@@ -115,7 +115,7 @@
assertEquals(wrapper.getValue("/html/body/script[" + (scriptIx++) +
"]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&refresh=3600" +
+ "&fp=1150739864&container=default&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F4.js");
// Excluded URL is untouched
@@ -125,7 +125,7 @@
assertEquals(wrapper.getValue("/html/body/script[" + (scriptIx++) +
"]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&refresh=3600" +
+ "&fp=1150739864&container=default&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F6.js" +
"&2=http%3A%2F%2Fwww.example.org%2F10.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+
"&3=http%3A%2F%2Fwww.example.org%2F11.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+
@@ -142,7 +142,7 @@
assertEquals(wrapper.getValue("/html/body/script[" + (scriptIx++) +
"]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&refresh=3600" +
+ "&fp=1150739864&container=default&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F20.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+
"&2=http%3A%2F%2Fwww.example.org%2F21.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+
"&3=http%3A%2F%2Fwww.example.org%2F22.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+
@@ -156,7 +156,7 @@
assertEquals(wrapper.getValue("/html/body/script[" + (scriptIx++) +
"]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&refresh=3600" +
+ "&fp=1150739864&container=default&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F24.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+
"&2=http%3A%2F%2Fwww.example.org%2F25.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
}
@@ -165,7 +165,7 @@
public void testScriptsBasicNoCache() throws Exception {
String content = IOUtils.toString(this.getClass().getClassLoader().
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritescriptbasic.html"));
- Document doc = rewriteContent(rewriter, content, null, false,
true).getDocument();
+ Document doc = rewriteContent(rewriter, content, "default", false,
true).getDocument();
XPathWrapper wrapper = new XPathWrapper(doc);
@@ -174,7 +174,7 @@
assertEquals(wrapper.getValue("/html/body/script[3]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&nocache=1&refresh=3600" +
+ "&fp=1150739864&container=default&nocache=1&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F1.js" +
"&2=http%3A%2F%2Fwww.example.org%2F2.js");
@@ -183,7 +183,7 @@
assertEquals(wrapper.getValue("/html/body/script[12]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&nocache=1&refresh=3600" +
+ "&fp=1150739864&container=default&nocache=1&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F24.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+
"&2=http%3A%2F%2Fwww.example.org%2F25.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
}
@@ -192,7 +192,7 @@
public void testScriptsBasicNoCacheAndDebug() throws Exception {
String content = IOUtils.toString(this.getClass().getClassLoader().
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritescriptbasic.html"));
- Document doc = rewriteContent(rewriter, content, null, true,
true).getDocument();
+ Document doc = rewriteContent(rewriter, content, "default", true,
true).getDocument();
XPathWrapper wrapper = new XPathWrapper(doc);
@@ -201,7 +201,7 @@
assertEquals(wrapper.getValue("/html/body/script[3]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&debug=1&nocache=1&refresh=3600" +
+ "&fp=1150739864&container=default&debug=1&nocache=1&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F1.js" +
"&2=http%3A%2F%2Fwww.example.org%2F2.js");
@@ -210,7 +210,7 @@
assertEquals(wrapper.getValue("/html/body/script[12]/@src"),
"http://www.test.com/dir/concat?"; +
"rewriteMime=text/javascript&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml"
+
- "&fp=1150739864&debug=1&nocache=1&refresh=3600" +
+ "&fp=1150739864&container=default&debug=1&nocache=1&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2F24.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+
"&2=http%3A%2F%2Fwww.example.org%2F25.js%260123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
}
@@ -347,7 +347,7 @@
public void testStyleBasic() throws Exception {
String content = IOUtils.toString(this.getClass().getClassLoader().
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritestylebasic.html"));
- MutableContent mc = rewriteContent(rewriter, content, null);
+ MutableContent mc = rewriteContent(rewriter, content, "default");
Document doc = mc.getDocument();
XPathWrapper wrapper = new XPathWrapper(doc);
@@ -356,7 +356,8 @@
// Note that relative URLs are fully resolved
assertEquals(wrapper.getValue("//link[1]/@href"),
"http://www.test.com/dir/concat?"; +
-
"rewriteMime=text/css&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=1150739864&refresh=3600"
+
+
"rewriteMime=text/css&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=1150739864"
+
+ "&container=default&refresh=3600" +
"&1=http%3A%2F%2Fwww.example.org%2Flinkedstyle1.css" +
"&2=http%3A%2F%2Fwww.example.org%2Flinkedstyle3.css" +
"&3=http%3A%2F%2Fwww.example.org%2Fimportedstyle1.css" +
Modified:
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=920547&r1=920546&r2=920547&view=diff
==============================================================================
---
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
(original)
+++
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
Mon Mar 8 22:22:40 2010
@@ -45,7 +45,6 @@
import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
