svn commit: r679055 [2/2] - in /incubator/shindig/trunk/java: server/src/main/webapp/WEB-INF/ server/src/test/java/org/apache/shindig/server/endtoend/ social-api/src/main/java/org/apache/shindig/social/ social-api/src/main/java/org/apache/shindig/socia...

[ie...@apache.org]

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java Wed Jul 23 03:06:30 2008
@@ -17,6 +17,8 @@
  */
 package org.apache.shindig.social.opensocial.model;
 
+import org.apache.shindig.social.core.model.UrlImpl;
+
 import com.google.inject.ImplementedBy;
 
 @ImplementedBy(UrlImpl.class)

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthConsumerStore.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthConsumerStore.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthConsumerStore.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthConsumerStore.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthConsumerStore.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthConsumerStore.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthConsumerStore.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.opensocial.oauth;
 
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthProblemException;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthPrincipal.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthPrincipal.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthPrincipal.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,9 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.opensocial.oauth;
+
+import org.apache.shindig.social.core.oauth.DelegatedPrincipal;
 
 import net.oauth.OAuthMessage;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenPrincipalMapper.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenPrincipalMapper.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenPrincipalMapper.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenPrincipalMapper.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenPrincipalMapper.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenPrincipalMapper.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenPrincipalMapper.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,8 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.opensocial.oauth;
