Author: lryan
Date: Wed Feb 11 02:31:27 2009
New Revision: 743197
URL: http://svn.apache.org/viewvc?rev=743197&view=rev
Log:
Applied patch from Ben Smith to fix samples. SHINDIG-908
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/EnumDb.java
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/api/FilterCapability.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDbTest.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonDbToJsonTest.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/EnumDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/EnumDb.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/EnumDb.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/EnumDb.java
Wed Feb 11 02:31:27 2009
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.social.opensocial.jpa;
-import org.apache.shindig.social.opensocial.model.Enum;
+import org.apache.shindig.protocol.model.Enum;
/**
* This a utility holder class for Enums to assist in database storage. It
does not have any
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=743197&r1=743196&r2=743197&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
Wed Feb 11 02:31:27 2009
@@ -26,23 +26,23 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.apache.shindig.protocol.model.Enum;
+import org.apache.shindig.protocol.model.FilterOperation;
import org.apache.shindig.social.opensocial.jpa.api.DbObject;
import org.apache.shindig.social.opensocial.jpa.api.FilterCapability;
import org.apache.shindig.social.opensocial.jpa.api.FilterSpecification;
import org.apache.shindig.social.opensocial.model.Account;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.BodyType;
-import org.apache.shindig.social.opensocial.model.Enum;
+import org.apache.shindig.social.opensocial.model.Drinker;
import org.apache.shindig.social.opensocial.model.ListField;
+import org.apache.shindig.social.opensocial.model.LookingFor;
import org.apache.shindig.social.opensocial.model.Name;
+import org.apache.shindig.social.opensocial.model.NetworkPresence;
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.model.Smoker;
import org.apache.shindig.social.opensocial.model.Url;
-import org.apache.shindig.social.opensocial.model.Enum.Drinker;
-import org.apache.shindig.social.opensocial.model.Enum.LookingFor;
-import org.apache.shindig.social.opensocial.model.Enum.NetworkPresence;
-import org.apache.shindig.social.opensocial.model.Enum.Smoker;
-import org.apache.shindig.social.opensocial.spi.PersonService.FilterOperation;
import java.util.Date;
import java.util.HashMap;
@@ -267,7 +267,7 @@
protected String drinkerDb;
@Transient
- protected Enum<Enum.Drinker> drinker;
+ protected Enum<Drinker> drinker;
@Basic
@Column(name = "display_name", length = 255)
@@ -387,7 +387,7 @@
*/
@Transient
// stored as a property, processed on get,set
- protected List<Enum<Enum.LookingFor>> lookingFor;
+ protected List<Enum<LookingFor>> lookingFor;
/**
*
@@ -416,7 +416,7 @@
protected String networkPresenceDb;
@Transient
- protected Enum<Enum.NetworkPresence> networkPresence = new
EnumDb<NetworkPresence>(
+ protected Enum<NetworkPresence> networkPresence = new
EnumDb<NetworkPresence>(
NetworkPresence.XA);
/**
@@ -516,7 +516,7 @@
protected String smokerDb;
@Transient
- protected Enum<Enum.Smoker> smoker;
+ protected Enum<Smoker> smoker;
/**
*
@@ -691,11 +691,11 @@
}
}
- public Enum<Enum.Drinker> getDrinker() {
+ public Enum<Drinker> getDrinker() {
return this.drinker;
}
- public void setDrinker(Enum<Enum.Drinker> newDrinker) {
+ public void setDrinker(Enum<Drinker> newDrinker) {
this.drinker = newDrinker;
}
@@ -834,11 +834,11 @@
this.livingArrangement = livingArrangement;
}
- public List<Enum<Enum.LookingFor>> getLookingFor() {
+ public List<Enum<LookingFor>> getLookingFor() {
return lookingFor;
}
- public void setLookingFor(List<Enum<Enum.LookingFor>> lookingFor) {
+ public void setLookingFor(List<Enum<LookingFor>> lookingFor) {
this.lookingFor = lookingFor;
}
@@ -866,11 +866,11 @@
this.name = name;
}
- public Enum<Enum.NetworkPresence> getNetworkPresence() {
+ public Enum<NetworkPresence> getNetworkPresence() {
return networkPresence;
}
- public void setNetworkPresence(Enum<Enum.NetworkPresence> networkPresence) {
+ public void setNetworkPresence(Enum<NetworkPresence> networkPresence) {
this.networkPresence = networkPresence;
}
@@ -986,11 +986,11 @@
this.sexualOrientation = sexualOrientation;
}
- public Enum<Enum.Smoker> getSmoker() {
+ public Enum<Smoker> getSmoker() {
return this.smoker;
}
- public void setSmoker(Enum<Enum.Smoker> newSmoker) {
+ public void setSmoker(Enum<Smoker> newSmoker) {
this.smoker = newSmoker;
}
@@ -1139,7 +1139,7 @@
smokerDb = smoker.toString();
List<String> lookingFor = Lists.newArrayList();
- for (Enum<Enum.LookingFor> np : this.lookingFor) {
+ for (Enum<LookingFor> np : this.lookingFor) {
lookingFor.add(np.toString());
}
Map<String, List<String>> toSave = new HashMap<String, List<String>>();
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterCapability.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterCapability.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterCapability.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterCapability.java
Wed Feb 11 02:31:27 2009
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.social.opensocial.jpa.api;
-import org.apache.shindig.social.opensocial.spi.PersonService;
+import org.apache.shindig.protocol.model.FilterOperation;
/**
* Specifies the ability to filter an object
@@ -33,5 +33,5 @@
* @return the final property that is being filtered or null is the filter
operation specified is
* not applicable
*/
- String findFilterableProperty(String fieldName,
PersonService.FilterOperation filterOperation);
+ String findFilterableProperty(String fieldName, FilterOperation
filterOperation);
}
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java
Wed Feb 11 02:31:27 2009
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.social.opensocial.jpa.api;
-import org.apache.shindig.social.opensocial.spi.PersonService.FilterOperation;
+import org.apache.shindig.protocol.model.FilterOperation;
/**
* A FilterSpecifiation encapsulates the Filter operation for a specific
field. Name of the target
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
Wed Feb 11 02:31:27 2009
@@ -22,7 +22,8 @@
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.ResponseError;
+import org.apache.shindig.protocol.ResponseError;
+import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.social.opensocial.jpa.ActivityDb;
import org.apache.shindig.social.opensocial.jpa.MediaItemDb;
import org.apache.shindig.social.opensocial.model.Activity;
@@ -30,7 +31,6 @@
import org.apache.shindig.social.opensocial.spi.ActivityService;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
-import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
Wed Feb 11 02:31:27 2009
@@ -23,9 +23,9 @@
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
+import org.apache.shindig.protocol.DataCollection;
import org.apache.shindig.social.opensocial.jpa.ApplicationDataMapDb;
import org.apache.shindig.social.opensocial.spi.AppDataService;
-import org.apache.shindig.social.opensocial.spi.DataCollection;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPQLUtils.java
Wed Feb 11 02:31:27 2009
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.social.opensocial.jpa.spi;
-import org.apache.shindig.social.ResponseError;
+import org.apache.shindig.protocol.ResponseError;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
Wed Feb 11 02:31:27 2009
@@ -22,7 +22,8 @@
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.ResponseError;
+import org.apache.shindig.protocol.ResponseError;
+import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.social.opensocial.jpa.PersonDb;
import org.apache.shindig.social.opensocial.jpa.api.FilterCapability;
import org.apache.shindig.social.opensocial.jpa.api.FilterSpecification;
@@ -30,7 +31,6 @@
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.PersonService;
-import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
@@ -172,7 +172,7 @@
*/
private int addFilterClause(StringBuilder sb, FilterCapability filterable,
CollectionOptions collectionOptions, int lastPos) {
- // this makes the filter value safe
+ // this makes the filter value saf
String filter =
filterable.findFilterableProperty(collectionOptions.getFilter(),
collectionOptions.getFilterOperation());
String filterValue = collectionOptions.getFilterValue();
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDbTest.java
Wed Feb 11 02:31:27 2009
@@ -20,11 +20,11 @@
import static org.junit.Assert.assertEquals;
+import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.EnumUtil;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
-import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import org.apache.shindig.social.opensocial.spi.UserId;
import org.apache.shindig.social.opensocial.spi.UserId.Type;
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDbTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDbTest.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDbTest.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDbTest.java
Wed Feb 11 02:31:27 2009
@@ -20,7 +20,7 @@
import static org.junit.Assert.assertEquals;
-import org.apache.shindig.social.opensocial.spi.DataCollection;
+import org.apache.shindig.protocol.DataCollection;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.UserId;
import org.apache.shindig.social.opensocial.spi.UserId.Type;
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java
Wed Feb 11 02:31:27 2009
@@ -20,11 +20,12 @@
import static org.junit.Assert.assertEquals;
+import org.apache.shindig.protocol.RestfulCollection;
+import org.apache.shindig.protocol.model.SortOrder;
import org.apache.shindig.social.opensocial.model.Person;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.PersonService;
-import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import org.apache.shindig.social.opensocial.spi.UserId;
import org.apache.shindig.social.opensocial.spi.UserId.Type;
@@ -77,7 +78,7 @@
// Set collection options
CollectionOptions collectionOptions = new CollectionOptions();
collectionOptions.setSortBy("name");
- collectionOptions.setSortOrder(PersonService.SortOrder.ascending);
+ collectionOptions.setSortOrder(SortOrder.ascending);
collectionOptions.setMax(20);
// Get all friends of john.doe
@@ -98,7 +99,7 @@
// Set collection options
CollectionOptions collectionOptions = new CollectionOptions();
collectionOptions.setSortBy("name");
- collectionOptions.setSortOrder(PersonService.SortOrder.ascending);
+ collectionOptions.setSortOrder(SortOrder.ascending);
collectionOptions.setFirst(0);
collectionOptions.setMax(1);
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
Wed Feb 11 02:31:27 2009
@@ -18,6 +18,8 @@
package org.apache.shindig.social.opensocial.jpa.spi;
+import org.apache.shindig.protocol.model.Enum;
+import org.apache.shindig.protocol.model.EnumImpl;
import org.apache.shindig.social.opensocial.jpa.ActivityDb;
import org.apache.shindig.social.opensocial.jpa.AddressDb;
import org.apache.shindig.social.opensocial.jpa.ApplicationDataMapDb;
@@ -36,16 +38,15 @@
import org.apache.shindig.social.opensocial.jpa.PhotoDb;
import org.apache.shindig.social.opensocial.jpa.UrlDb;
import org.apache.shindig.social.opensocial.model.Address;
-import org.apache.shindig.social.opensocial.model.Enum;
+import org.apache.shindig.social.opensocial.model.Drinker;
import org.apache.shindig.social.opensocial.model.ListField;
+import org.apache.shindig.social.opensocial.model.LookingFor;
import org.apache.shindig.social.opensocial.model.MediaItem;
+import org.apache.shindig.social.opensocial.model.NetworkPresence;
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.model.Smoker;
import org.apache.shindig.social.opensocial.model.Url;
-import org.apache.shindig.social.opensocial.model.Enum.Drinker;
-import org.apache.shindig.social.opensocial.model.Enum.LookingFor;
-import org.apache.shindig.social.opensocial.model.Enum.NetworkPresence;
-import org.apache.shindig.social.opensocial.model.Enum.Smoker;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -56,6 +57,7 @@
import javax.persistence.EntityManager;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
@@ -437,12 +439,12 @@
person.setUpdated(new Date());
person.setLivingArrangement("in a house");
- List<Enum<LookingFor>> lookingForList = new ArrayList<Enum<LookingFor>>();
- EnumDb<LookingFor> lookingFor1 = new EnumDb<LookingFor>(LookingFor.RANDOM);
- EnumDb<LookingFor> lookingFor2 = new
EnumDb<LookingFor>(LookingFor.NETWORKING);
- lookingForList.add(lookingFor1);
- lookingForList.add(lookingFor2);
- person.setLookingFor(lookingForList);
+ List<Enum<LookingFor>> lookingFor = Lists.newArrayList();
+ Enum<LookingFor> lookingForOne = new
EnumImpl<LookingFor>(LookingFor.RANDOM);
+ Enum<LookingFor> lookingForTwo = new
EnumImpl<LookingFor>(LookingFor.NETWORKING);
+ lookingFor.add(lookingForOne);
+ lookingFor.add(lookingForTwo);
+ person.setLookingFor(lookingFor);
person.setMovies(asList("Iron Man", "Nosferatu"));
person.setMusic(asList("Chieftains","Beck"));
@@ -595,12 +597,12 @@
person.setUpdated(new Date());
person.setLivingArrangement("");
- List<Enum<LookingFor>> lookingForList = new ArrayList<Enum<LookingFor>>();
- EnumDb<LookingFor> lookingFor1 = new EnumDb<LookingFor>(LookingFor.RANDOM);
- EnumDb<LookingFor> lookingFor2 = new
EnumDb<LookingFor>(LookingFor.NETWORKING);
- lookingForList.add(lookingFor1);
- lookingForList.add(lookingFor2);
- person.setLookingFor(lookingForList);
+ List<Enum<LookingFor>> lookingFor = Lists.newArrayList();
+ Enum<LookingFor> lookingForOne = new
EnumImpl<LookingFor>(LookingFor.RANDOM);
+ Enum<LookingFor> lookingForTwo = new
EnumImpl<LookingFor>(LookingFor.NETWORKING);
+ lookingFor.add(lookingForOne);
+ lookingFor.add(lookingForTwo);
+ person.setLookingFor(lookingFor);
person.setMovies(asList(""));
person.setMusic(asList(""));
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
Wed Feb 11 02:31:27 2009
@@ -22,10 +22,11 @@
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.testing.FakeGadgetToken;
+import org.apache.shindig.protocol.model.Enum;
+import org.apache.shindig.protocol.model.EnumImpl;
import org.apache.shindig.social.core.model.ActivityImpl;
import org.apache.shindig.social.core.model.AddressImpl;
import org.apache.shindig.social.core.model.BodyTypeImpl;
-import org.apache.shindig.social.core.model.EnumImpl;
import org.apache.shindig.social.core.model.ListFieldImpl;
import org.apache.shindig.social.core.model.NameImpl;
import org.apache.shindig.social.core.model.OrganizationImpl;
@@ -34,11 +35,14 @@
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.BodyType;
-import org.apache.shindig.social.opensocial.model.Enum;
+import org.apache.shindig.social.opensocial.model.Drinker;
import org.apache.shindig.social.opensocial.model.ListField;
+import org.apache.shindig.social.opensocial.model.LookingFor;
import org.apache.shindig.social.opensocial.model.Name;
+import org.apache.shindig.social.opensocial.model.NetworkPresence;
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.model.Smoker;
import org.apache.shindig.social.opensocial.model.Url;
import org.apache.shindig.social.opensocial.spi.UserId;
import org.apache.shindig.social.opensocial.spi.UserId.Type;
@@ -48,6 +52,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import com.google.common.collect.Lists;
@@ -109,7 +114,7 @@
canonical.setCurrentLocation(location);
canonical.setBirthday(buildDate("1975-01-01"));
- canonical.setDrinker(new EnumImpl<Enum.Drinker>(Enum.Drinker.SOCIALLY));
+ canonical.setDrinker(new EnumImpl<Drinker>(Drinker.SOCIALLY));
ListField email = new ListFieldImpl("work",
"[email protected]");
canonical.setEmails(Lists.newArrayList(email));
@@ -155,14 +160,15 @@
canonical.setUpdated(new Date());
canonical.setLanguagesSpoken(Lists.newArrayList("English", "Dutch",
"Esperanto"));
canonical.setLivingArrangement("in a house");
- Enum<Enum.LookingFor> lookingForRandom =
- new EnumImpl<Enum.LookingFor>(Enum.LookingFor.RANDOM, "Random");
- Enum<Enum.LookingFor> lookingForNetworking =
- new EnumImpl<Enum.LookingFor>(Enum.LookingFor.NETWORKING,
"Networking");
- canonical.setLookingFor(Lists.newArrayList(lookingForRandom,
lookingForNetworking));
+ List<Enum<LookingFor>> lookingFor = Lists.newArrayList();
+ Enum<LookingFor> lookingForOne = new
EnumImpl<LookingFor>(LookingFor.RANDOM);
+ Enum<LookingFor> lookingForTwo = new
EnumImpl<LookingFor>(LookingFor.NETWORKING);
+ lookingFor.add(lookingForOne);
+ lookingFor.add(lookingForTwo);
+ canonical.setLookingFor(lookingFor);
canonical.setMovies(Lists.newArrayList("Iron Man", "Nosferatu"));
canonical.setMusic(Lists.newArrayList("Chieftains", "Beck"));
- canonical.setNetworkPresence(new
EnumImpl<Enum.NetworkPresence>(Enum.NetworkPresence.ONLINE));
+ canonical.setNetworkPresence(new
EnumImpl<NetworkPresence>(NetworkPresence.ONLINE));
canonical.setNickname("diggy");
canonical.setPets("dog,cat");
canonical.setPhoneNumbers(Lists.<ListField> newArrayList(new
ListFieldImpl("work",
@@ -180,7 +186,7 @@
canonical.setRomance("twice a year");
canonical.setScaredOf("COBOL");
canonical.setSexualOrientation("north");
- canonical.setSmoker(new EnumImpl<Enum.Smoker>(Enum.Smoker.NO));
+ canonical.setSmoker(new EnumImpl<Smoker>(Smoker.NO));
canonical.setSports(Lists.newArrayList("frisbee", "rugby"));
canonical.setStatus("happy");
canonical.setTags(Lists.newArrayList("C#", "JSON", "template"));
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
Wed Feb 11 02:31:27 2009
@@ -18,13 +18,13 @@
package org.apache.shindig.social.opensocial.jpa.spi.integration;
-import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.protocol.DataServiceServlet;
+import org.apache.shindig.protocol.HandlerRegistry;
+import org.apache.shindig.protocol.conversion.BeanJsonConverter;
+import org.apache.shindig.protocol.conversion.BeanXStreamConverter;
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
-import org.apache.shindig.social.core.util.BeanXStreamConverter;
import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
import org.apache.shindig.social.opensocial.jpa.spi.SpiEntityManagerFactory;
-import org.apache.shindig.social.opensocial.service.DataServiceServlet;
-import org.apache.shindig.social.opensocial.service.HandlerRegistry;
import javax.persistence.EntityManager;
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonDbToJsonTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonDbToJsonTest.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonDbToJsonTest.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonDbToJsonTest.java
Wed Feb 11 02:31:27 2009
@@ -20,7 +20,7 @@
import com.google.inject.Guice;
import com.google.inject.Injector;
-import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.protocol.conversion.BeanJsonConverter;
import org.apache.shindig.social.opensocial.jpa.hibernate.Bootstrap;
import org.apache.shindig.social.opensocial.jpa.spi.JPASocialModule;
import org.apache.shindig.social.opensocial.model.Person;
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
Wed Feb 11 02:31:27 2009
@@ -20,7 +20,8 @@
import com.google.common.collect.Lists;
-import org.apache.shindig.social.core.model.EnumImpl;
+import org.apache.shindig.protocol.model.Enum;
+import org.apache.shindig.protocol.model.EnumImpl;
import org.apache.shindig.social.opensocial.jpa.AddressDb;
import org.apache.shindig.social.opensocial.jpa.BodyTypeDb;
import org.apache.shindig.social.opensocial.jpa.EmailDb;
@@ -35,15 +36,14 @@
import org.apache.shindig.social.opensocial.jpa.UrlDb;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.BodyType;
-import org.apache.shindig.social.opensocial.model.Enum;
+import org.apache.shindig.social.opensocial.model.Drinker;
import org.apache.shindig.social.opensocial.model.ListField;
+import org.apache.shindig.social.opensocial.model.LookingFor;
import org.apache.shindig.social.opensocial.model.Name;
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.model.Smoker;
import org.apache.shindig.social.opensocial.model.Url;
-import org.apache.shindig.social.opensocial.model.Enum.Drinker;
-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;
@@ -120,8 +120,10 @@
person.setLanguagesSpoken(getList("LanguagesSpoken"));
person.setLivingArrangement("living Arrangement");
List<Enum<LookingFor>> lookingFor = Lists.newArrayList();
- lookingFor.add(new EnumImpl<LookingFor>(LookingFor.RANDOM));
- lookingFor.add(new EnumImpl<LookingFor>(LookingFor.NETWORKING));
+ Enum<LookingFor> lookingForOne = new
EnumImpl<LookingFor>(LookingFor.RANDOM);
+ Enum<LookingFor> lookingForTwo = new
EnumImpl<LookingFor>(LookingFor.NETWORKING);
+ lookingFor.add(lookingForOne);
+ lookingFor.add(lookingForTwo);
person.setLookingFor(lookingFor);
person.setMovies(getList("Movies"));
person.setMusic(getList("music"));
Modified: incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml?rev=743197&r1=743196&r2=743197&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml
(original)
+++ incubator/shindig/trunk/javascript/samplecontainer/examples/oauth.xml Wed
Feb 11 02:31:27 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+ <?xml version="1.0" encoding="UTF-8" ?>
<Module>
<ModulePrefs title="Demo OAuth Gadget">
<OAuth>
