Author: ieb
Date: Mon Jan 19 16:10:08 2009
New Revision: 735882
URL: http://svn.apache.org/viewvc?rev=735882&view=rev
Log:
SHINDIG-875
Fixed the build for samples.
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml?rev=735882&r1=735881&r2=735882&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/pom.xml Mon Jan 19
16:10:08 2009
@@ -134,5 +134,9 @@
<artifactId>hsqldb</artifactId>
<version>1.8.0.1</version>
</dependency>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java?rev=735882&r1=735881&r2=735882&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java
Mon Jan 19 16:10:08 2009
@@ -17,12 +17,21 @@
*/
package org.apache.shindig.social.opensocial.jpa;
+import static javax.persistence.CascadeType.ALL;
import static javax.persistence.GenerationType.IDENTITY;
+import com.google.common.collect.Lists;
+
import org.apache.shindig.social.opensocial.jpa.api.DbObject;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.MediaItem;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -41,14 +50,6 @@
import javax.persistence.Transient;
import javax.persistence.Version;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import static javax.persistence.CascadeType.ALL;
-
/**
* Activity model object stored in the "activity" table.
*/
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java?rev=735882&r1=735881&r2=735882&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java
Mon Jan 19 16:10:08 2009
@@ -19,8 +19,13 @@
import static javax.persistence.GenerationType.IDENTITY;
+import com.google.common.collect.Lists;
+
import org.apache.shindig.social.opensocial.jpa.api.DbObject;
-import org.apache.shindig.social.opensocial.model.Person;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.persistence.Basic;
import javax.persistence.Column;
@@ -36,11 +41,6 @@
import javax.persistence.Table;
import javax.persistence.Version;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
* An application data map is the map of data for a single key within an
application.
*/
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java?rev=735882&r1=735881&r2=735882&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
Mon Jan 19 16:10:08 2009
@@ -18,7 +18,7 @@
package org.apache.shindig.social.opensocial.jpa.hibernate;
-import com.google.collect.common.Maps;
+import com.google.common.collect.Maps;
import java.util.HashMap;
import java.util.Map;
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java?rev=735882&r1=735881&r2=735882&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
Mon Jan 19 16:10:08 2009
@@ -17,7 +17,9 @@
*/
package org.apache.shindig.social.opensocial.jpa.spi;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.inject.Inject;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
@@ -28,17 +30,14 @@
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
-import com.google.inject.Inject;
-
-import javax.persistence.EntityManager;
-
-import java.util.ArrayList;
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/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java?rev=735882&r1=735881&r2=735882&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
Mon Jan 19 16:10:08 2009
@@ -17,6 +17,9 @@
*/
package org.apache.shindig.social.opensocial.jpa.spi;
+import com.google.common.collect.Lists;
+import com.google.inject.Inject;
+
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
@@ -31,16 +34,13 @@
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
-import com.google.inject.Inject;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
/**
* Implements the PersonService from the SPI binding to the JPA model and
providing queries to
* support the OpenSocial implementation.
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java?rev=735882&r1=735881&r2=735882&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java
Mon Jan 19 16:10:08 2009
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.social.opensocial.jpa.spi;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.shindig.auth.SecurityToken;
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=735882&r1=735881&r2=735882&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
Mon Jan 19 16:10:08 2009
@@ -18,6 +18,8 @@
package org.apache.shindig.social.opensocial.jpa.test;
+import com.google.common.collect.Lists;
+
import org.apache.shindig.social.core.model.EnumImpl;
import org.apache.shindig.social.opensocial.jpa.AddressDb;
import org.apache.shindig.social.opensocial.jpa.BodyTypeDb;
@@ -43,19 +45,19 @@
import org.apache.shindig.social.opensocial.model.Enum.LookingFor;
import org.apache.shindig.social.opensocial.model.Enum.Smoker;
import org.apache.shindig.social.opensocial.model.Person.Gender;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Random;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
public class PersonPopulate {
private EntityManager entityManager;
