ate 2005/01/21 08:30:42
Modified: applications/jpetstore/src/webapp/common IncludeTop.jsp
IncludeBanner.jsp
applications/jpetstore/src/webapp help.jsp index.jsp
applications/jpetstore/src/webapp/WEB-INF
struts-portlet-config.xml
applications/jpetstore project.xml
Log:
With the latest Struts Bridge update the link and rewrite tags now allow
rendering of resource urls.
Thus, the jstl dependency is removed again as the table background image urls
can now be rendered by the rewrite tag.
Revision Changes Path
1.2 +1 -2
jakarta-jetspeed-2/applications/jpetstore/src/webapp/common/IncludeTop.jsp
Index: IncludeTop.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jpetstore/src/webapp/common/IncludeTop.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IncludeTop.jsp 20 Jan 2005 01:47:37 -0000 1.1
+++ IncludeTop.jsp 21 Jan 2005 16:30:41 -0000 1.2
@@ -14,13 +14,12 @@
limitations under the License.
--%>
<[EMAIL PROTECTED] contentType="text/html"%>
-<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html";
prefix="html" %>
<%@ taglib
uri="http://portals.apache.org/bridges/struts/tags-portlet-html-el";
prefix="html-el" %>
- <table background="<c:out
value="${pageContext.request.contextPath}"/>/images/bkg-topbar.gif" border="0"
cellspacing="0"
+ <table background="<html:rewrite href="../images/bkg-topbar.gif"/>"
border="0" cellspacing="0"
cellpadding="5" width="100%">
<tr>
<td>
1.2 +1 -1
jakarta-jetspeed-2/applications/jpetstore/src/webapp/common/IncludeBanner.jsp
Index: IncludeBanner.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jpetstore/src/webapp/common/IncludeBanner.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IncludeBanner.jsp 20 Jan 2005 01:47:37 -0000 1.1
+++ IncludeBanner.jsp 21 Jan 2005 16:30:41 -0000 1.2
@@ -18,7 +18,7 @@
<logic:equal name="accountBean" property="authenticated" value="true">
<logic:equal name="accountBean" property="account.bannerOption"
value="true">
- <table align="center" background="<c:out
value="${pageContext.request.contextPath}"/>/images/bkg-topbar.gif"
+ <table align="center" background="<html:rewrite
href="../images/bkg-topbar.gif"/>"
cellpadding="5" width="100%">
<tr>
<td>
1.2 +1 -2
jakarta-jetspeed-2/applications/jpetstore/src/webapp/help.jsp
Index: help.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jpetstore/src/webapp/help.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- help.jsp 20 Jan 2005 01:47:39 -0000 1.1
+++ help.jsp 21 Jan 2005 16:30:41 -0000 1.2
@@ -14,9 +14,8 @@
limitations under the License.
--%>
<%@ page contentType="text/html" %>
-<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html";
prefix="html" %>
- <TABLE background="<c:out
value="${pageContext.request.contextPath}"/>/images/bkg-topbar.gif" border=0
cellSpacing=0
+ <TABLE background="<html:rewrite href="images/bkg-topbar.gif"/>"
border=0 cellSpacing=0
cellPadding=5 width="100%">
<TR>
<TD>
1.2 +1 -2
jakarta-jetspeed-2/applications/jpetstore/src/webapp/index.jsp
Index: index.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jpetstore/src/webapp/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.jsp 20 Jan 2005 01:47:39 -0000 1.1
+++ index.jsp 21 Jan 2005 16:30:41 -0000 1.2
@@ -14,9 +14,8 @@
limitations under the License.
--%>
<%@ page contentType="text/html" %>
-<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html";
prefix="html" %>
- <TABLE background="<c:out
value="${pageContext.request.contextPath}"/>/images/bkg-topbar.gif" border=0
cellSpacing=0
+ <TABLE background="<html:rewrite href="images/bkg-topbar.gif"/>"
border=0 cellSpacing=0
cellPadding=5 width="100%">
<TR>
<TD>
1.2 +2 -1
jakarta-jetspeed-2/applications/jpetstore/src/webapp/WEB-INF/struts-portlet-config.xml
Index: struts-portlet-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/jpetstore/src/webapp/WEB-INF/struts-portlet-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-portlet-config.xml 20 Jan 2005 01:47:37 -0000 1.1
+++ struts-portlet-config.xml 21 Jan 2005 16:30:41 -0000 1.2
@@ -34,5 +34,6 @@
<action path="/shop/newOrder"/>
<render path="/shop/newOrderForm"/>
<action path="/shop/listOrders"/>
+ <resource path="/images/"/>
</portlet-url-type>
</config>
1.2 +1 -10 jakarta-jetspeed-2/applications/jpetstore/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/jpetstore/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Jan 2005 01:47:38 -0000 1.1
+++ project.xml 21 Jan 2005 16:30:41 -0000 1.2
@@ -149,15 +149,6 @@
</properties>
</dependency>
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0.6</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.0.6</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
