You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by vs...@apache.org on 2009/04/04 15:37:01 UTC
svn commit: r761940 - in /incubator/shindig/trunk/java/samples/src:
main/java/org/apache/shindig/social/opensocial/jpa/
main/java/org/apache/shindig/social/opensocial/jpa/spi/ main/resources/
test/java/org/apache/shindig/social/opensocial/jpa/spi/integ...
Author: vsiveton
Date: Sat Apr 4 13:37:01 2009
New Revision: 761940
URL: http://svn.apache.org/viewvc?rev=761940&view=rev
Log:
o fixed build due to r760259, r755306
Added:
incubator/shindig/trunk/java/samples/src/test/resources/sampledata/
- copied from r761629, incubator/shindig/trunk/javascript/sampledata/
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java
incubator/shindig/trunk/java/samples/src/main/resources/socialjpa.properties
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java?rev=761940&r1=761939&r2=761940&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java Sat Apr 4 13:37:01 2009
@@ -1306,4 +1306,15 @@
public void setApplictions(List<ApplicationDb> applictions) {
this.applictions = applictions;
}
+
+ /** {@inheritDoc} */
+ public Map<String, ? extends Object> getAppData()
+ {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ public void setAppData( Map<String, ? extends Object> appData )
+ {
+ }
}
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java?rev=761940&r1=761939&r2=761940&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java Sat Apr 4 13:37:01 2009
@@ -43,11 +43,20 @@
private final static String DEFAULT_PROPERTIES = "socialjpa.properties";
private Properties properties;
+ private EntityManager entityManager;
/**
*
*/
public JPASocialModule() {
+ this(null);
+ }
+
+ /**
+ *
+ */
+ public JPASocialModule(EntityManager entityManager) {
+ this.entityManager = entityManager;
InputStream is = null;
try {
is = this.getClass().getClassLoader().getResourceAsStream(DEFAULT_PROPERTIES);
@@ -73,8 +82,12 @@
@Override
protected void configure() {
Names.bindProperties(this.binder(), properties);
- bind(EntityManager.class).toProvider(EclipseEntityManagerProvider.class)
- .in(Scopes.SINGLETON);
+ if (entityManager == null) {
+ bind(EntityManager.class).toProvider(EclipseEntityManagerProvider.class)
+ .in(Scopes.SINGLETON);
+ } else {
+ bind(EntityManager.class).toInstance(this.entityManager);
+ }
bind(ActivityService.class).to(ActivityServiceDb.class)
.in(Scopes.SINGLETON);
bind(PersonService.class).to(PersonServiceDb.class).in(Scopes.SINGLETON);
Modified: incubator/shindig/trunk/java/samples/src/main/resources/socialjpa.properties
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/resources/socialjpa.properties?rev=761940&r1=761939&r2=761940&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/resources/socialjpa.properties (original)
+++ incubator/shindig/trunk/java/samples/src/main/resources/socialjpa.properties Sat Apr 4 13:37:01 2009
@@ -22,3 +22,5 @@
db.write.min=1
db.read.min=1
jpa.socialapi.unitname=default
+
+shindig.canonical.json.db=sampledata/canonicaldb.json
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java?rev=761940&r1=761939&r2=761940&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java Sat Apr 4 13:37:01 2009
@@ -36,9 +36,7 @@
import org.apache.shindig.social.opensocial.jpa.OrganizationDb;
import org.apache.shindig.social.opensocial.jpa.PersonDb;
import org.apache.shindig.social.opensocial.jpa.UrlDb;
-import org.apache.shindig.social.opensocial.jpa.spi.ActivityServiceDb;
-import org.apache.shindig.social.opensocial.jpa.spi.AppDataServiceDb;
-import org.apache.shindig.social.opensocial.jpa.spi.PersonServiceDb;
+import org.apache.shindig.social.opensocial.jpa.spi.JPASocialModule;
import org.apache.shindig.social.opensocial.model.Account;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.Address;
@@ -52,12 +50,8 @@
import org.apache.shindig.social.opensocial.model.Url;
import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
import org.apache.shindig.social.opensocial.oauth.OAuthEntry;
-import org.apache.shindig.social.opensocial.spi.ActivityService;
-import org.apache.shindig.social.opensocial.spi.AppDataService;
-import org.apache.shindig.social.opensocial.spi.PersonService;
import com.google.inject.AbstractModule;
-import com.google.inject.Scopes;
import net.oauth.OAuthConsumer;
@@ -85,14 +79,7 @@
install(new DefaultGuiceModule());
install(new SocialApiGuiceModule());
install(new OAuthModule());
-
- // Entity manager
- this.bind(EntityManager.class).toInstance(this.entityManager);
-
- // Service implementations
- this.bind(ActivityService.class).to(ActivityServiceDb.class).in(Scopes.SINGLETON);
- this.bind(AppDataService.class).to(AppDataServiceDb.class).in(Scopes.SINGLETON);
- this.bind(PersonService.class).to(PersonServiceDb.class).in(Scopes.SINGLETON);
+ install(new JPASocialModule(entityManager));
this.bind(OAuthDataStore.class).toInstance(new NullOAuthDataStore());