svn commit: r1145878 - in /incubator/rave/trunk/rave-portal/src/main: java/org/apache/rave/portal/util/ java/org/apache/rave/portal/web/controller/ java/org/apache/rave/provider/opensocial/config/ webapp/WEB-INF/ webapp/WEB-INF/views/

[ja...@apache.org]

Author: jasha
Date: Wed Jul 13 06:28:31 2011
New Revision: 1145878

URL: http://svn.apache.org/viewvc?rev=1145878&view=rev
Log:
RAVE-45 move OpenSocialEnvironment from o.a.r.portal.util to o.a.r.provider.opensocial.config

Added:
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/opensocial/config/
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java
      - copied, changed from r1145874, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/util/OpenSocialEnvironment.java
Removed:
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/util/OpenSocialEnvironment.java
Modified:
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/HomeController.java
    incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml
    incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/HomeController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/HomeController.java?rev=1145878&r1=1145877&r2=1145878&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/HomeController.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/HomeController.java Wed Jul 13 06:28:31 2011
@@ -22,9 +22,9 @@ import org.apache.rave.portal.model.Page
 import org.apache.rave.portal.model.User;
 import org.apache.rave.portal.service.PageService;
 import org.apache.rave.portal.service.UserService;
-import org.apache.rave.portal.util.OpenSocialEnvironment;
 import org.apache.rave.portal.web.util.ModelKeys;
 import org.apache.rave.portal.web.util.ViewNames;
+import org.apache.rave.provider.opensocial.config.OpenSocialEnvironment;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

Copied: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java (from r1145874, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/util/OpenSocialEnvironment.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java?p2=incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java&p1=incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/util/OpenSocialEnvironment.java&r1=1145874&r2=1145878&rev=1145878&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/util/OpenSocialEnvironment.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java Wed Jul 13 06:28:31 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.rave.portal.util;
+package org.apache.rave.provider.opensocial.config;
 
 /**
  * Environment variables for OpenSocial calls from the portal (to Shindig)

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml?rev=1145878&r1=1145877&r2=1145878&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml Wed Jul 13 06:28:31 2011
@@ -91,7 +91,7 @@
     </bean>
 
     <!-- Environment variables for opensocial calls from the portal -->
-    <bean id="openSocialEnvironment" class="org.apache.rave.portal.util.OpenSocialEnvironment">
+    <bean id="openSocialEnvironment" class="org.apache.rave.provider.opensocial.config.OpenSocialEnvironment">
         <property name="engineProtocol" value="${portal.opensocial_engine.protocol}"/>
         <property name="engineRoot" value="${portal.opensocial_engine.root}"/>
         <property name="engineGadgetPath" value="${portal.opensocial_engine.gadget_path}"/>

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp?rev=1145878&r1=1145877&r2=1145878&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp Wed Jul 13 06:28:31 2011
@@ -25,7 +25,7 @@
 <%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %>
 <%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
 <jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
-<jsp:useBean id="openSocialEnv" scope="request" type="org.apache.rave.portal.util.OpenSocialEnvironment"/>
+<jsp:useBean id="openSocialEnv" scope="request" type="org.apache.rave.provider.opensocial.config.OpenSocialEnvironment"/>
 <c:set var="opensocial_engine_url" value="${openSocialEnv.engineProtocol}://${openSocialEnv.engineRoot}${openSocialEnv.engineGadgetPath}"/>
 
 <rave:rave_generic_page pageTitle="Home - Rave">