svn commit: r1057318 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/features/ test/java/org/apache/shindig/gadgets/parse/ test/java/org/apache/shindig/gadgets/servlet/ test/java/org/apache/shindig/gadgets/uri/

[li...@apache.org]

Author: lindner
Date: Mon Jan 10 19:11:31 2011
New Revision: 1057318

URL: http://svn.apache.org/viewvc?rev=1057318&view=rev
Log:
fix bad references to guice internal classes

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java?rev=1057318&r1=1057317&r2=1057318&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/TestFeatureRegistry.java Mon Jan 10 19:11:31 2011
@@ -24,11 +24,11 @@ import java.util.Map;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.gadgets.GadgetException;
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.inject.internal.Join;
 
 import java.util.List;
 
@@ -61,7 +61,7 @@ public class TestFeatureRegistry extends
     }
     
     public TestFeatureRegistry build() throws GadgetException {
-      return build(Join.join(",", featureFiles));
+      return build(Joiner.on(",").join(featureFiles));
     }
     
     public Builder addFeatureFile(String featureFile) {

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java?rev=1057318&r1=1057317&r2=1057318&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java Mon Jan 10 19:11:31 2011
@@ -17,7 +17,8 @@
  */
 package org.apache.shindig.gadgets.parse;
 
-import com.google.inject.internal.ImmutableList;
+import com.google.common.collect.ImmutableList;
+
 import org.apache.shindig.gadgets.parse.caja.CajaHtmlParser;
 import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
 import org.junit.Before;

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java?rev=1057318&r1=1057317&r2=1057318&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java Mon Jan 10 19:11:31 2011
@@ -22,7 +22,7 @@ import com.google.caja.plugin.PluginComp
 import com.google.caja.plugin.PluginMeta;
 import com.google.caja.reporting.BuildInfo;
 import com.google.caja.reporting.MessageQueue;
-import com.google.inject.internal.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import org.apache.shindig.common.cache.CacheProvider;
 import org.apache.shindig.common.cache.LruCacheProvider;
 import org.apache.shindig.common.uri.Uri;

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java?rev=1057318&r1=1057317&r2=1057318&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java Mon Jan 10 19:11:31 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.shindig.gadgets.uri;
 
-import com.google.inject.internal.ImmutableList;
-import com.google.inject.internal.ImmutableMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.gadgets.http.HttpRequest;
 import org.apache.shindig.gadgets.http.HttpResponse;