You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/26 00:34:54 UTC
svn commit: r178542 - in /incubator/beehive/trunk/samples/petstoreWeb/web:
WEB-INF/tags/beehive/petstore/accountNavHeader.tag index.jsp
webappRoot/SharedFlow.java
Author: ekoneil
Date: Wed May 25 15:34:52 2005
New Revision: 178542
URL: http://svn.apache.org/viewcvs?rev=178542&view=rev
Log:
Fixes for JIRA 734 and 765.
BB: self
DRT: petstoreWeb pass / build.dist pass
Modified:
incubator/beehive/trunk/samples/petstoreWeb/web/WEB-INF/tags/beehive/petstore/accountNavHeader.tag
incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp
incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/WEB-INF/tags/beehive/petstore/accountNavHeader.tag
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/WEB-INF/tags/beehive/petstore/accountNavHeader.tag?rev=178542&r1=178541&r2=178542&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/WEB-INF/tags/beehive/petstore/accountNavHeader.tag (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/WEB-INF/tags/beehive/petstore/accountNavHeader.tag Wed May 25 15:34:52 2005
@@ -16,8 +16,7 @@
</td>
<td class="separator">|</td>
<td>
-<!-- TODO: fix this -->
- <netui:anchor href="http://localhost:8080/petstoreWeb/account/edit/listOrders.do" value="${bundle.account.listOrdersLabel}" styleClass="toolbar" />
+ <netui:anchor action="rootSharedFlow.globalViewOrders" value="${bundle.account.listOrdersLabel}" styleClass="toolbar" />
</td>
<td class="separator">|</td>
<td>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp?rev=178542&r1=178541&r2=178542&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp Wed May 25 15:34:52 2005
@@ -28,7 +28,7 @@
<netui-template:setAttribute name="title" value="${bundle.view.welcomeTitle}" />
<%-- do not show any top menu --%>
- <netui-template:section name="topMenu" />
+ <netui-template:section name="topMenu" />
<netui-template:section name="body">
@@ -41,13 +41,13 @@
<netui:span styleClass="boldlabel" value="${bundle.view.welcome}"/>
<br/>
<netui:anchor tagId="enter" href="shop/Controller.jpf">${bundle.view.enterTheStore}</netui:anchor>
- <br/><br/><br/>
- <c:if test="${pageContext.request.serverName == 'localhost'}">
- <b>${bundle.view.adminTitle}</b><br>
- <netui:anchor tagId="initDB" action="initDB">${bundle.view.adminInit}</netui:anchor><br/>
- <netui:anchor action="stopDB">${bundle.view.adminStop}</netui:anchor><br/>
- <netui:label value="${requestScope.message}" />
- </c:if>
+ <br/>
+ <br/>
+ <br/>
+ <b>${bundle.view.adminTitle}</b><br>
+ <netui:anchor tagId="initDB" action="initDB">${bundle.view.adminInit}</netui:anchor><br/>
+ <netui:anchor action="stopDB">${bundle.view.adminStop}</netui:anchor><br/>
+ <netui:label value="${requestScope.message}" />
</td>
</tr>
</table>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java?rev=178542&r1=178541&r2=178542&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java Wed May 25 15:34:52 2005
@@ -270,7 +270,7 @@
servletContext.setAttribute(ATTR_CATEGORY_NAMES, categoryNames);
}
else {
- assert categoryNames instanceof String[] :
+ assert obj instanceof String[] :
"Found ServletContext \"" + ATTR_CATEGORY_NAMES + "\" that is not a String[]";
categoryNames = (String[])obj;
}