+
 
 import net.oauth.OAuthMessage;
 import net.oauth.OAuthProblemException;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenStore.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenStore.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenStore.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenStore.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenStore.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenStore.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenStore.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.opensocial.oauth;
 
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthProblemException;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/PrincipalMapperException.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/PrincipalMapperException.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/PrincipalMapperException.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/PrincipalMapperException.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/PrincipalMapperException.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/PrincipalMapperException.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/PrincipalMapperException.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.opensocial.oauth;
 
 /**
  * Exception indicating that an OAuth message could not be mapped to a

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java Wed Jul 23 03:06:30 2008
@@ -15,10 +15,11 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.social.ResponseItem;
 import org.apache.shindig.social.opensocial.model.Activity;
+import org.apache.shindig.social.opensocial.spi.ActivityService;
 
 import com.google.inject.Inject;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java Wed Jul 23 03:06:30 2008
@@ -15,9 +15,10 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.opensocial.spi.AppDataService;
 
 import com.google.inject.Inject;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.social.ResponseItem;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.common.SecurityTokenDecoder;
@@ -24,7 +24,7 @@
 import org.apache.shindig.common.servlet.ParameterFetcher;
 import org.apache.shindig.social.ResponseItem;
 import org.apache.shindig.social.ResponseError;
-import org.apache.shindig.social.opensocial.util.BeanConverter;
+import org.apache.shindig.social.core.util.BeanConverter;
 
 import com.google.common.collect.Maps;
 import com.google.inject.Inject;
@@ -59,7 +59,7 @@
   public static final String APPDATA_ROUTE = "appdata";
 
   private static final Logger logger = Logger.getLogger(
-      "org.apache.shindig.social.dataservice");
+      "org.apache.shindig.social.opensocial.spi");
 
   private transient SecurityTokenDecoder securityTokenDecoder;
   private transient Map<String, Class<? extends DataRequestHandler>> handlers;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServletFetcher.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServletFetcher.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServletFetcher.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java Wed Jul 23 03:06:30 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.common.SecurityTokenDecoder;
 import org.apache.shindig.common.servlet.ParameterFetcher;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/HandlerProvider.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/HandlerProvider.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/HandlerProvider.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/HandlerProvider.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/HandlerProvider.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/HandlerProvider.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/HandlerProvider.java Wed Jul 23 03:06:30 2008
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
+
 
 import com.google.inject.Inject;
 import com.google.common.collect.Maps;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java Wed Jul 23 03:06:30 2008
@@ -15,11 +15,15 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.social.ResponseError;
 import org.apache.shindig.social.ResponseItem;
 import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.spi.GroupId;
+import org.apache.shindig.social.opensocial.spi.PersonService;
+import org.apache.shindig.social.opensocial.spi.UserId;
+import org.apache.shindig.social.opensocial.spi.GroupId.Type;
 import org.apache.shindig.common.util.ImmediateFuture;
 
 import com.google.common.collect.Sets;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java Wed Jul 23 03:06:30 2008
@@ -15,10 +15,15 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.social.opensocial.util.BeanConverter;
+import org.apache.shindig.social.core.util.BeanConverter;
+import org.apache.shindig.social.opensocial.spi.GroupId;
+import org.apache.shindig.social.opensocial.spi.PersonService;
+import org.apache.shindig.social.opensocial.spi.UserId;
+import org.apache.shindig.social.opensocial.spi.PersonService.FilterType;
+import org.apache.shindig.social.opensocial.spi.PersonService.SortOrder;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java Wed Jul 23 03:06:30 2008
@@ -15,12 +15,12 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.canonical.JsonDbOpensocialService;
 import org.apache.shindig.social.opensocial.model.Activity;
+import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
 
 import com.google.inject.ImplementedBy;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java Wed Jul 23 03:06:30 2008
@@ -15,11 +15,11 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.canonical.JsonDbOpensocialService;
+import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
 
 import com.google.inject.ImplementedBy;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DataCollection.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataCollection.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DataCollection.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DataCollection.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataCollection.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataCollection.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DataCollection.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import java.util.Map;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/GroupId.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/GroupId.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/GroupId.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import org.apache.commons.lang.StringUtils;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java Wed Jul 23 03:06:30 2008
@@ -15,12 +15,12 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.canonical.JsonDbOpensocialService;
 import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
 
 import com.google.inject.ImplementedBy;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/RestfulCollection.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RestfulCollection.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/RestfulCollection.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/RestfulCollection.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RestfulCollection.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RestfulCollection.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/RestfulCollection.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import java.util.List;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/UserId.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/UserId.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/UserId.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import org.apache.shindig.common.SecurityToken;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandler.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandler.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java Wed Jul 23 03:06:30 2008
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.social.samplecontainer;
+package org.apache.shindig.social.sample.container;
 
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.social.ResponseError;
 import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.canonical.JsonDbOpensocialService;
-import org.apache.shindig.social.dataservice.DataRequestHandler;
-import org.apache.shindig.social.dataservice.RequestItem;
+import org.apache.shindig.social.opensocial.service.DataRequestHandler;
+import org.apache.shindig.social.opensocial.service.RequestItem;
+import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
 
 import com.google.inject.Inject;
 import org.apache.commons.httpclient.HttpClient;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandlerProvider.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandlerProvider.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandlerProvider.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandlerProvider.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandlerProvider.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandlerProvider.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandlerProvider.java Wed Jul 23 03:06:30 2008
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.social.samplecontainer;
+package org.apache.shindig.social.sample.container;
 
-import org.apache.shindig.social.dataservice.ActivityHandler;
-import org.apache.shindig.social.dataservice.AppDataHandler;
-import org.apache.shindig.social.dataservice.DataRequestHandler;
-import org.apache.shindig.social.dataservice.HandlerProvider;
-import org.apache.shindig.social.dataservice.PersonHandler;
+import org.apache.shindig.social.opensocial.service.ActivityHandler;
+import org.apache.shindig.social.opensocial.service.AppDataHandler;
+import org.apache.shindig.social.opensocial.service.DataRequestHandler;
+import org.apache.shindig.social.opensocial.service.HandlerProvider;
+import org.apache.shindig.social.opensocial.service.PersonHandler;
 
 import com.google.inject.Inject;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java Wed Jul 23 03:06:30 2008
@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.social.canonical;
+package org.apache.shindig.social.sample.service;
 
 import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.common.util.ResourceLoader;
 import org.apache.shindig.social.ResponseError;
 import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.dataservice.ActivityService;
-import org.apache.shindig.social.dataservice.AppDataService;
-import org.apache.shindig.social.dataservice.DataCollection;
-import org.apache.shindig.social.dataservice.GroupId;
-import org.apache.shindig.social.dataservice.PersonService;
-import org.apache.shindig.social.dataservice.RestfulCollection;
-import org.apache.shindig.social.dataservice.UserId;
+import org.apache.shindig.social.core.util.BeanJsonConverter;
 import org.apache.shindig.social.opensocial.model.Activity;
 import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
+import org.apache.shindig.social.opensocial.spi.ActivityService;
+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.PersonService;
+import org.apache.shindig.social.opensocial.spi.RestfulCollection;
+import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java Wed Jul 23 03:06:30 2008
@@ -19,7 +19,7 @@
 package org.apache.shindig.social;
 
 import org.apache.shindig.common.servlet.ParameterFetcher;
-import org.apache.shindig.social.dataservice.DataServiceServletFetcher;
+import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.name.Names;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java Wed Jul 23 03:06:30 2008
@@ -22,13 +22,14 @@
 import org.apache.shindig.common.testing.FakeGadgetToken;
 import org.apache.shindig.social.ResponseItem;
 import org.apache.shindig.social.SocialApiTestsGuiceModule;
-import org.apache.shindig.social.dataservice.DataCollection;
-import org.apache.shindig.social.dataservice.GroupId;
-import org.apache.shindig.social.dataservice.PersonService;
-import org.apache.shindig.social.dataservice.RestfulCollection;
-import org.apache.shindig.social.dataservice.UserId;
 import org.apache.shindig.social.opensocial.model.Activity;
 import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.spi.DataCollection;
+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.sample.service.JsonDbOpensocialService;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStoreTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStoreTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStoreTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStoreTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStoreTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStoreTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStoreTest.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,9 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.core.oauth;
+
+import org.apache.shindig.social.core.oauth.BasicOAuthConsumerStore;
 
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthConsumer;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapperTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapperTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapperTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,10 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.core.oauth;
+
+import org.apache.shindig.social.core.oauth.BasicOAuthTokenPrincipalMapper;
+import org.apache.shindig.social.core.oauth.DelegatedPrincipal;
 
 import junit.framework.TestCase;
 

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStoreTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenStoreTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStoreTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStoreTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenStoreTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenStoreTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStoreTest.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,9 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.core.oauth;
+
+import org.apache.shindig.social.core.oauth.BasicOAuthTokenStore;
 
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthConsumer;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/OAuthServletFilterTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/OAuthServletFilterTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/OAuthServletFilterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java Wed Jul 23 03:06:30 2008
@@ -15,12 +15,19 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.oauth;
+package org.apache.shindig.social.core.oauth;
 
 import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.common.SecurityTokenDecoder;
 import org.apache.shindig.common.crypto.Crypto;
 import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.social.core.oauth.AuthenticationServletFilter;
+import org.apache.shindig.social.core.oauth.DelegatedPrincipal;
+import org.apache.shindig.social.core.oauth.RequestorIdPrincipal;
+import org.apache.shindig.social.opensocial.oauth.OAuthConsumerStore;
+import org.apache.shindig.social.opensocial.oauth.OAuthPrincipal;
+import org.apache.shindig.social.opensocial.oauth.OAuthTokenPrincipalMapper;
+import org.apache.shindig.social.opensocial.oauth.OAuthTokenStore;
 
 import net.oauth.OAuth;
 import net.oauth.OAuthAccessor;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java Wed Jul 23 03:06:30 2008
@@ -19,15 +19,15 @@
 
 import org.apache.shindig.common.BasicSecurityTokenDecoder;
 import org.apache.shindig.social.SocialApiTestsGuiceModule;
-import org.apache.shindig.social.dataservice.ActivityHandler;
-import org.apache.shindig.social.dataservice.AppDataHandler;
-import org.apache.shindig.social.dataservice.DataRequestHandler;
-import org.apache.shindig.social.dataservice.DataServiceServlet;
-import org.apache.shindig.social.dataservice.DataServiceServletFetcher;
-import org.apache.shindig.social.dataservice.HandlerProvider;
-import org.apache.shindig.social.dataservice.PersonHandler;
-import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
-import org.apache.shindig.social.opensocial.util.BeanXmlConverter;
+import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanXmlConverter;
+import org.apache.shindig.social.opensocial.service.ActivityHandler;
+import org.apache.shindig.social.opensocial.service.AppDataHandler;
+import org.apache.shindig.social.opensocial.service.DataRequestHandler;
+import org.apache.shindig.social.opensocial.service.DataServiceServlet;
+import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
+import org.apache.shindig.social.opensocial.service.HandlerProvider;
+import org.apache.shindig.social.opensocial.service.PersonHandler;
 
 import com.google.common.collect.Maps;
 import com.google.inject.Guice;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java Wed Jul 23 03:06:30 2008
@@ -17,8 +17,8 @@
  */
 package org.apache.shindig.social.dataservice.integration;
 
