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 5BF2A9AE4 for ; Mon, 12 Mar 2012 18:14:11 +0000 (UTC) Received: (qmail 13911 invoked by uid 500); 12 Mar 2012 18:14:11 -0000 Delivered-To: apmail-incubator-rave-commits-archive@incubator.apache.org Received: (qmail 13883 invoked by uid 500); 12 Mar 2012 18:14:10 -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 13869 invoked by uid 99); 12 Mar 2012 18:14:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2012 18:14:10 +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; Mon, 12 Mar 2012 18:14:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E73FB2388CAE; Mon, 12 Mar 2012 18:13:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1299768 - in /incubator/rave/trunk: rave-components/rave-core/src/main/java/org/apache/rave/portal/service/ rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/ rave-portal-resources/src/main/resources/ rave-portal-re... Date: Mon, 12 Mar 2012 18:13:38 -0000 To: rave-commits@incubator.apache.org From: jasha@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120312181338.E73FB2388CAE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jasha Date: Mon Mar 12 18:13:37 2012 New Revision: 1299768 URL: http://svn.apache.org/viewvc?rev=1299768&view=rev Log: RAVE-492 Add ability to import w3c widgets using the "add widget" page. Patch made by Paul Sharples (psharples). Added: incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/ incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/W3CWidgetMetadataRepository.java incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/impl/ incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/repository/impl/WookieWidgetMetadataRepository.java incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolver.java incubator/rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java incubator/rave/trunk/rave-providers/rave-w3c-provider/src/test/resources/allwidgets.xml incubator/rave/trunk/rave-providers/rave-w3c-provider/src/test/resources/singlewidget.xml Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp incubator/rave/trunk/rave-portal-resources/src/main/webapp/script/rave_api.js incubator/rave/trunk/rave-providers/rave-opensocial-provider/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java?rev=1299768&r1=1299767&r2=1299768&view=diff ============================================================================== --- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java (original) +++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java Mon Mar 12 18:13:37 2012 @@ -24,4 +24,5 @@ import org.apache.rave.portal.model.Widg public interface WidgetMetadataResolver { String getSupportedContext(); Widget getMetadata(String url); + Widget[] getMetadataGroup(String url); } Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java?rev=1299768&r1=1299767&r2=1299768&view=diff ============================================================================== --- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java (original) +++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java Mon Mar 12 18:13:37 2012 @@ -65,4 +65,19 @@ public class WidgetApi { } }.getResult(); } + + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "metadatagroup/get") + public RpcResult getWidgetMetadataGroup(@RequestParam final String url, + @RequestParam final String type) { + return new RpcOperation() { + @Override + public Widget[] execute() { + if (widgetMetadataResolverMap.get(type) == null) { + throw new IllegalArgumentException("Get Metadata group for provider " + type + " is not implemented"); + } + return widgetMetadataResolverMap.get(type).getMetadataGroup(url); + } + }.getResult(); + } } Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1299768&r1=1299767&r2=1299768&view=diff ============================================================================== --- incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties (original) +++ incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties Mon Mar 12 18:13:37 2012 @@ -48,6 +48,7 @@ page.error.reload=reloading page.error.details=technical details page.general.back=Back to Rave +page.general.browse=Browse page.general.addnewpage=Add a New Page page.general.confirmpassword=Confirm password: page.general.deletepage=Delete Page Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1299768&r1=1299767&r2=1299768&view=diff ============================================================================== --- incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties (original) +++ incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties Mon Mar 12 18:13:37 2012 @@ -50,6 +50,7 @@ page.error.reload=herladen page.error.details=Technische details page.general.back=Terug naar Rave +page.general.browse=Blader page.general.addnewpage=Voeg een nieuwe pagina toe page.general.confirmpassword=Bevestig wachtwoord: page.general.deletepage=Verwijder pagina Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1299768&r1=1299767&r2=1299768&view=diff ============================================================================== --- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp (original) +++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp Mon Mar 12 18:13:37 2012 @@ -75,10 +75,15 @@

- - + +

@@ -98,6 +103,12 @@ $('#authorEmail').val(widget.authorEmail); $('#addWidgetForm').show(); $('#addWidgetFormSubmit').show(); + // update this field so we can pass widgets by key + // (soon to be superseeded in wookie by using the guid instead) + // remove when using 0.10.0 of wookie + if($('input[name=type]:checked').val()=='W3C'){ + $('#url').val(widget.url); + } } });"> @@ -178,4 +189,144 @@ rave.setContext(""); $('#addWidgetForm').hide(); $('#addWidgetFormSubmit').hide(); - }); \ No newline at end of file + $('#w3cBrowseLink').hide(); + $('input[name=type]:first').attr('checked', true); + $('input[name=type]').change(function(){ + if($('input[name=type]:checked').val()=='W3C'){ + $('#w3cBrowseLink').show(); + } + else{ + $('#w3cBrowseLink').hide(); + } + }); + + $("#w3cBrowseForm").dialog({ + autoOpen: false, + height: 300, + width: 350, + modal: true, + buttons: { + Cancel: function(){ + $(this).dialog("close"); + } + }, + close: function(){ + // clear contents + $('#w3cwidgetsList').empty(); + } + }); + + $("#w3cBrowseLink").click(function() { + rave.api.rpc.getWidgetMetadataGroup({ + url: "?all=true", + providerType: "W3C", + successCallback: function(result) { + var i=0; + var widgets = result.result; + PostLoadW3cWidgets.setList(widgets); + jQuery.each(widgets, function() { + $('#w3cwidgetsList') + .append( + $("
  • ") + .addClass("storeItem") + .append( + $("
    ") + .addClass("storeItemLeft") + .append( + $("
    ") + .attr("id", "w3cImageHolder"+i) + ) + .append( + $("
    ") + .attr("id", "widgetAdded") + .addClass("storeButton") + .append( + $("