You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/06/30 01:59:31 UTC
svn commit: r959147 - in /shindig/trunk: ./ java/gadgets/
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/
java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/
java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ java/...
Author: lindner
Date: Tue Jun 29 23:59:30 2010
New Revision: 959147
URL: http://svn.apache.org/viewvc?rev=959147&view=rev
Log:
add jsr305.jar for javax.annotations, remove json-simple (not used), and clean up usage of internal/incorrect classes
Modified:
shindig/trunk/java/gadgets/pom.xml
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.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/features/FeatureRegistryTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java
shindig/trunk/java/samples/pom.xml
shindig/trunk/java/social-api/pom.xml
shindig/trunk/pom.xml
Modified: shindig/trunk/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/pom.xml?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/pom.xml (original)
+++ shindig/trunk/java/gadgets/pom.xml Tue Jun 29 23:59:30 2010
@@ -160,10 +160,6 @@
<artifactId>htmlparser</artifactId>
</dependency>
<dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- </dependency>
- <dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
</dependency>
@@ -176,6 +172,10 @@
<artifactId>oauth-provider</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</dependency>
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java Tue Jun 29 23:59:30 2010
@@ -17,11 +17,10 @@
*/
package org.apache.shindig.gadgets.http;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import com.google.inject.internal.Nullable;
-import com.google.inject.internal.Preconditions;
import com.google.inject.name.Named;
import org.apache.commons.lang.StringUtils;
@@ -84,6 +83,7 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
+import javax.annotation.Nullable;
import javax.servlet.http.HttpServletResponse;
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java Tue Jun 29 23:59:30 2010
@@ -20,7 +20,7 @@ package org.apache.shindig.gadgets.http;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
-import com.google.inject.internal.Nullable;
+import javax.annotation.Nullable;
import com.google.inject.name.Named;
import org.apache.shindig.common.util.Utf8UrlCoder;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java Tue Jun 29 23:59:30 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.parse.nekohtml;
+import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.GadgetException;
@@ -37,7 +38,6 @@ import org.apache.xerces.xni.parser.XMLI
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import com.google.inject.internal.ImmutableMap;
import org.cyberneko.html.HTMLConfiguration;
import org.cyberneko.html.HTMLElements;
import org.cyberneko.html.HTMLEntities;
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=959147&r1=959146&r2=959147&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 Tue Jun 29 23:59:30 2010
@@ -21,7 +21,6 @@ package org.apache.shindig.gadgets.uri;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
-import com.google.inject.internal.Nullable;
import com.google.inject.name.Named;
import org.apache.commons.lang.StringEscapeUtils;
@@ -30,6 +29,7 @@ import org.apache.shindig.common.uri.Uri
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.uri.UriCommon.Param;
+import javax.annotation.Nullable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
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=959147&r1=959146&r2=959147&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 Tue Jun 29 23:59:30 2010
@@ -21,7 +21,6 @@ package org.apache.shindig.gadgets.uri;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
-import com.google.inject.internal.Nullable;
import com.google.inject.name.Named;
import org.apache.commons.lang.StringUtils;
@@ -32,6 +31,7 @@ import org.apache.shindig.gadgets.Gadget
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.uri.UriCommon.Param;
+import javax.annotation.Nullable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java Tue Jun 29 23:59:30 2010
@@ -18,9 +18,9 @@
package org.apache.shindig.gadgets.features;
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.ImmutableMap;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java Tue Jun 29 23:59:30 2010
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;
-import com.google.inject.internal.ImmutableSet;
+import com.google.common.collect.ImmutableSet;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java Tue Jun 29 23:59:30 2010
@@ -27,8 +27,7 @@ import static org.easymock.EasyMock.repl
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import com.google.inject.internal.ImmutableList;
-
+import com.google.common.collect.ImmutableList;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.common.uri.Uri;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java Tue Jun 29 23:59:30 2010
@@ -20,13 +20,13 @@ package org.apache.shindig.gadgets.uri;
import java.util.List;
+import com.google.common.collect.ImmutableList;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.uri.UriCommon.Param;
import com.google.common.collect.Lists;
-import com.google.inject.internal.ImmutableList;
public class PassthruManager implements ProxyUriManager {
private UriStatus expectStatus = UriStatus.VALID_VERSIONED;
Modified: shindig/trunk/java/samples/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/pom.xml?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/samples/pom.xml (original)
+++ shindig/trunk/java/samples/pom.xml Tue Jun 29 23:59:30 2010
@@ -127,10 +127,6 @@
<groupId>commons-io</groupId>
</dependency>
<dependency>
- <groupId>findbugs</groupId>
- <artifactId>annotations</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</dependency>
Modified: shindig/trunk/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/pom.xml?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/java/social-api/pom.xml (original)
+++ shindig/trunk/java/social-api/pom.xml Tue Jun 29 23:59:30 2010
@@ -125,10 +125,6 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>findbugs</groupId>
- <artifactId>annotations</artifactId>
- </dependency>
- <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=959147&r1=959146&r2=959147&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Tue Jun 29 23:59:30 2010
@@ -1364,6 +1364,13 @@
</dependency>
<!-- external dependencies -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>1.3.9</version>
+ <!-- cannot be provided scope, guice uses @Nullable at runtime -->
+ </dependency>
+
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
@@ -1415,11 +1422,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
<version>20100527</version>
@@ -1516,12 +1518,6 @@
<version>1.6.2</version>
</dependency>
<dependency>
- <groupId>findbugs</groupId>
- <artifactId>annotations</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.3.1</version>