+import org.apache.shindig.social.core.model.ActivityImpl;
 import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.opensocial.model.ActivityImpl;
 
 import org.json.JSONArray;
 import org.json.JSONException;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java Wed Jul 23 03:06:30 2008
@@ -17,24 +17,24 @@
  */
 package org.apache.shindig.social.dataservice.integration;
 
+import org.apache.shindig.social.core.model.AddressImpl;
+import org.apache.shindig.social.core.model.BodyTypeImpl;
+import org.apache.shindig.social.core.model.EmailImpl;
+import org.apache.shindig.social.core.model.EnumImpl;
+import org.apache.shindig.social.core.model.NameImpl;
+import org.apache.shindig.social.core.model.OrganizationImpl;
+import org.apache.shindig.social.core.model.PersonImpl;
+import org.apache.shindig.social.core.model.PhoneImpl;
+import org.apache.shindig.social.core.model.UrlImpl;
 import org.apache.shindig.social.opensocial.model.Address;
-import org.apache.shindig.social.opensocial.model.AddressImpl;
 import org.apache.shindig.social.opensocial.model.BodyType;
-import org.apache.shindig.social.opensocial.model.BodyTypeImpl;
 import org.apache.shindig.social.opensocial.model.Email;
-import org.apache.shindig.social.opensocial.model.EmailImpl;
 import org.apache.shindig.social.opensocial.model.Enum;
