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/10/06 12:35:45 UTC
svn commit: r1179565 - in /incubator/rave/trunk:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/
rave-portal-resources/src/main/webapp/WEB-INF/views/ rave-port...
Author: mfranklin
Date: Thu Oct 6 10:35:45 2011
New Revision: 1179565
URL: http://svn.apache.org/viewvc?rev=1179565&view=rev
Log:
Fixed cyclic calls in model toString (Supports RAVE-291)
Added:
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp
Modified:
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java?rev=1179565&r1=1179564&r2=1179565&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java Thu Oct 6 10:35:45 2011
@@ -180,6 +180,6 @@ public class Region implements BasicEnti
@Override
public String toString() {
- return "Region{" + "entityId=" + entityId + ", page=" + page + ", regionWidgets=" + regionWidgets + '}';
+ return "Region{" + "entityId=" + entityId + ", pageId=" + page.getEntityId() + ", regionWidgets=" + regionWidgets + '}';
}
}
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java?rev=1179565&r1=1179564&r2=1179565&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java Thu Oct 6 10:35:45 2011
@@ -224,8 +224,8 @@ public class RegionWidget implements Bas
sb.append(entityId);
sb.append(",widget=");
sb.append(widget);
- sb.append(",region=");
- sb.append(region);
+ sb.append(",regionId=");
+ sb.append(region.getEntityId());
sb.append("}");
return sb.toString();
}
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1179565&r1=1179564&r2=1179565&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java Thu Oct 6 10:35:45 2011
@@ -283,6 +283,6 @@ public class User implements UserDetails
@Override
public String toString() {
- return "User{" + "entityId=" + entityId + ", username=" + username + ", password=" + password + ", expired=" + expired + ", locked=" + locked + ", enabled=" + enabled + ", email=" + email + ", openId=" + openId + ", confirmPassword=" + confirmPassword + '}';
+ return "User{" + "entityId=" + entityId + ", username=" + username + ", expired=" + expired + ", locked=" + locked + ", enabled=" + enabled + ", email=" + email + ", openId=" + openId + '}';
}
}
Modified: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java?rev=1179565&r1=1179564&r2=1179565&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java Thu Oct 6 10:35:45 2011
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.tag;
+import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.web.renderer.RenderService;
@@ -138,8 +139,10 @@ public class RegionWidgetTagTest {
replay(pageContext);
RegionWidget regionWidget = new RegionWidget();
+ Region region = new Region(25L);
Widget widget = new Widget();
regionWidget.setWidget(widget);
+ regionWidget.setRegion(region);
widget.setType("INVALID");
Set<String> strings = new HashSet<String>();
Added: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp?rev=1179565&view=auto
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp (added)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp Thu Oct 6 10:35:45 2011
@@ -0,0 +1,35 @@
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
+--%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
+--%><rave:rave_generic_page pageTitle="Error: ${errorMessage}">
+ <div id="errorPage" >
+ <div id="errorContent">
+ <div id="errorTitle">Rave has suffered a brief meltdown</div>
+ <div class="errorLogo"><img src="<spring:url value="images/error_generic.png" />" alt="Error has occurred"
+ title="Error has occurred"/></div>
+ <div class="errorMessage">
+ Please bear with us while we fetch some ice cubes.<br/><br/>
+ In the meantime, please try <a href="javascript: window.location.reload();">reloading</a>.<br/>
+ <span style="font-size: 85%;">Interested in <a
+ href="javascript: portal.common.displayStackTraceDialog(true);">technical details</a>?</span>
+ </div>
+ </div>
+ <button type="button"
+ style="margin-bottom: 10px;"
+ onClick="document.getElementById('errorStackDialog').style.display = 'block';">Close
+ </button>
+ </div>
+ <div id="errorStackDialog" title="Error Details" style="display: none;">
+ <button type="button"
+ style="margin-bottom: 10px;"
+ onClick="document.getElementById('errorStackDialog').style.display = 'none';">Close
+ </button>
+ <pre class="errorTrace">
+ ${exception}
+
+ Stack Trace:
+ <c:forEach var="i" items="exception.stackTrace">
+ ${i}
+ </c:forEach>
+ </pre>
+ </div>
+</rave:rave_generic_page>
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css?rev=1179565&r1=1179564&r2=1179565&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css Thu Oct 6 10:35:45 2011
@@ -602,4 +602,7 @@ span.error, label.error {
#pageMenuButton {
cursor: pointer;
margin-right: 10px;
+}
+.errorTrace {
+ display: none;
}
\ No newline at end of file