Author: etnu
Date: Mon May 12 16:52:06 2008
New Revision: 655698
URL: http://svn.apache.org/viewvc?rev=655698&view=rev
Log:
Final patch to migrate common code from "gadgets" to "common" artifact. This
patch moves the actual source from java/gadgets to java/common. Moved
ContentFetcher bindings back into gadgets since they are not a common
dependency any longer, and removed unnecessary dependency on
gadgets.http.HttpGuiceModule from social-api test cases.
All common code from this point forward belongs in common. The "gadgets"
artifact should never depend on "social-api", and "social-api" should never
depend on "gadgets".
Added:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityToken.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityToken.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
- copied, changed from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityToken.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityToken.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenException.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenException.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypter.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/crypto/BlobCrypter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobCrypterException.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/crypto/BlobCrypterException.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BlobExpiredException.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/crypto/BlobExpiredException.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/crypto/Crypto.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/Base32.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/util/Base32.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/Check.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/util/Check.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/util/HashUtil.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/InputStreamConsumer.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/util/InputStreamConsumer.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/util/StringEncoding.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/util/TimeSource.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlException.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/xml/XmlException.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
incubator/shindig/trunk/java/common/src/test/java/
incubator/shindig/trunk/java/common/src/test/java/org/
incubator/shindig/trunk/java/common/src/test/java/org/apache/
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
- copied, changed from r655689,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CheckTest.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/util/CheckTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/StringEncodingTest.java
- copied unchanged from r655689,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/util/StringEncodingTest.java
Removed:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityToken.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityToken.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenException.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/crypto/
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/servlet/
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/util/
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/xml/
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/crypto/
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/util/
Modified:
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=655698&r1=655697&r2=655698&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Mon May 12 16:52:06 2008
@@ -49,5 +49,9 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ </dependency>
</dependencies>
</project>
Copied:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
(from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/CommonGuiceModule.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/CommonGuiceModule.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java&r1=655689&r2=655698&rev=655698&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
Mon May 12 16:52:06 2008
@@ -17,11 +17,6 @@
*/
package org.apache.shindig.common;
-import org.apache.shindig.gadgets.BasicContentCache;
-import org.apache.shindig.gadgets.BasicRemoteContentFetcher;
-import org.apache.shindig.gadgets.ContentCache;
-import org.apache.shindig.gadgets.ContentFetcher;
-
import com.google.inject.AbstractModule;
/**
@@ -32,11 +27,6 @@
/** [EMAIL PROTECTED] */
@Override
protected void configure() {
- // TODO: These classes should be moved into the common package.
- // Once that happens then this common guice module can also move to
- // java/common.
- bind(ContentFetcher.class).to(BasicRemoteContentFetcher.class);
bind(SecurityTokenDecoder.class).to(BasicSecurityTokenDecoder.class);
- bind(ContentCache.class).to(BasicContentCache.class);
}
}
Copied:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
(from r655689,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java?p2=incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java&r1=655689&r2=655698&rev=655698&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/BlobCrypterTest.java
Mon May 12 16:52:06 2008
@@ -42,13 +42,13 @@
private BasicBlobCrypter crypter;
private FakeTimeSource timeSource;
-
+
public BlobCrypterTest() {
crypter = new BasicBlobCrypter("0123456789abcdef".getBytes());
timeSource = new FakeTimeSource();
crypter.timeSource = timeSource;
}
-
+
@Test
public void testEncryptAndDecrypt() throws Exception {
checkString("");
@@ -69,7 +69,7 @@
Map<String, String> out = crypter.unwrap(blob, 0);
assertEquals(string, out.get("a"));
}
-
+
@Test
public void testManyEntries() throws Exception {
Map<String, String> in = new HashMap<String, String>();
@@ -82,7 +82,7 @@
assertEquals(out.get(Integer.toString(i)), Integer.toString(i));
}
}
-
+
@Test
public void testTimeStamping() throws Exception {
long start = 1201917724000L;
@@ -90,7 +90,7 @@
int maxAge = 300; // 5 minutes
int realAge = 600; // 10 minutes
try {
-
+
timeSource.setCurrentTimeMillis(start);
Map<String, String> in = new HashMap<String, String>();
in.put("a", "b");
@@ -104,7 +104,7 @@
assertEquals(start+skew+maxAge*1000, e.maxDate.getTime());
}
}
-
+
@Test
public void testTamperIV() throws Exception {
try {
@@ -120,7 +120,7 @@
// Good
}
}
-
+
@Test
public void testTamperData() throws Exception {
try {
@@ -136,7 +136,7 @@
// Good
}
}
-
+
@Test
public void testTamperMac() throws Exception {
try {
@@ -152,7 +152,7 @@
// Good
}
}
-
+
@Test
public void testFixedKey() throws Exception {
BlobCrypter alt = new BasicBlobCrypter("0123456789abcdef".getBytes());
@@ -162,7 +162,7 @@
Map<String, String> out = alt.unwrap(blob, 30);
assertEquals("b", out.get("a"));
}
-
+
@Test
public void testBadKey() throws Exception {
BlobCrypter alt = new BasicBlobCrypter("1123456789abcdef".getBytes());
@@ -176,7 +176,7 @@
// Good.
}
}
-
+
@Test
public void testShortKeyFails() throws Exception {
try {
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=655698&r1=655697&r2=655698&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Mon May 12 16:52:06 2008
@@ -214,10 +214,6 @@
<artifactId>json</artifactId>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- </dependency>
- <dependency>
<groupId>caja</groupId>
<artifactId>caja</artifactId>
<scope>compile</scope>
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=655698&r1=655697&r2=655698&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
Mon May 12 16:52:06 2008
@@ -46,6 +46,9 @@
protected void configure() {
Names.bindProperties(this.binder(), properties);
+ bind(ContentFetcher.class).to(BasicRemoteContentFetcher.class);
+ bind(ContentCache.class).to(BasicContentCache.class);
+
bind(RemoteContentFetcherFactory.class);
bind(SigningFetcherFactory.class);
// Needed becuase OAuth fetcher factory fetches its config
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=655698&r1=655697&r2=655698&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Mon May 12 16:52:06 2008
@@ -53,10 +53,6 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.shindig</groupId>
- <artifactId>shindig-gadgets</artifactId>
- </dependency>
<!-- external depenencies -->
<dependency>
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java?rev=655698&r1=655697&r2=655698&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java
Mon May 12 16:52:06 2008
@@ -38,7 +38,6 @@
"org.apache.shindig.social.abdera.SocialApiProvider";
public static final String GUICE_MODULES =
"org.apache.shindig.common.CommonGuiceModule:" +
- "org.apache.shindig.gadgets.http.HttpGuiceModule:" +
"org.apache.shindig.social.SocialApiGuiceModule";
private final int port;
