Return-Path: X-Original-To: apmail-incubator-rave-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-rave-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 546DE68C3 for ; Thu, 26 May 2011 14:29:22 +0000 (UTC) Received: (qmail 54150 invoked by uid 500); 26 May 2011 14:29:22 -0000 Delivered-To: apmail-incubator-rave-commits-archive@incubator.apache.org Received: (qmail 54124 invoked by uid 500); 26 May 2011 14:29:22 -0000 Mailing-List: contact rave-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: rave-dev@incubator.apache.org Delivered-To: mailing list rave-commits@incubator.apache.org Received: (qmail 54117 invoked by uid 99); 26 May 2011 14:29:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2011 14:29:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2011 14:29:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 787702388901; Thu, 26 May 2011 14:28:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1127941 - in /incubator/rave/trunk/rave-portal/src: main/java/org/apache/rave/portal/web/controller/ main/java/org/apache/rave/portal/web/util/ main/resources/ main/webapp/WEB-INF/views/ test/java/org/apache/rave/portal/web/controller/ Date: Thu, 26 May 2011 14:28:57 -0000 To: rave-commits@incubator.apache.org From: mfranklin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110526142857.787702388901@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mfranklin Date: Thu May 26 14:28:56 2011 New Revision: 1127941 URL: http://svn.apache.org/viewvc?rev=1127941&view=rev Log: Added social gadget to widget store Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java incubator/rave/trunk/rave-portal/src/main/resources/initial_data.sql incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java?rev=1127941&r1=1127940&r2=1127941&view=diff ============================================================================== --- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java (original) +++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java Thu May 26 14:28:56 2011 @@ -44,14 +44,14 @@ public class WidgetStoreController { @RequestMapping(method = RequestMethod.GET) public String view(Model model, @RequestParam long referringPageId) { model.addAttribute(ModelKeys.WIDGETS, widgetService.getAllWidgets()); - model.addAttribute(ModelKeys.REFERER, referringPageId); + model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId); return ViewNames.STORE; } @RequestMapping(method = RequestMethod.GET, value = "widget/{widgetId}") public String viewWidget(Model model, @PathVariable long widgetId, @RequestParam long referringPageId) { model.addAttribute(ModelKeys.WIDGET, widgetService.getWidget(widgetId)); - model.addAttribute(ModelKeys.REFERER, referringPageId); + model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId); return ViewNames.WIDGET; } } Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java?rev=1127941&r1=1127940&r2=1127941&view=diff ============================================================================== --- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java (original) +++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java Thu May 26 14:28:56 2011 @@ -24,5 +24,5 @@ public class ModelKeys { public final static String ERROR_MESSAGE = "errorMessage"; // an error message to be reported to the user public static final String WIDGETS = "widgets"; // a list of widget objects public static final String WIDGET = "widget"; - public static final String REFERER = "referrer"; + public static final String REFERRING_PAGE_ID = "referringPageId"; } \ No newline at end of file Modified: incubator/rave/trunk/rave-portal/src/main/resources/initial_data.sql URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/resources/initial_data.sql?rev=1127941&r1=1127940&r2=1127941&view=diff ============================================================================== --- incubator/rave/trunk/rave-portal/src/main/resources/initial_data.sql (original) +++ incubator/rave/trunk/rave-portal/src/main/resources/initial_data.sql Thu May 26 14:28:56 2011 @@ -60,6 +60,10 @@ values(set(@tabnews_widget_id, next valu -- hamster widget insert into widget (id, title, url, type) values(set(@hamster_widget_id, next value for widget_id_seq), 'Pet Hamster', 'http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml', 'OpenSocial'); + +-- slideshare widget +insert into widget (id, title, url, type) +values(set(@gifts_widget_id, next value for widget_id_seq), 'Gifts', 'http://opensocial-resources.googlecode.com/svn/samples/tutorial/tags/api-0.8/gifts_1_friends.xml', 'OpenSocial'); -- end widget data ---- --- start page layout data --- @@ -158,4 +162,4 @@ INSERT INTO region_widget(id, widget_id, values (next value for region_widget_id_seq, @hamster_widget_id, @page_1_region_2, 0, 'N'); INSERT INTO region_widget(id, widget_id, region_id, render_order, collapsed) values (next value for region_widget_id_seq, @tabnews_widget_id, @page_1_region_2, 1, 'N'); ---- End canonical user_id_6 layout --- \ No newline at end of file +--- End canonical user_id_6 layout --- 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=1127941&r1=1127940&r2=1127941&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 Thu May 26 14:28:56 2011 @@ -35,7 +35,7 @@

Hello ${defaultPage.owner.username}, welcome to Rave!