-import org.apache.shindig.social.opensocial.model.EnumImpl;
 import org.apache.shindig.social.opensocial.model.Name;
-import org.apache.shindig.social.opensocial.model.NameImpl;
 import org.apache.shindig.social.opensocial.model.Organization;
-import org.apache.shindig.social.opensocial.model.OrganizationImpl;
 import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.PersonImpl;
 import org.apache.shindig.social.opensocial.model.Phone;
-import org.apache.shindig.social.opensocial.model.PhoneImpl;
 import org.apache.shindig.social.opensocial.model.Url;
-import org.apache.shindig.social.opensocial.model.UrlImpl;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/ActivityHandlerTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/ActivityHandlerTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/ActivityHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java Wed Jul 23 03:06:30 2008
@@ -15,12 +15,18 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.opensocial.model.ActivityImpl;
+import org.apache.shindig.social.core.model.ActivityImpl;
+import org.apache.shindig.social.core.util.BeanJsonConverter;
 import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
+import org.apache.shindig.social.opensocial.service.ActivityHandler;
+import org.apache.shindig.social.opensocial.service.RequestItem;
+import org.apache.shindig.social.opensocial.spi.ActivityService;
+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.common.testing.FakeGadgetToken;
 import org.apache.shindig.common.util.ImmediateFuture;
 

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/AppDataHandlerTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/AppDataHandlerTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/AppDataHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java Wed Jul 23 03:06:30 2008
@@ -15,12 +15,18 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.common.testing.FakeGadgetToken;
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.opensocial.service.AppDataHandler;
+import org.apache.shindig.social.opensocial.service.RequestItem;
+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.UserId;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,7 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.common.BasicSecurityTokenDecoder;
 import org.apache.shindig.common.SecurityTokenDecoder;
@@ -24,9 +24,17 @@
 import org.apache.shindig.common.testing.FakeGadgetToken;
 import org.apache.shindig.social.ResponseItem;
 import org.apache.shindig.social.SocialApiTestsGuiceModule;
-import org.apache.shindig.social.opensocial.util.BeanConverter;
-import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
-import org.apache.shindig.social.opensocial.util.BeanXmlConverter;
+import org.apache.shindig.social.core.util.BeanConverter;
+import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanXmlConverter;
+import org.apache.shindig.social.opensocial.service.ActivityHandler;
+import org.apache.shindig.social.opensocial.service.AppDataHandler;
+import org.apache.shindig.social.opensocial.service.DataRequestHandler;
+import org.apache.shindig.social.opensocial.service.DataServiceServlet;
+import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
+import org.apache.shindig.social.opensocial.service.HandlerProvider;
+import org.apache.shindig.social.opensocial.service.PersonHandler;
+import org.apache.shindig.social.opensocial.service.RequestItem;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/PersonHandlerTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/PersonHandlerTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/PersonHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java Wed Jul 23 03:06:30 2008
@@ -15,13 +15,19 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.common.testing.FakeGadgetToken;
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.social.ResponseError;
 import org.apache.shindig.social.ResponseItem;
 import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.service.PersonHandler;
+import org.apache.shindig.social.opensocial.service.RequestItem;
+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 com.google.common.collect.Maps;
 import com.google.common.collect.Sets;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RequestItemTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RequestItemTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RequestItemTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RequestItemTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RequestItemTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RequestItemTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RequestItemTest.java Wed Jul 23 03:06:30 2008
