On 11/01/2012 12:45 AM, Chris Geer wrote:
Has this helped performance on your box much?
With H2, it helps, but only a bit:
- 0 widgets: ~ 7 sec. (no change, as expected)
- 1 widgets: ~ 11 sec.
- 2 widgets: ~ 15 sec.
So, while it is a little faster, performance on H2 still isn't acceptable IMO.
On Wed, Oct 31, 2012 at 4:43 PM, Ate Douma <[email protected]> wrote:
I hit the same problems and found the error was in the tld definition for
the tag. I committed the fix with an additional fix as well.
On 10/31/2012 11:04 PM, Chris Geer wrote:
Matt,
When I got the latest code and ran it I get an error when trying to load
any page (with widgets)
The issue is the widget variable is null, so it looks like the widget tag
isn't loading the widget properly maybe. Could I be doing something wrong?
I did a clean build then deleted the tmp rave db file.
[WARNING] [talledLocalContainer] SEVERE: Servlet.service() for servlet jsp
threw exception
[WARNING] [talledLocalContainer] javax.servlet.jsp.**JspException:
Unsupported regionWidget type:
JpaRegionWidget{entityId=1,**widget=25,regionId=1}
[WARNING] [talledLocalContainer] at
org.apache.rave.portal.web.**tag.RegionWidgetTag.**
doStartTag(RegionWidgetTag.**java:101)
[WARNING] [talledLocalContainer] at
org.apache.jsp.tag.web.region_**005fwidget_tag._jspx_meth_**
portal_005frender_002dwidget_**005f0(region_005fwidget_tag.**java:929)
[WARNING] [talledLocalContainer] at
org.apache.jsp.tag.web.region_**005fwidget_tag.doTag(region_**
005fwidget_tag.java:150)
[WARNING] [talledLocalContainer] at
org.apache.jsp.tag.web.region_**tag._jspx_meth_rave_**
005fregion_005fwidget_005f0(**region_tag.java:295)
[WARNING] [talledLocalContainer] at
org.apache.jsp.tag.web.region_**tag._jspx_meth_c_005fforEach_**
005f0(region_tag.java:240)
To make matters stranger, when I logged in as John Doe I got a different
error
[WARNING] [talledLocalContainer] SEVERE: Servlet.service() for servlet jsp
threw exception
[WARNING] [talledLocalContainer] javax.el.ELException: Cannot convert
User{entityId=2, username='john.doe', expired=false, locked=false,
enabled=true, email='[email protected]', openId='null',
authorities=['ROLE_USER']} of type class
org.apache.rave.portal.model.**JpaUser to interface
org.apache.rave.portal.model.**Widget
[WARNING] [talledLocalContainer] at
org.apache.el.lang.ELSupport.**coerceToType(ELSupport.java:**434)
[WARNING] [talledLocalContainer] at
org.apache.el.**ValueExpressionImpl.getValue(**
ValueExpressionImpl.java:188)
On Wed, Oct 31, 2012 at 2:35 PM, <[email protected]> wrote:
Author: mfranklin
Date: Wed Oct 31 21:35:25 2012
New Revision: 1404364
URL:
http://svn.apache.org/viewvc?**rev=1404364&view=rev<http://svn.apache.org/viewvc?rev=1404364&view=rev>
Log:
Updated JSPs for Widget fix
Modified:
rave/trunk/rave-components/**rave-web/src/test/java/org/**
apache/rave/portal/web/**controller/**ProfileControllerTest.java
rave/trunk/rave-components/**rave-web/src/test/java/org/**
apache/rave/portal/web/tag/**RegionWidgetTagTest.java
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_1.jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_2.jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_2wn.**jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3.jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3_**newuser.jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3nwn.**jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3nwn_**1_bottom.jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_4.jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/person_**profile.jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/views/mobile_home.jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/views/personProfile.**jsp
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/tags/region.tag
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/tags/simple_regions.tag
Modified:
rave/trunk/rave-components/**rave-web/src/test/java/org/**
apache/rave/portal/web/**controller/**ProfileControllerTest.java
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-components/**
rave-web/src/test/java/org/**apache/rave/portal/web/**controller/**
ProfileControllerTest.java?**rev=1404364&r1=1404363&r2=**
1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-components/**rave-web/src/test/java/org/**
apache/rave/portal/web/**controller/**ProfileControllerTest.java
(original)
+++
rave/trunk/rave-components/**rave-web/src/test/java/org/**
apache/rave/portal/web/**controller/**ProfileControllerTest.java
Wed Oct 31 21:35:25 2012
@@ -94,7 +94,7 @@ public class ProfileControllerTest {
//creating a mock user
final UserImpl user = new UserImpl();
final ModelMap model = new ModelMap();
- final int modelSize = 5;
+ final int modelSize = 4;
final String username="canonical";
user.setUsername(username);
user.setId(USER_ID);
@@ -135,7 +135,7 @@ public class ProfileControllerTest {
//creating a mock user
final UserImpl user = new UserImpl();
final ModelMap model = new ModelMap();
- final int modelSize = 5;
+ final int modelSize = 4;
final String username="canonical";
user.setUsername(username);
user.setId(USER_ID);
Modified:
rave/trunk/rave-components/**rave-web/src/test/java/org/**
apache/rave/portal/web/tag/**RegionWidgetTagTest.java
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-components/**
rave-web/src/test/java/org/**apache/rave/portal/web/tag/**
RegionWidgetTagTest.java?rev=**1404364&r1=1404363&r2=1404364&**view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-components/**rave-web/src/test/java/org/**
apache/rave/portal/web/tag/**RegionWidgetTagTest.java
(original)
+++
rave/trunk/rave-components/**rave-web/src/test/java/org/**
apache/rave/portal/web/tag/**RegionWidgetTagTest.java
Wed Oct 31 21:35:25 2012
@@ -95,7 +95,7 @@ public class RegionWidgetTagTest {
RegionWidgetWrapper wrapper = new RegionWidgetWrapper(widget,
regionWidget);
expect(service.**getSupportedWidgetTypes()).**
andReturn(strings);
- expect(service.render(wrapper, context)).andReturn(RENDERED);
+ expect(service.render(isA(**RegionWidgetWrapper.class),
same(context))).andReturn(**RENDERED);
replay(service);
JspWriter writer = createNiceMock(JspWriter.**class);
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_1.jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/columns_1.jsp?**
rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_1.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_1.jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_1.jsp
Wed Oct 31 21:35:25 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" widgets="${widgets}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_2.jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/columns_2.jsp?**
rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_2.jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_2.jsp
Wed Oct 31 21:35:25 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" widgets="${widgets}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_2wn.**jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/columns_2wn.**
jsp?rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2wn.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_2wn.**jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_2wn.**jsp
Wed Oct 31 21:35:25 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" widgets="${widgets}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3.jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/columns_3.jsp?**
rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3.jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3.jsp
Wed Oct 31 21:35:25 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" widgets="${widgets}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3_**newuser.jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/columns_3_**
newuser.jsp?rev=1404364&r1=**1404363&r2=1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3_newuser.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3_**newuser.jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3_**newuser.jsp
Wed Oct 31 21:35:25 2012
@@ -27,10 +27,10 @@
<div class="columns_3_newuser_**widgets">
<div class="columns_3_newuser_**subtitle"><fmt:message
key="page.layout.newuser.**subtitle"/></div>
<div class="widgetRow upperRow">
- <rave:region region="${page.regions[0]}" regionIdx="1"
widgets="${widgets}" />
- <rave:region region="${page.regions[1]}" regionIdx="2"
widgets="${widgets}" />
+ <rave:region region="${page.regions[0]}" regionIdx="1" />
+ <rave:region region="${page.regions[1]}" regionIdx="2" />
</div>
<div class="widgetRow bottomRow">
- <rave:region region="${page.regions[2]}" regionIdx="3"
widgets="${widgets}" />
+ <rave:region region="${page.regions[2]}" regionIdx="3" />
</div>
</div>
\ No newline at end of file
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3nwn.**jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/columns_3nwn.**
jsp?rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3nwn.**jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3nwn.**jsp
Wed Oct 31 21:35:25 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" widgets="${widgets}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3nwn_**1_bottom.jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/columns_3nwn_**
1_bottom.jsp?rev=1404364&r1=**1404363&r2=1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn_1_bottom.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3nwn_**1_bottom.jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_3nwn_**1_bottom.jsp
Wed Oct 31 21:35:25 2012
@@ -19,11 +19,11 @@
--%>
<div class="widgetRow upperRow">
- <rave:region region="${page.regions[0]}" regionIdx="1"
widgets="${widgets}" />
- <rave:region region="${page.regions[1]}" regionIdx="2"
widgets="${widgets}" />
- <rave:region region="${page.regions[2]}" regionIdx="3"
widgets="${widgets}" />
+ <rave:region region="${page.regions[0]}" regionIdx="1" />
+ <rave:region region="${page.regions[1]}" regionIdx="2" />
+ <rave:region region="${page.regions[2]}" regionIdx="3" />
</div>
<div class="widgetRow bottomRow">
- <rave:region region="${page.regions[3]}" regionIdx="4"
widgets="${widgets}" />
+ <rave:region region="${page.regions[3]}" regionIdx="4" />
</div>
\ No newline at end of file
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_4.jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/columns_4.jsp?**
rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_4.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_4.jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/columns_4.jsp
Wed Oct 31 21:35:25 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" widgets="${widgets}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/person_**profile.jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/layouts/person_**
profile.jsp?rev=1404364&r1=**1404363&r2=1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/person_**profile.jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/layouts/person_**profile.jsp
Wed Oct 31 21:35:25 2012
@@ -30,7 +30,7 @@
<c:forEach var="subPage" items="${subPages}"
varStatus="subPageStatus">
<div class="tab-pane" id="tab-${subPage.id}">
<c:forEach var="subPageRegion" items="${subPage.regions}"
varStatus="**subPageRegionStatus">
- <rave:region region="${subPageRegion}"
regionIdx="${**subPageRegionStatus.count}" widgets="${widgets}" />
+ <rave:region region="${subPageRegion}"
regionIdx="${**subPageRegionStatus.count}" />
</c:forEach>
<div class="clear-float"> </**div>
</div>
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/views/mobile_home.jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/views/mobile_home.jsp?**
rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/views/mobile_home.jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/views/mobile_home.jsp
Wed Oct 31 21:35:25 2012
@@ -66,22 +66,19 @@
<c:forEach var="region" items="${page.regions}">
<div class="region-mobile" id="region-${region.id}-id">
<c:forEach var="regionWidget"
items="${region.regionWidgets}**">
- <c:forEach var="widget" items="${widgets}">
- <c:if test="${regionWidget.widgetId == widget.id}">
- <div class="widget-wrapper widget-wrapper-mobile"
id="widget-${regionWidget.id}-**wrapper">
- <div class="widget-title-bar
widget-title-bar-mobile"
onclick="rave.**toggleMobileWidget(${**regionWidget.id});">
- <span
id="widget-${regionWidget.id}-**collapse"
class="widget-toolbar-toggle-**collapse" title="<fmt:message
key="widget.chrome.toggle"/>">**<i class="icon-chevron-down"></i>**
</span>
- <div id="widget-${regionWidget.id}-**
title"
class="widget-title">
- <c:out value="${widget.title}"/>
- </div>
- </div>
- <div class="widget-prefs"
id="widget-${regionWidget.id}-**prefs-content"></div>
- <div class="widget widget-mobile"
id="widget-${regionWidget.id}-**body">
- <portal:render-widget
regionWidget="${regionWidget}" widget="${widget}"/>
- </div>
+ <portal:widget var="widget" id="${regionWidget.widgetId}"
/>
+ <div class="widget-wrapper widget-wrapper-mobile"
id="widget-${regionWidget.id}-**wrapper">
+ <div class="widget-title-bar
widget-title-bar-mobile"
onclick="rave.**toggleMobileWidget(${**regionWidget.id});">
+ <span id="widget-${regionWidget.id}-**collapse"
class="widget-toolbar-toggle-**collapse" title="<fmt:message
key="widget.chrome.toggle"/>">**<i class="icon-chevron-down"></i>**
</span>
+ <div id="widget-${regionWidget.id}-**title"
class="widget-title">
+ <c:out value="${widget.title}"/>
</div>
- </c:if>
- </c:forEach>
+ </div>
+ <div class="widget-prefs"
id="widget-${regionWidget.id}-**prefs-content"></div>
+ <div class="widget widget-mobile"
id="widget-${regionWidget.id}-**body">
+ <portal:render-widget
regionWidget="${regionWidget}" widget="${widget}"/>
+ </div>
+ </div>
</c:forEach>
</div>
</c:forEach>
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/views/personProfile.**jsp
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/jsp/views/personProfile.**
jsp?rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/views/personProfile.**jsp
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/jsp/views/personProfile.**jsp
Wed Oct 31 21:35:25 2012
@@ -172,7 +172,7 @@
<div>
<%-- render the person profile parent page
region/widgets
--%>
<c:forEach var="region" items="${page.regions}"
varStatus="status">
- <rave:region region="${region}"
regionIdx="${status.count}" widgets="${widgets}"/>
+ <rave:region region="${region}"
regionIdx="${status.count}" />
</c:forEach>
</div>
</div>
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/tags/region.tag
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/tags/region.tag?rev=**
1404364&r1=1404363&r2=1404364&**view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/tags/region.tag
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/tags/region.tag
Wed Oct 31 21:35:25 2012
@@ -25,7 +25,6 @@ Template for rendering a Region on a pag
<%@ taglib prefix="fmt"
uri="http://java.sun.com/jsp/**jstl/fmt<http://java.sun.com/jsp/jstl/fmt>"
%>
<%@ include file="/WEB-INF/jsp/includes/**taglibs.jsp" %>
<%@ attribute name="region" type="org.apache.rave.portal.**
model.Region"
required="true" description="The region object" %>
-<%@ attribute name="widgets" type="java.util.List" required="true"
description="The Widget object" %>
<%@ attribute name="regionIdx" required="true" description="The
regionIdx" %>
<fmt:setBundle basename="messages"/>
@@ -33,10 +32,7 @@ Template for rendering a Region on a pag
<%--@elvariable id="region" type="org.apache.rave.portal.**
model.Region"--%>
<div class="region<c:if test="${region.locked || pageUser.editor ==
false}"> region-locked</c:if> <c:out
value="${region.page.**pageLayout.code}"/>_${**regionIdx}
regionNonDragging"
id="region-${region.id}-id">
<c:forEach var="regionWidget" items="${region.regionWidgets}**">
- <c:forEach var="widget" items="${widgets}">
- <c:if test="${regionWidget.widgetId == widget.id}">
- <rave:region_widget regionWidget="${regionWidget}"
widget="${widget}"/>
- </c:if>
- </c:forEach>
+ <portal:widget var="widget" id="${regionWidget.widgetId}" />
+ <rave:region_widget regionWidget="${regionWidget}"
widget="${widget}"/>
</c:forEach>
</div>
Modified:
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/tags/simple_regions.tag
URL:
http://svn.apache.org/viewvc/**rave/trunk/rave-portal-**
resources/src/main/webapp/WEB-**INF/tags/simple_regions.tag?**
rev=1404364&r1=1404363&r2=**1404364&view=diff<http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/simple_regions.tag?rev=1404364&r1=1404363&r2=1404364&view=diff>
==============================**==============================**
==================
---
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/tags/simple_regions.tag
(original)
+++
rave/trunk/rave-portal-**resources/src/main/webapp/WEB-**
INF/tags/simple_regions.tag
Wed Oct 31 21:35:25 2012
@@ -29,6 +29,6 @@ simply render each region one after anot
<%--@elvariable id="region" type="org.apache.rave.portal.**
model.Region"--%>
<div class="widgetRow bottomRow">
<c:forEach var="region" items="${page.regions}" varStatus="status">
- <rave:region region="${region}" regionIdx="${status.count}"
widgets="${widgets}"/>
+ <rave:region region="${region}" regionIdx="${status.count}" />
</c:forEach>
</div>
\ No newline at end of file
