Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java (original) +++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java Mon Oct 29 03:59:56 2012 @@ -76,7 +76,7 @@ public class NewWidgetValidatorTest { final String existingUrl = "http://example.com/existing_widget.xml";; WidgetImpl widget = new WidgetImpl(); - widget.setId(123L); + widget.setId("123"); widget.setTitle(VALID_TITLE); widget.setType(VALID_TYPE); widget.setDescription(VALID_DESCRIPTION);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java (original) +++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java Mon Oct 29 03:59:56 2012 @@ -47,7 +47,7 @@ public class UpdateWidgetValidatorTest { @Test public void testValidateValidFormData() throws Exception { WidgetImpl widget = new WidgetImpl(); - widget.setId(123L); + widget.setId("123"); widget.setTitle(VALID_TITLE); widget.setUrl(VALID_URL); widget.setType(VALID_TYPE); @@ -77,7 +77,7 @@ public class UpdateWidgetValidatorTest { final String existingUrl = "http://example.com/existing_widget.xml";; WidgetImpl widget = new WidgetImpl(); - widget.setId(123L); + widget.setId("123"); widget.setTitle(VALID_TITLE); widget.setType(VALID_TYPE); widget.setDescription(VALID_DESCRIPTION); Modified: rave/trunk/rave-portal-resources/src/main/resources/portal.properties URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/portal.properties?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/resources/portal.properties (original) +++ rave/trunk/rave-portal-resources/src/main/resources/portal.properties Mon Oct 29 03:59:56 2012 @@ -48,7 +48,7 @@ portal.jpaVendorAdapter.database=H2 # General Rave portal database settings portal.jpaVendorAdapter.showSql=true -portal.openjpa.Log=DefaultLevel=WARN, Runtime=WARN, Tool=WARN, SQL=WARN +portal.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=WARN, SQL=WARN portal.openjpa.RuntimeUnenhancedClasses=unsupported portal.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true) portal.openjpa.jdbc.MappingDefaults=ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -18,4 +18,4 @@ ~ under the License. --%> -<rave:simple_regions page="${page}" /> \ No newline at end of file +<rave:simple_regions page="${page}" widgets="${widgets}" /> \ 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -18,4 +18,4 @@ ~ under the License. --%> -<rave:simple_regions page="${page}" /> \ No newline at end of file +<rave:simple_regions page="${page}" widgets="${widgets}" /> \ 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -18,4 +18,4 @@ ~ under the License. --%> -<rave:simple_regions page="${page}" /> \ No newline at end of file +<rave:simple_regions page="${page}" widgets="${widgets}" /> \ 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -18,4 +18,4 @@ ~ under the License. --%> -<rave:simple_regions page="${page}" /> \ No newline at end of file +<rave:simple_regions page="${page}" widgets="${widgets}" /> \ 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 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" /> - <rave:region region="${page.regions[1]}" regionIdx="2" /> + <rave:region region="${page.regions[0]}" regionIdx="1" widgets="${widgets}" /> + <rave:region region="${page.regions[1]}" regionIdx="2" widgets="${widgets}" /> </div> <div class="widgetRow bottomRow"> - <rave:region region="${page.regions[2]}" regionIdx="3" /> + <rave:region region="${page.regions[2]}" regionIdx="3" widgets="${widgets}" /> </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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -18,4 +18,4 @@ ~ under the License. --%> -<rave:simple_regions page="${page}" /> \ No newline at end of file +<rave:simple_regions page="${page}" widgets="${widgets}" /> \ 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -19,11 +19,11 @@ --%> <div class="widgetRow upperRow"> - <rave:region region="${page.regions[0]}" regionIdx="1" /> - <rave:region region="${page.regions[1]}" regionIdx="2" /> - <rave:region region="${page.regions[2]}" regionIdx="3" /> + <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}" /> </div> <div class="widgetRow bottomRow"> - <rave:region region="${page.regions[3]}" regionIdx="4" /> + <rave:region region="${page.regions[3]}" regionIdx="4" widgets="${widgets}" /> </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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -18,4 +18,4 @@ ~ under the License. --%> -<rave:simple_regions page="${page}" /> \ No newline at end of file +<rave:simple_regions page="${page}" widgets="${widgets}" /> \ 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 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}" /> + <rave:region region="${subPageRegion}" regionIdx="${subPageRegionStatus.count}" widgets="${widgets}" /> </c:forEach> <div class="clear-float"> </div> </div> Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp Mon Oct 29 03:59:56 2012 @@ -53,19 +53,21 @@ <tbody> <c:forEach items="${categories}" var="category"> <spring:url value="/app/admin/category/edit?id=${category.id}" var="detaillink"/> - + <portal:person id="${category.createdUserId}" var="createdUser" /> + <portal:person id="${category.lastModifiedUserId}" var="modifiedUser" /> + <tr data-detaillink="${detaillink}"> <td> <a href="${detaillink}"><c:out value="${category.text}"/></a> </td> <td> - <c:out value="${category.createdUser.username}"/> + <c:out value="${createdUser.username}"/> </td> <td> <c:out value="${category.createdDate}"/> </td> <td> - <c:out value="${category.lastModifiedUser.username}"/> + <c:out value="${modifiedUser.username}"/> </td> <td> <c:out value="${category.lastModifiedDate}"/> Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp Mon Oct 29 03:59:56 2012 @@ -23,7 +23,9 @@ <jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/> <jsp:useBean id="pageUser" type="org.apache.rave.portal.model.PageUser" scope="request"/> <jsp:useBean id="pageLayouts" type="java.util.List<org.apache.rave.portal.model.JpaPageLayout>" scope="request"/> + <%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%> +<sec:authentication property="principal.id" var="principalId" scope="request"/> <sec:authentication property="principal.username" var="principleUsername" scope="request"/> <sec:authentication property="principal.displayName" var="displayName" scope="request"/> @@ -59,7 +61,7 @@ </c:set> <c:set var="isSharedToMe"> <c:choose> - <c:when test="${userPage.owner.username == principleUsername}">false</c:when> + <c:when test="${userPage.ownerId == principalId}">false</c:when> <c:otherwise>true</c:otherwise> </c:choose> </c:set> @@ -69,8 +71,9 @@ <c:otherwise>false</c:otherwise> </c:choose> </c:set> + <portal:person id="${userPage.ownerId}" var="userPageOwner" /> <fmt:message key="sharing.page.tab.icon.tip.from" var="iconShareToolTipFrom"> - <fmt:param value="${userPage.owner.username}"/> + <fmt:param value="${userPageOwner.username}"/> </fmt:message> <fmt:message key="sharing.page.tab.icon.tip.to" var="iconShareToolTipTo"/> <c:choose> @@ -119,7 +122,7 @@ </c:otherwise> </c:choose> <c:forEach var="members" items="${userPage.members}"> - <c:if test="${members.user.username == principleUsername and members.editor and userPage.id != page.id}"> + <c:if test="${members.userId == principalId and members.editor and userPage.id != page.id}"> <c:set var="canMoveWidgetsToEditablePage" scope="request" value="true"/> </c:if> </c:forEach> @@ -340,7 +343,7 @@ <select id="moveToPageId"> <c:forEach var="userPage" items="${pages}"> <c:forEach var="members" items="${userPage.members}"> - <c:if test="${members.user.username == principleUsername and members.editor and userPage.id != page.id}"> + <c:if test="${members.userId == principalId and members.editor and userPage.id != page.id}"> <option value="${userPage.id}"> <c:out value="${userPage.name}"/> </option> @@ -395,6 +398,7 @@ }); </script> <c:forEach var="members" items="${page.members}"> - <script>rave.layout.searchHandler.addExistingMember("${members.user.username}",${members.editor});</script> + <portal:person id="${members.userId}" var="member" /> + <script>rave.layout.searchHandler.addExistingMember("${member.username}",${members.editor});</script> </c:forEach> </portal:register-init-script> 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -165,13 +165,14 @@ </div> </div> <div class="span3"> - <button type="button" id="addRemoveFriend" value="${page.owner.username}" class="btn btn-primary profile-info-visible"><fmt:message key="page.personProfile.addremove.friends"/></button> + <portal:person id="${page.ownerId}" var="${owner}" /> + <button type="button" id="addRemoveFriend" value="${owner.username}" class="btn btn-primary profile-info-visible"><fmt:message key="page.personProfile.addremove.friends"/></button> </div> <div class="span3"> <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}" /> + <rave:region region="${region}" regionIdx="${status.count}" widgets="${widgets}"/> </c:forEach> </div> </div> Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp Mon Oct 29 03:59:56 2012 @@ -21,5 +21,5 @@ <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %> <fmt:setBundle basename="messages"/> <%--@elvariable id="regionWidget" type="org.apache.rave.portal.model.RegionWidget"--%> -<rave:region_widget regionWidget="${regionWidget}"/> +<rave:region_widget regionWidget="${regionWidget}" widget="${widget}"/> <portal:render-script location="${'AFTER_RAVE'}" /> \ No newline at end of file Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Mon Oct 29 03:59:56 2012 @@ -174,8 +174,15 @@ <td> <fmt:message key="page.widget.tags.title"/> </td> - <c:forEach var="tag" items="${widget.tags}"> - <td class="storeWidgetDesc"><c:out value="${tag.tag.keyword}"/></td> + <c:forEach var="widgettag" items="${widget.tags}"> + <c:forEach var="tag" items="${tags}"> + <c:set var="tagMatched"> + ${tag.id==widgettag.tagId?true:false} + </c:set> + <c:if test="${tagMatched}"> + <td class="storeWidgetDesc"><c:out value="${tag.keyword}"/></td> + </c:if> + </c:forEach> </c:forEach> </tr> </table> Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp Mon Oct 29 03:59:56 2012 @@ -151,9 +151,16 @@ <c:if test="${not empty widget.tags}"> <h3><fmt:message key="page.widget.tags.title"/></h3> <div class="detail-widget-tags"> - <c:forEach var="tag" items="${widget.tags}"> - <span class="label"><c:out value="${tag.tag.keyword}"/></span> + <c:forEach var="widgettag" items="${widget.tags}"> + <c:forEach var="tag" items="${tags}"> + <c:set var="tagMatched"> + ${tag.id==widgettag.tagId?true:false} + </c:set> + <c:if test="${tagMatched}"> + <span class="label"><c:out value="${tag.keyword}"/></span> + </c:if> </c:forEach> + </c:forEach> </div> </c:if> <div id="tagInput" class="form-inline hide"> @@ -193,21 +200,22 @@ <c:if test="${not empty widget.comments}"> <ul class="comments"> <c:forEach var="comment" items="${widget.comments}"> + <portal:person id="${comment.userId}" var="commenter" /> <li class="comment"> <fmt:formatDate value="${comment.createdDate}" type="both" var="commentDate"/> <p class="comment-heading"> <span class="commenter"> <c:choose> - <c:when test="${not empty comment.user.displayName}"> - <c:out value="${comment.user.displayName}"/> + <c:when test="${not empty commenter.username}"> + <c:out value="${commenter.username}"/> </c:when> - <c:otherwise><c:out value="${comment.user.username}"/></c:otherwise> + <c:otherwise><c:out value="${comment.userId}"/></c:otherwise> </c:choose> </span> <span class="comment-date"> <c:out value=" - ${commentDate} "/> </span> - <c:if test="${userProfile.id eq comment.user.id}"> + <c:if test="${userProfile.id eq comment.userId}"> <button id="comment-delete-${comment.id}" class="btn btn-danger btn-mini commentDeleteButton" value="Delete" title="Delete comment" data-widgetid="<c:out value="${comment.widgetId}"/>"> <i class="icon-remove icon-white"></i> 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -25,6 +25,7 @@ Template for rendering a Region on a pag <%@ taglib prefix="fmt" uri="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"/> @@ -32,6 +33,10 @@ 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}"> - <rave:region_widget regionWidget="${regionWidget}"/> + <c:forEach var="widget" items="${widgets}"> + <c:if test="${regionWidget.widgetId == widget.id}"> + <rave:region_widget regionWidget="${regionWidget}" widget="${widget}"/> + </c:if> + </c:forEach> </c:forEach> </div> Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag Mon Oct 29 03:59:56 2012 @@ -25,6 +25,7 @@ Template for rendering a RegionWidget in <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %> <%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags"; %> <%@ attribute name="regionWidget" type="org.apache.rave.portal.model.RegionWidget" required="true" description="The regionWidget object" %> +<%@ attribute name="widget" type="org.apache.rave.portal.model.Widget" required="true" description="The Widget object" %> <c:set var="isLocked" value="${regionWidget.locked}" /> <c:set var="isHideChrome" value="${regionWidget.hideChrome}" /> @@ -39,11 +40,11 @@ Template for rendering a RegionWidget in </c:if> <div id="widget-${regionWidget.id}-title" class="widget-title"> <c:choose> - <c:when test="${not empty regionWidget.widget.titleUrl}"> - <a href="<c:out value="${regionWidget.widget.titleUrl}"/>" rel="external"><c:out value="${regionWidget.widget.title}"/></a> + <c:when test="${not empty widget.titleUrl}"> + <a href="<c:out value="${widget.titleUrl}"/>" rel="external"><c:out value="${widget.title}"/></a> </c:when> <c:otherwise> - <c:out value="${regionWidget.widget.title}"/> + <c:out value="${widget.title}"/> </c:otherwise> </c:choose> </div> @@ -106,7 +107,7 @@ Template for rendering a RegionWidget in </div> <%-- if widget is disabled then display notification in titlebar --%> - <c:if test="${regionWidget.widget.disableRendering}"> + <c:if test="${widget.disableRendering}"> <div id="widget-${regionWidget.id}-disabled" class="widget-disabled-icon ui-icon ui-icon-alert" title="<fmt:message key="widget.chrome.disabled"/>"></div> </c:if> </div> @@ -114,6 +115,6 @@ Template for rendering a RegionWidget in <div class="widget-prefs" id="widget-${regionWidget.id}-prefs-content"></div> <div class="widget" id="widget-${regionWidget.id}-body"> - <portal:render-widget regionWidget="${regionWidget}" /> + <portal:render-widget regionWidget="${regionWidget}" widget="${widget}" /> </div> </div> \ No newline at end of file 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=1403166&r1=1403165&r2=1403166&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 Mon Oct 29 03:59:56 2012 @@ -24,10 +24,11 @@ simply render each region one after anot <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %> <%@ attribute name="page" type="org.apache.rave.portal.model.Page" required="true" description="The Page object" %> +<%@ attribute name="widgets" type="java.util.List" required="true" description="The Widgets" %> <%--@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}" /> + <rave:region region="${region}" regionIdx="${status.count}" widgets="${widgets}"/> </c:forEach> </div> \ No newline at end of file Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js Mon Oct 29 03:59:56 2012 @@ -195,9 +195,11 @@ rave.store = rave.store || (function() { $("#categoryList").change(function() { var selected = $("#categoryList option:selected").val(); selected = parseInt(selected); - if (!isNaN(selected)) { + if (!isNaN(selected) && selected != "0") { document.location.href = rave.getContext() + "store/category?categoryId=" + selected +"&referringPageId="+referringPageId; + } else { + document.location.href = rave.getContext() + "store?referringPageId="+referringPageId; } }); } Modified: rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff ============================================================================== --- rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java (original) +++ rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java Mon Oct 29 03:59:56 2012 @@ -20,7 +20,10 @@ package renderer; -import org.apache.rave.portal.model.*; +import org.apache.rave.portal.model.Page; +import org.apache.rave.portal.model.Region; +import org.apache.rave.portal.model.RegionWidget; +import org.apache.rave.portal.model.User; import org.apache.rave.portal.model.impl.*; import org.apache.rave.portal.web.renderer.RenderService; import org.apache.rave.portal.web.renderer.ScriptLocation; @@ -36,11 +39,13 @@ import org.springframework.security.auth import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextImpl; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.client.RestOperations; +import java.sql.SQLException; import java.util.Arrays; import java.util.HashMap; @@ -48,6 +53,7 @@ import static org.hamcrest.CoreMatchers. import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"}) //@ContextConfiguration(locations = {"file:src/main/webapp/WEB-INF/dataContext.xml", "file:src/main/webapp/WEB-INF/applicationContext.xml"}) public class RenderServiceIntegrationTest { @@ -64,14 +70,14 @@ public class RenderServiceIntegrationTes private RestOperations restOperations; private static final String VALID_METADATA = "[{\"id\":\"gadgets.metadata\",\"result\"" + - ":{\"http://www.example.com/gadget.xml\":{\"data-snipped\":\"here-for-brevity\"}}}]";; + ":{\"http://www.widget-dico.com/wikipedia/google/wikipedia.xml\":{\"data-snipped\":\"here-for-brevity\"}}}]";; - private static final Long VALID_USER_ID = 1234L; - private static final String VALID_USER_NAME = "jdoe"; + private static final String VALID_USER_ID = "2"; + private static final String VALID_USER_NAME = "john.doe"; @SuppressWarnings("unchecked") @Before - public void setup() { + public void setup() throws SQLException { restOperations = EasyMock.createNiceMock(RestOperations.class); EasyMock.expect(restOperations.postForObject(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class), EasyMock.anyObject(Class.class))) .andReturn(VALID_METADATA); @@ -100,17 +106,17 @@ public class RenderServiceIntegrationTes @Test public void renderOpenSocial() { - Page page = new PageImpl(1L, new UserImpl(VALID_USER_ID, VALID_USER_NAME)); - Region region = new RegionImpl(1L, page, 1); + Page page = new PageImpl("1", VALID_USER_ID); + Region region = new RegionImpl("1", page, 1); page.setRegions(Arrays.asList(region)); WidgetImpl w = new WidgetImpl(); w.setType("OpenSocial"); - w.setId(1L); - w.setTitle("Gadget Title"); - w.setUrl("http://www.example.com/gadget.xml";); + w.setId("1"); + w.setTitle("Wikipedia"); + w.setUrl("http://www.widget-dico.com/wikipedia/google/wikipedia.xml";); - RegionWidget rw = new RegionWidgetImpl(1L, w, region); + RegionWidget rw = new RegionWidgetImpl("1", w.getId(), region); region.setRegionWidgets(Arrays.asList(rw)); RenderContext context = new RenderContext();