@@ -15,10 +15,14 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.common.testing.FakeGadgetToken;
+import org.apache.shindig.social.opensocial.service.RequestItem;
+import org.apache.shindig.social.opensocial.spi.GroupId;
+import org.apache.shindig.social.opensocial.spi.PersonService;
+import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -85,7 +89,7 @@
     RequestItem request = new RequestItem();
 
     request.setParameters(Maps.immutableMap("userId", "@owner"));
-    assertEquals(UserId.Type.owner, request.getUser().type);
+    assertEquals(UserId.Type.owner, request.getUser().getType());
   }
 
   public void testGetGroup() throws Exception {

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataCollectionTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataCollectionTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataCollectionTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataCollectionTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataCollectionTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataCollectionTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataCollectionTest.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,9 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
+
+import org.apache.shindig.social.opensocial.spi.DataCollection;
 
 import com.google.common.collect.Maps;
 import junit.framework.TestCase;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java Wed Jul 23 03:06:30 2008
@@ -15,9 +15,11 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.opensocial.service.DataRequestHandler;
+import org.apache.shindig.social.opensocial.service.RequestItem;
 import org.apache.shindig.common.util.ImmediateFuture;
 
 import junit.framework.TestCase;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/GroupIdTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/GroupIdTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/GroupIdTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,9 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
+
+import org.apache.shindig.social.opensocial.spi.GroupId;
 
 import junit.framework.TestCase;
 

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/RestfulCollectionTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RestfulCollectionTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/RestfulCollectionTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/RestfulCollectionTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RestfulCollectionTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RestfulCollectionTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/RestfulCollectionTest.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,9 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
+
+import org.apache.shindig.social.opensocial.spi.RestfulCollection;
 
 import com.google.common.collect.Lists;
 import junit.framework.TestCase;

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java (from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/UserIdTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/UserIdTest.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/UserIdTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java Wed Jul 23 03:06:30 2008
@@ -15,9 +15,10 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.dataservice;
+package org.apache.shindig.social.opensocial.spi;
 
 import org.apache.shindig.common.testing.FakeGadgetToken;
+import org.apache.shindig.social.opensocial.spi.UserId;
 
 import junit.framework.TestCase;
 
@@ -36,14 +37,14 @@
 
   public void testFromJson() throws Exception {
     UserId owner = UserId.fromJson("@owner");
-    assertEquals(UserId.Type.owner, owner.type);
+    assertEquals(UserId.Type.owner, owner.getType());
 
     UserId viewer = UserId.fromJson("@viewer");
-    assertEquals(UserId.Type.viewer, viewer.type);
+    assertEquals(UserId.Type.viewer, viewer.getType());
 
     UserId user = UserId.fromJson("john.doe");
-    assertEquals(UserId.Type.userId, user.type);
-    assertEquals("john.doe", user.userId);
+    assertEquals(UserId.Type.userId, user.getType());
+    assertEquals("john.doe", user.getUserId());
   }
 
 }
\ No newline at end of file

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java Wed Jul 23 03:06:30 2008
@@ -18,19 +18,20 @@
 package org.apache.shindig.social.opensocial.util;
 
 import org.apache.shindig.social.SocialApiTestsGuiceModule;
+import org.apache.shindig.social.core.model.ActivityImpl;
+import org.apache.shindig.social.core.model.AddressImpl;
+import org.apache.shindig.social.core.model.EmailImpl;
+import org.apache.shindig.social.core.model.MediaItemImpl;
+import org.apache.shindig.social.core.model.NameImpl;
+import org.apache.shindig.social.core.model.PersonImpl;
+import org.apache.shindig.social.core.model.PhoneImpl;
+import org.apache.shindig.social.core.util.BeanJsonConverter;
 import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.opensocial.model.ActivityImpl;
 import org.apache.shindig.social.opensocial.model.Address;
-import org.apache.shindig.social.opensocial.model.AddressImpl;
 import org.apache.shindig.social.opensocial.model.Email;
-import org.apache.shindig.social.opensocial.model.EmailImpl;
 import org.apache.shindig.social.opensocial.model.MediaItem;
-import org.apache.shindig.social.opensocial.model.MediaItemImpl;
-import org.apache.shindig.social.opensocial.model.NameImpl;
 import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.PersonImpl;
 import org.apache.shindig.social.opensocial.model.Phone;
-import org.apache.shindig.social.opensocial.model.PhoneImpl;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java Wed Jul 23 03:06:30 2008
@@ -26,20 +26,21 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shindig.social.JsonLibTestsGuiceModule;
+import org.apache.shindig.social.core.model.ActivityImpl;
+import org.apache.shindig.social.core.model.AddressImpl;
+import org.apache.shindig.social.core.model.EmailImpl;
+import org.apache.shindig.social.core.model.MediaItemImpl;
+import org.apache.shindig.social.core.model.NameImpl;
+import org.apache.shindig.social.core.model.PersonImpl;
+import org.apache.shindig.social.core.model.PhoneImpl;
+import org.apache.shindig.social.core.util.BeanJsonLibConverter;
 import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.opensocial.model.ActivityImpl;
 import org.apache.shindig.social.opensocial.model.Address;
-import org.apache.shindig.social.opensocial.model.AddressImpl;
 import org.apache.shindig.social.opensocial.model.Email;
-import org.apache.shindig.social.opensocial.model.EmailImpl;
 import org.apache.shindig.social.opensocial.model.MediaItem;
-import org.apache.shindig.social.opensocial.model.MediaItemImpl;
 import org.apache.shindig.social.opensocial.model.Name;
-import org.apache.shindig.social.opensocial.model.NameImpl;
 import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.PersonImpl;
 import org.apache.shindig.social.opensocial.model.Phone;
-import org.apache.shindig.social.opensocial.model.PhoneImpl;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java Wed Jul 23 03:06:30 2008
@@ -18,19 +18,20 @@
 package org.apache.shindig.social.opensocial.util;
 
 import org.apache.shindig.common.xml.XmlUtil;
+import org.apache.shindig.social.core.model.ActivityImpl;
+import org.apache.shindig.social.core.model.AddressImpl;
+import org.apache.shindig.social.core.model.EmailImpl;
+import org.apache.shindig.social.core.model.MediaItemImpl;
+import org.apache.shindig.social.core.model.NameImpl;
+import org.apache.shindig.social.core.model.PersonImpl;
+import org.apache.shindig.social.core.model.PhoneImpl;
+import org.apache.shindig.social.core.util.BeanXmlConverter;
 import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.ActivityImpl;
-import org.apache.shindig.social.opensocial.model.AddressImpl;
-import org.apache.shindig.social.opensocial.model.EmailImpl;
-import org.apache.shindig.social.opensocial.model.MediaItemImpl;
-import org.apache.shindig.social.opensocial.model.NameImpl;
-import org.apache.shindig.social.opensocial.model.PersonImpl;
-import org.apache.shindig.social.opensocial.model.PhoneImpl;
-import org.apache.shindig.social.opensocial.model.Phone;
 import org.apache.shindig.social.opensocial.model.Address;
 import org.apache.shindig.social.opensocial.model.Email;
 import org.apache.shindig.social.opensocial.model.MediaItem;
+import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.model.Phone;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java Wed Jul 23 03:06:30 2008
@@ -23,19 +23,22 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.shindig.social.JsonLibTestsGuiceModule;
 import org.apache.shindig.social.SocialApiTestsGuiceModule;
+import org.apache.shindig.social.core.model.ActivityImpl;
+import org.apache.shindig.social.core.model.AddressImpl;
+import org.apache.shindig.social.core.model.EmailImpl;
+import org.apache.shindig.social.core.model.MediaItemImpl;
+import org.apache.shindig.social.core.model.NameImpl;
+import org.apache.shindig.social.core.model.PersonImpl;
+import org.apache.shindig.social.core.model.PhoneImpl;
+import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.core.util.BeanJsonLibConverter;
 import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.opensocial.model.ActivityImpl;
 import org.apache.shindig.social.opensocial.model.Address;
-import org.apache.shindig.social.opensocial.model.AddressImpl;
 import org.apache.shindig.social.opensocial.model.Email;
-import org.apache.shindig.social.opensocial.model.EmailImpl;
 import org.apache.shindig.social.opensocial.model.MediaItem;
-import org.apache.shindig.social.opensocial.model.MediaItemImpl;
-import org.apache.shindig.social.opensocial.model.NameImpl;
 import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.model.PersonImpl;
 import org.apache.shindig.social.opensocial.model.Phone;
-import org.apache.shindig.social.opensocial.model.PhoneImpl;
+
 import org.json.JSONObject;
 
 import com.google.common.collect.Lists;