svn commit: r679055 [1/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]

Author: ieb
Date: Wed Jul 23 03:06:30 2008
New Revision: 679055

URL: http://svn.apache.org/viewvc?rev=679055&view=rev
Log:
SHINDIG-467

Fisrt pass at a refactoring to collect together API's and implementations into functional groups.

In general the SPI moves to
o/a/s/social/opensocial/spi
and the service moves to
o/a/s/social/opensocial/service

with the model API in
o/a/s/social/opensocial/model
and the default impl in
o/a/s/social/core/model

Added:
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/AddressImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyTypeImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EmailImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmailImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/IdSpec.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItemImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NameImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OrganizationImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PersonImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PhoneImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PhoneImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/UrlImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/AuthenticationServletFilter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStore.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStore.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapper.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapper.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStore.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenStore.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/DelegatedPrincipal.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/GadgetSecurityTokenPrincipal.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/RequestorIdPrincipal.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanConverter.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanConverter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConversionException.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConversionException.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConverter.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/EnumUtil.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthConsumerStore.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthConsumerStore.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthPrincipal.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthPrincipal.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenPrincipalMapper.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenPrincipalMapper.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthTokenStore.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenStore.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/PrincipalMapperException.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/PrincipalMapperException.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServletFetcher.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/HandlerProvider.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/HandlerProvider.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/DataCollection.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataCollection.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/GroupId.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/RestfulCollection.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RestfulCollection.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/UserId.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandlerProvider.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandlerProvider.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/JsonDbOpensocialService.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStoreTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStoreTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapperTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapperTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStoreTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenStoreTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthServletFilterTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/OAuthServletFilterTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/ActivityHandlerTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/AppDataHandlerTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/PersonHandlerTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RequestItemTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RequestItemTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataCollectionTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataCollectionTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/GroupIdTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/RestfulCollectionTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RestfulCollectionTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/UserIdTest.java
      - copied, changed from r679043, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/UserIdTest.java
Removed:
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataCollection.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServlet.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataServiceServletFetcher.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/GroupId.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/HandlerProvider.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RequestItem.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/RestfulCollection.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/UserId.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/AuthenticationServletFilter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStore.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapper.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenStore.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/DelegatedPrincipal.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/GadgetSecurityTokenPrincipal.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthConsumerStore.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthPrincipal.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenPrincipalMapper.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/OAuthTokenStore.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/PrincipalMapperException.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/RequestorIdPrincipal.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/AddressImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyTypeImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmailImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItemImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NameImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OrganizationImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PersonImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PhoneImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/UrlImpl.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanConverter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConversionException.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/EnumUtil.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/SampleContainerHandlerProvider.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/ActivityHandlerTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/AppDataHandlerTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataCollectionTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/GroupIdTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/PersonHandlerTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RequestItemTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/RestfulCollectionTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/UserIdTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStoreTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapperTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/BasicOAuthTokenStoreTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/oauth/OAuthServletFilterTest.java
Modified:
    incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
    incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
    incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
    incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
    incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java

Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml Wed Jul 23 03:06:30 2008
@@ -26,12 +26,12 @@
   <!-- If you have your own Guice module(s), put them here as a colon-separated list. -->
   <context-param>
     <param-name>guice-modules</param-name>
-    <param-value>org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+    <param-value>org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.core.config.SocialApiGuiceModule</param-value>
   </context-param>
 
   <filter>
     <filter-name>oauthFilter</filter-name>
-    <filter-class>org.apache.shindig.social.oauth.AuthenticationServletFilter</filter-class>
+    <filter-class>org.apache.shindig.social.core.oauth.AuthenticationServletFilter</filter-class>
   </filter>
 
   <filter-mapping>
@@ -92,7 +92,7 @@
   <servlet>
     <servlet-name>restapiServlet</servlet-name>
     <servlet-class>
-      org.apache.shindig.social.dataservice.DataServiceServlet
+      org.apache.shindig.social.opensocial.service.DataServiceServlet
     </servlet-class>
   </servlet>
 

Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml Wed Jul 23 03:06:30 2008
@@ -26,12 +26,12 @@
   <!-- If you have your own Guice module(s), put them here as a colon-separated list. -->
   <context-param>
     <param-name>guice-modules</param-name>
-    <param-value>org.apache.shindig.social.SocialApiGuiceModule</param-value>
+    <param-value>org.apache.shindig.social.core.config.SocialApiGuiceModule</param-value>
   </context-param>
 
   <filter>
     <filter-name>oauthFilter</filter-name>
-    <filter-class>org.apache.shindig.social.oauth.AuthenticationServletFilter</filter-class>
+    <filter-class>org.apache.shindig.social.core.oauth.AuthenticationServletFilter</filter-class>
   </filter>
 
   <filter-mapping>
@@ -47,7 +47,7 @@
   <servlet>
     <servlet-name>restapiServlet</servlet-name>
     <servlet-class>
-      org.apache.shindig.social.dataservice.DataServiceServlet
+      org.apache.shindig.social.opensocial.service.DataServiceServlet
     </servlet-class>
   </servlet>
 

Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Wed Jul 23 03:06:30 2008
@@ -26,8 +26,18 @@
   <!-- If you have your own Guice module(s), put them here as a colon-separated list. -->
   <context-param>
     <param-name>guice-modules</param-name>
-    <param-value>org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+    <param-value>org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.core.config.SocialApiGuiceModule</param-value>
   </context-param>
+  
+  <filter>
+    <filter-name>oauthFilter</filter-name>
+    <filter-class>org.apache.shindig.social.core.oauth.AuthenticationServletFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>oauthFilter</filter-name>
+    <url-pattern>/social/*</url-pattern>
+  </filter-mapping>
 
   <listener>
     <listener-class>org.apache.shindig.common.servlet.GuiceServletContextListener</listener-class>
@@ -83,7 +93,7 @@
   <servlet>
     <servlet-name>restapiServlet</servlet-name>
     <servlet-class>
-      org.apache.shindig.social.dataservice.DataServiceServlet
+      org.apache.shindig.social.opensocial.service.DataServiceServlet
     </servlet-class>
   </servlet>
 

Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java (original)
+++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java Wed Jul 23 03:06:30 2008
@@ -18,10 +18,10 @@
 package org.apache.shindig.server.endtoend;
 
 import org.apache.shindig.common.servlet.ParameterFetcher;
-import org.apache.shindig.social.dataservice.DataServiceServletFetcher;
-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.DataServiceServletFetcher;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.name.Names;

Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java (original)
+++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTests.java Wed Jul 23 03:06:30 2008
@@ -33,7 +33,8 @@
 import org.apache.shindig.gadgets.servlet.ConcatProxyServlet;
 import org.apache.shindig.gadgets.servlet.GadgetRenderingServlet;
 import org.apache.shindig.gadgets.servlet.HttpGuiceModule;
-import org.apache.shindig.social.dataservice.DataServiceServlet;
+import org.apache.shindig.social.opensocial.service.DataServiceServlet;
+
 import org.junit.After;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertEquals;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java Wed Jul 23 03:06:30 2008
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.social;
+package org.apache.shindig.social.core.config;
 
 import org.apache.shindig.common.servlet.ParameterFetcher;
-import org.apache.shindig.social.dataservice.DataServiceServletFetcher;
-import org.apache.shindig.social.dataservice.HandlerProvider;
-import org.apache.shindig.social.oauth.AuthenticationServletFilter;
-import org.apache.shindig.social.oauth.BasicOAuthConsumerStore;
-import org.apache.shindig.social.oauth.BasicOAuthTokenPrincipalMapper;
-import org.apache.shindig.social.oauth.BasicOAuthTokenStore;
-import org.apache.shindig.social.oauth.OAuthConsumerStore;
-import org.apache.shindig.social.oauth.OAuthTokenPrincipalMapper;
-import org.apache.shindig.social.oauth.OAuthTokenStore;
-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.samplecontainer.SampleContainerHandlerProvider;
+import org.apache.shindig.social.core.oauth.AuthenticationServletFilter;
+import org.apache.shindig.social.core.oauth.BasicOAuthConsumerStore;
+import org.apache.shindig.social.core.oauth.BasicOAuthTokenPrincipalMapper;
+import org.apache.shindig.social.core.oauth.BasicOAuthTokenStore;
+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.oauth.OAuthConsumerStore;
+import org.apache.shindig.social.opensocial.oauth.OAuthTokenPrincipalMapper;
+import org.apache.shindig.social.opensocial.oauth.OAuthTokenStore;
+import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
+import org.apache.shindig.social.opensocial.service.HandlerProvider;
+import org.apache.shindig.social.sample.container.SampleContainerHandlerProvider;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Activity;
+import org.apache.shindig.social.opensocial.model.MediaItem;
 
 import java.util.Date;
 import java.util.List;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/AddressImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/AddressImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/AddressImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Address;
 
 public class AddressImpl implements Address {
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyTypeImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyTypeImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyTypeImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.BodyType;
 
 /**
  * see

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EmailImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmailImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EmailImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EmailImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmailImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmailImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EmailImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Email;
 
 public class EmailImpl implements Email {
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/EnumImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Enum;
 
 public final class EnumImpl<E extends Enum.EnumKey> implements Enum<E> {
   private String displayValue;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/IdSpec.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/IdSpec.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/IdSpec.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/IdSpec.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/IdSpec.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.opensocial.model;
+package org.apache.shindig.social.core.model;
 
 import com.google.common.collect.Lists;
 import org.json.JSONArray;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItemImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItemImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItemImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.MediaItem;
 
 /**
  * see

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Message;
 
 public final class MessageImpl implements Message {
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NameImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NameImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NameImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Name;
 
 public class NameImpl implements Name {
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OrganizationImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OrganizationImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/OrganizationImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Address;
+import org.apache.shindig.social.opensocial.model.Organization;
 
 import java.util.Date;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PersonImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PersonImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PersonImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java Wed Jul 23 03:06:30 2008
@@ -15,7 +15,17 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.social.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Address;
+import org.apache.shindig.social.opensocial.model.BodyType;
+import org.apache.shindig.social.opensocial.model.Email;
+import org.apache.shindig.social.opensocial.model.Enum;
+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.Phone;
+import org.apache.shindig.social.opensocial.model.Url;
 
 import java.util.Date;
 import java.util.List;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PhoneImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PhoneImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PhoneImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PhoneImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PhoneImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/PhoneImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PhoneImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Phone;
 
 public class PhoneImpl implements Phone {
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/UrlImpl.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/UrlImpl.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/UrlImpl.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/UrlImpl.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.opensocial.model;
+package org.apache.shindig.social.core.model;
+
+import org.apache.shindig.social.opensocial.model.Url;
 
 /**
  * see

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/AuthenticationServletFilter.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/AuthenticationServletFilter.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/AuthenticationServletFilter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java Wed Jul 23 03:06:30 2008
@@ -15,12 +15,16 @@
  * 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.SecurityTokenException;
 import org.apache.shindig.common.servlet.GuiceServletContextListener;
+import org.apache.shindig.social.opensocial.oauth.OAuthConsumerStore;
+import org.apache.shindig.social.opensocial.oauth.OAuthTokenPrincipalMapper;
+import org.apache.shindig.social.opensocial.oauth.OAuthTokenStore;
+import org.apache.shindig.social.opensocial.oauth.PrincipalMapperException;
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStore.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStore.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStore.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStore.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStore.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthConsumerStore.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthConsumerStore.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.opensocial.oauth.OAuthConsumerStore;
 
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthConsumer;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapper.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapper.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapper.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapper.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapper.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenPrincipalMapper.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenPrincipalMapper.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.opensocial.oauth.OAuthPrincipal;
+import org.apache.shindig.social.opensocial.oauth.OAuthTokenPrincipalMapper;
 
 import net.oauth.OAuthMessage;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStore.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenStore.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStore.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStore.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenStore.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/BasicOAuthTokenStore.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/BasicOAuthTokenStore.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.opensocial.oauth.OAuthTokenStore;
 
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthConsumer;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/DelegatedPrincipal.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/DelegatedPrincipal.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/DelegatedPrincipal.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/DelegatedPrincipal.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.core.oauth;
 
 import java.security.Principal;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/GadgetSecurityTokenPrincipal.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/GadgetSecurityTokenPrincipal.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/GadgetSecurityTokenPrincipal.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/GadgetSecurityTokenPrincipal.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.core.oauth;
 
 import org.apache.shindig.common.SecurityToken;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/RequestorIdPrincipal.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/RequestorIdPrincipal.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/oauth/RequestorIdPrincipal.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/RequestorIdPrincipal.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.core.oauth;
 
 public class RequestorIdPrincipal extends DelegatedPrincipal {
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanConverter.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanConverter.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanConverter.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanConverter.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanConverter.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanConverter.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.opensocial.util;
+package org.apache.shindig.social.core.util;
 
 public interface BeanConverter {
   <T> T convertToObject(String string, Class<T> className);

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.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.opensocial.util;
+package org.apache.shindig.social.core.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -23,8 +23,9 @@
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 
+import org.apache.shindig.social.core.model.EnumImpl;
 import org.apache.shindig.social.opensocial.model.Enum;
-import org.apache.shindig.social.opensocial.model.EnumImpl;
+
 import org.joda.time.DateTime;
 import org.json.JSONArray;
 import org.json.JSONException;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConversionException.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConversionException.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConversionException.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConversionException.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConversionException.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConversionException.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConversionException.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.opensocial.util;
+package org.apache.shindig.social.core.util;
 
 /**
  * Where a conversion exception happens in the Json Lib conversion, this

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConverter.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConverter.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConverter.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConverter.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.opensocial.util;
+package org.apache.shindig.social.core.util;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
@@ -37,6 +37,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.apache.shindig.social.opensocial.model.Address;
 import org.apache.shindig.social.opensocial.model.Email;
 import org.apache.shindig.social.opensocial.model.Enum;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXmlConverter.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.opensocial.util;
+package org.apache.shindig.social.core.util;
 
 import org.apache.commons.betwixt.io.BeanReader;
 import org.apache.commons.betwixt.io.BeanWriter;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/EnumUtil.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/EnumUtil.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/EnumUtil.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/EnumUtil.java Wed Jul 23 03:06:30 2008
@@ -1,4 +1,4 @@
-package org.apache.shindig.social.opensocial.util;
+package org.apache.shindig.social.core.util;
 
 import com.google.common.collect.Sets;
 

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtils.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonLibConverterUtils.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.opensocial.util;
+package org.apache.shindig.social.core.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java (from r679043, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java&r1=679043&r2=679055&rev=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpher.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.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.opensocial.util;
+package org.apache.shindig.social.core.util;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.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.ActivityImpl;
+
 import com.google.inject.ImplementedBy;
 import java.util.Date;
 import java.util.List;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.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.AddressImpl;
+
 import com.google.inject.ImplementedBy;
 
 /**

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.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.BodyTypeImpl;
+
 import com.google.inject.ImplementedBy;
 
 @ImplementedBy(BodyTypeImpl.class)

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.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.EmailImpl;
+
 import com.google.inject.ImplementedBy;
 
 /**

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.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.MediaItemImpl;
+
 import com.google.inject.ImplementedBy;
 
 @ImplementedBy(MediaItemImpl.class)

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.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.MessageImpl;
+
 import com.google.inject.ImplementedBy;
 
 /**

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.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.NameImpl;
+
 import com.google.inject.ImplementedBy;
 
 /**

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.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.OrganizationImpl;
+
 import com.google.inject.ImplementedBy;
 import java.util.Date;
 

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

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java?rev=679055&r1=679054&r2=679055&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.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.PhoneImpl;
+
 import com.google.inject.ImplementedBy;
 
 /**