You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2013/03/22 17:13:07 UTC
svn commit: r1459881 [8/8] - in /rave/trunk: ./ rave-components/
rave-components/rave-core-api/ rave-components/rave-core-api/src/
rave-components/rave-core-api/src/main/
rave-components/rave-core-api/src/main/java/
rave-components/rave-core-api/src/ma...
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.provider.opensocial.service.impl;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.WidgetMetadataResolver;
import org.apache.rave.provider.opensocial.Constants;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@
package org.apache.rave.provider.opensocial.web.renderer;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.web.renderer.RegionWidgetRenderer;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.ScriptLocation;
@@ -84,7 +84,7 @@ public class OpenSocialWidgetRenderer im
}
/**
- * Renders a {@link org.apache.rave.portal.model.RegionWidget} as HTML markup
+ * Renders a {@link org.apache.rave.model.RegionWidget} as HTML markup
*
*
* @param item RegionWidget to render
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/OpenSocialServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/OpenSocialServiceTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/OpenSocialServiceTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/OpenSocialServiceTest.java Fri Mar 22 16:12:58 2013
@@ -20,10 +20,10 @@
package org.apache.rave.provider.opensocial.service;
import org.apache.rave.exception.ResourceNotFoundException;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
-import org.apache.rave.portal.model.WidgetStatus;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.WidgetStatus;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.PageService;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/OpenSocialWidgetMetadataResolverTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/OpenSocialWidgetMetadataResolverTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/OpenSocialWidgetMetadataResolverTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/OpenSocialWidgetMetadataResolverTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.provider.opensocial.service;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.service.WidgetMetadataResolver;
import org.apache.rave.provider.opensocial.repository.GadgetMetadataRepository;
import org.apache.rave.provider.opensocial.service.impl.OpenSocialWidgetMetadataResolver;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.provider.opensocial.service;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.service.UserService;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@
package org.apache.rave.provider.opensocial.web.renderer;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.Renderer;
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java Fri Mar 22 16:12:58 2013
@@ -26,8 +26,8 @@ import net.oauth.signature.RSA_SHA1;
import org.apache.commons.io.IOUtils;
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.model.OAuthConsumerStore;
+import org.apache.rave.model.OAuthTokenInfo;
import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.gadgets.GadgetException;
@@ -132,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.portal.model.OAuthConsumerStore}
+ * @param consumerStore {@link org.apache.rave.model.OAuthConsumerStore}
* persistent OAuth consumer keys & secrets
* @return {@link OAuthConsumer} if the signature method is supported
*/
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthConsumerStoreService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthConsumerStoreService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthConsumerStoreService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.gadgets.oauth.service;
-import org.apache.rave.portal.model.OAuthConsumerStore;
+import org.apache.rave.model.OAuthConsumerStore;
/**
* Service to handle OAuth Consumer store
@@ -27,27 +27,27 @@ import org.apache.rave.portal.model.OAut
public interface OAuthConsumerStoreService {
/**
- * Fetches {@link org.apache.rave.portal.model.OAuthConsumerStore} based on the gadget location and the service provider
+ * Fetches {@link org.apache.rave.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.portal.model.OAuthConsumerStore} or {@literal null} if none matches the criteria
+ * @return {@link org.apache.rave.model.OAuthConsumerStore} or {@literal null} if none matches the criteria
*/
OAuthConsumerStore findByUriAndServiceName(String gadgetUri, String serviceName);
/**
- * Persists {@link org.apache.rave.portal.model.OAuthConsumerStore}
+ * Persists {@link org.apache.rave.model.OAuthConsumerStore}
*
- * @param oAuthConsumerStore {@link org.apache.rave.portal.model.OAuthConsumerStore} to store
- * @return persisted {@link org.apache.rave.portal.model.OAuthConsumerStore}
+ * @param oAuthConsumerStore {@link org.apache.rave.model.OAuthConsumerStore} to store
+ * @return persisted {@link org.apache.rave.model.OAuthConsumerStore}
*/
OAuthConsumerStore save(OAuthConsumerStore oAuthConsumerStore);
/**
- * Removes the {@link org.apache.rave.portal.model.OAuthConsumerStore} from the database
+ * Removes the {@link org.apache.rave.model.OAuthConsumerStore} from the database
*
- * @param oAuthConsumerStore {@link org.apache.rave.portal.model.OAuthConsumerStore} to delete
+ * @param oAuthConsumerStore {@link org.apache.rave.model.OAuthConsumerStore} to delete
*/
void delete(OAuthConsumerStore oAuthConsumerStore);
}
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java Fri Mar 22 16:12:58 2013
@@ -19,35 +19,35 @@
package org.apache.rave.gadgets.oauth.service;
-import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.model.OAuthTokenInfo;
/**
* Service to handle OAuth Tokens
*/
public interface OAuthTokenInfoService {
/**
- * Retrieves {@link org.apache.rave.portal.model.OAuthTokenInfo}
+ * Retrieves {@link org.apache.rave.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.portal.model.OAuthTokenInfo} or {@literal null} if none matches the criteria
+ * @return {@link org.apache.rave.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.portal.model.OAuthTokenInfo} to the data store
+ * Persists the {@link org.apache.rave.model.OAuthTokenInfo} to the data store
*
- * @param tokenInfo {@link org.apache.rave.portal.model.OAuthTokenInfo} to save
+ * @param tokenInfo {@link org.apache.rave.model.OAuthTokenInfo} to save
* @return persisted OAuthTokenInfo
*/
OAuthTokenInfo saveOAuthTokenInfo(OAuthTokenInfo tokenInfo);
/**
- * Removes the {@link org.apache.rave.portal.model.OAuthTokenInfo}'s that match the criteria from the data store
+ * Removes the {@link org.apache.rave.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/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.gadgets.oauth.service.impl;
-import org.apache.rave.portal.model.OAuthConsumerStore;
+import org.apache.rave.model.OAuthConsumerStore;
import org.apache.rave.portal.repository.OAuthConsumerStoreRepository;
import org.apache.rave.gadgets.oauth.service.OAuthConsumerStoreService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.gadgets.oauth.service.impl;
-import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.model.OAuthTokenInfo;
import org.apache.rave.portal.repository.OAuthTokenInfoRepository;
import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/OpenSocialPersonRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/OpenSocialPersonRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/OpenSocialPersonRepository.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/OpenSocialPersonRepository.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.opensocial.repository;
-import org.apache.rave.portal.model.Person;
+import org.apache.rave.model.Person;
import org.apache.rave.portal.repository.PersonRepository;
import org.apache.shindig.protocol.model.FilterOperation;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ 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.model.Person;
import org.apache.rave.portal.repository.PersonRepository;
import org.apache.shindig.protocol.model.FilterOperation;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/SimplePersonService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/SimplePersonService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/SimplePersonService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/SimplePersonService.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.opensocial.service;
-import org.apache.rave.portal.model.Person;
+import org.apache.rave.model.Person;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.GroupId;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java Fri Mar 22 16:12:58 2013
@@ -23,8 +23,8 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.apache.rave.portal.model.ActivityStreamsEntry;
-import org.apache.rave.portal.model.ActivityStreamsObject;
+import org.apache.rave.model.ActivityStreamsEntry;
+import org.apache.rave.model.ActivityStreamsObject;
import org.apache.rave.portal.model.impl.ActivityStreamsEntryImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsMediaLinkImpl;
import org.apache.rave.portal.repository.ActivityStreamsRepository;
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java Fri Mar 22 16:12:58 2013
@@ -20,11 +20,11 @@
package org.apache.rave.opensocial.service.impl;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.ApplicationData;
+import org.apache.rave.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.model.Person;
import org.apache.rave.service.LockService;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
@@ -232,7 +232,7 @@ public class DefaultAppDataService imple
private List<String> convertPeopleToUserIds(List<Person> people) {
List<String> ids = new ArrayList<String>(people.size());
- for (org.apache.rave.portal.model.Person person : people) {
+ for (Person person : people) {
ids.add(String.valueOf(person.getUsername()));
}
return ids;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java Fri Mar 22 16:12:58 2013
@@ -65,7 +65,7 @@ public class DefaultPersonService implem
SecurityToken token) throws ProtocolException {
collectionOptions = manipulateCollectionOptions(collectionOptions,token);
- List<org.apache.rave.portal.model.Person> people = getPeople(userIds, groupId, collectionOptions, token);
+ List<org.apache.rave.model.Person> people = getPeople(userIds, groupId, collectionOptions, token);
return ImmediateFuture.newInstance(new RestfulCollection<Person>(convertPeople(people, fields)));
}
@@ -81,7 +81,7 @@ public class DefaultPersonService implem
}
@Override
- public List<org.apache.rave.portal.model.Person> getPeople(Set<UserId> userIds, GroupId groupId,
+ public List<org.apache.rave.model.Person> getPeople(Set<UserId> userIds, GroupId groupId,
CollectionOptions collectionOptions,
SecurityToken token) {
switch (groupId.getType()) {
@@ -101,36 +101,36 @@ public class DefaultPersonService implem
}
}
- private List<org.apache.rave.portal.model.Person> getUniqueListOfFriends(Set<UserId> userIds,
+ private List<org.apache.rave.model.Person> getUniqueListOfFriends(Set<UserId> userIds,
CollectionOptions collectionOptions,
SecurityToken token) {
- List<org.apache.rave.portal.model.Person> people = new ArrayList<org.apache.rave.portal.model.Person>();
+ List<org.apache.rave.model.Person> people = new ArrayList<org.apache.rave.model.Person>();
for (UserId id : userIds) {
- org.apache.rave.portal.model.Person person = this.getPersonForId(id, token);
+ org.apache.rave.model.Person person = this.getPersonForId(id, token);
CollectionUtils.addUniqueValues(getFriendsFromRepository(collectionOptions, token.getAppId(), person.getUsername()), people);
}
return people;
}
- private List<org.apache.rave.portal.model.Person> getUniqueListOfConnectedPeople(Set<UserId> userIds,
+ private List<org.apache.rave.model.Person> getUniqueListOfConnectedPeople(Set<UserId> userIds,
CollectionOptions collectionOptions,
SecurityToken token) {
- List<org.apache.rave.portal.model.Person> people = new ArrayList<org.apache.rave.portal.model.Person>();
+ List<org.apache.rave.model.Person> people = new ArrayList<org.apache.rave.model.Person>();
for (UserId id : userIds) {
- org.apache.rave.portal.model.Person person = this.getPersonForId(id, token);
+ org.apache.rave.model.Person person = this.getPersonForId(id, token);
CollectionUtils.addUniqueValues(getConnectedPeopleFromRepository(collectionOptions, token.getAppId(), person.getUsername()), people);
}
return people;
}
- private List<org.apache.rave.portal.model.Person> getFriendsFromRepository(CollectionOptions collectionOptions,
+ private List<org.apache.rave.model.Person> getFriendsFromRepository(CollectionOptions collectionOptions,
String appId,
String userId) {
String filter = collectionOptions == null ? null : collectionOptions.getFilter();
- List<org.apache.rave.portal.model.Person> current;
+ List<org.apache.rave.model.Person> current;
//Currently ignoring TOP FRIENDS as it hasn't been defined what a top friend is
if (filter == null || filter.equals(PersonService.ALL_FILTER) || filter.equals(PersonService.TOP_FRIENDS_FILTER)) {
current = repository.findFriends(userId);
@@ -148,12 +148,12 @@ public class DefaultPersonService implem
return current;
}
- private List<org.apache.rave.portal.model.Person> getConnectedPeopleFromRepository(CollectionOptions collectionOptions,
+ private List<org.apache.rave.model.Person> getConnectedPeopleFromRepository(CollectionOptions collectionOptions,
String appId,
String userId) {
String filter = collectionOptions == null ? null : collectionOptions.getFilter();
- List<org.apache.rave.portal.model.Person> current;
+ List<org.apache.rave.model.Person> current;
//Currently ignoring TOP FRIENDS as it hasn't been defined what a top friend is
if (filter == null || filter.equals(PersonService.ALL_FILTER) || filter.equals(PersonService.TOP_FRIENDS_FILTER)) {
@@ -172,12 +172,12 @@ public class DefaultPersonService implem
return current;
}
- private List<org.apache.rave.portal.model.Person> getGroupMembersFromRepository(CollectionOptions collectionOptions,
+ private List<org.apache.rave.model.Person> getGroupMembersFromRepository(CollectionOptions collectionOptions,
String groupId,
String appId) {
String filter = collectionOptions == null ? null : collectionOptions.getFilter();
- List<org.apache.rave.portal.model.Person> current;
+ List<org.apache.rave.model.Person> current;
if (filter == null || filter.equals(PersonService.ALL_FILTER) || filter.equals(PersonService.TOP_FRIENDS_FILTER)) {
current = repository.findByGroup(groupId);
@@ -195,29 +195,29 @@ public class DefaultPersonService implem
return current;
}
- private org.apache.rave.portal.model.Person getPersonForId(UserId id, SecurityToken token) {
+ private org.apache.rave.model.Person getPersonForId(UserId id, SecurityToken token) {
return getFromRepository(id.getUserId(token));
}
- private org.apache.rave.portal.model.Person getFromRepository(String userId) {
+ private org.apache.rave.model.Person getFromRepository(String userId) {
- org.apache.rave.portal.model.Person person = repository.findByUsername(userId);
+ org.apache.rave.model.Person person = repository.findByUsername(userId);
if (person == null) {
throw new ProtocolException(HttpServletResponse.SC_NOT_FOUND, "The person with the id " + userId + " was not found.");
}
return person;
}
- private static List<Person> convertPeople(List<org.apache.rave.portal.model.Person> people, Set<String> fields) {
+ private static List<Person> convertPeople(List<org.apache.rave.model.Person> people, Set<String> fields) {
List<Person> wrappedPeople = new ArrayList<Person>();
- for (org.apache.rave.portal.model.Person person : people) {
+ for (org.apache.rave.model.Person person : people) {
wrappedPeople.add(convertPerson(person, fields));
}
return wrappedPeople;
}
- private static Person convertPerson(org.apache.rave.portal.model.Person person, Set<String> fields) {
+ private static Person convertPerson(org.apache.rave.model.Person person, Set<String> fields) {
return new FieldRestrictingPerson(person, fields);
}
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,8 @@
package org.apache.rave.opensocial.service.impl;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.PersonProperty;
+import org.apache.rave.model.Person;
+import org.apache.rave.model.PersonProperty;
import org.apache.rave.portal.model.util.ModelUtils;
import org.apache.rave.util.CollectionUtils;
import org.apache.shindig.protocol.model.Enum;
@@ -56,7 +57,7 @@ import java.util.Set;
import static org.apache.rave.util.CollectionUtils.getSingleValue;
/**
- * Wraps a {@link org.apache.rave.portal.model.Person} model object and returns values only if
+ * Wraps a {@link org.apache.rave.model.Person} model object and returns values only if
* the field set contains the requested field
* <p/>
* Usage of this wrapper is made possible by Shindig's use of a getter based serialization model
@@ -66,14 +67,14 @@ import static org.apache.rave.util.Colle
*/
public class FieldRestrictingPerson implements org.apache.shindig.social.opensocial.model.Person, Serializable {
- private org.apache.rave.portal.model.Person internal;
+ private Person internal;
private Set<String> fields;
private Map<String, ?> appData;
private boolean isOwner;
private boolean isViewer;
private Map<String, List<PersonProperty>> propertyMap;
- public FieldRestrictingPerson(org.apache.rave.portal.model.Person internal, Set<String> fields) {
+ public FieldRestrictingPerson(Person internal, Set<String> fields) {
this.internal = internal;
this.fields = fields;
this.propertyMap = internal != null && internal.getProperties() != null ?
@@ -230,7 +231,7 @@ public class FieldRestrictingPerson impl
public Address getCurrentLocation() {
String qualifier = getSingleValueFromProperties(Field.CURRENT_LOCATION);
if (qualifier != null) {
- for (org.apache.rave.portal.model.Address address : internal.getAddresses()) {
+ for (org.apache.rave.model.Address address : internal.getAddresses()) {
if (qualifier.equals(address.getQualifier())) {
return convertAddress(address);
}
@@ -852,17 +853,17 @@ public class FieldRestrictingPerson impl
return new UrlImpl(property.getValue(), property.getExtendedValue(), property.getQualifier());
}
- private List<Address> convertAddresses(List<org.apache.rave.portal.model.Address> addresses) {
+ private List<Address> convertAddresses(List<org.apache.rave.model.Address> addresses) {
List<Address> converted = new ArrayList<Address>();
if (addresses != null) {
- for (org.apache.rave.portal.model.Address address : addresses) {
+ for (org.apache.rave.model.Address address : addresses) {
converted.add(convertAddress(address));
}
}
return converted;
}
- private Address convertAddress(org.apache.rave.portal.model.Address address) {
+ private Address convertAddress(org.apache.rave.model.Address address) {
Address converted = new AddressImpl(address.getFormatted());
converted.setCountry(address.getCountry());
converted.setLatitude(address.getLatitude());
@@ -910,17 +911,17 @@ public class FieldRestrictingPerson impl
return account;
}
- private List<Organization> convertOrganizations(List<org.apache.rave.portal.model.Organization> organizations) {
+ private List<Organization> convertOrganizations(List<org.apache.rave.model.Organization> organizations) {
List<Organization> converted = new ArrayList<Organization>();
if (organizations != null) {
- for (org.apache.rave.portal.model.Organization org : organizations) {
+ for (org.apache.rave.model.Organization org : organizations) {
converted.add(convertOrganization(org));
}
}
return converted;
}
- private Organization convertOrganization(org.apache.rave.portal.model.Organization org) {
+ private Organization convertOrganization(org.apache.rave.model.Organization org) {
Organization converted = new org.apache.shindig.social.core.model.OrganizationImpl();
converted.setAddress(convertAddress(org.getAddress()));
converted.setDescription(org.getDescription());
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/util/ActivityConversionUtil.java Fri Mar 22 16:12:58 2013
@@ -20,10 +20,10 @@
package org.apache.rave.util;
import com.google.common.collect.Lists;
-import org.apache.rave.portal.model.ActivityStreamsEntry;
-import org.apache.rave.portal.model.ActivityStreamsItem;
-import org.apache.rave.portal.model.ActivityStreamsMediaLink;
-import org.apache.rave.portal.model.ActivityStreamsObject;
+import org.apache.rave.model.ActivityStreamsEntry;
+import org.apache.rave.model.ActivityStreamsMediaLink;
+import org.apache.rave.model.ActivityStreamsItem;
+import org.apache.rave.model.ActivityStreamsObject;
import org.apache.rave.portal.model.impl.ActivityStreamsEntryImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsMediaLinkImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsObjectImpl;
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java Fri Mar 22 16:12:58 2013
@@ -21,8 +21,8 @@ package org.apache.rave.gadgets.oauth.in
import net.oauth.OAuth;
import net.oauth.OAuthServiceProvider;
-import org.apache.rave.portal.model.OAuthConsumerStore;
-import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.model.OAuthConsumerStore;
+import org.apache.rave.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;
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.gadgets.oauth.service;
-import org.apache.rave.portal.model.OAuthConsumerStore;
+import org.apache.rave.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;
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.gadgets.oauth.service;
-import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.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;
Modified: rave/trunk/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/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java Fri Mar 22 16:12:58 2013
@@ -19,9 +19,9 @@
package org.apache.rave.opensocial.service;
-import org.apache.rave.portal.model.ApplicationData;
+import org.apache.rave.model.ApplicationData;
import org.apache.rave.portal.model.impl.ApplicationDataImpl;
-import org.apache.rave.portal.model.Person;
+import org.apache.rave.model.Person;
import org.apache.rave.portal.repository.ApplicationDataRepository;
import org.apache.rave.opensocial.service.impl.DefaultAppDataService;
import org.apache.rave.portal.model.impl.PersonImpl;
@@ -63,7 +63,7 @@ public class AppDataServiceTest {
private Map<String, String> validApplicationDataMap;
private ApplicationData validApplicationData;
- private org.apache.rave.portal.model.Person validPerson;
+ private Person validPerson;
@Before
public void setup() {
@@ -392,7 +392,7 @@ public class AppDataServiceTest {
private List<String> convertPeopleToUserIds(List<Person> people) {
List<String> ids = new ArrayList<String>(people.size());
- for (org.apache.rave.portal.model.Person person : people) {
+ for (Person person : people) {
ids.add(String.valueOf(person.getUsername()));
}
return ids;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/DefaultActivityStreamsServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/DefaultActivityStreamsServiceTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/DefaultActivityStreamsServiceTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/DefaultActivityStreamsServiceTest.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ package org.apache.rave.opensocial.servi
import com.google.common.collect.Lists;
import org.apache.rave.opensocial.service.impl.DefaultActivityStreamsService;
-import org.apache.rave.portal.model.ActivityStreamsEntry;
+import org.apache.rave.model.ActivityStreamsEntry;
import org.apache.rave.portal.model.impl.ActivityStreamsEntryImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsMediaLinkImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsObjectImpl;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java Fri Mar 22 16:12:58 2013
@@ -22,7 +22,7 @@ package org.apache.rave.opensocial.servi
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.opensocial.service.impl.FieldRestrictingPerson;
-import org.apache.rave.portal.model.PersonProperty;
+import org.apache.rave.model.PersonProperty;
import org.apache.rave.portal.model.impl.AddressImpl;
import org.apache.rave.portal.model.impl.PersonImpl;
import org.apache.rave.portal.model.impl.PersonPropertyImpl;
@@ -263,7 +263,7 @@ public class FieldRestrictingPersonTest
@Test
public void getGender_null() {
- org.apache.rave.portal.model.Person testPerson = getTestPerson();
+ org.apache.rave.model.Person testPerson = getTestPerson();
testPerson.setProperties(new ArrayList<PersonProperty>());
Person p = new FieldRestrictingPerson(testPerson, getFieldSet(Person.Field.GENDER));
assertThat(p.getGender(), is(nullValue()));
@@ -631,8 +631,8 @@ public class FieldRestrictingPersonTest
new FieldRestrictingPerson(null, null).setHappiestWhen(SUFFIX);
}
- private org.apache.rave.portal.model.Person getTestPerson() {
- org.apache.rave.portal.model.Person person = new PersonImpl();
+ private org.apache.rave.model.Person getTestPerson() {
+ org.apache.rave.model.Person person = new PersonImpl();
person.setUsername(USERNAME);
person.setAboutMe(ABOUT_ME);
person.setAdditionalName(ADDITIONAL_NAME);
@@ -663,7 +663,7 @@ public class FieldRestrictingPersonTest
properties.add(new PersonPropertyImpl("1", "currentLocation", QUALIFIER, null, null, null));
properties.add(new PersonPropertyImpl("1", "account", IM_1, "1", IM_PROVIDER_1, false));
person.setProperties(properties);
- org.apache.rave.portal.model.Address address = new AddressImpl();
+ org.apache.rave.model.Address address = new AddressImpl();
address.setCountry(COUNTRY);
address.setLatitude(LATITUDE);
address.setLongitude(LONGITUDE);
@@ -672,7 +672,7 @@ public class FieldRestrictingPersonTest
address.setPostalCode(POSTAL_CODE);
address.setStreetAddress(STREET);
address.setQualifier(QUALIFIER);
- List<org.apache.rave.portal.model.Address> addresses = new ArrayList<org.apache.rave.portal.model.Address>();
+ List<org.apache.rave.model.Address> addresses = new ArrayList<org.apache.rave.model.Address>();
addresses.add(new AddressImpl());
addresses.add(address);
person.setAddresses(addresses);
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java Fri Mar 22 16:12:58 2013
@@ -23,7 +23,7 @@ import com.google.common.collect.Lists;
import org.apache.rave.opensocial.repository.OpenSocialPersonRepository;
import org.apache.rave.opensocial.service.impl.DefaultPersonService;
import org.apache.rave.opensocial.service.impl.FieldRestrictingPerson;
-import org.apache.rave.portal.model.PersonProperty;
+import org.apache.rave.model.PersonProperty;
import org.apache.rave.portal.model.impl.PersonImpl;
import org.apache.rave.portal.model.impl.PersonPropertyImpl;
import org.apache.shindig.auth.SecurityToken;
@@ -81,7 +81,7 @@ public class PersonServiceTest {
UserId id = new UserId(UserId.Type.userId, ID_1);
Set<String> fields = new HashSet<String>();
- org.apache.rave.portal.model.Person dbPerson = getDbPerson(ID_1);
+ org.apache.rave.model.Person dbPerson = getDbPerson(ID_1);
expect(repository.findByUsername(ID_1)).andReturn(dbPerson);
replay(repository);
@@ -103,7 +103,7 @@ public class PersonServiceTest {
fields.add(Person.Field.DISPLAY_NAME.toString());
fields.add(Person.Field.ID.toString());
- org.apache.rave.portal.model.Person dbPerson = getDbPerson();
+ org.apache.rave.model.Person dbPerson = getDbPerson();
expect(repository.findByUsername(ID_1)).andReturn(dbPerson);
replay(repository);
@@ -121,7 +121,7 @@ public class PersonServiceTest {
public void getPerson_nullFields() throws ExecutionException, InterruptedException {
UserId id = new UserId(UserId.Type.userId, ID_1);
- org.apache.rave.portal.model.Person dbPerson = getDbPerson(ID_1);
+ org.apache.rave.model.Person dbPerson = getDbPerson(ID_1);
expect(repository.findByUsername(ID_1)).andReturn(dbPerson);
replay(repository);
@@ -142,7 +142,7 @@ public class PersonServiceTest {
expect(token.getViewerId()).andReturn(ID_1);
replay(token);
- org.apache.rave.portal.model.Person dbPerson = getDbPerson(ID_1);
+ org.apache.rave.model.Person dbPerson = getDbPerson(ID_1);
expect(repository.findByUsername(ID_1)).andReturn(dbPerson);
replay(repository);
@@ -485,8 +485,8 @@ public class PersonServiceTest {
// Future<RestfulCollection<Person>> people = service.getPeople(ids, groupId, null, null, token);
// }
- private List<org.apache.rave.portal.model.Person> getDbPersonList() {
- return Lists.asList(getDbPerson(), new org.apache.rave.portal.model.Person[]{});
+ private List<org.apache.rave.model.Person> getDbPersonList() {
+ return Lists.asList(getDbPerson(), new org.apache.rave.model.Person[]{});
}
private Set<UserId> getUserIdSet() {
@@ -496,14 +496,14 @@ public class PersonServiceTest {
return ids;
}
- private org.apache.rave.portal.model.Person getDbPerson() {
+ private org.apache.rave.model.Person getDbPerson() {
PersonImpl dbPerson = new PersonImpl();
dbPerson.setUsername(ID_1);
dbPerson.setDisplayName(DISPLAY_NAME);
return dbPerson;
}
- private org.apache.rave.portal.model.Person getDbPerson(String id) {
+ private org.apache.rave.model.Person getDbPerson(String id) {
PersonImpl dbPerson = new PersonImpl();
dbPerson.setUsername(id);
dbPerson.setDisplayName(DISPLAY_NAME);
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/util/ActivityConversionUtilTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/util/ActivityConversionUtilTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/util/ActivityConversionUtilTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/util/ActivityConversionUtilTest.java Fri Mar 22 16:12:58 2013
@@ -21,8 +21,8 @@ package org.apache.rave.opensocial.util;
-import org.apache.rave.portal.model.ActivityStreamsMediaLink;
-import org.apache.rave.portal.model.ActivityStreamsObject;
+import org.apache.rave.model.ActivityStreamsObject;
+import org.apache.rave.model.ActivityStreamsMediaLink;
import org.apache.rave.portal.model.impl.ActivityStreamsEntryImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsMediaLinkImpl;
import org.apache.rave.portal.model.impl.ActivityStreamsObjectImpl;
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/W3CWidgetMetadataRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/W3CWidgetMetadataRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/W3CWidgetMetadataRepository.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/W3CWidgetMetadataRepository.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.provider.w3c.repository;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
public interface W3CWidgetMetadataRepository {
/**
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/impl/WookieWidgetMetadataRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/impl/WookieWidgetMetadataRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/impl/WookieWidgetMetadataRepository.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/impl/WookieWidgetMetadataRepository.java Fri Mar 22 16:12:58 2013
@@ -19,9 +19,7 @@
package org.apache.rave.provider.w3c.repository.impl;
-import java.io.IOException;
-
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.service.WidgetProviderService;
import org.apache.rave.provider.w3c.repository.W3CWidgetMetadataRepository;
import org.apache.rave.provider.w3c.service.impl.WookieWidgetService;
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolver.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolver.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolver.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolver.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.provider.w3c.service.impl;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.service.WidgetMetadataResolver;
import org.apache.rave.portal.service.WidgetProviderService;
import org.apache.rave.provider.w3c.Constants;
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java Fri Mar 22 16:12:58 2013
@@ -31,8 +31,8 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.commons.io.FileUtils;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.service.WidgetProviderService;
import org.apache.wookie.connector.framework.WidgetInstance;
import org.apache.wookie.connector.framework.WookieConnectorException;
@@ -57,7 +57,7 @@ public class WookieWidgetService impleme
}
/* (non-Javadoc)
- * @see org.apache.rave.portal.service.WidgetProviderService#getWidget(org.apache.rave.portal.model.User)
+ * @see org.apache.rave.portal.service.WidgetProviderService#getWidget(org.apache.rave.model.User)
*/
@Override
public Widget getWidget(User viewer, String sharedDataKey, Widget widget) {
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@
package org.apache.rave.provider.w3c.web.renderer;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.WidgetProviderService;
import org.apache.rave.portal.web.renderer.RegionWidgetRenderer;
@@ -85,7 +85,7 @@ public class W3cWidgetRenderer implement
}
/**
- * Renders a {@link org.apache.rave.portal.model.RegionWidget} as HTML markup
+ * Renders a {@link org.apache.rave.model.RegionWidget} as HTML markup
*
* @param wrapper RegionWidgetImpl to render
* @param context
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.provider.w3c.service.impl;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.WidgetMetadataResolver;
import org.apache.rave.provider.w3c.repository.W3CWidgetMetadataRepository;
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@
package org.apache.rave.provider.w3c.web.renderer;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.WidgetProviderService;