Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java Tue Jun 12 14:32:42 2012 @@ -19,19 +19,16 @@ package org.apache.rave.gadgets.oauth.inject; -import java.io.IOException; -import java.io.InputStream; - import net.oauth.OAuth; import net.oauth.OAuthConsumer; import net.oauth.OAuthServiceProvider; import net.oauth.signature.RSA_SHA1; import org.apache.commons.io.IOUtils; -import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore; -import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo; -import org.apache.rave.gadgets.oauth.model.impl.OAuthTokenInfoImpl; import org.apache.rave.gadgets.oauth.service.OAuthConsumerStoreService; import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService; +import org.apache.rave.portal.model.OAuthConsumerStore; +import org.apache.rave.portal.model.OAuthTokenInfo; +import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl; import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.gadgets.GadgetException; import org.apache.shindig.gadgets.oauth.BasicOAuthStore; @@ -40,6 +37,9 @@ import org.apache.shindig.gadgets.oauth. import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; +import java.io.IOException; +import java.io.InputStream; + /** * {@link OAuthStore} that retrieves the consumer_key, consumer_secret and key_type from the database * <p/> @@ -112,8 +112,9 @@ public class DefaultOAuthStore implement @Override public void setTokenInfo(SecurityToken securityToken, ConsumerInfo consumerInfo, String serviceName, String tokenName, TokenInfo tokenInfo) throws GadgetException { - OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfoImpl(securityToken, - serviceName, tokenName, tokenInfo); + OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfoImpl(securityToken.getAppUrl(), + serviceName, tokenName, tokenInfo.getAccessToken(), tokenInfo.getSessionHandle(), + tokenInfo.getTokenSecret(), securityToken.getViewerId(), tokenInfo.getTokenExpireMillis()); tokenInfoService.saveOAuthTokenInfo(oAuthTokenInfo); } @@ -131,7 +132,7 @@ public class DefaultOAuthStore implement * Creates an {@link OAuthConsumer} based on the OAuth signature method * * @param provider {@link net.oauth.OAuthServiceProvider} - * @param consumerStore {@link org.apache.rave.gadgets.oauth.model.OAuthConsumerStore} + * @param consumerStore {@link org.apache.rave.portal.model.OAuthConsumerStore} * persistent OAuth consumer keys & secrets * @return {@link OAuthConsumer} if the signature method is supported */
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthConsumerStoreService.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthConsumerStoreService.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthConsumerStoreService.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthConsumerStoreService.java Tue Jun 12 14:32:42 2012 @@ -19,7 +19,7 @@ package org.apache.rave.gadgets.oauth.service; -import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore; +import org.apache.rave.portal.model.OAuthConsumerStore; /** * Service to handle OAuth Consumer store @@ -27,27 +27,27 @@ import org.apache.rave.gadgets.oauth.mod public interface OAuthConsumerStoreService { /** - * Fetches {@link org.apache.rave.gadgets.oauth.model.OAuthConsumerStore} based on the gadget location and the service provider + * Fetches {@link org.apache.rave.portal.model.OAuthConsumerStore} based on the gadget location and the service provider * * @param gadgetUri location of the gadget definition * @param serviceName name of the service provider - * @return {@link org.apache.rave.gadgets.oauth.model.OAuthConsumerStore} or {@literal null} if none matches the criteria + * @return {@link org.apache.rave.portal.model.OAuthConsumerStore} or {@literal null} if none matches the criteria */ OAuthConsumerStore findByUriAndServiceName(String gadgetUri, String serviceName); /** - * Persists {@link org.apache.rave.gadgets.oauth.model.OAuthConsumerStore} + * Persists {@link org.apache.rave.portal.model.OAuthConsumerStore} * - * @param oAuthConsumerStore {@link org.apache.rave.gadgets.oauth.model.OAuthConsumerStore} to store - * @return persisted {@link org.apache.rave.gadgets.oauth.model.OAuthConsumerStore} + * @param oAuthConsumerStore {@link org.apache.rave.portal.model.OAuthConsumerStore} to store + * @return persisted {@link org.apache.rave.portal.model.OAuthConsumerStore} */ OAuthConsumerStore save(OAuthConsumerStore oAuthConsumerStore); /** - * Removes the {@link org.apache.rave.gadgets.oauth.model.OAuthConsumerStore} from the database + * Removes the {@link org.apache.rave.portal.model.OAuthConsumerStore} from the database * - * @param oAuthConsumerStore {@link org.apache.rave.gadgets.oauth.model.OAuthConsumerStore} to delete + * @param oAuthConsumerStore {@link org.apache.rave.portal.model.OAuthConsumerStore} to delete */ void delete(OAuthConsumerStore oAuthConsumerStore); } Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java Tue Jun 12 14:32:42 2012 @@ -19,35 +19,35 @@ package org.apache.rave.gadgets.oauth.service; -import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo; +import org.apache.rave.portal.model.OAuthTokenInfo; /** * Service to handle OAuth Tokens */ public interface OAuthTokenInfoService { /** - * Retrieves {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} + * Retrieves {@link org.apache.rave.portal.model.OAuthTokenInfo} * * @param userId unique identifier of gadget viewer * @param appUrl URL of the gadget * @param moduleId the module ID of the application * @param tokenName gadget's nickname for the token to use * @param serviceName name of the service provider - * @return {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} or {@literal null} if none matches the criteria + * @return {@link org.apache.rave.portal.model.OAuthTokenInfo} or {@literal null} if none matches the criteria */ OAuthTokenInfo findOAuthTokenInfo(String userId, String appUrl, String moduleId, String tokenName, String serviceName); /** - * Persists the {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} to the data store + * Persists the {@link org.apache.rave.portal.model.OAuthTokenInfo} to the data store * - * @param tokenInfo {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} to save + * @param tokenInfo {@link org.apache.rave.portal.model.OAuthTokenInfo} to save * @return persisted OAuthTokenInfo */ OAuthTokenInfo saveOAuthTokenInfo(OAuthTokenInfo tokenInfo); /** - * Removes the {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo}'s that match the criteria from the data store + * Removes the {@link org.apache.rave.portal.model.OAuthTokenInfo}'s that match the criteria from the data store * * @param userId unique identifier of the gadget viewer * @param appUrl URL of the gadget Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java Tue Jun 12 14:32:42 2012 @@ -19,8 +19,8 @@ package org.apache.rave.gadgets.oauth.service.impl; -import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore; -import org.apache.rave.gadgets.oauth.repository.OAuthConsumerStoreRepository; +import org.apache.rave.portal.model.OAuthConsumerStore; +import org.apache.rave.portal.repository.OAuthConsumerStoreRepository; import org.apache.rave.gadgets.oauth.service.OAuthConsumerStoreService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java Tue Jun 12 14:32:42 2012 @@ -19,8 +19,8 @@ package org.apache.rave.gadgets.oauth.service.impl; -import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo; -import org.apache.rave.gadgets.oauth.repository.OAuthTokenInfoRepository; +import org.apache.rave.portal.model.OAuthTokenInfo; +import org.apache.rave.portal.repository.OAuthTokenInfoRepository; import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; Copied: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java (from r1349202, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/JpaOpenSocialPersonRepository.java) URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java?p2=rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java&p1=rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/JpaOpenSocialPersonRepository.java&r1=1349202&r2=1349374&rev=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/JpaOpenSocialPersonRepository.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java Tue Jun 12 14:32:42 2012 @@ -22,8 +22,9 @@ package org.apache.rave.opensocial.repos import org.apache.rave.exception.NotSupportedException; import org.apache.rave.opensocial.repository.OpenSocialPersonRepository; import org.apache.rave.portal.model.Person; -import org.apache.rave.portal.repository.impl.JpaPersonRepository; +import org.apache.rave.portal.repository.PersonRepository; import org.apache.shindig.protocol.model.FilterOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import java.util.List; @@ -32,7 +33,10 @@ import java.util.List; * */ @Repository -public class JpaOpenSocialPersonRepository extends JpaPersonRepository implements OpenSocialPersonRepository { +public class DecoratingOpenSocialPersonRepository implements OpenSocialPersonRepository { + + @Autowired + private PersonRepository underlying; @Override public List<Person> findAllConnectedPeople(String username, String field, FilterOperation operation, String value) { @@ -48,4 +52,74 @@ public class JpaOpenSocialPersonReposito public List<Person> findByGroup(String groupId, String field, FilterOperation operation, String value) { throw new NotSupportedException(); } + + @Override + public Person findByUsername(String username) { + return underlying.findByUsername(username); + } + + @Override + public List<Person> findAllConnectedPeople(String username) { + return underlying.findAllConnectedPeople(username); + } + + @Override + public List<Person> findAllConnectedPeople(String username, String appId) { + return underlying.findAllConnectedPeople(username, appId); + } + + @Override + public List<Person> findAllConnectedPeopleWithFriend(String username, String friendUsername) { + return underlying.findAllConnectedPeopleWithFriend(username, friendUsername); + } + + @Override + public List<Person> findFriends(String username) { + return underlying.findFriends(username); + } + + @Override + public List<Person> findFriends(String username, String appId) { + return underlying.findFriends(username, appId); + } + + @Override + public List<Person> findFriendsWithFriend(String username, String friendUsername) { + return underlying.findFriendsWithFriend(username, friendUsername); + } + + @Override + public List<Person> findByGroup(String groupId) { + return underlying.findByGroup(groupId); + } + + @Override + public List<Person> findByGroup(String groupId, String appId) { + return underlying.findByGroup(groupId, appId); + } + + @Override + public List<Person> findByGroupWithFriend(String groupId, String friendUsername) { + return underlying.findByGroupWithFriend(groupId, friendUsername); + } + + @Override + public Class<? extends Person> getType() { + return underlying.getType(); + } + + @Override + public Person get(long id) { + return underlying.get(id); + } + + @Override + public Person save(Person item) { + return underlying.save(item); + } + + @Override + public void delete(Person item) { + underlying.delete(item); + } } Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java Tue Jun 12 14:32:42 2012 @@ -20,9 +20,9 @@ package org.apache.rave.opensocial.service.impl; import org.apache.commons.lang.StringUtils; -import org.apache.rave.opensocial.model.ApplicationData; -import org.apache.rave.opensocial.model.impl.ApplicationDataImpl; -import org.apache.rave.opensocial.repository.ApplicationDataRepository; +import org.apache.rave.portal.model.ApplicationData; +import org.apache.rave.portal.model.impl.ApplicationDataImpl; +import org.apache.rave.portal.repository.ApplicationDataRepository; import org.apache.rave.opensocial.service.SimplePersonService; import org.apache.rave.portal.model.Person; import org.apache.rave.service.LockService; Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java Tue Jun 12 14:32:42 2012 @@ -21,10 +21,10 @@ package org.apache.rave.gadgets.oauth.in import net.oauth.OAuth; import net.oauth.OAuthServiceProvider; -import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore; -import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo; -import org.apache.rave.gadgets.oauth.model.impl.OAuthConsumerStoreImpl; -import org.apache.rave.gadgets.oauth.model.impl.OAuthTokenInfoImpl; +import org.apache.rave.portal.model.OAuthConsumerStore; +import org.apache.rave.portal.model.OAuthTokenInfo; +import org.apache.rave.portal.model.impl.OAuthConsumerStoreImpl; +import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl; import org.apache.rave.gadgets.oauth.service.OAuthConsumerStoreService; import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService; import org.apache.shindig.auth.SecurityToken; Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java Tue Jun 12 14:32:42 2012 @@ -19,9 +19,9 @@ package org.apache.rave.gadgets.oauth.service; -import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore; -import org.apache.rave.gadgets.oauth.model.impl.OAuthConsumerStoreImpl; -import org.apache.rave.gadgets.oauth.repository.OAuthConsumerStoreRepository; +import org.apache.rave.portal.model.OAuthConsumerStore; +import org.apache.rave.portal.model.impl.OAuthConsumerStoreImpl; +import org.apache.rave.portal.repository.OAuthConsumerStoreRepository; import org.apache.rave.gadgets.oauth.service.impl.DefaultOAuthConsumerStoreService; import org.junit.Before; import org.junit.Test; Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java Tue Jun 12 14:32:42 2012 @@ -19,9 +19,9 @@ package org.apache.rave.gadgets.oauth.service; -import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo; -import org.apache.rave.gadgets.oauth.model.impl.OAuthTokenInfoImpl; -import org.apache.rave.gadgets.oauth.repository.OAuthTokenInfoRepository; +import org.apache.rave.portal.model.OAuthTokenInfo; +import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl; +import org.apache.rave.portal.repository.OAuthTokenInfoRepository; import org.apache.rave.gadgets.oauth.service.impl.DefaultOAuthTokenInfoService; import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.gadgets.oauth.OAuthStore; @@ -103,6 +103,8 @@ public class DefaultOAuthTokenInfoServic expect(tokenInfo.getTokenExpireMillis()).andReturn(3600000L); expect(tokenInfo.getTokenSecret()).andReturn("tokenSecret"); replay(securityToken, tokenInfo); - return new OAuthTokenInfoImpl(securityToken, SERVICE_NAME, TOKEN_NAME, tokenInfo); + return new OAuthTokenInfoImpl(securityToken.getAppUrl(), SERVICE_NAME, TOKEN_NAME, tokenInfo.getAccessToken(), + tokenInfo.getSessionHandle(), tokenInfo.getTokenSecret(), + securityToken.getViewerId(), tokenInfo.getTokenExpireMillis()); } } Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java Tue Jun 12 14:32:42 2012 @@ -22,14 +22,11 @@ package org.apache.rave.inject; import com.google.inject.Guice; import com.google.inject.Injector; import org.apache.rave.opensocial.service.impl.DefaultPersonService; -import org.apache.rave.persistence.BasicEntity; import org.apache.shindig.social.opensocial.spi.PersonService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.LocalEntityManagerFactoryBean; -import org.springframework.stereotype.Repository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -64,41 +61,6 @@ public class SpringBindingModuleTest { assertThat(personService1, is(sameInstance(personService2))); } - @Test - public void bindsProxiedBean() { - LocalEntityManagerFactoryBean factory = injector.getInstance(LocalEntityManagerFactoryBean.class); - assertThat(factory, is(not(nullValue()))); - } - @Test - public void multipleRepositories() { - TestRepo repo = injector.getInstance(TestRepo.class); - assertThat(repo, is(not(nullValue()))); - } - public static interface TestRepo extends org.apache.rave.persistence.Repository<BasicEntity> {} - - @Repository - public static class JpaTestRepo implements TestRepo { - - @Override - public Class<? extends BasicEntity> getType() { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - @Override - public BasicEntity get(long id) { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - @Override - public BasicEntity save(BasicEntity item) { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - - @Override - public void delete(BasicEntity item) { - //To change body of implemented methods use File | Settings | File Templates. - } - } } Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java Tue Jun 12 14:32:42 2012 @@ -19,10 +19,10 @@ package org.apache.rave.opensocial.service; -import org.apache.rave.opensocial.model.ApplicationData; -import org.apache.rave.opensocial.model.impl.ApplicationDataImpl; +import org.apache.rave.portal.model.ApplicationData; +import org.apache.rave.portal.model.impl.ApplicationDataImpl; import org.apache.rave.portal.model.Person; -import org.apache.rave.opensocial.repository.ApplicationDataRepository; +import org.apache.rave.portal.repository.ApplicationDataRepository; import org.apache.rave.opensocial.service.impl.DefaultAppDataService; import org.apache.rave.portal.model.impl.PersonImpl; import org.apache.rave.service.LockService; Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml Tue Jun 12 14:32:42 2012 @@ -41,51 +41,27 @@ <!-- enable the use of the @AspectJ style of Spring AOP --> <aop:aspectj-autoproxy /> - <context:component-scan base-package="org.apache.rave.commoncontainer" annotation-config="true"/> +<!-- <context:component-scan base-package="org.apache.rave.commoncontainer" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.gadgets" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.inject" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.portal.model" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.portal.repository" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.opensocial" annotation-config="true"/> - <context:component-scan base-package="org.apache.rave.service" annotation-config="true"/> - - <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager"> - <property name="entityManagerFactory" ref="entityManagerFactory"/> + <context:component-scan base-package="org.apache.rave.service" annotation-config="true"/>--> + <bean id="mockPersonRepo" class="org.easymock.EasyMock" factory-method="createNiceMock"> + <constructor-arg value="org.apache.rave.opensocial.repository.OpenSocialPersonRepository"/> </bean> - <tx:annotation-driven transaction-manager="transactionManager"/> - - <bean id="entityManagerFactory" - class="org.apache.rave.persistence.jpa.PopulatedLocalContainerEntityManagerFactory"> - <property name="persistenceUnitName" value="raveShindigPersistenceUnit"/> - <property name="dataSource" ref="dataSource"/> - <property name="populator" ref="dataSourcePopulator"/> - <property name="jpaVendorAdapter"> - <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" - p:databasePlatform="${rave-shindig.jpaVendorAdapter.databasePlatform}" - p:database="${rave-shindig.jpaVendorAdapter.database}" - p:showSql="${rave-shindig.jpaVendorAdapter.showSql}"/> - </property> - <property name="jpaPropertyMap"> - <map> - <entry key="openjpa.Log" value="${rave-shindig.openjpa.Log}"/> - <entry key="openjpa.RuntimeUnenhancedClasses" value="${rave-shindig.openjpa.RuntimeUnenhancedClasses}"/> - <entry key="openjpa.jdbc.SynchronizeMappings" value="${rave-shindig.openjpa.jdbc.SynchronizeMappings}"/> - </map> - </property> - </bean> - - <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> - <property name="url" value="${rave-shindig.dataSource.url}"/> - <property name="driverClassName" value="${rave-shindig.dataSource.driver}"/> - <property name="username" value="${rave-shindig.dataSource.username}"/> - <property name="password" value="${rave-shindig.dataSource.password}"/> + <bean id="personService" class="org.apache.rave.opensocial.service.impl.DefaultPersonService"> + <constructor-arg name="repository" ref="mockPersonRepo" /> </bean> + <bean id="springBindingModule" class="org.apache.rave.inject.SpringBindingModule" /> + <!-- <bean id="oAuthStore" class="org.apache.rave.gadgets.oauth.inject.DefaultOAuthStore"> <constructor-arg name="defaultCallbackUrl" value="${shindig.signing.global-callback-url}"/> <constructor-arg name="pathToPrivateKey" value="${shindig.signing.key-file}"/> <constructor-arg name="privateKeyName" value="${shindig.signing.key-name}"/> - </bean> + </bean>--> </beans> Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml?rev=1349374&r1=1349373&r2=1349374&view=diff ============================================================================== --- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml (original) +++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml Tue Jun 12 14:32:42 2012 @@ -59,6 +59,10 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.rave</groupId> + <artifactId>rave-jpa</artifactId> + </dependency> + <dependency> <groupId>org.apache.shindig</groupId> <artifactId>shindig-server</artifactId> <type>war</type>
