[portal-commits] JBoss Portal SVN: r12984 - in branches/JBoss_Portal_AS5_Deployer/core-cms: src/main/org/jboss/portal/core/cms and 7 other directories.

Author: mwringe Date: 2009-03-06 18:22:30 -0500 (Fri, 06 Mar 2009) New Revision: 12984 Added: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/.classpath branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml branches/JBoss_Portal_AS5_Deployer/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java branches/JBoss_Portal_AS5_Deployer/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp Log: Merge JBoss_Portal_Branch_2_7 changes (rev range 12254:12964) into JBoss_Portal_AS5_Deployer branch Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/.classpath =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/.classpath 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/.classpath 2009-03-06 23:22:30 UTC (rev 12984) @@ -24,8 +24,8 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/> <classpathentry kind="lib" path="/thirdparty/jbpm/jpdl/lib/jbpm-jpdl.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/cms/lib/cms-jackrabbit-trunk-SNAPSHOT.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/cms/lib/cms-jackrabbit.jar"/> + <classpathentry kind="lib" path="/thirdparty/glassfish/jsf/lib/jsf-api.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml 2009-03-06 23:22:30 UTC (rev 12984) @@ -105,10 +105,10 @@ <path refid="apache.fileupload.classpath"/> <path refid="jakarta.io.classpath"/> <path refid="oswego.concurrent.classpath"/> - <path refid="sun.javamail.classpath"/> + <path refid="glassfish.javamail.classpath"/> <path refid="jwebunit.jwebunit.classpath"/> <path refid="dbunit.dbunit.classpath"/> - <path refid="sun.jaf.classpath"/> + <path refid="glassfish.jaf.classpath"/> <path refid="portals.bridges.classpath"/> <path refid="beanshell.beanshell.classpath"/> <path refid="facelets.facelets.classpath"/> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java 2009-03-06 23:22:30 UTC (rev 12984) @@ -168,7 +168,7 @@ if (e.toString().indexOf("Access to this resource is denied") != -1) { ParametersStateString parameters = ParametersStateString.create(); - parameters.setValue("path", requestPath); + parameters.setValue(CMSPortlet.RENDER_PARAMETER_PATH, requestPath); return new InvokePortletWindowRenderCommand(targetWindowId, Mode.VIEW, null, parameters); } else Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * Copyright 2009, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -20,6 +20,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * ******************************************************************************/ + package org.jboss.portal.core.cms.ui.admin; import org.apache.commons.fileupload.FileItem; @@ -32,6 +33,7 @@ import org.jboss.portal.cms.impl.ContentImpl; import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.impl.FolderImpl; +import org.jboss.portal.cms.impl.jcr.JCRCMS; import org.jboss.portal.cms.model.Content; import org.jboss.portal.cms.model.File; import org.jboss.portal.cms.model.Folder; @@ -44,9 +46,9 @@ import org.jboss.portal.cms.util.NodeUtil; import org.jboss.portal.cms.workflow.ApprovePublish; import org.jboss.portal.cms.workflow.CMSWorkflowUtil; -import org.jboss.portal.cms.impl.jcr.JCRCMS; +import org.jboss.portal.common.util.ParameterValidation; +import org.jboss.portal.core.cms.command.StreamContentCommand; import org.jboss.portal.core.cms.ui.Util; -import org.jboss.portal.core.cms.command.StreamContentCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.identity.AnonymousRole; import org.jboss.portal.identity.IdentityException; @@ -77,7 +79,8 @@ import javax.portlet.PortletSession; import javax.portlet.UnavailableException; import java.io.IOException; -import java.io.InputStream; +import java.text.Format; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -85,11 +88,10 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.ResourceBundle; import java.util.Set; import java.util.Vector; -import java.util.ResourceBundle; -import java.text.SimpleDateFormat; -import java.text.Format; +import java.util.regex.Pattern; /** * @author <a href="mailto:roy@jboss.org">Roy Russo</a> @@ -105,6 +107,8 @@ private ApprovePublish approvePublish; private AuthorizationManager authorizationManager; private ResourceBundle resources = null; + private static final Pattern CHECK_FOR_XSS_PATTERN = ParameterValidation.XSS_CHECK; + private static final String SLASH = "/"; public void init() throws PortletException @@ -136,22 +140,22 @@ throw new PortletException("Authorization Service not found"); } - this.initializeApprovePublishWorkflow(); + this.initializeApprovePublishWorkflow(); } - + /** - * + * */ public void init(PortletConfig config) throws PortletException { super.init(config); - + //Get the Resource Bundle for this Portlet this.resources = config.getResourceBundle(Locale.getDefault()); } /** - * + * */ protected void doView(final JBossRenderRequest rReq, final JBossRenderResponse rRes) throws PortletException, IOException, UnavailableException @@ -161,8 +165,8 @@ String datePattern = bundle.getString(CMSAdminConstants.CMS_DATE_PATTERN); Format dateFormat = new SimpleDateFormat(datePattern, rReq.getLocale()); rReq.setAttribute(CMSAdminConstants.DATE_FORMAT, dateFormat); - - + + //check and make sure the CMSAdminPortlet is accessible to the current user if (!this.isPortletAccessible(rReq)) { @@ -204,36 +208,44 @@ } } } - - /** - * - * @param renderResponse - * @throws IOException - */ + + /** @throws IOException */ private void showAccessDeniedScreen(JBossRenderRequest rReq, JBossRenderResponse rRes) throws IOException, PortletException { - try - { - String sPath = rReq.getParameter("path"); - String sOp = rReq.getParameter("returnOp"); - - - rRes.setContentType("text/html"); - rReq.setAttribute("path", sPath); - rReq.setAttribute("returnOp", sOp); - javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/accessdenied.jsp"); - prd.include(rReq, rRes); - } - catch(Exception e) - { - throw new PortletException(e); - } + try + { + String sPath = rReq.getParameter("path"); + String sOp = rReq.getParameter("returnOp"); + + + rRes.setContentType("text/html"); + rReq.setAttribute("path", sPath); + rReq.setAttribute("returnOp", sOp); + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/accessdenied.jsp"); + prd.include(rReq, rRes); + } + catch (Exception e) + { + throw new PortletException(e); + } } private void internalDoView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws CMSException, PortletException, IOException { String op = rReq.getParameter("op"); + String sPath = rReq.getParameter("path"); + if (sPath != null) + { + sPath = ParameterValidation.sanitizeFromPattern(sPath, CHECK_FOR_XSS_PATTERN, SLASH); + } + + String sNavPath = rReq.getParameter("navpath"); + if (sNavPath != null) + { + sNavPath = ParameterValidation.sanitizeFromPattern(sNavPath, CHECK_FOR_XSS_PATTERN, SLASH); + } + if (op == null) { op = CMSAdminConstants.OP_MAIN; @@ -241,17 +253,35 @@ if (CMSAdminConstants.OP_MAIN.equals(op)) // list page. { - String sPath = rReq.getParameter("path"); if (sPath == null) { - sPath = "/"; + sPath = SLASH; } - + JCRCMS.enableUISecurityFilter(); Command listCMD = CMSService.getCommandFactory().createFolderGetListCommand(sPath); Folder mainFolder = (Folder)CMSService.execute(listCMD); - List folders = mainFolder.getFolders(); - List files = mainFolder.getFiles(); + + List folders = new ArrayList(); + List files = new ArrayList(); + + if (mainFolder != null) + { + folders = mainFolder.getFolders(); + files = mainFolder.getFiles(); + } + else + { + Object messages = rReq.getPortletSession().getAttribute("messages"); + if (messages == null) + { + messages = new ArrayList(); + rReq.getPortletSession().setAttribute("messages", messages); + } + + ((List)messages).add(this.resources.getObject("CMS_MISSING_RESOURCE")); + } + JCRCMS.disableUISecurityFilter(); rRes.setContentType("text/html"); @@ -270,12 +300,13 @@ { rReq.setAttribute("manageWorkflowAccessible", new Boolean(false)); } - + //Messages - if(rReq.getPortletSession().getAttribute("messages") != null) + if (rReq.getPortletSession().getAttribute("messages") != null) { Object messages = rReq.getPortletSession().getAttribute("messages"); rReq.getPortletSession().removeAttribute("messages"); + rReq.setAttribute("messages", messages); } @@ -286,42 +317,42 @@ { try { - String sNavPath = rReq.getParameter("navpath"); - List folders = this.getFolderList(sNavPath); - if((folders == null || folders.isEmpty()) && - (sNavPath != null && !sNavPath.equals("/"))) + if ((folders == null || folders.isEmpty()) && + (sNavPath != null && !sNavPath.equals(SLASH))) { sNavPath = NodeUtil.getParentPath(sNavPath); folders = this.getFolderList(sNavPath); } - + rReq.setAttribute("folders", folders); rRes.setContentType("text/html"); rReq.setAttribute("navpath", sNavPath); - - String sPath = rReq.getParameter("path"); + rRes.setContentType("text/html"); rReq.setAttribute("createpath", sPath); - - if (rReq.getParameter("error:message") != null) + + String parameter = rReq.getParameter("error:message"); + if (parameter != null) { - rReq.setAttribute("error:message", rReq.getParameter("error:message")); + rReq.setAttribute("error:message", parameter); } - if (rReq.getParameter("error:newcollectionname") != null) + parameter = rReq.getParameter("error:newcollectionname"); + if (parameter != null) { - rReq.setAttribute("error:newcollectionname", rReq.getParameter("error:newcollectionname")); + rReq.setAttribute("error:newcollectionname", parameter); } - if (rReq.getParameter("error:newcollectiondescription") != null) + parameter = rReq.getParameter("error:newcollectiondescription"); + if (parameter != null) { - rReq.setAttribute("error:newcollectiondescription", rReq.getParameter("error:newcollectiondescription")); + rReq.setAttribute("error:newcollectiondescription", parameter); } - - + + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmcreatecollection.jsp"); prd.include(rReq, rRes); } - catch(Exception e) + catch (Exception e) { throw new PortletException(e); } @@ -330,17 +361,15 @@ { try { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); - + List folders = this.getFolderList(sNavPath); - if((folders == null || folders.isEmpty()) && - (sNavPath != null && !sNavPath.equals("/"))) + if ((folders == null || folders.isEmpty()) && + (sNavPath != null && !sNavPath.equals(SLASH))) { sNavPath = NodeUtil.getParentPath(sNavPath); folders = this.getFolderList(sNavPath); } - + rReq.setAttribute("folders", folders); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); @@ -349,15 +378,13 @@ javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/upload.jsp"); prd.include(rReq, rRes); } - catch(Exception e) + catch (Exception e) { throw new PortletException(e); } } else if (CMSAdminConstants.OP_VIEWFILE.equals(op)) { - String sPath = rReq.getParameter("path"); - Command fileGetList = CMSService.getCommandFactory().createFileGetListCommand(sPath); List contentList = (List)CMSService.execute(fileGetList); @@ -438,17 +465,15 @@ { try { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); - + List folders = this.getFolderList(sNavPath); - if((folders == null || folders.isEmpty()) && - (sNavPath != null && !sNavPath.equals("/"))) + if ((folders == null || folders.isEmpty()) && + (sNavPath != null && !sNavPath.equals(SLASH))) { sNavPath = NodeUtil.getParentPath(sNavPath); folders = this.getFolderList(sNavPath); } - + rReq.setAttribute("folders", folders); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); @@ -456,7 +481,7 @@ javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/uploadarchive.jsp"); prd.include(rReq, rRes); } - catch(Exception e) + catch (Exception e) { throw new PortletException(e); } @@ -465,18 +490,16 @@ { try { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); String sType = rReq.getParameter("type"); - + List folders = this.getFolderList(sNavPath); - if((folders == null || folders.isEmpty()) && - (sNavPath != null && !sNavPath.equals("/"))) + if ((folders == null || folders.isEmpty()) && + (sNavPath != null && !sNavPath.equals(SLASH))) { sNavPath = NodeUtil.getParentPath(sNavPath); folders = this.getFolderList(sNavPath); } - + rReq.setAttribute("folders", folders); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); @@ -485,7 +508,7 @@ javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmcopy.jsp"); prd.include(rReq, rRes); } - catch(Exception e) + catch (Exception e) { throw new PortletException(e); } @@ -494,18 +517,16 @@ { try { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); String sType = rReq.getParameter("type"); - + List folders = this.getFolderList(sNavPath); - if((folders == null || folders.isEmpty()) && - (sNavPath != null && !sNavPath.equals("/"))) + if ((folders == null || folders.isEmpty()) && + (sNavPath != null && !sNavPath.equals(SLASH))) { sNavPath = NodeUtil.getParentPath(sNavPath); folders = this.getFolderList(sNavPath); } - + rReq.setAttribute("folders", folders); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); @@ -514,14 +535,13 @@ javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmmove.jsp"); prd.include(rReq, rRes); } - catch(Exception e) + catch (Exception e) { throw new PortletException(e); } } else if (CMSAdminConstants.OP_CONFIRMDELETE.equals(op)) { - String sPath = rReq.getParameter("path"); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmdelete.jsp"); @@ -529,18 +549,16 @@ } else if (CMSAdminConstants.OP_EDIT_BINARY.equals(op)) { - String sPath = rReq.getParameter("path"); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); - rReq.setAttribute("language", rReq.getParameter("language")); + String language = rReq.getParameter("language"); + ParameterValidation.sanitizeFromPattern(language, CHECK_FOR_XSS_PATTERN, "en"); + rReq.setAttribute("language", language); javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/editbinary.jsp"); prd.include(rReq, rRes); } - else - if (CMSAdminConstants.OP_CREATENEWTEXT.equals(op) || CMSAdminConstants.OP_CREATEFILE_VALIDATION_ERROR.equals(op)) + else if (CMSAdminConstants.OP_CREATENEWTEXT.equals(op) || CMSAdminConstants.OP_CREATEFILE_VALIDATION_ERROR.equals(op)) { - String sPath = rReq.getParameter("path"); - // get Base for editor StringBuffer sbUrl = new StringBuffer(); sbUrl.append(rReq.getScheme()); @@ -567,32 +585,38 @@ rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); - rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rReq, "/")); + rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rReq, SLASH)); //If a validation error occurred, re-populate data already submitted - if (rReq.getParameter("error:content") != null) + String parameter = rReq.getParameter("error:content"); + if (parameter != null) { - rReq.setAttribute("error:content", rReq.getParameter("error:content")); + rReq.setAttribute("error:content", parameter); } - if (rReq.getParameter("error:description") != null) + parameter = rReq.getParameter("error:description"); + if (parameter != null) { - rReq.setAttribute("error:description", rReq.getParameter("error:description")); + rReq.setAttribute("error:description", parameter); } - if (rReq.getParameter("error:title") != null) + parameter = rReq.getParameter("error:title"); + if (parameter != null) { - rReq.setAttribute("error:title", rReq.getParameter("error:title")); + rReq.setAttribute("error:title", parameter); } - if (rReq.getParameter("error:language") != null) + parameter = rReq.getParameter("error:language"); + if (parameter != null) { - rReq.setAttribute("error:language", rReq.getParameter("error:language")); + rReq.setAttribute("error:language", parameter); } - if (rReq.getParameter("error:filename") != null) + parameter = rReq.getParameter("error:filename"); + if (parameter != null) { - rReq.setAttribute("error:filename", rReq.getParameter("error:filename")); + rReq.setAttribute("error:filename", parameter); } - if (rReq.getParameter("error:message") != null) + parameter = rReq.getParameter("error:message"); + if (parameter != null) { - rReq.setAttribute("error:message", rReq.getParameter("error:message")); + rReq.setAttribute("error:message", parameter); } javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/create.jsp"); @@ -600,8 +624,9 @@ } else if (CMSAdminConstants.OP_EDIT.equals(op)) { - String sPath = rReq.getParameter("path"); String sLanguage = rReq.getParameter("language"); + ParameterValidation.sanitizeFromPattern(sLanguage, CHECK_FOR_XSS_PATTERN, "en"); + String sVersion = rReq.getParameter("version"); StringBuffer sbUrl = new StringBuffer(); @@ -630,7 +655,7 @@ rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); - rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rReq, "/")); + rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rReq, SLASH)); Command getCommand; @@ -659,17 +684,14 @@ { try { - String sPath = rReq.getParameter("path"); - String sNavPath = rReq.getParameter("navpath"); - List folders = this.getFolderList(sNavPath); - if((folders == null || folders.isEmpty()) && - (sNavPath != null && !sNavPath.equals("/"))) + if ((folders == null || folders.isEmpty()) && + (sNavPath != null && !sNavPath.equals(SLASH))) { sNavPath = NodeUtil.getParentPath(sNavPath); folders = this.getFolderList(sNavPath); } - + rReq.setAttribute("folders", folders); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); @@ -677,15 +699,15 @@ javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/exportarchive.jsp"); prd.include(rReq, rRes); } - catch(Exception e) + catch (Exception e) { throw new PortletException(e); } } else if (CMSAdminConstants.OP_EXPORTARCHIVE_PICKUP.equals(op)) { - String sPath = rReq.getParameter("path"); String sPickupFile = rReq.getParameter("filepath"); + ParameterValidation.sanitizeFromPattern(sPickupFile, CHECK_FOR_XSS_PATTERN, SLASH); rRes.setContentType("text/html"); PortletRequestDispatcher prd = null; @@ -704,7 +726,6 @@ } else if (CMSAdminConstants.OP_CONFIRMSECURE.equals(op)) { - String sPath = rReq.getParameter("path"); String sConfirm = rReq.getParameter("confirm"); String returnOp = rReq.getParameter("returnOp"); @@ -765,13 +786,11 @@ else if (CMSAdminConstants.OP_VIEWPENDING.equals(op)) { boolean isWorkflowManagementAccessible = this.isWorkflowManagementAccessible(rReq); - if(!isWorkflowManagementAccessible) + if (!isWorkflowManagementAccessible) { this.showAccessDeniedScreen(rReq, rRes); return; } - - String sPath = rReq.getParameter("path"); if (this.getApprovePublish() != null) { @@ -788,30 +807,29 @@ rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); - + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/pending_items.jsp"); prd.include(rReq, rRes); } else if (CMSAdminConstants.OP_VIEWPENDINGPREVIEW.equals(op)) { String processId = rReq.getParameter("pid"); - String path = rReq.getParameter("path"); String contentPath = rReq.getParameter("contentPath"); - + boolean isWorkflowManagementAccessible = this.isWorkflowManagementAccessible(rReq); - if(!isWorkflowManagementAccessible) + if (!isWorkflowManagementAccessible) { this.showAccessDeniedScreen(rReq, rRes); return; } - - boolean hasWriteAccess = this.hasWriteAccess(rReq, path); - if(!hasWriteAccess) + + boolean hasWriteAccess = this.hasWriteAccess(rReq, sPath); + if (!hasWriteAccess) { this.showAccessDeniedScreen(rReq, rRes); return; } - + if (this.getApprovePublish() != null) { try @@ -824,12 +842,12 @@ rReq.setAttribute("pendingQueue", null); } } - + Content pendingContent = CMSWorkflowUtil.getPendingContent(Long.parseLong(processId), contentPath); String viewableContent = Util.getViewableContent(rReq, rRes, pendingContent.getContentAsString()); - + rReq.setAttribute("pendingPreviewContent", viewableContent); - + StringBuffer sbUrl = new StringBuffer(); sbUrl.append(rReq.getScheme()); sbUrl.append("://"); @@ -841,12 +859,12 @@ sbUrl.append(rReq.getServerPort()); } rRes.setContentType("text/html"); - rReq.setAttribute("currpath", path); - rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rReq, "/")); - + rReq.setAttribute("currpath", sPath); + rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rReq, SLASH)); + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/pending_items.jsp"); prd.include(rReq, rRes); - } + } } public void processAction(final JBossActionRequest aReq, final JBossActionResponse aRes) throws PortletException @@ -896,7 +914,7 @@ String sFolderDescription = aReq.getParameter("newcollectiondescription"); if (!"".equals(sCreatePath) && !"".equals(sFolderName)) { - String sNewPath = FileUtil.cleanDoubleSlashes(sCreatePath + "/" + sFolderName); + String sNewPath = FileUtil.cleanDoubleSlashes(sCreatePath + SLASH + sFolderName); Folder folder = new FolderImpl(); folder.setCreationDate(new Date()); @@ -911,9 +929,9 @@ Command saveCMD = CMSService.getCommandFactory().createFolderSaveCommand(folder); CMSService.execute(saveCMD); } - catch(CMSException cme) + catch (CMSException cme) { - if(cme.hasPathFormatFailure()) + if (cme.hasPathFormatFailure()) { //Validation Error occurred //FileName should not be empty @@ -923,7 +941,7 @@ //used to remember the data already submitted by the user aRes.setRenderParameter("error:message", CMSAdminConstants.CMS_FOLDERNAME_INVALID); aRes.setRenderParameter("error:newcollectionname", aReq.getParameter("newcollectionname")); - aRes.setRenderParameter("error:newcollectiondescription", aReq.getParameter("newcollectiondescription")); + aRes.setRenderParameter("error:newcollectiondescription", aReq.getParameter("newcollectiondescription")); return; } @@ -935,7 +953,7 @@ aRes.setRenderParameter("op", CMSAdminConstants.OP_MAIN); aRes.setRenderParameter("path", sNewPath); - } + } else { //Validation Error @@ -945,7 +963,7 @@ //used to remember the data already submitted by the user aRes.setRenderParameter("error:message", CMSAdminConstants.CMS_FOLDERNAME_INVALID); aRes.setRenderParameter("error:newcollectionname", aReq.getParameter("newcollectionname")); - aRes.setRenderParameter("error:newcollectiondescription", aReq.getParameter("newcollectiondescription")); + aRes.setRenderParameter("error:newcollectiondescription", aReq.getParameter("newcollectiondescription")); } } else if (CMSAdminConstants.OP_UPLOADCONTENT.equals(op)) @@ -968,6 +986,8 @@ if (!item.isFormField()) { String sFilename = item.getName(); + sFilename = ParameterValidation.sanitizeFromPattern(sFilename, CHECK_FOR_XSS_PATTERN, ""); + if (!"".equals(sFilename)) { int backslashIndex = sFilename.lastIndexOf("\\"); @@ -977,7 +997,7 @@ } else // unix { - backslashIndex = sFilename.lastIndexOf("/"); + backslashIndex = sFilename.lastIndexOf(SLASH); sFilename = sFilename.substring(backslashIndex + 1); } @@ -995,12 +1015,12 @@ content.setMimeType("application/octet-stream"); } - String sBasePath = FileUtil.cleanDoubleSlashes(sPath + "/" + sFilename); + String sBasePath = FileUtil.cleanDoubleSlashes(sPath + SLASH + sFilename); file.setBasePath(sBasePath); content.setTitle(sTitle); content.setDescription(sDescription); - content.setBasePath(sBasePath + "/" + new Locale(sLanguage)); + content.setBasePath(sBasePath + SLASH + new Locale(sLanguage)); content.setBytes(item.get()); file.setContent(new Locale(sLanguage), content); @@ -1029,21 +1049,23 @@ else { String fieldName = item.getFieldName(); + String itemValue = item.getString(aReq.getCharacterEncoding()); + itemValue = ParameterValidation.sanitizeFromPattern(itemValue, CHECK_FOR_XSS_PATTERN, ""); if ("destination".equals(fieldName)) { - sPath = item.getString(aReq.getCharacterEncoding()); + sPath = itemValue; } else if ("description".equals(fieldName)) { - sDescription = item.getString(aReq.getCharacterEncoding()); + sDescription = itemValue; } else if ("title".equals(fieldName)) { - sTitle = item.getString(aReq.getCharacterEncoding()); + sTitle = itemValue; } else if ("language".equals(fieldName)) { - sLanguage = item.getString(aReq.getCharacterEncoding()); + sLanguage = itemValue; } } } @@ -1079,12 +1101,26 @@ if (!item.isFormField()) { byte[] archiveBytes = item.get(); - + Command storearchiveCMD = CMSService.getCommandFactory().createAsyncStoreArchiveCommand(sPath, archiveBytes, sLanguage); - CMSService.execute(storearchiveCMD); - + List messages = new ArrayList(); - messages.add(this.resources.getObject("CMS_MSG_UPLOADARCHIVE_ASYNC")); + + try + { + CMSService.execute(storearchiveCMD); + messages.add(this.resources.getObject("CMS_MSG_UPLOADARCHIVE_ASYNC")); + } + catch (CMSException cme) + { + String messageKey = cme.getMessageKey(); + if (messageKey != null && messageKey.trim().length() > 0) + { + messages.add(this.resources.getObject(messageKey)); + } + } + + aReq.getPortletSession().setAttribute("messages", messages); aRes.setRenderParameter("path", FileUtil.cleanDoubleSlashes(sPath)); @@ -1099,7 +1135,7 @@ else if ("language".equals(fieldName)) { sLanguage = item.getString(aReq.getCharacterEncoding()); - } + } } } } @@ -1116,27 +1152,27 @@ String sType = aReq.getParameter("type"); if (!"".equals(sTo) && !"".equals(sFrom) && !"".equals(sType)) { - String sNodeName = sFrom.substring(sFrom.lastIndexOf("/") + 1, sFrom.length()); - sTo = FileUtil.cleanDoubleSlashes(sTo + "/" + sNodeName); - + String sNodeName = sFrom.substring(sFrom.lastIndexOf(SLASH) + 1, sFrom.length()); + sTo = FileUtil.cleanDoubleSlashes(sTo + SLASH + sNodeName); + // check if destination already exists Command existsCMD = CMSService.getCommandFactory().createItemExistsCommand(sTo); Boolean bExists = (Boolean)CMSService.execute(existsCMD); - if (bExists.booleanValue()) - { - List messages = new ArrayList(); - messages.add(this.resources.getObject("CMS_MSG_DESTINATION_ALREADY_EXISTS")); - aReq.getPortletSession().setAttribute("messages", messages); - try - { - String sParentPath = NodeUtil.getParentPath(sFrom); - aRes.setRenderParameter("path", sParentPath); - } - catch (Exception e) - { + if (bExists.booleanValue()) + { + List messages = new ArrayList(); + messages.add(this.resources.getObject("CMS_MSG_DESTINATION_ALREADY_EXISTS")); + aReq.getPortletSession().setAttribute("messages", messages); + try + { + String sParentPath = NodeUtil.getParentPath(sFrom); + aRes.setRenderParameter("path", sParentPath); + } + catch (Exception e) + { - } - return; + } + return; } Command copyCommand = CMSService.getCommandFactory().createCopyCommand(sFrom, sTo); @@ -1158,7 +1194,7 @@ String sTo = aReq.getParameter("destination"); String sFrom = aReq.getParameter("source"); String sType = aReq.getParameter("type"); - + if (sTo.startsWith(sFrom)) { List messages = new ArrayList(); @@ -1175,33 +1211,33 @@ } return; } - + if (!"".equals(sTo) && !"".equals(sFrom) && !"".equals(sType)) { - String sNodeName = sFrom.substring(sFrom.lastIndexOf("/") + 1, sFrom.length()); - sTo = FileUtil.cleanDoubleSlashes(sTo + "/" + sNodeName); - + String sNodeName = sFrom.substring(sFrom.lastIndexOf(SLASH) + 1, sFrom.length()); + sTo = FileUtil.cleanDoubleSlashes(sTo + SLASH + sNodeName); + // check if destination already exists Command existsCMD = CMSService.getCommandFactory().createItemExistsCommand(sTo); Boolean bExists = (Boolean)CMSService.execute(existsCMD); if (bExists.booleanValue()) - { - List messages = new ArrayList(); - messages.add(this.resources.getObject("CMS_MSG_DESTINATION_ALREADY_EXISTS")); - aReq.getPortletSession().setAttribute("messages", messages); - try - { - String sParentPath = NodeUtil.getParentPath(sFrom); - aRes.setRenderParameter("path", sParentPath); - } - catch (Exception e) - { + { + List messages = new ArrayList(); + messages.add(this.resources.getObject("CMS_MSG_DESTINATION_ALREADY_EXISTS")); + aReq.getPortletSession().setAttribute("messages", messages); + try + { + String sParentPath = NodeUtil.getParentPath(sFrom); + aRes.setRenderParameter("path", sParentPath); + } + catch (Exception e) + { - } - return; + } + return; } - + Command moveCommand = CMSService.getCommandFactory().createMoveCommand(sFrom, sTo); CMSService.execute(moveCommand); if ("fo".equalsIgnoreCase(sType)) @@ -1211,7 +1247,7 @@ else if ("fi".equalsIgnoreCase(sType)) { aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE); - } + } aRes.setRenderParameter("path", sTo); } @@ -1263,7 +1299,7 @@ } else // unix { - backslashIndex = sFilename.lastIndexOf("/"); + backslashIndex = sFilename.lastIndexOf(SLASH); sFilename = sFilename.substring(backslashIndex + 1); } @@ -1284,7 +1320,7 @@ } content.setTitle(sTitle); content.setDescription(sDescription); - content.setBasePath(sBasePath + "/" + sLanguage); + content.setBasePath(sBasePath + SLASH + sLanguage); content.setBytes(item.get()); file.setContent(new Locale(sLanguage), content); @@ -1361,7 +1397,7 @@ if (!"".equals(sFileName) && !"".equals(sDirectory)) { String sContent = aReq.getParameter("elm1"); - String sNewFilePath = FileUtil.cleanDoubleSlashes(sDirectory + "/" + sFileName); + String sNewFilePath = FileUtil.cleanDoubleSlashes(sDirectory + SLASH + sFileName); File file = new FileImpl(); Content content = new ContentImpl(); @@ -1382,7 +1418,7 @@ content.setTitle(sTitle); content.setDescription(sDescription); - content.setBasePath(sBasePath + "/" + new Locale(sLanguage)); + content.setBasePath(sBasePath + SLASH + new Locale(sLanguage)); content.setBytes(sContent.getBytes()); file.setContent(new Locale(sLanguage), content); @@ -1392,11 +1428,15 @@ Boolean bExists = null; try { + if (!CHECK_FOR_XSS_PATTERN.matcher(content.getBasePath()).matches()) + { + throw new CMSException(content.getBasePath() + " is not a legal path element"); + } bExists = (Boolean)CMSService.execute(existsCMD); } - catch(CMSException cme) + catch (CMSException cme) { - if(cme.hasPathFormatFailure()) + if (cme.hasPathFormatFailure()) { //Validation Error occurred //FileName should not be empty @@ -1420,7 +1460,7 @@ throw cme; } } - + if (bExists.booleanValue()) // if file exists, update contentNode { Command cmdUpdate = CMSService.getCommandFactory().createUpdateFileCommand(file, content, true); @@ -1448,7 +1488,7 @@ sMakeLive = "on"; } - if (!"".equals(sFilePath)) + if (!"".equals(sFilePath) && CHECK_FOR_XSS_PATTERN.matcher(sFilePath).matches()) { String sContent = aReq.getParameter("elm1"); @@ -1470,7 +1510,7 @@ content.setTitle(sTitle); content.setDescription(sDescription); - content.setBasePath(sFilePath + "/" + new Locale(sLanguage).getLanguage()); + content.setBasePath(sFilePath + SLASH + new Locale(sLanguage).getLanguage()); content.setBytes(sContent.getBytes()); file.setContent(new Locale(sLanguage), content); @@ -1550,11 +1590,11 @@ else if (CMSAdminConstants.OP_APPROVE.equals(op)) { boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path")); - if(!hasWriteAccess) + if (!hasWriteAccess) { throw new CMSException("Access to this resource is denied"); } - + String sManager = aReq.getUser().getUserName(); String sPID = aReq.getParameter("pid"); try @@ -1584,11 +1624,11 @@ else if (CMSAdminConstants.OP_DENY.equals(op)) { boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path")); - if(!hasWriteAccess) + if (!hasWriteAccess) { throw new CMSException("Access to this resource is denied"); } - + String sManager = aReq.getUser().getUserName(); String sPID = aReq.getParameter("pid"); try @@ -1612,45 +1652,45 @@ } return; } - + String filePath = aReq.getParameter("path"); String parentPath = null; try { parentPath = NodeUtil.getParentPath(filePath); } - catch(Exception e) + catch (Exception e) { - parentPath = "/"; + parentPath = SLASH; } - + //Check if this file still exists Command existsCmd = this.CMSService.getCommandFactory().createItemExistsCommand(filePath); - boolean exists = ((Boolean)this.CMSService.execute(existsCmd)).booleanValue(); - if(exists) + boolean exists = ((Boolean)this.CMSService.execute(existsCmd)).booleanValue(); + if (exists) { aRes.setRenderParameter("path", filePath); aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE); } else - { + { aRes.setRenderParameter("path", parentPath); aRes.setRenderParameter("op", CMSAdminConstants.OP_MAIN); } } - else if(CMSAdminConstants.OP_MODIFYANDAPPROVE.equals(op)) + else if (CMSAdminConstants.OP_MODIFYANDAPPROVE.equals(op)) { boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path")); - if(!hasWriteAccess) + if (!hasWriteAccess) { throw new CMSException("Access to this resource is denied"); } - + String modifiedContent = aReq.getParameter("elm1"); String processId = aReq.getParameter("pid"); String path = aReq.getParameter("path"); String sManager = aReq.getUser().getUserName(); - + try { //Apply this modifiedContent instead of the one published by the original author @@ -1672,7 +1712,7 @@ aRes.setRenderParameter("op", from); } return; - } + } aRes.setRenderParameter("path", path); aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE); } @@ -1682,13 +1722,13 @@ String language = aReq.getParameter("language"); String version = aReq.getParameter("version"); - //Perform the change in live version here + //Perform the change in live version here Command makeLiveCommand = CMSService.getCommandFactory().createMakeLiveVersionCommand(path, language, version); CMSService.execute(makeLiveCommand); aRes.setRenderParameter("path", path); aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE); - } + } } else { @@ -1708,7 +1748,7 @@ { if (sNavPath == null) { - sNavPath = "/"; + sNavPath = SLASH; } Command listCMD = CMSService.getCommandFactory().createFolderGetListCommand(sNavPath); Folder mainFolder = (Folder)CMSService.execute(listCMD); @@ -1752,13 +1792,13 @@ (manageUsers == null || manageUsers.length == 0) ) { - //remove all direct permissions on this node + //remove all direct permissions on this node String uri = this.authorizationManager.getProvider().getCriteriaURI("path", path); this.authorizationManager.getProvider().removeSecurityBindings(uri); return; } - //cleanup the old permissions on this node, before new ones are created + //cleanup the old permissions on this node, before new ones are created String uri = this.authorizationManager.getProvider().getCriteriaURI("path", path); this.authorizationManager.getProvider().removeSecurityBindings(uri); @@ -1871,11 +1911,11 @@ if (portletRequest.getUserPrincipal() != null) { - if(portletRequest.getUserPrincipal().getName().equals(this.authorizationManager.getProvider().getRoot().getUserName())) + if (portletRequest.getUserPrincipal().getName().equals(this.authorizationManager.getProvider().getRoot().getUserName())) { return true; } - + //Not the Root User. so now make sure the Portlet is accessible to the User that is logged in User user = this.userModule.findUserByUserName(portletRequest.getUserPrincipal().getName()); String uri = this.authorizationManager.getProvider().getUserURI(user.getUserName()); @@ -1923,7 +1963,6 @@ } /** - * * @param portletRequest * @return */ @@ -2030,26 +2069,26 @@ this.setApprovePublish(null); } } - + private void filterResourceBySecurity(List resources, PortalCMSSecurityContext securityContext) { - + } - + private boolean hasWriteAccess(PortletRequest request, String path) { boolean hasAccess = false; - + User user = null; - if(request instanceof JBossRenderRequest) + if (request instanceof JBossRenderRequest) { user = ((JBossRenderRequest)request).getUser(); } - else if(request instanceof JBossActionRequest) + else if (request instanceof JBossActionRequest) { user = ((JBossActionRequest)request).getUser(); } - + try { user = userModule.findUserById(user.getId()); @@ -2062,11 +2101,11 @@ PortalCMSSecurityContext securityContext = new PortalCMSSecurityContext(user); File file = new FileImpl(); file.setBasePath(path); - securityContext.setAttribute("command", CMSService.getCommandFactory().createFileUpdateCommand(file)); + securityContext.setAttribute("command", CMSService.getCommandFactory().createFileUpdateCommand(file)); PortalPermission cmsPermission = new CMSPermission(securityContext); hasAccess = this.authorizationManager.checkPermission(cmsPermission); - + return hasAccess; } } \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2009-03-06 23:22:30 UTC (rev 12984) @@ -71,7 +71,8 @@ <attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute> <attribute name="DefaultLocale">en</attribute> <attribute name="RepositoryName">PortalRepository</attribute> - <attribute name="HomeDir">${jboss.server.data.dir}${/}portal${/}cms${/}conf</attribute> + <attribute name="HomeDir">${jboss.server.data.dir}${/}portal${/}cms${/}conf</attribute> + <attribute name="CmsSessionFactory">java:/portal/cms/CMSSessionFactory</attribute> <attribute name="Config"> <Repository> <!-- Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2009-03-06 23:22:30 UTC (rev 12984) @@ -149,4 +149,7 @@ CMS_DATE_PATTERN=MM/dd/yy HH:mm +INVALID_ARCHIVE_MESSAGE=The archive being uploaded is not a valid archive file +CMS_MISSING_RESOURCE=Requested CMS Resource could not be Found + Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2009-03-06 23:22:30 UTC (rev 12984) @@ -121,8 +121,9 @@ CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet, CMS_CLICK_HERE=clicca qui +CMS_SELECT_ACTION=Seleziona un\'azione -CMS_QUERYERROR=The query you entered is not valid +CMS_QUERYERROR=La query che hai inserito non \u00e8 valida CMS_ADMIN_SET_READ_PERMISSIONS=Configura i permessi in lettura CMS_ADMIN_SET_WRITE_PERMISSIONS=Configura i permessi in scrittura @@ -130,4 +131,19 @@ CMS_ADMIN_SELECT_ROLES=Seleziona i ruoli che hanno accesso a questo nodo. CMS_ADMIN_SELECT_USERS=Seleziona gli utenti che hanno accesso a questo nodo. CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=Puoi selezionare pi\u00f9 ruoli usando il CTRL+click sui nomi dei ruoli. -CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Puoi selezionare pi\u00f9 utenti usando il CTRL+click sui nomi degli utenti. \ No newline at end of file +CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Puoi selezionare pi\u00f9 utenti usando il CTRL+click sui nomi degli utenti. + +CMS_ACCESS_DENIED=Accesso negato +CMS_ACCESS_DENIED_DESCRIPTION=Non ti \u00e8 permesso accedere alla risorsa +CMS_ACCESS_DENIED_DESCRIPTION_PATH=Non ti \u00e8 permesso accedere alla risorsa + +CMS_MISSING_DOCUMENT=404 - Pagina non trovata +CMS_MISSING_DOCUMENT_DESCRIPTION=Il documento a cui hai tentato di accedere non \u00e8 disponibile + +CMS_FILENAME_INVALID=Il nome del File non \u00e8 valido. Non sono permessi caratteri quali '.', '/', ':', '[', ']', '*', ''', '"', '|' o lo spazio. +CMS_FOLDERNAME_INVALID=Il nome della cartella non \u00e8 valido. Non sono permessi caratteri quali '.', '/', ':', '[', ']', '*', ''', '"', '|' o lo spazio. + +CMS_MSG_DESTINATION_ALREADY_EXISTS=Il comando non pu\u00F2 essere eseguito, perch\u00e8 la destinazione esiste gi\u00e0. +CMS_CANT_MOVE_SAME_DESTINATION=Non puoi spostare la cartella nella stessa destinazione + +CMS_DATE_PATTERN=MM/dd/yy HH:mm \ No newline at end of file Copied: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties) =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties (rev 0) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ja.properties 2009-03-06 23:22:30 UTC (rev 12984) @@ -0,0 +1,154 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, Red Hat Middleware, LLC, and individual # +# contributors as indicated by the @authors tag. See the # +# copyright.txt in the distribution for a full listing of # +# individual contributors. # +# # +# This is free software; you can redistribute it and/or modify it # +# under the terms of the GNU Lesser General Public License as # +# published by the Free Software Foundation; either version 2.1 of # +# the License, or (at your option) any later version. # +# # +# This software is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # +# Lesser General Public License for more details. # +# # +# You should have received a copy of the GNU Lesser General Public # +# License along with this software; if not, write to the Free # +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # +################################################################################ + +org.jboss.portal.object.name.admin.CMS=\u30b3\u30f3\u30c6\u30f3\u30c4\u7ba1\u7406 + +## CMS ADMIN PORTLET +TITLE_HEAD=CMS \u7ba1\u7406 +TITLE_BROWSE=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea \u30d6\u30e9\u30a6\u30b6 +TITLE_FILEBROWSE=\u30d5\u30a1\u30a4\u30eb \u30d6\u30e9\u30a6\u30b6 +TITLE_DELETECONFIRM=\u524a\u9664\u78ba\u8a8d +TITLE_CREATECOLLCONFIRM=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4f5c\u6210\u78ba\u8a8d +TITLE_COPYCONFIRM=\u30ea\u30bd\u30fc\u30b9\u30b3\u30d4\u30fc\u78ba\u8a8d +TITLE_MOVECONFIRM=\u30ea\u30bd\u30fc\u30b9\u79fb\u52d5\u78ba\u8a8d +TITLE_VIEWFILE=\u89b3\u89a7\u30d5\u30a1\u30a4\u30eb\u30d7\u30ed\u30d1\u30c6\u30a3 +TITLE_EDIT=\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6 +TITLE_CREATE=\u30d5\u30a1\u30a4\u30eb\u4f5c\u6210 +TITLE_UPLOAD=\u30d5\u30a1\u30a4\u30eb\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9 +TITLE_SECURECONFIRM=\u30bb\u30ad\u30e5\u30a2\u30ce\u30fc\u30c9 + +CMS_SEARCH=\u691c\u7d22 +CMS_SEARCHNORESULT=\u691c\u7d22\u7d50\u679c\u304c\u3042\u308a\u307e\u305b\u3093 +CMS_MENU=\u30a2\u30af\u30b7\u30e7\u30f3\u30e1\u30cb\u30e5\u30fc +CMS_ACTION=\u30a2\u30af\u30b7\u30e7\u30f3 +CMS_NAME=\u540d\u524d +CMS_TYPE=\u30bf\u30a4\u30d7 +CMS_CREATED=\u4f5c\u6210 +CMS_MODIFIED=\u4fee\u6b63 +CMS_DESCRIPTION=\u8aac\u660e +CMS_VIEW=\u89b3\u89a7 +CMS_COPY=\u30b3\u30d4\u30fc +CMS_MOVE=\u79fb\u52d5 +CMS_DELETE=\u524a\u9664 +CMS_FOLDER=\u30d5\u30a9\u30eb\u30c0 +CMS_FILE=\u30d5\u30a1\u30a4\u30eb +CMS_CREATE=\u4f5c\u6210 +CMS_CANCEL=\u30ad\u30e3\u30f3\u30bb\u30eb +CMS_EDIT=\u7de8\u96c6 +CMS_UPLOAD=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9 +CMS_MODIFY=\u4fee\u6b63 +CMS_CREATEFOLDER= \u30d5\u30a9\u30eb\u30c0\u4f5c\u6210 +CMS_CREATEFILE=\u30d5\u30a1\u30a4\u30eb\u4f5c\u6210 +CMS_UPLOADARCHIVE=\u30a2\u30fc\u30ab\u30a4\u30d6\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9 +CMS_UPLOADARCHIVE_ASYNC=\u975e\u540c\u671f\u30d7\u30ed\u30bb\u30b9 +CMS_BACKTOBROWSER=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d6\u30e9\u30a6\u30b6\u306b\u623b\u308b +CMS_TRANSFER=\u30a4\u30f3\u30dd\u30fc\u30c8/\u30a8\u30af\u30b9\u30dd\u30fc\u30c8 +CMS_EXPORTARCHIVE=\u30d5\u30a9\u30eb\u30c0\u306e\u30a8\u30af\u30b9\u30dd\u30fc\u30c8 +CMS_SECURE=\u30bb\u30ad\u30e5\u30a2 +CMS_PREVIEW=\u30d7\u30ec\u30d3\u30e5\u30fc +CMS_GO=Go + +CMS_CREATEFILEINDIR=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210 +CMS_FILENAME=\u30d5\u30a1\u30a4\u30eb\u540d +CMS_TITLE=\u30bf\u30a4\u30c8\u30eb +CMS_LANGUAGE=\u8a00\u8a9e + +CMS_DELETEPATH=\u524a\u9664\u5bfe\u8c61\u306e\u78ba\u8a8d: +CMS_DELETEWARN1=\u8b66\u544a! \u3053\u306e\u5909\u66f4\u3092\u3082\u3068\u306b\u623b\u3059\u3053\u3068\u306f\u51fa\u6765\u307e\u305b\u3093\! +CMS_DELETEWARN2=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3092\u672c\u5f53\u306b\u524a\u9664\u3057\u307e\u3059\u304b\? + +CMS_DESTINATION=\u5834\u6240 +CMS_SOURCE=\u30bd\u30fc\u30b9 + +CMS_EDITING=\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6 +CMS_LIVE=Make \"Live\" +CMS_VERSION=\u30d0\u30fc\u30b8\u30e7\u30f3 +CMS_WYSIWYG=WYSIWYG \u30a8\u30c7\u30a3\u30bf + +CMS_LIVEVERSION=Live \u30d0\u30fc\u30b8\u30e7\u30f3 +CMS_SIZE=\u30b5\u30a4\u30ba + +CMS_CONTENT_DIR=\u30b3\u30f3\u30c6\u30f3\u30c4\u30c7\u30a3\u30ec\u30af\u30c8\u30ea +CMS_CONTENT_DIR_USE=\u30dd\u30fc\u30bf\u30eb\u30d5\u30a9\u30eb\u30c0\u69cb\u9020\u3092\u64cd\u4f5c\u3059\u308b\u305f\u3081\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30c4\u30ea\u30fc\u3092\u5229\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +CMS_MAIN_USE=\u30dd\u30fc\u30bf\u30eb\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u7ba1\u7406\u3059\u308b\u305f\u3081\u306bCMS\u7ba1\u7406\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u5229\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +CMS_MANAGE=\u7ba1\u7406\u30b3\u30f3\u30c6\u30f3\u30c4 + +CMS_CREATED_BY=Created By +CMS_APPROVE=\u627f\u8a8d +CMS_DENY=\u5426\u8a8d +CMS_APPROVAL=\u30da\u30f3\u30c7\u30a3\u30f3\u30b0\u30a2\u30a4\u30c6\u30e0 +CMS_PATH=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3 + +CMS_EMPTY_FOLDER=\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u306f\u7a7a\u3067\u3059\u3002 + +CMS_ERROR_UPLOADARCHIVE_ASYNC=\u30a2\u30fc\u30ab\u30a4\u30d6\u51e6\u7406\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u300e\u975e\u540c\u671f\u30d7\u30ed\u30bb\u30b9\u300f\u3092\u8d77\u52d5\u3055\u305b\u3082\u3046\u4e00\u5ea6\u305f\u3081\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +CMS_MSG_UPLOADARCHIVE_ASYNC=\u30a2\u30fc\u30ab\u30a4\u30d6\u306f\u51e6\u7406\u4e2d\u3067\u3059\u3002\u51e6\u7406\u304c\u7d42\u308f\u308b\u3068\u30ea\u30bd\u30fc\u30b9\u3092\u30d5\u30a9\u30eb\u30c0\u5185\u306b\u78ba\u8a8d\u3067\u304d\u307e\u3059\u3002 + +CMS_REQUIRED=\u5fc5\u9808 +CMS_LINK_TO_RESOURCES=\u30dd\u30fc\u30bf\u30eb\u5185\u306e\u30ea\u30bd\u30fc\u30b9\u30ea\u30f3\u30af\u306f\u53b3\u5bc6\u306b\u8a18\u8ff0\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u4f8b\u3048\u3070 default/images/back.gif\u306b\u914d\u7f6e\u3055\u308c\u305f\u30a4\u30e1\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u306e\u30ea\u30f3\u30af\u306f\u3053\u3053\u3067\u793a\u3055\u308c\u3066\u3044\u308b\u901a\u308a\u306b\u30bf\u30a4\u30d7\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3064\u307e\u308a\u30b9\u30e9\u30c3\u30b7\u30e5(/)\u3092\u30ea\u30bd\u30fc\u30b9\u30d1\u30b9\u306e\u5148\u982d\u306b\u8a18\u8ff0\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093\u3002\u3042\u306a\u305f\u306f\u30a8\u30c7\u30a3\u30bf\u306ePreview\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3053\u3068\u3067\u30ea\u30f3\u30af\u304c\u6b63\u3057\u3044\u304b\u3092\u78ba\u8a8d\u3059\u308b\u4e8b\u304c\u3067\u304d\u307e\u3059\u3002 +CMS_ERROR_PROCESSING=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u51e6\u7406\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 +CMS_ERROR_EXPORT=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u51e6\u7406\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30d5\u30a9\u30eb\u30c0\u304c\u7a7a\u3067\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +CMS_YOUR_EXPORT_0=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0: +CMS_YOUR_EXPORT_1=\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u6e96\u5099\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002 +CMS_CLICK_TO_DOWNLOAD=\u30af\u30ea\u30c3\u30af\u3057\u3066\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9 +CMS_ROOT_FOLDER=\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0 +CMS_MESSAGES=\u30e1\u30c3\u30bb\u30fc\u30b8 +CMS_HOME=\u30db\u30fc\u30e0 +CMS_ERROR=\u30a8\u30e9\u30fc +CMS_PENDING_APPROVAL_QUEUE=\u627f\u8a8d\u4fdd\u7559\u4e2d\u30ad\u30e5\u30fc +CMS_CONFIGURE_RESTRICTION=\u30ce\u30fc\u30c9\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u9650\u3092\u8a2d\u5b9a +CMS_SELECT_ACTION=\u30a2\u30af\u30b7\u30e7\u30f3\u9078\u629e... +CMS_BROWSING=\u30d6\u30e9\u30a6\u30b8\u30f3\u30b0 +CMS_CONTENT_NOT_FOUND=\u30b3\u30f3\u30c6\u30f3\u30c4\u306f\u9078\u629e\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u898b\u3064\u3051\u308b\u4e8b\u304c\u51fa\u6765\u307e\u305b\u3093\u3067\u3057\u305f\u3002 +CMS_INTRODUCTION=\u7d39\u4ecb +CMS_HELP=CMS \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306f\u3001\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a6\u30a4\u30f3\u30c9\u30a6\u5185\u306e\u30d5\u30a1\u30a4\u30eb\u30b9\u30c8\u30a2\u3001\u3082\u3057\u304f\u306f\u3001\u30d0\u30a4\u30ca\u30ea\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u5834\u5408\u3001\u5b8c\u5168\u306b\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a6\u30a4\u30f3\u30c9\u30a6\u306e\u5916\u5074\u306b\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u793a\u3057\u307e\u3059\u3002 +CMS_TO_MODIFY=\u3053\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u6319\u52d5\u3092\u5909\u66f4\u3059\u308b\u306b\u306f\u3001 +CMS_CLICK_HERE=\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af +CMS_SELECT_ACTION=\u30a2\u30af\u30b7\u30e7\u30f3\u306e\u9078\u629e + +CMS_QUERYERROR=\u5165\u529b\u3055\u308c\u305f\u30af\u30a8\u30ea\u306f\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 + +CMS_ADMIN_SET_READ_PERMISSIONS=\u8aad\u307f\u8fbc\u307f\u6a29\u9650\u3092\u8a2d\u5b9a +CMS_ADMIN_SET_WRITE_PERMISSIONS=\u66f8\u304d\u8fbc\u307f\u6a29\u9650\u3092\u8a2d\u5b9a +CMS_ADMIN_SET_MANAGE_PERMISSIONS=\u7ba1\u7406\u6a29\u9650\u3092\u8a2d\u5b9a +CMS_ADMIN_SELECT_ROLES=\u3053\u306e\u30ce\u30fc\u30c9\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u30ed\u30fc\u30eb\u3092\u9078\u629e +CMS_ADMIN_SELECT_USERS=\u3053\u306e\u30ce\u30fc\u30c9\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u30e6\u30fc\u30b6\u3092\u9078\u629e +CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=CTRL+click\uff08Mac\u3067\u306fCMD+click\uff09\u3067\u8907\u6570\u306e\u5f79\u5272\u3092\u9078\u629e\u3067\u304d\u307e\u3059\u3002 +CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=CTRL+click\uff08Mac\u3067\u306fCMD+click\uff09\u3067\u8907\u6570\u306e\u5f79\u5272\u3092\u9078\u629e\u3067\u304d\u307e\u3059\u3002 + +CMS_ACCESS_DENIED=\u30a2\u30af\u30bb\u30b9\u62d2\u5426 +CMS_ACCESS_DENIED_DESCRIPTION=\u3042\u306a\u305f\u306f\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u3092\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 +CMS_ACCESS_DENIED_DESCRIPTION_PATH=\u3042\u306a\u305f\u306f\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u3092\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 + +CMS_MISSING_DOCUMENT=404 - \u30da\u30fc\u30b8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 +CMS_MISSING_DOCUMENT_DESCRIPTION=\u3042\u306a\u305f\u304c\u30a2\u30af\u30bb\u30b9\u3057\u3088\u3046\u3068\u3057\u305f\u6587\u66f8\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002 + +CMS_FILENAME_INVALID=\u30d5\u30a1\u30a4\u30eb\u540d\u304c\u7121\u52b9\u3067\u3059\u3002\u7121\u52b9\u306a\u6587\u5b57\u5217\uff08 '.', '/', ':', '[', ']', '*', ''', '"', '|'\uff09\u3084\u30b9\u30da\u30fc\u30b9\u304c\u4f7f\u308f\u308c\u3066\u3044\u306a\u3044\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +CMS_FOLDERNAME_INVALID=\u30d5\u30a9\u30eb\u30c0\u540d\u304c\u7121\u52b9\u3067\u3059\u3002\u7121\u52b9\u306a\u6587\u5b57\u5217\uff08 '.', '/', ':', '[', ']', '*', ''', '"', '|'\uff09\u3084\u30b9\u30da\u30fc\u30b9\u304c\u4f7f\u308f\u308c\u3066\u3044\u306a\u3044\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + +CMS_MSG_DESTINATION_ALREADY_EXISTS=\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u5b9f\u884c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002 +CMS_CANT_MOVE_SAME_DESTINATION=\u540c\u3058\u30d5\u30a9\u30eb\u30c0\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u79fb\u52d5\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 + +CMS_DATE_PATTERN=yy/MM/dd HH:mm + + Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2009-03-06 23:22:30 UTC (rev 12984) @@ -22,68 +22,134 @@ ################################################################################ ## CMS ADMIN PORTLET -TITLE_HEAD=CMS Admin -TITLE_BROWSE=Navegador de Diret�rios -TITLE_FILEBROWSE=Navegador de Arquivos -TITLE_DELETECONFIRM=Confirmar remo��o -TITLE_CREATECOLLCONFIRM=Confirmar cria��o de diret�rio -TITLE_COPYCONFIRM=Confirm Resource Copy -TITLE_MOVECONFIRM=Confirm Resource Move -TITLE_VIEWFILE=Visualizando Propriedades de Arquivo +TITLE_HEAD=Administra\u00E7\u00E3o do CMS +TITLE_BROWSE=Navegador do diret\u00F3rio +TITLE_FILEBROWSE=Navegador do arquivo +TITLE_DELETECONFIRM=Confirmar exclus\u00E3o +TITLE_CREATECOLLCONFIRM=Confirmar Cria\u00E7\u00E3o de Diret\u00F3rio +TITLE_COPYCONFIRM=Confirmar C\u00F3pia de Recurso +TITLE_MOVECONFIRM=Confirmar Movimenta\u00E7\u00E3o de Recurso +TITLE_VIEWFILE=Visualizando Propriedades do Arquivo TITLE_EDIT=Editar Arquivo TITLE_CREATE=Criar Arquivo -TITLE_UPLOAD=Enviar Arquivo +TITLE_UPLOAD=Upload de Arquivo +TITLE_SECURECONFIRM=N\u00F3 Seguro CMS_SEARCH=Pesquisar -CMS_MENU=Menu de A��es -CMS_ACTION=A��o +CMS_SEARCHNORESULT=Nenhum resultado para esta pesquisa +CMS_MENU=Menu de A\u00E7\u00E3o +CMS_ACTION=A\u00E7\u00E3o CMS_NAME=Nome CMS_TYPE=Tipo CMS_CREATED=Criado -CMS_MODIFIED=Modificado -CMS_DESCRIPTION=Descri��o +CMS_MODIFIED=Alterado +CMS_DESCRIPTION=Descri\u00E7\u00E3o CMS_VIEW=Visualizar -CMS_COPY=Copiar +CMS_COPY=Copy CMS_MOVE=Mover -CMS_DELETE=Remover +CMS_DELETE=Excluir CMS_FOLDER=Pasta CMS_FILE=Arquivo CMS_CREATE=Criar -CMS_CANCEL=Cancel -CMS_RESET=Resetar +CMS_CANCEL=Cancelar CMS_EDIT=Editar -CMS_UPLOAD=Enviar -CMS_MODIFY=Modificar +CMS_UPLOAD=Upload +CMS_MODIFY=Alterar CMS_CREATEFOLDER=Criar Pasta -CMS_CREATEFILE=Criar Diret�rio -CMS_UPLOADARCHIVE=Enviar Arquivo -CMS_BACKTOBROWSER=Voltar ao Navegador de Diret�rios +CMS_CREATEFILE=Criar Arquivo +CMS_UPLOADARCHIVE=Upload de Arquivo +CMS_UPLOADARCHIVE_ASYNC=Processar assincronamente +CMS_BACKTOBROWSER=Voltar para o Navegador do Diret\u00F3rio +CMS_TRANSFER=Importar/Exportar +CMS_EXPORTARCHIVE=Exportar Pasta +CMS_SECURE=Proteger +CMS_PREVIEW=Prever +CMS_GO=Ir -CMS_CREATEFILEINDIR=Criando Arquivo em Diret�rio +CMS_CREATEFILEINDIR=Criar Arquivo no Diret\u00F3rio CMS_FILENAME=Nome do Arquivo -CMS_TITLE=T�tulo -CMS_LANGUAGE=L�ngua +CMS_TITLE=T\u00EDtulo +CMS_LANGUAGE=Linguagem -CMS_DELETEPATH=Confirmar remo��o de -CMS_DELETEWARN1=ATEN��O\! Voc� n�o poderar desfazer estas altera��es\! -CMS_DELETEWARN2=Voc� tem certeza que deseja remover\? +CMS_DELETEPATH=Confirmar Exclus\u00E3o de +CMS_DELETEWARN1=ATEN\u00C7\u00C3O\! Voc\u00EA n\u00E3o ser\u00E1 capaz de desfazer essas altera\u00E7\u00F5es\! +CMS_DELETEWARN2=Tem certeza de que deseja excluir este recurso? CMS_DESTINATION=Destino CMS_SOURCE=Fonte CMS_EDITING=Editando Arquivo -CMS_LIVE=Tornar \"Ativo\" -CMS_VERSION=Vers�o +CMS_LIVE=Tornar "Ativo" +CMS_VERSION=Vers\u00E3o +CMS_WYSIWYG=Editor WYSIWYG -CMS_LIVEVERSION=Vers�o \"Ativa\" +CMS_LIVEVERSION=Vers\u00E3o Ativa CMS_SIZE=Tamanho -CMS_CONTENT_DIR=Content Directory -CMS_CONTENT_DIR_USE=Use the directory tree to navigate the portal folder structure. -CMS_MAIN_USE=Use the CMS Administration portlet to manage the content of your portal. -CMS_MANAGE=Manage Content +CMS_CONTENT_DIR=Diret\u00F3rio de conte\u00FAdo +CMS_CONTENT_DIR_USE=Use a \u00E1rvore de diret\u00F3rio para navegar na estrutura de p +CMS_MAIN_USE=Utilize o portlet de Administra\u00E7\u00E3o do CMS para gerenciar o conte\u00FAdo de seu portal. +CMS_MANAGE=Gerenciar Conte\u00FAdo -CMS_CREATED_BY=Created By -CMS_APPROVE=Approve -CMS_DENY=Deny -CMS_APPROVAL=Pending Items +CMS_CREATED_BY=Criado por +CMS_APPROVE=Aprovar +CMS_DENY=N\u00E3o aprovar +CMS_APPROVAL=Itens Pendentes +CMS_PATH=Local + +CMS_EMPTY_FOLDER=Esta pasta est\u00E1 vazia. + +CMS_ERROR_UPLOADARCHIVE_ASYNC=Ocorreu um erro ao processar o arquivo. Tente novamente com a op\u00E7\u00E3o 'Processamento Ass\u00EDncrono' ativada +CMS_MSG_UPLOADARCHIVE_ASYNC=Seu arquivo foi aceito para processamento. Os recursos ser\u00E3o exibidos na pasta assim que o processamento terminar + +CMS_REQUIRED=Obrigat\u00F3rio +CMS_LINK_TO_RESOURCES\=Links para recursos no \u00E2mbito deste portal devem ser absolutos. Por exemplo\: Um link para uma imagem localizada em default/images/back.gif deve ser digitado exatamente como mostrado aqui. N\u00E3o prefixando uma barra (/) no caminho do recurso. Voc\u00EA pode verificar se o link est\u00E1 correto, clicando no bot\u00E3o visualizar no editor +CMS_ERROR_PROCESSING=Erro ao processar o pedido de exporta\u00E7\u00E3o +CMS_ERROR_EXPORT=Ocorreu um erro durante a opera\u00E7\u00E3o de Exporta\u00E7\u00E3o. Tenha certeza de que a pasta a ser exportada n\u00E3o est\u00E1 vazia +CMS_YOUR_EXPORT_0=Sua exporta\u00E7\u00E3o de +CMS_YOUR_EXPORT_1=est\u00E1 pronta para download +CMS_CLICK_TO_DOWNLOAD=Clique para Download +CMS_ROOT_FOLDER=Pasta raiz +CMS_MESSAGES=Mensagens +CMS_HOME=In\u00EDcio +CMS_ERROR=Erro +CMS_PENDING_APPROVAL_QUEUE=Fila de Aprova\u00E7\u00F5es Pendentes +CMS_CONFIGURE_RESTRICTION=Configurar restri\u00E7\u00F5es de seguran\u00E7a no n\u00F3asta do portal. +CMS_SELECT_ACTION=Selecionar A\u00E7\u00E3o +CMS_BROWSING=Navega\u00E7\u00E3o +CMS_CONTENT_NOT_FOUND=Conte\u00FAdo n\u00E3o p\u00F4de ser encontrado para o arquivo selecionado +CMS_INTRODUCTION=Introdu\u00E7\u00E3o +CMS_HELP=O Portlet de CMS exibe o conte\u00FAdo do arquivo dentro de uma janela de portlet, ou, no caso de conte\u00FAdo bin\u00E1rio, de fora da janela de portlet totalmente +CMS_TO_MODIFY=Para modificar o comportamento desse portlet, por favor +CMS_CLICK_HERE=clique aqui +CMS_SELECT_ACTION=Selecionar A\u00e7\u00e3o... + +CMS_QUERYERROR=A pesquisa que voc\u00EA digitou n\u00E3o \u00E9 v\u00E1lida + +CMS_ADMIN_SET_READ_PERMISSIONS=Definir Permiss\u00F5es de Leitura +CMS_ADMIN_SET_WRITE_PERMISSIONS=Definir Permiss\u00F5es de Escrita +CMS_ADMIN_SET_MANAGE_PERMISSIONS=Definir Permiss\u00F5es de Gerenciamento +CMS_ADMIN_SELECT_ROLES=Selecione os Perfis que t\u00EAm acesso a esse n\u00F3. +CMS_ADMIN_SELECT_USERS=Selecionar Usu\u00E1rios que t\u00EAm acesso a esse n\u00F3. +CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=Voc\u00EA pode selecionar m\u00FAltiplos perfis usando CTRL+clique (CMD+clique no Mac) sobre os nomes dos perfis. +CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Voc\u00EA pode selecionar v\u00E1rios usu\u00E1rios, usando CTRL+clique (CMD+clique no Mac) sobre os nomes dos usu\u00E1rios. + +CMS_ACCESS_DENIED=Acesso Negado +CMS_ACCESS_DENIED_DESCRIPTION=Voc\u00EA n\u00E3o tem permiss\u00E3o para acessar esse recurso +CMS_ACCESS_DENIED_DESCRIPTION_PATH=Voc\u00EA n\u00E3o tem permiss\u00E3o para acessar o recurso + +CMS_MISSING_DOCUMENT=404 - P\u00E1gina N\u00E3o Encontrada +CMS_MISSING_DOCUMENT_DESCRIPTION=O documento que voc\u00EA tentou acessar n\u00E3o est\u00E1 dispon\u00EDvel + +CMS_FILENAME_INVALID=Nome do arquivo \u00E9 inv\u00E1lido. N\u00E3o pode conter caracteres ilegais, tais como '.', '/', '\:', '[', ']', '*','' ',' " ',' | ', Ou qualquer caractere branco. +CMS_FOLDERNAME_INVALID=Nome da pasta \u00E9 inv\u00E1lido. N\u00E3o pode conter caracteres ilegais, tais como '.', '/', '\:', '[', ']', '*','' ',' " ',' | ', Ou qualquer caractere branco. + +CMS_MSG_DESTINATION_ALREADY_EXISTS=O comando n\u00E3o foi realizado, porque o destino j\u00E1 existe. +CMS_CANT_MOVE_SAME_DESTINATION=Voc\u00EA n\u00E3o pode mover uma pasta para o mesmo local + +CMS_DATE_PATTERN=dd/MM/yy HH:mm + +INVALID_ARCHIVE_MESSAGE=O arquivo enviado n\u00E3o \u00E9 um arquivo v\u00E1lido +CMS_MISSING_RESOURCE=Recurso CMS solicitado n\u00E3o p\u00F4de ser encontrado + + Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml 2009-03-06 23:22:30 UTC (rev 12984) @@ -31,6 +31,9 @@ <parent-ref>admin</parent-ref> <page> <page-name>CMS</page-name> + <supported-locale>en</supported-locale> + <supported-locale>ja</supported-locale> + <resource-bundle>Resource</resource-bundle> <window> <window-name>CMSAdminPortletWindow</window-name> <instance-ref>CMSAdminPortletInstance</instance-ref> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,6 +1,6 @@ <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,5 +1,7 @@ <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ 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_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,5 +1,5 @@ <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,7 +1,9 @@ <%@ 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" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> @@ -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_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,8 +1,10 @@ <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ 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_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -2,7 +2,9 @@ org.jboss.portal.core.cms.ui.admin.CMSAdminConstants, java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ 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_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,7 +1,8 @@ <%@ 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" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> @@ -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_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,6 +1,6 @@ <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,6 +1,6 @@ <%@ page import="java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,6 +1,6 @@ <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,6 +1,6 @@ <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -4,7 +4,7 @@ <%@ page import="java.util.List" %> <%@ page import="java.util.StringTokenizer" %> <%@ page isELIgnored="false" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <% Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1 +1 @@ -Help page - nothing to see hear. Move along. \ No newline at end of file +Help page - nothing to see here. Move along. \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,12 +1,14 @@ <%@ 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" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ page isELIgnored="false" %> <portlet:defineObjects/> @@ -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_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,5 +1,5 @@ <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> @@ -94,15 +94,20 @@ <!-- Preview of Content being approved --> <% String pendingPreviewContent = (String)request.getAttribute("pendingPreviewContent"); - String contentBeingPreviewed = "-1"; + String contentBeingPreviewed = "-1"; + if(pendingPreviewContent == null) + { + pendingPreviewContent = ""; + } + String sDocBase = (String)request.getAttribute("document_base_url"); %> -<%if(pendingPreviewContent != null && pendingPreviewContent.trim().length() >0){%> + +<%if(sDocBase != null){%> <% String pid = request.getParameter("pid"); String path = request.getParameter("path"); - String sDocBase = (String)request.getAttribute("document_base_url"); String sCSSURL = (String)request.getAttribute("css_url"); - contentBeingPreviewed = pid; + contentBeingPreviewed = pid; %> <!-- tinyMCE --> <script language="javascript" type="text/javascript" @@ -122,7 +127,7 @@ plugin_insertdate_timeFormat : "%H:%M:%S", relative_urls : "true", convert_urls: "false", - document_base_url : "<%= sDocBase %>", + document_base_url : "<%= sDocBase %>", extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]" }); @@ -176,10 +181,12 @@ </table> </form> </div> -<br/></br> <%}%> +<br/></br> + + <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td class="portlet-table-text"><b>${n:i18n("CMS_PATH")}</b></td> @@ -227,36 +234,36 @@ <!-- User who requested approval --> <td><%= cour.getUserName() %> </td> - <td> - <% - if (cour.getMimeType().equals("text/html") || cour.getMimeType().equals("text/plain")) - { - %> - <a href="<portlet:renderURL> - <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDINGPREVIEW %>"/> - <portlet:param name="pid" value="<%=cour.getProcessId()%>"/> - <portlet:param name="path" value="<%=linkPath%>"/> - <portlet:param name="contentPath" value="<%=cour.getPath()%>"/> - </portlet:renderURL>" - <%if(contentBeingPreviewed.equals(cour.getProcessId())){%>style="color: red;"<%}%> - >${n:i18n("CMS_PREVIEW")}</a> - - <% } - else - { - //save the principal for the preview servlet - String remoteUser = request.getRemoteUser(); - request.getSession().setAttribute("remoteUser", remoteUser); - %> - <a target="_blank" - href="<%= request.getContextPath() %>/cmspreview?pid=<%= cour.getProcessId() %>&p=<%= cour.getPath() %>"<%if(contentBeingPreviewed.equals(cour.getProcessId())){%>style="color: red;"<%}%> - >${n:i18n("CMS_PREVIEW")}</a> - <% - } - %> - - + <td> + <% + if (cour.getMimeType().equals("text/html") || cour.getMimeType().equals("text/plain")) + { + %> + <a href="<portlet:renderURL> + <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDINGPREVIEW %>"/> + <portlet:param name="pid" value="<%=cour.getProcessId()%>"/> + <portlet:param name="path" value="<%=linkPath%>"/> + <portlet:param name="contentPath" value="<%=cour.getPath()%>"/> + </portlet:renderURL>" + <%if(contentBeingPreviewed.equals(cour.getProcessId())){%>style="color: red;"<%}%> + >${n:i18n("CMS_PREVIEW")}</a> + + <% } + else + { + //save the principal for the preview servlet + String remoteUser = request.getRemoteUser(); + request.getSession().setAttribute("remoteUser", remoteUser); + %> + <a target="_blank" + href="<%= request.getContextPath() %>/cmspreview?pid=<%= cour.getProcessId() %>&p=<%= cour.getPath() %>"<%if(contentBeingPreviewed.equals(cour.getProcessId())){%>style="color: red;"<%}%> + >${n:i18n("CMS_PREVIEW")}</a> + <% + } + %> + + &nbsp; <a href="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_APPROVE %>"/> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -3,7 +3,7 @@ <%@ page import="java.text.Format" %> <%@ page import="java.util.List" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,11 +1,12 @@ <%@ 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" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.Set" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> @@ -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_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,6 +1,6 @@ <%@ page import="java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,6 +1,6 @@ <%@ page import="java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,11 +1,12 @@ <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ 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.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> <% } @@ -175,7 +176,19 @@ if (contentList.size() > 0) { Content content = (Content)contentList.get(0); + + boolean hasPublishedContent = false; + for (int i = 0; i < contentList.size(); i++) // cycle thru list of version nodes + { + Content version = (Content)contentList.get(i); + if (!version.isWaitingForPublishApproval()) + { + hasPublishedContent = true; + break; + } + } %> +<%if(hasPublishedContent){%> <tr> <td height="15"></td> </tr> @@ -322,9 +335,10 @@ %> <%= modifiedDate %> </td> - <td><%= version.getTitle() %> + <td><%= EntityEncoder.FULL.encode(version.getTitle()) %> </td> </tr> +<%}%> <% } } Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,5 +1,5 @@ <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -8,7 +8,7 @@ <%@ page import="javax.portlet.PortletURL" %> <%@ 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" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ page isELIgnored="false" %> <portlet:defineObjects/> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2009-03-06 23:22:21 UTC (rev 12983) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2009-03-06 23:22:30 UTC (rev 12984) @@ -1,5 +1,5 @@ <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %>