You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/06/06 15:39:46 UTC
svn commit: r1132637 - in /incubator/rave/trunk/rave-portal/src:
main/java/org/apache/rave/provider/w3c/web/renderer/
main/webapp/WEB-INF/tags/ main/webapp/WEB-INF/views/ test/javascript/
Author: mfranklin
Date: Mon Jun 6 13:39:46 2011
New Revision: 1132637
URL: http://svn.apache.org/viewvc?rev=1132637&view=rev
Log:
Applied patch from RAVE-56
Added:
incubator/rave/trunk/rave-portal/src/test/javascript/raveStoreSpec.js
Modified:
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/tags/rave_generic_page.tag
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java?rev=1132637&r1=1132636&r2=1132637&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java Mon Jun 6 13:39:46 2011
@@ -19,6 +19,8 @@
package org.apache.rave.provider.w3c.web.renderer;
+import static org.apache.rave.provider.w3c.Constants.WIDGET_TYPE;
+
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.Widget;
@@ -28,8 +30,6 @@ import org.springframework.beans.factory
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
-import static org.apache.rave.provider.w3c.Constants.WIDGET_TYPE;
-
/**
* Creates the appropriate markup to represent a W3C widget
*/
@@ -37,7 +37,7 @@ import static org.apache.rave.provider.w
public class W3cWidgetRenderer implements RegionWidgetRenderer {
- private static final String IFRAME_MARKUP = "<script type=\"text/javascript\">" +
+ private static final String IFRAME_MARKUP = "<script>" +
"widgets.push({type: '%1$s'," +
" regionWidgetId: %2$s," +
" widgetUrl: '%3$s'});" +
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/tags/rave_generic_page.tag
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/tags/rave_generic_page.tag?rev=1132637&r1=1132636&r2=1132637&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/tags/rave_generic_page.tag (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/tags/rave_generic_page.tag Mon Jun 6 13:39:46 2011
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML>
<%--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,20 +17,21 @@
specific language governing permissions and limitations
under the License.
---%><%@ tag language="java" pageEncoding="UTF-8"%><%--
---%><%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%><%--
---%><%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%><%--
---%><%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%><%--
---%><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><%--
+--%>
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%--
This tag will provide simple template layouts for pages that use it. See for example home.jsp.
--%>
<html>
<head>
<title>Rave Home</title>
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/base/jquery-ui.css"/>
+ <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/base/jquery-ui.css"/>
<link rel="stylesheet" href="<c:url value="/css/default.css" />" />
</head>
<body>
- <jsp:doBody/>
+ <jsp:doBody/>
</body>
</html>
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=1132637&r1=1132636&r2=1132637&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 Mon Jun 6 13:39:46 2011
@@ -18,36 +18,36 @@
$Id$
---%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
---%><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
---%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %><%--
---%><%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %><%--
---%><%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%><%--
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ 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"/>
+<fmt:setBundle basename="portal" var="portal"/>
+<fmt:message bundle="${portal}" key="portal.opensocial_engine.protocol" var="osProtocol"/>
+<fmt:message bundle="${portal}" key="portal.opensocial_engine.root" var="osRoot"/>
+<fmt:message bundle="${portal}" key="portal.opensocial_engine.gadget_path" var="osGadget"/>
+<c:set var="opensocial_engine_url" value="${osProtocol}://${osRoot}${osGadget}"/>
---%><jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/><%--
---%><fmt:setBundle basename="portal" var="portal"/><%--
---%><fmt:message bundle="${portal}" key="portal.opensocial_engine.protocol" var="osProtocol"/><%--
---%><fmt:message bundle="${portal}" key="portal.opensocial_engine.root" var="osRoot"/><%--
---%><fmt:message bundle="${portal}" key="portal.opensocial_engine.gadget_path" var="osGadget"/><%--
---%><c:set var="opensocial_engine_url" value="${osProtocol}://${osRoot}${osGadget}"/><%--
-
---%><rave:rave_generic_page>
+<rave:rave_generic_page>
<c:set var="defaultPage" value="${pages[0]}"/>
<div id="header">
<a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">Logout</a>
<a href="<spring:url value="/app/store?referringPageId=${defaultPage.id}" />">Widget Store</a>
</div>
-<script src="${opensocial_engine_url}/js/container.js?c=1&container=default&debug=1" type="text/javascript"></script>
-<script src="<spring:url value="/script/rave.js"/>" type="text/javascript"></script>
-<script src="<spring:url value="/script/rave_api.js"/>" type="text/javascript"></script>
-<script src="<spring:url value="/script/rave_opensocial.js"/>" type="text/javascript"></script>
-<script src="<spring:url value="/script/rave_wookie.js"/>" type="text/javascript"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js" type="text/javascript"></script>
+<script src="${opensocial_engine_url}/js/container.js?c=1&container=default&debug=1"></script>
+<script src="<spring:url value="/script/rave.js"/>"></script>
+<script src="<spring:url value="/script/rave_api.js"/>"></script>
+<script src="<spring:url value="/script/rave_opensocial.js"/>"></script>
+<script src="<spring:url value="/script/rave_wookie.js"/>"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
<h1>Hello ${defaultPage.owner.username}, welcome to Rave!</h1>
-<script type="text/javascript">
+<script>
//Define the global widgets variable
//This array will be populated by RegionWidgetRender providers.
var widgets = [];
@@ -67,7 +67,7 @@
<span id="widget-${regionWidget.id}-toolbar" style="float:right;">
<button id="widget-${regionWidget.id}-max" class="widget-toolbar-btn"></button>
<button id="widget-${regionWidget.id}-remove" class="widget-toolbar-btn"></button>
- <script type="text/javascript">
+ <script>
$("#widget-${regionWidget.id}-max").button({
text: false,
icons: {
@@ -112,7 +112,7 @@
</c:forEach>
<div class="clear-float"> </div>
-<script type="text/javascript">
+<script>
$(function(){
rave.setContext("<spring:url value="/app/" />");
rave.initProviders();
@@ -120,4 +120,4 @@
rave.initDragAndDrop();
});
</script>
-</rave:rave_generic_page>
\ No newline at end of file
+</rave:rave_generic_page>
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp?rev=1132637&r1=1132636&r2=1132637&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp Mon Jun 6 13:39:46 2011
@@ -16,12 +16,13 @@
specific language governing permissions and limitations
under the License.
---%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
---%><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
---%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %><%--
---%><%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%><%--
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
---%><rave:rave_generic_page>
+<rave:rave_generic_page>
<div id="banner">
<span class="backToPage">
<a href="<spring:url value="/index.html" />">Back to Rave</a>
@@ -62,13 +63,13 @@
</div>
</c:forEach>
</div>
-<script type="text/javascript">
+<script>
var rave = rave || {
getContext : function() {
return "<spring:url value="/app/" />";
}
}
</script>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
-<script src="<spring:url value="/script/rave_api.js"/>" type="text/javascript"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
+<script src="<spring:url value="/script/rave_api.js"/>"></script>
</rave:rave_generic_page>
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp?rev=1132637&r1=1132636&r2=1132637&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp Mon Jun 6 13:39:46 2011
@@ -16,12 +16,14 @@
specific language governing permissions and limitations
under the License.
---%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
---%><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
---%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %><%--
---%><%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%><%--
---%><jsp:useBean id="widget" scope="request" class="org.apache.rave.portal.model.Widget" /><%--
---%><rave:rave_generic_page>
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
+<jsp:useBean id="widget" scope="request" class="org.apache.rave.portal.model.Widget" />
+
+<rave:rave_generic_page>
<div id="banner">
<span class="backToPage">
<a href="<spring:url value="/index.html" />">Back to Rave</a>
@@ -89,14 +91,14 @@
</table>
</div>
-<script type="text/javascript">
+<script>
var rave = rave || {
getContext : function() {
return "<spring:url value="/app/" />";
}
}
</script>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
-<script src="<spring:url value="/script/rave_api.js"/>" type="text/javascript"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
+<script src="<spring:url value="/script/rave_api.js"/>"></script>
</rave:rave_generic_page>
\ No newline at end of file
Added: incubator/rave/trunk/rave-portal/src/test/javascript/raveStoreSpec.js
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/javascript/raveStoreSpec.js?rev=1132637&view=auto
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/javascript/raveStoreSpec.js (added)
+++ incubator/rave/trunk/rave-portal/src/test/javascript/raveStoreSpec.js Mon Jun 6 13:39:46 2011
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+