You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/07/22 03:17:28 UTC
svn commit: r1149429 [2/2] - in /incubator/rave/trunk:
rave-portal/src/main/java/org/apache/rave/portal/repository/impl/
rave-portal/src/main/java/org/apache/rave/portal/service/
rave-portal/src/main/java/org/apache/rave/portal/service/impl/ rave-porta...
Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/OpenJPAEntityManagerProvider.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/OpenJPAEntityManagerProvider.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/OpenJPAEntityManagerProvider.java (original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/OpenJPAEntityManagerProvider.java Fri Jul 22 01:17:21 2011
@@ -19,7 +19,6 @@ package org.apache.shindig.social.openso
import com.google.inject.Inject;
import com.google.inject.Provider;
-import com.google.inject.name.Named;
import javax.persistence.EntityManager;
Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java (original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java Fri Jul 22 01:17:21 2011
@@ -18,8 +18,6 @@
package org.apache.shindig.social.opensocial.jpa.spi;
import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-
import org.apache.rave.os.DatabasePopulateContextListener;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
@@ -34,16 +32,15 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.UserId;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.servlet.http.HttpServletResponse;
-
/**
* The Class ActivityServiceDb.
*/
Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java (original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java Fri Jul 22 01:17:21 2011
@@ -19,8 +19,6 @@ package org.apache.shindig.social.openso
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-
import org.apache.rave.os.DatabasePopulateContextListener;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
@@ -31,14 +29,13 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.UserId;
+import javax.persistence.EntityManager;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Future;
-import javax.persistence.EntityManager;
-
/**
*
*/
Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java (original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java Fri Jul 22 01:17:21 2011
@@ -17,31 +17,16 @@
*/
package org.apache.shindig.social.opensocial.jpa.spi;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-
-import org.apache.commons.io.IOUtils;
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+import com.google.inject.name.Names;
import org.apache.rave.os.JPAOpenSocialService;
import org.apache.shindig.social.opensocial.jpa.openjpa.OpenJPAEntityManagerProvider;
import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
-import org.apache.shindig.social.opensocial.spi.ActivityService;
-import org.apache.shindig.social.opensocial.spi.ActivityStreamService;
-import org.apache.shindig.social.opensocial.spi.AlbumService;
-import org.apache.shindig.social.opensocial.spi.AppDataService;
-import org.apache.shindig.social.opensocial.spi.MediaItemService;
-import org.apache.shindig.social.opensocial.spi.MessageService;
-import org.apache.shindig.social.opensocial.spi.PersonService;
+import org.apache.shindig.social.opensocial.spi.*;
import org.apache.shindig.social.sample.oauth.SampleOAuthDataStore;
-import com.google.inject.AbstractModule;
-import com.google.inject.CreationException;
-import com.google.inject.Scopes;
-import com.google.inject.name.Names;
-import com.google.inject.spi.Message;
+import javax.persistence.EntityManager;
/**
*
Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java (original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java Fri Jul 22 01:17:21 2011
@@ -20,11 +20,10 @@ package org.apache.shindig.social.openso
import org.apache.shindig.protocol.ProtocolException;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
-import java.util.List;
-
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
*
Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java (original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java Fri Jul 22 01:17:21 2011
@@ -17,14 +17,6 @@
*/
package org.apache.shindig.social.opensocial.jpa.spi;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Future;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.servlet.http.HttpServletResponse;
-
import com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
import org.apache.rave.os.DatabasePopulateContextListener;
@@ -44,6 +36,13 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.UserId;
import org.json.JSONObject;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Future;
+
/**
* Implements the PersonService from the SPI binding to the JPA model and providing queries to
* support the OpenSocial implementation.
Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java (original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java Fri Jul 22 01:17:21 2011
@@ -19,7 +19,6 @@ package org.apache.shindig.social.openso
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.social.opensocial.spi.UserId;
Modified: incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/gadgets/oauth/OAuthStoreDbTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/gadgets/oauth/OAuthStoreDbTest.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/gadgets/oauth/OAuthStoreDbTest.java (original)
+++ incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/gadgets/oauth/OAuthStoreDbTest.java Fri Jul 22 01:17:21 2011
@@ -19,9 +19,6 @@
package org.apache.shindig.gadgets.oauth;
-import java.io.IOException;
-import java.util.Date;
-
import net.oauth.OAuth;
import net.oauth.OAuthServiceProvider;
import org.apache.shindig.auth.SecurityToken;
@@ -33,10 +30,10 @@ import org.apache.shindig.social.core.oa
import org.junit.Before;
import org.junit.Test;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import java.io.IOException;
+import java.util.Date;
+
+import static org.easymock.EasyMock.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
Modified: incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/gadgets/oauth/service/impl/TokenInfoServiceDbImplTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/gadgets/oauth/service/impl/TokenInfoServiceDbImplTest.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/gadgets/oauth/service/impl/TokenInfoServiceDbImplTest.java (original)
+++ incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/gadgets/oauth/service/impl/TokenInfoServiceDbImplTest.java Fri Jul 22 01:17:21 2011
@@ -19,8 +19,6 @@
package org.apache.shindig.gadgets.oauth.service.impl;
-import java.util.Date;
-
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.apache.shindig.auth.SecurityToken;
@@ -32,6 +30,8 @@ import org.apache.shindig.social.opensoc
import org.junit.Before;
import org.junit.Test;
+import java.util.Date;
+
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull;
Modified: incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java?rev=1149429&r1=1149428&r2=1149429&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java (original)
+++ incubator/rave/trunk/rave-shindig/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java Fri Jul 22 01:17:21 2011
@@ -19,12 +19,6 @@
package org.apache.shindig.social.opensocial.jpa.spi;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.Future;
-
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.apache.rave.os.model.RaveNameImpl;
@@ -38,25 +32,21 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.jpa.api.FilterCapability;
import org.apache.shindig.social.opensocial.jpa.api.FilterSpecification;
import org.apache.shindig.social.opensocial.jpa.openjpa.OpenJPADbModule;
-import org.apache.shindig.social.opensocial.model.Drinker;
-import org.apache.shindig.social.opensocial.model.Name;
-import org.apache.shindig.social.opensocial.model.NetworkPresence;
-import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.Smoker;
+import org.apache.shindig.social.opensocial.model.*;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.PersonService;
import org.apache.shindig.social.opensocial.spi.UserId;
import org.junit.Before;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Future;
+
+import static junit.framework.Assert.*;
+import static org.easymock.EasyMock.*;
/**
* Test for {@link PersonServiceDb}