Author: vbriand Date: 2011-02-25 15:59:33 +0100 (Fri, 25 Feb 2011) New Revision: 222 Url: http://chorem.org/repositories/revision/bow/222 Log: The i18n plugin doesn't throw exceptions anymore on build (fixed anomaly #301). Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp trunk/src/main/webapp/jsp/permanentXml.jsp trunk/src/main/webapp/jsp/temporaryXml.jsp Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -1,4 +1,3 @@ -<%@page import="org.chorem.bow.BookmarkActions"%> <!-- #%L bow @@ -24,16 +23,17 @@ --> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> +<%@page import="org.chorem.bow.BookmarkActions"%> -<s:if test="#request.bookmarkActions != null"> - <div id="nuage" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> +<div id="nuage" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <s:if test="#request.bookmarkActions != null"> <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}"> <s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" /> </s:if> <s:else> - <s:set var="maxTags" value="#session.BowSession.preference.tags" /> + <s:set var="maxTags" value="#session.BowSession.preference.tags" /> </s:else> <s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}"> <s:url var="search" action="search" escapeAmp="true"> @@ -45,5 +45,5 @@ <!-- --> <s:a href="%{search}" title="%{count} results" cssClass="tag" cssStyle="font-size: %{#request.bookmarkActions.getFont(count)}px"><s:property value="topicName" /></s:a> </s:iterator> - </div> -</s:if> \ No newline at end of file + </s:if> +</div> \ No newline at end of file Modified: trunk/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -1,4 +1,3 @@ -<%@page import="org.chorem.bow.BowConfig"%> <!-- #%L bow @@ -30,12 +29,15 @@ String url = BowConfig.getInstance().getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" - xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + xmlns:moz="http://www.mozilla.org/2006/browser/search/" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> <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=<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}" /> + <s:set var="token" value="#session.BowSession.getPermanentToken()" /> + <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}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription> Modified: trunk/src/main/webapp/jsp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -29,12 +29,15 @@ String url = BowConfig.getInstance().getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" - xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + xmlns:moz="http://www.mozilla.org/2006/browser/search/" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> <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=<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}" /> + <s:set var="token" value="%{#session.BowSession.getTemporaryToken()}" /> + <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}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription>