svn commit: r1348193 [3/3] - in /rave/branches/model_interfaces: rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/ rave-components/rave-core/src/main/j...

[ca...@apache.org]

Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java?rev=1348193&r1=1348192&r2=1348193&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java Fri Jun  8 19:07:05 2012
@@ -20,7 +20,11 @@
 package org.apache.rave.provider.opensocial.service.impl;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.PageImpl;
+import org.apache.rave.portal.model.impl.RegionImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
 import org.apache.rave.portal.model.impl.WidgetImpl;
 import org.apache.rave.portal.service.UserService;
 import org.apache.rave.provider.opensocial.exception.SecurityTokenException;
@@ -138,9 +142,9 @@ public class EncryptedBlobSecurityTokenS
         }
 
         //Create a new RegionWidget instance from it so we can use it to generate a new encrypted token
-        RegionWidget regionWidget = new JpaRegionWidget(securityToken.getModuleId(),
-                new JpaWidget(-1L, securityToken.getAppUrl()),
-                new JpaRegion(-1L, new Page(-1L, new User(Long.valueOf(securityToken.getOwnerId()))), -1));
+        RegionWidget regionWidget = new RegionWidgetImpl(securityToken.getModuleId(),
+                new WidgetImpl(-1L, securityToken.getAppUrl()),
+                new RegionImpl(-1L, new PageImpl(-1L, new User(Long.valueOf(securityToken.getOwnerId()))), -1));
 
         //Create and return the newly encrypted token
         return getEncryptedSecurityToken(regionWidget);

Modified: rave/branches/model_interfaces/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/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java?rev=1348193&r1=1348192&r2=1348193&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java Fri Jun  8 19:07:05 2012
@@ -25,6 +25,7 @@ import org.apache.rave.portal.model.conv
 import org.apache.rave.portal.model.conversion.JpaRegionConverter;
 import org.apache.rave.portal.model.conversion.JpaRegionWidgetConverter;
 import org.apache.rave.portal.model.conversion.JpaWidgetConverter;
+import org.apache.rave.portal.model.impl.*;
 import org.apache.rave.portal.service.UserService;
 import org.apache.rave.provider.opensocial.service.impl.EncryptedBlobSecurityTokenService;
 import org.apache.shindig.auth.SecurityToken;
@@ -56,7 +57,7 @@ public class SecurityTokenServiceTest {
     private Page validPage;
     private Region validRegion;
     private RegionWidget validRegionWidget;
-    private JpaWidget validWidget;
+    private Widget validWidget;
 
     private final Long VALID_REGION_WIDGET_ID = 1L;
     private final Long VALID_USER_ID = 1L;
@@ -100,15 +101,15 @@ public class SecurityTokenServiceTest {
 
         validPerson = new User(VALID_USER_ID, VALID_USER_NAME);
 
-        validPage = new Page(1L, validPerson);
-        validRegion = new JpaRegion(1L, validPage, 1);
+        validPage = new PageImpl(1L, validPerson);
+        validRegion = new RegionImpl(1L, validPage, 1);
         validPage.setRegions(Arrays.asList(validRegion));
 
         validWidget = new JpaWidget(1L, VALID_URL);
         validWidget.setType("OpenSocial");
         validWidget.setTitle("Widget Title");
 
-        validRegionWidget = new JpaRegionWidget(VALID_REGION_WIDGET_ID, validWidget, (JpaRegion)validRegion);
+        validRegionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID, validWidget, validRegion);
         validRegion.setRegionWidgets(Arrays.asList(validRegionWidget));
     }