gatein SVN: r6207 - in epp/portal/branches/EPP_5_1_Branch: portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-04-13 08:52:50 -0400 (Wed, 13 Apr 2011)
New Revision: 6207
Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl
Log:
JBEPP-597 XSS issue in dashboard new page creation
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-04-13 12:30:38 UTC (rev 6206)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-04-13 12:52:50 UTC (rev 6207)
@@ -6,6 +6,7 @@
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.web.application.JavascriptManager;
+ import org.gatein.common.text.EntityEncoder;
//PageNavigation pageNavigation = uicomponent.getPageNavigation();
//ArrayList<PageNode> nodes = pageNavigation.getNodes();
@@ -31,6 +32,8 @@
<% for(int i = 0;i < tabNbs;i++){
node = nodes.get(i);
String tabLabel = node.getResolvedLabel();
+ EntityEncoder encoder = EntityEncoder.FULL;
+ tabLabel = encoder.encode(tabLabel);
String param = "" + i;
if(node.getUri().equals(selectedNode.getUri())){
%>
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-04-13 12:30:38 UTC (rev 6206)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-04-13 12:52:50 UTC (rev 6207)
@@ -4,6 +4,7 @@
import org.exoplatform.web.application.JavascriptManager;
import org.exoplatform.portal.webui.util.Util ;
import org.exoplatform.webui.organization.OrganizationUtils;
+ import org.gatein.common.text.EntityEncoder;
def rcontext = _ctx.getRequestContext() ;
JavascriptManager jsmanager = rcontext.getJavascriptManager();
@@ -57,6 +58,8 @@
String title = "";
if(toolong) title = "title='$node.resolvedLabel'";
else title = "";
+ EntityEncoder entityEncoder = EntityEncoder.FULL;
+ label = entityEncoder.encode(label);
print """
<div class="MenuItem $tabStyleNavigation">
<div class="$clazz">
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-04-13 12:30:38 UTC (rev 6206)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-04-13 12:52:50 UTC (rev 6207)
@@ -49,7 +49,7 @@
String title = "";
if(toolong) title = "title='$node.resolvedLabel'";
else title = "";
- EntityEncoder entityEncoder = EntityEncoder.FULL;
+ EntityEncoder entityEncoder = EntityEncoder.FULL;
label = entityEncoder.encode(label);
print """
<div class="MenuItem $tabStyleNavigation">
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2011-04-13 12:30:38 UTC (rev 6206)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2011-04-13 12:52:50 UTC (rev 6207)
@@ -7,7 +7,8 @@
* version: $Id$
*/
%>
-<%
+<%
+ import org.gatein.common.text.EntityEncoder;
String popupId = uicomponent.getId();
def rcontext = _ctx.getRequestContext();
@@ -69,6 +70,8 @@
}
}
}
+ EntityEncoder encoder = EntityEncoder.FULL;
+ msgValue = encoder.encode(msgValue);
println msgValue;
println " </div>";
println " <div style=\"clear:left\"><span></span></div>";
@@ -166,4 +169,4 @@
rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.show('$popupId', $uicomponent.showMask);");
rcontext.getJavascriptManager().addJavascript("window.setTimeout(\"eXo.webui.UIPopupWindow.increasezIndex('$popupId')\", 100);");
}
- %>
\ No newline at end of file
+ %>
13 years, 9 months
gatein SVN: r6205 - portal/trunk/component/portal/src/main/java.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-04-13 08:09:35 -0400 (Wed, 13 Apr 2011)
New Revision: 6205
Added:
portal/trunk/component/portal/src/main/java/gatein_objects_1_1_1.xsd
Log:
GTNPORTAL-1648: Error in Xml definition in gatein_objects_1_0 / visibility options do not include the default : VISIBLE value
Added: portal/trunk/component/portal/src/main/java/gatein_objects_1_1_1.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein_objects_1_1_1.xsd (rev 0)
+++ portal/trunk/component/portal/src/main/java/gatein_objects_1_1_1.xsd 2011-04-13 12:09:35 UTC (rev 6205)
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ 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.
+ -->
+
+<xs:schema
+ targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <!-- A top page element -->
+ <xs:element name="page" type="pageType"/>
+
+ <!-- A top page-set element -->
+ <xs:element name="page-set" type="pageSetType"/>
+
+ <!-- A top portal-config element -->
+ <xs:element name="portal-config" type="portalConfigType"/>
+
+ <!-- A top container element -->
+ <xs:element name="container" type="containerType"/>
+
+ <!-- A top node-navigation element -->
+ <xs:element name="node-navigation" type="nodeNavigationType"/>
+
+ <!-- The type of a top navigation node -->
+ <xs:complexType name="nodeNavigationType">
+ <xs:sequence>
+ <xs:element name="priority" type="xs:positiveInteger"/>
+ <xs:element name="page-nodes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- The type of a navigation node -->
+ <xs:complexType name="nodeType">
+ <xs:sequence>
+ <xs:element name="uri" type="xs:string"/>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="visibility" type="visibility" default="DISPLAYED" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="page-reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="visibility">
+ <xs:restriction base='xs:string'>
+ <xs:enumeration value="DISPLAYED"/>
+ <xs:enumeration value="HIDDEN"/>
+ <xs:enumeration value="TEMPORAL"/>
+ <xs:enumeration value="SYSTEM"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="pageSetType">
+ <xs:sequence>
+ <xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portalConfigType">
+ <xs:sequence>
+ <xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="skin" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="properties" type="propertiesType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="portal-layout" minOccurs="1" maxOccurs="1">
+ <xs:complexType>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="entry" type="propertiesEntryType" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesEntryType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="key" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:group name="containerChildrenGroup">
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="container" type="containerType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="page-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="site-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="pageType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-max-window" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="containerType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:string"/>
+ <xs:attribute name="template" type="xs:string"/>
+ <xs:attribute name="attribute" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="portletApplicationType">
+ <xs:sequence>
+ <xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletType">
+ <xs:sequence>
+ <xs:element name="application-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="portlet-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="preferences" type="portletPreferencesType" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferencesType">
+ <xs:sequence>
+ <xs:element name="preference" type="portletPreferenceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferenceType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
13 years, 9 months
gatein SVN: r6203 - portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-04-13 07:05:58 -0400 (Wed, 13 Apr 2011)
New Revision: 6203
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl
Log:
GTNPORTAL-1830: Cross Site Scripting vulnerabilities in user forms
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl 2011-04-13 10:26:26 UTC (rev 6202)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserInfoPortlet.gtmpl 2011-04-13 11:05:58 UTC (rev 6203)
@@ -1,16 +1,20 @@
<%
import org.exoplatform.services.organization.User;
-
+ import org.gatein.common.text.EntityEncoder;
+
def rcontext = _ctx.getRequestContext();
String accountSetting = "javascript:if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));"
%>
<div class="UIUserInfoPortlet" id="$uicomponent.id">
<div class="Name">
- <% if(rcontext.getRemoteUser() != null) { %>
- <a href="$accountSetting"><%=uicomponent.getUser().getFullName()%></a>
+ <% if(rcontext.getRemoteUser() != null) {
+ EntityEncoder encoder = EntityEncoder.FULL;
+ fullName = encoder.encode(uicomponent.getUser().getFullName());
+ %>
+ <a href="$accountSetting"><%=fullName%></a>
<%} else {%>
<span></span>
<%}%>
</div>
-</div>
\ No newline at end of file
+</div>
13 years, 9 months
gatein SVN: r6202 - in portal/trunk/portlet: exoadmin/src/main/webapp/groovy/admintoolbar/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-04-13 06:26:26 -0400 (Wed, 13 Apr 2011)
New Revision: 6202
Modified:
portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
Log:
GTNPORTAL-1858: XSS issue in dashboard new page creation
Modified: portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-04-13 09:46:45 UTC (rev 6201)
+++ portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-04-13 10:26:26 UTC (rev 6202)
@@ -6,6 +6,7 @@
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.web.application.JavascriptManager;
+ import org.gatein.common.text.EntityEncoder;
//PageNavigation pageNavigation = uicomponent.getPageNavigation();
//ArrayList<PageNode> nodes = pageNavigation.getNodes();
@@ -35,6 +36,8 @@
{
tabLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel());
}
+ EntityEncoder encoder = EntityEncoder.FULL;
+ tabLabel = encoder.encode(tabLabel);
String param = "" + i;
if(node.getUri().equals(selectedNode.getUri())){
%>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-04-13 09:46:45 UTC (rev 6201)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-04-13 10:26:26 UTC (rev 6202)
@@ -4,6 +4,7 @@
import org.exoplatform.web.application.JavascriptManager;
import org.exoplatform.portal.webui.util.Util ;
import org.exoplatform.webui.organization.OrganizationUtils;
+ import org.gatein.common.text.EntityEncoder;
def rcontext = _ctx.getRequestContext() ;
JavascriptManager jsmanager = rcontext.getJavascriptManager();
@@ -63,6 +64,8 @@
String title = "";
if(toolong) title = "title='$resolvedLabel'";
else title = "";
+ EntityEncoder entityEncoder = EntityEncoder.FULL;
+ label = entityEncoder.encode(label);
print """
<div class="MenuItem $tabStyleNavigation">
<div class="$clazz">
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-04-13 09:46:45 UTC (rev 6201)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-04-13 10:26:26 UTC (rev 6202)
@@ -49,7 +49,7 @@
String title = "";
if(toolong) title = "title='$node.resolvedLabel'";
else title = "";
- EntityEncoder entityEncoder = EntityEncoder.FULL;
+ EntityEncoder entityEncoder = EntityEncoder.FULL;
label = entityEncoder.encode(label);
print """
<div class="MenuItem $tabStyleNavigation portlet-menu-cascade-item">
13 years, 9 months
gatein SVN: r6201 - portal/trunk/web/portal/src/main/webapp/groovy/webui/core.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-04-13 05:46:45 -0400 (Wed, 13 Apr 2011)
New Revision: 6201
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl
Log:
GTNPORTAL-1858: XSS issue in dashboard new page creation
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2011-04-13 06:55:43 UTC (rev 6200)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupMessages.gtmpl 2011-04-13 09:46:45 UTC (rev 6201)
@@ -7,7 +7,8 @@
* version: $Id$
*/
%>
-<%
+<%
+ import org.gatein.common.text.EntityEncoder;
String popupId = uicomponent.getId();
def rcontext = _ctx.getRequestContext();
@@ -69,6 +70,8 @@
}
}
}
+ EntityEncoder encoder = EntityEncoder.FULL;
+ msgValue = encoder.encode(msgValue);
println msgValue;
println " </div>";
println " <div style=\"clear:left\"><span></span></div>";
@@ -166,4 +169,4 @@
rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.show('$popupId', $uicomponent.showMask);");
rcontext.getJavascriptManager().addJavascript("window.setTimeout(\"eXo.webui.UIPopupWindow.increasezIndex('$popupId')\", 100);");
}
- %>
\ No newline at end of file
+ %>
13 years, 9 months
gatein SVN: r6200 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tkobayas(a)redhat.com
Date: 2011-04-13 02:55:43 -0400 (Wed, 13 Apr 2011)
New Revision: 6200
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
Log:
GTNPORTAL-1856 Fix for some mistranslations in webui_ja.properties
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-04-13 06:43:12 UTC (rev 6199)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2011-04-13 06:55:43 UTC (rev 6200)
@@ -118,7 +118,7 @@
UIPortalComposer.action.Abort=\u4e2d\u65ad
UIPortalComposer.action.Finish=\u7d42\u4e86
UIPortalComposer.action.ViewProperties=\u30dd\u30fc\u30bf\u30eb\u306e\u30d7\u30ed\u30d1\u30c6\u30a3
-UIPortalComposer.action.SwitchMode=\u30d3\u30e5\u30fc\u30e2\u30fc\u30c9\u3092\u30e2\u30fc\u30c9
+UIPortalComposer.action.SwitchMode=\u30d3\u30e5\u30fc\u30e2\u30fc\u30c9\u3092\u5207\u308a\u66ff\u3048\u308b
UITabPane.title.UIApplicationList=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
UITabPane.title.UIContainerList=\u30b3\u30f3\u30c6\u30ca\u30fc
@@ -243,19 +243,20 @@
UILoginForm.msg.Invalid-account=\u30e6\u30fc\u30b6\u540d\u304b\u3064/\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u8aa4\u3063\u3066\u3044\u308b\u304b\u7a7a\u3067\u3059\u3002\u518d\u8a66\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
UILoginForm.label.welcome=\u3088\u3046\u3053\u305d
UILoginForm.label.login=\u30ed\u30b0\u30a4\u30f3
-UILoginForm.label.Discard=\u7834\u68c4
+UILoginForm.label.Discard=\u30ad\u30e3\u30f3\u30bb\u30eb
UILoginForm.label.user=\u30e6\u30fc\u30b6\u30fc
UILoginForm.label.forgot=\u30e6\u30fc\u30b6\u540d/\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5fd8\u308c\u307e\u3057\u305f\u304b\uff1f
UILoginForm.label.password=\u30d1\u30b9\u30ef\u30fc\u30c9
UILoginForm.label.UserName=\u30e6\u30fc\u30b6\u30fc\u540d
-UILoginForm.label.RememberOnComputer=\u30ed\u30b0\u30a4\u30f3\u3092\u8a18\u61b6
+UILoginForm.label.RememberOnComputer=\u30ed\u30b0\u30a4\u30f3\u60c5\u5831\u3092\u4fdd\u6301
UILoginForm.label.NotMember=\u30e1\u30f3\u30d0\u30fc\u3067\u306f\u306a\u3044\uff1f
UILoginForm.label.Signup=\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7
UILoginForm.label.Signin=\u30b5\u30a4\u30f3\u30a4\u30f3
UILoginForm.label.ForAccount=\u30a2\u30ab\u30a6\u30f3\u30c8\u767b\u9332
UILoginForm.label.SigninFail=\u30b5\u30a4\u30f3\u30a4\u30f3\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8aa4\u3063\u305f\u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002
-UILoginForm.label.Copyright=Copyright © 2010. All rights Reserved, eXo Platform SAS \u3057\u3066 Red Hat, Inc.
+UILoginForm.label.Copyright=Copyright © 2009-2010. All rights reserved, Red Hat, Inc
+
#############################################################################
# Message Error #
#############################################################################
@@ -926,9 +927,10 @@
# org.exoplatform.portal.component.customization.UIPortalToolPanel #
############################################################################
-UIPortalToolPanel.label.copyrightText=Copyright © 2010. All rights Reserved,
-UIPortalToolPanel.label.companyTitleText= eXo Platform SAS \u3057\u3066 Red Hat, Inc..
+UIPortalToolPanel.label.copyrightText=Copyright © 2010. All rights reserved,
+UIPortalToolPanel.label.companyTitleText= Red Hat, Inc
+
############################################################################
# org.exoplatform.portal.component.view.UIContainer #
############################################################################
13 years, 9 months
gatein SVN: r6199 - epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-04-13 02:43:12 -0400 (Wed, 13 Apr 2011)
New Revision: 6199
Modified:
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/index.jsp
Log:
JBEPP-599: Deleting current portal caused redirect to default portal in public mode
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/index.jsp
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/index.jsp 2011-04-12 20:10:45 UTC (rev 6198)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/index.jsp 2011-04-13 06:43:12 UTC (rev 6199)
@@ -22,8 +22,14 @@
<%@ page import="org.exoplatform.container.PortalContainer"%>
<%@ page import="org.exoplatform.portal.config.UserPortalConfigService"%>
<%
- PortalContainer manager = PortalContainer.getCurrentInstance(session.getServletContext()) ;
- UserPortalConfigService userPortalConfigService = (UserPortalConfigService) manager.getComponentInstanceOfType(UserPortalConfigService.class) ;
- response.sendRedirect(request.getContextPath() + "/public/"+userPortalConfigService.getDefaultPortal()+"/");
+ PortalContainer manager = PortalContainer.getCurrentInstance(session.getServletContext());
+ UserPortalConfigService userPortalConfigService = (UserPortalConfigService)manager.getComponentInstanceOfType(UserPortalConfigService.class);
+ String remoteUser = request.getRemoteUser();
+ String accessMode = "public";
+ if (remoteUser != null && remoteUser.trim().length() > 0)
+ {
+ accessMode = "private";
+ }
+ response.sendRedirect(request.getContextPath() + "/" + accessMode + "/" + userPortalConfigService.getDefaultPortal() + "/");
%>
13 years, 9 months
gatein SVN: r6198 - components/pc/trunk/test/servers/tomcat7/src/test.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-04-12 16:10:45 -0400 (Tue, 12 Apr 2011)
New Revision: 6198
Modified:
components/pc/trunk/test/servers/tomcat7/src/test/build.xml
Log:
Have to use configfile now for some reason. This should fix the currently failing tomcat 7 tests.
Modified: components/pc/trunk/test/servers/tomcat7/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/build.xml 2011-04-12 19:42:12 UTC (rev 6197)
+++ components/pc/trunk/test/servers/tomcat7/src/test/build.xml 2011-04-12 20:10:45 UTC (rev 6198)
@@ -92,7 +92,7 @@
<property name="cargo.logging" value="high"/>
<property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/>
<file file="${target}/test-classes/config/tomcat-users.xml" tofile="conf/tomcat-users.xml" overwrite="true"/>
- <file file="${target}/test-classes/config/server.xml" tofile="conf/server.xml" overwrite="true"/>
+ <configfile file="${target}/test-classes/config/server.xml" tofile="conf/server.xml"/>
<deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/>
</configuration>
</cargo>
13 years, 9 months
gatein SVN: r6197 - in components/pc/trunk/test/servers/tomcat7/src/test: resources/config and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-04-12 15:42:12 -0400 (Tue, 12 Apr 2011)
New Revision: 6197
Added:
components/pc/trunk/test/servers/tomcat7/src/test/resources/config/server.xml
Modified:
components/pc/trunk/test/servers/tomcat7/src/test/build.xml
Log:
Fix issue with Tomcat 7 not running properly due to cargo bug. Can be reverted with the next cargo release.
Modified: components/pc/trunk/test/servers/tomcat7/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/build.xml 2011-04-12 18:59:42 UTC (rev 6196)
+++ components/pc/trunk/test/servers/tomcat7/src/test/build.xml 2011-04-12 19:42:12 UTC (rev 6197)
@@ -92,6 +92,7 @@
<property name="cargo.logging" value="high"/>
<property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/>
<file file="${target}/test-classes/config/tomcat-users.xml" tofile="conf/tomcat-users.xml" overwrite="true"/>
+ <file file="${target}/test-classes/config/server.xml" tofile="conf/server.xml" overwrite="true"/>
<deployable type="war" file="${test.temp.lib}/Tomcat-7.0/portlet-test.war"/>
</configuration>
</cargo>
Added: components/pc/trunk/test/servers/tomcat7/src/test/resources/config/server.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/src/test/resources/config/server.xml (rev 0)
+++ components/pc/trunk/test/servers/tomcat7/src/test/resources/config/server.xml 2011-04-12 19:42:12 UTC (rev 6197)
@@ -0,0 +1,153 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="@cargo.rmi.port@" shutdown="SHUTDOWN" debug="@catalina.logging.level@">
+ <!-- Security listener. Documentation at /docs/config/listeners.html
+ <Listener className="org.apache.catalina.security.SecurityListener" />
+ -->
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- A "Service" is a collection of one or more "Connectors" that share
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
+ -->
+ <Service name="Catalina" debug="@catalina.logging.level@">
+
+ <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+ <!--
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+ maxThreads="150" minSpareThreads="4"/>
+ -->
+
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL HTTP/1.1 Connector on port @cargo.servlet.port@
+ -->
+ <Connector port="@cargo.servlet.port@" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443"
+ scheme="@cargo.protocol@"
+ secure="@catalina.secure@"
+ SSLEnabled="@catalina.secure@"
+ debug="@catalina.logging.level@"
+ emptySessionPath="@catalina.connector.emptySessionPath@"
+ URIEncoding="@catalina.servlet.uriencoding@" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="@cargo.servlet.port@" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ -->
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443
+ This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
+ <!--
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS" />
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port @cargo.tomcat.ajp.port@ -->
+ <Connector port="@cargo.tomcat.ajp.port@" protocol="AJP/1.3" redirectPort="8443" />
+
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ analyzes the HTTP headers included with the request, and passes them
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
+
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+ <Engine name="Catalina" defaultHost="@cargo.hostname@"
+ debug="@catalina.logging.level@">
+
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
+
+ <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+ via a brute-force attack -->
+ <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+ </Realm>
+
+ <Host name="@cargo.hostname@" appBase="webapps"
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false"
+ debug="@catalina.logging.level@">
+
+ @tomcat.webapps@
+
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html
+ Note: The pattern used is equivalent to using pattern="common" -->
+ <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+ prefix="@cargo.hostname@_access_log." suffix=".txt"
+ pattern="%h %l %u %t "%r" %s %b" resolveHosts="false"/>
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
13 years, 9 months