Author: thomas.heute(a)jboss.com Date: 2009-01-20 16:34:24 -0500 (Tue, 20 Jan 2009) New Revision: 12577 Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp branches/JBoss_Portal_Branch_2_7/theme/.classpath Log: - Encode before rendering - Fix Eclipse classpath Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2009-01-20 21:34:24 UTC (rev 12577) @@ -1,4 +1,6 @@ <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> +<%@ page import="org.jboss.portal.common.text.EntityEncoder" %> + <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> @@ -27,7 +29,7 @@ <table> <tr> <td>${n:i18n("CMS_SOURCE")}:</td> - <td><%= sCurrPath %> + <td><%= EntityEncoder.FULL.encode(sCurrPath) %> </td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2009-01-20 21:34:24 UTC (rev 12577) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.cms.util.NodeUtil" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> +<%@ page import="org.jboss.portal.common.text.EntityEncoder" %> + <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> @@ -24,7 +26,7 @@ <tr> <td align="center"> - <font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %> + <font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= EntityEncoder.FULL.encode(sCurrPath) %> </font> <br><br> <font class="portlet-font" style="color:red"><b>${n:i18n("CMS_DELETEWARN1")}</b></font> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2009-01-20 21:34:24 UTC (rev 12577) @@ -2,7 +2,9 @@ <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> +<%@ page import="org.jboss.portal.common.text.EntityEncoder" %> + <% String sCurrPath = (String)request.getAttribute("currpath"); String OP = CMSAdminConstants.OP_CONFIRMMOVE; @@ -31,7 +33,7 @@ <table> <tr> <td>${n:i18n("CMS_SOURCE")}:</td> - <td><%= sCurrPath %> + <td><%= EntityEncoder.FULL.encode(sCurrPath) %> </td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2009-01-20 21:34:24 UTC (rev 12577) @@ -2,6 +2,8 @@ org.jboss.portal.core.cms.ui.admin.CMSAdminConstants, java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> +<%@ page import="org.jboss.portal.common.text.EntityEncoder" %> + <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> @@ -126,7 +128,7 @@ <tr> <td>${n:i18n("CMS_CREATEFILEINDIR")}: </td> - <td><%= sCurrPath %> + <td><%= EntityEncoder.FULL.encode(sCurrPath) %> </td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2009-01-20 21:34:24 UTC (rev 12577) @@ -1,4 +1,5 @@ <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> +<%@ page import="org.jboss.portal.common.text.EntityEncoder" %> <%@ page import="java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> @@ -81,7 +82,7 @@ <tr> <td>${n:i18n("CMS_EDITING")}: </td> - <td><%= sCurrPath %> + <td><%= EntityEncoder.FULL.encode(sCurrPath) %> </td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2009-01-20 21:34:24 UTC (rev 12577) @@ -1,9 +1,11 @@ <%@ page import="org.jboss.portal.cms.model.File" %> <%@ page import="org.jboss.portal.cms.model.Folder" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> +<%@ page import="org.jboss.portal.common.text.EntityEncoder" %> <%@ page import="java.text.Format" %> <%@ page import="java.util.List" %> <%@ page import="java.util.StringTokenizer" %> + <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> @@ -79,7 +81,7 @@ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="<%= sPathBuilder %>"/> </portlet:renderURL> -"><%= sPathChunk %> +"><%= EntityEncoder.FULL.encode(sPathChunk) %> </a> </li> <% @@ -88,7 +90,7 @@ { %> <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> - <li class="selected"><%= sPathChunk %> + <li class="selected"><%= EntityEncoder.FULL.encode(sPathChunk) %> </li> <% } @@ -218,7 +220,7 @@ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="<%= folder.getBasePath() %>"/> </portlet:renderURL>"><%= - folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %> + EntityEncoder.FULL.encode(folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length())) %> </a> </td> <td> @@ -274,7 +276,7 @@ <portlet:param name="path" value="<%= file.getBasePath() %>"/> </portlet:renderURL>"><%= - file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, file.getBasePath().length()) %> + EntityEncoder.FULL.encode(file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, file.getBasePath().length())) %> </a> </td> <td> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2009-01-20 21:34:24 UTC (rev 12577) @@ -1,4 +1,5 @@ <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> +<%@ page import="org.jboss.portal.common.text.EntityEncoder" %> <%@ page import="org.jboss.portal.identity.Role" %> <%@ page import="org.jboss.portal.identity.User" %> <%@ page import="org.jboss.portal.cms.security.AuthorizationManager" %> @@ -50,7 +51,7 @@ %> <tr> <td colspan="2"> - <font class="portlet-font">${n:i18n("CMS_CONFIGURE_RESTRICTION")}: <%= sCurrPath %> + <font class="portlet-font">${n:i18n("CMS_CONFIGURE_RESTRICTION")}: <%= EntityEncoder.FULL.encode(sCurrPath) %> </font> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-01-20 21:34:24 UTC (rev 12577) @@ -6,6 +6,7 @@ <%@ page import="org.jboss.portal.cms.model.Content" %> <%@ page import="org.jboss.portal.cms.util.NodeUtil" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> +<%@ page import="org.jboss.portal.common.text.EntityEncoder" %> <%@ page import="java.text.Format" %> <%@ page import="java.util.Collection" %> <%@ page import="java.util.Iterator" %> @@ -77,7 +78,7 @@ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="<%= sPathBuilder %>"/> </portlet:renderURL> -"><%= sPathChunk %> +"><%= EntityEncoder.FULL.encode(sPathChunk) %> </a> </li> <% @@ -86,7 +87,7 @@ { %> <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> - <li class="selected"><%= sPathChunk %> + <li class="selected"><%= EntityEncoder.FULL.encode(sPathChunk) %> </li> <% } @@ -334,7 +335,7 @@ %> <%= modifiedDate %> </td> - <td><%= version.getTitle() %> + <td><%= EntityEncoder.FULL.encode(version.getTitle()) %> </td> </tr> <%}%> Modified: branches/JBoss_Portal_Branch_2_7/theme/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/.classpath 2009-01-20 21:30:31 UTC (rev 12576) +++ branches/JBoss_Portal_Branch_2_7/theme/.classpath 2009-01-20 21:34:24 UTC (rev 12577) @@ -19,5 +19,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> + <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath>