Author: vbriand Date: 2011-02-25 10:15:39 +0100 (Fri, 25 Feb 2011) New Revision: 216 Url: http://chorem.org/repositories/revision/bow/216 Log: Replaced jsp tags by Struts2 tags whenever possible Modified: trunk/src/main/webapp/jsp/home.jsp trunk/src/main/webapp/jsp/inc/bookmark.jsp trunk/src/main/webapp/jsp/login.jsp trunk/src/main/webapp/jsp/permanentXml.jsp trunk/src/main/webapp/jsp/preferences.jsp trunk/src/main/webapp/jsp/temporaryXml.jsp Modified: trunk/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/src/main/webapp/jsp/home.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/home.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -60,7 +60,7 @@ request.setAttribute("bookmark", bookmark); request.setAttribute("sdf", sdf); %> - <jsp:include page="inc/bookmark.jsp" flush="true" /> + <s:include value="inc/bookmark.jsp" /> <% ++count; if (count >= nbBookmarks) { @@ -86,7 +86,7 @@ request.setAttribute("bookmark", bookmark); request.setAttribute("sdf", sdf); %> - <jsp:include page="inc/bookmark.jsp" flush="true" /> + <s:include value="inc/bookmark.jsp" /> <% ++count; if (count >= nbBookmarks) { Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -23,7 +23,7 @@ --> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags" %> - +<%@page import="org.chorem.bow.BowBookmark" %> <div class="bookmark" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> Modified: trunk/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/src/main/webapp/jsp/login.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/login.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -44,8 +44,8 @@ <s:submit key="bow.login.submit" name="submit" /> </p> </s:form> - <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> - <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> + <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> + <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> </div> </div> </body> Modified: trunk/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -23,22 +23,19 @@ #L% --> <%@page contentType="text/xml" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@page import="org.chorem.bow.BowSession" %> <% -BowSession bowSession = BowSession.getBowSession(session); -String token = bowSession.getPermanentToken(); String url = BowConfig.getInstance().getBowUrl(); %> - <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> <ShortName>Bow (permanent)</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> - <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&searchLine={searchTerms}" /> + <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription> Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -23,17 +23,10 @@ --> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<%@page import="org.chorem.bow.BowSession" %> <%@page import="org.chorem.bow.BowImport" %> <%@page import="org.nuiton.wikitty.search.FacetTopic" %> <%@page import="java.util.List" %> - <% -BowSession bowSession = BowSession.getBowSession(session); -String permanentToken = bowSession.getPermanentToken(); -String temporaryToken = bowSession.getTemporaryToken(); - %> - <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <head> @@ -72,10 +65,10 @@ <p> <ul> <li><strong><s:text name="bow.rightMenu.token.permanent"/> - :</strong><%=permanentToken%> + :</strong><s:property value="%{#session.BowSession.getPermanentToken()}" /> </li> <li><strong><s:text name="bow.rightMenu.token.temporary"/> - :</strong><%=temporaryToken%> + :</strong><s:property value="%{#session.BowSession.getTemporaryToken()}" /> </li> </ul> <s:url var="regenPermToken" action="regenPermToken"/> Modified: trunk/src/main/webapp/jsp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -22,22 +22,19 @@ #L% --> <%@page contentType="text/xml" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@page import="org.chorem.bow.BowSession" %> <% -BowSession bowSession = BowSession.getBowSession(session); -String token = bowSession.getTemporaryToken(); String url = BowConfig.getInstance().getBowUrl(); %> - <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> <ShortName>Bow (temporary)</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> - <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&search={searchTerms}" /> + <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&search={searchTerms}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription>