portal-commits March 2010

portal-commits@lists.jboss.org

1 participants
4 discussions

JBoss Portal SVN: r13903 - branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.

by portal-commits＠lists.jboss.org

Author: ghjboss Date: 2010-03-10 22:52:34 -0500 (Wed, 10 Mar 2010) New Revision: 13903 Modified: branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp Log: fix for JBEPP-180 Modified: branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2010-03-11 03:51:54 UTC (rev 13902) +++ branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2010-03-11 03:52:34 UTC (rev 13903) @@ -1,6 +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 import="java.util.regex.Matcher" %> +<%@ page import="java.util.regex.Pattern" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> @@ -24,6 +26,14 @@ // for error handling String errorMessage = (String)request.getAttribute("error:message"); + + //****JBEPP-180: fix the nested textarea issue ******** + Pattern p = Pattern.compile("(?i)</textarea>"); + Matcher m = p.matcher(sContent); + if(m.find()) { + sContent=m.replaceAll("</textarea>"); + } + //***************************************************** %>

14 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r13902 - branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity.

by portal-commits＠lists.jboss.org

Author: ghjboss Date: 2010-03-10 22:51:54 -0500 (Wed, 10 Mar 2010) New Revision: 13902 Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity/UserActivity.java branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java Log: fix for JBEPP-159 Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity/UserActivity.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2010-03-05 16:56:23 UTC (rev 13901) +++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2010-03-11 03:51:54 UTC (rev 13902) @@ -24,6 +24,8 @@ import javax.management.Notification; +import org.jboss.portal.core.identity.UsersActivityStatsServiceImpl; + /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> @@ -70,8 +72,10 @@ { throw new IllegalArgumentException("Id (notification message) cannot be null"); } - this.id = notification.getMessage().substring(0, notification.getMessage().indexOf("_")); - this.sessionId = notification.getMessage().substring(notification.getMessage().indexOf("_")); + /************************ JBEPP-159 ****************************************************************************************************************************************************************************************/ + this.id = notification.getMessage().substring(0, notification.getMessage().indexOf(UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARATOR)); + this.sessionId = notification.getMessage().substring(notification.getMessage().indexOf(UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARATOR)+UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARATOR.length()); + /***************************************************************************************************************************************************************************************************************************/ this.timestamp = notification.getTimeStamp(); this.type = Integer.parseInt(notification.getType()); } Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2010-03-05 16:56:23 UTC (rev 13901) +++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2010-03-11 03:51:54 UTC (rev 13902) @@ -54,7 +54,9 @@ { /** Our logger. */ private static final Logger log = Logger.getLogger(UsersActivityStatsServiceImpl.class); - + /***************************** JBEPP-159 ***********************************/ + public static final String USERS_ACTIVITY_STATS_SEPARATOR = "__SEPARATOR__"; + /***************************************************************************/ // TODO: some value just to begin - find some good default private int userTrackerThreadsNumber = 10; @@ -177,10 +179,11 @@ { try { - Notification notification = new Notification(Integer.toString(userActivity.getType()), this.getServiceName(), - userActivity.getTimestamp(), userActivity.getTimestamp(), userActivity.getId() + "_" - + userActivity.getSessionId()); - + /****************** JBEPP-159 ***************************************************************************************/ + Notification notification = new Notification(Integer.toString(userActivity.getType()), this.getServiceName(), + userActivity.getTimestamp(), userActivity.getTimestamp(), userActivity.getId() + USERS_ACTIVITY_STATS_SEPARATOR + + userActivity.getSessionId()); + /********************************************************************************************************************/ if (activityBroadcasterName != null) { log.debug("Broadcasting user activity notification ");

14 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r13901 - branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-180/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.

by portal-commits＠lists.jboss.org

Author: ghjboss Date: 2010-03-05 11:56:23 -0500 (Fri, 05 Mar 2010) New Revision: 13901 Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-180/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp Log: fix for JBEPP-180. Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-180/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-180/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2010-03-05 16:10:30 UTC (rev 13900) +++ branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-180/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2010-03-05 16:56:23 UTC (rev 13901) @@ -1,6 +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 import="java.util.regex.Matcher" %> +<%@ page import="java.util.regex.Pattern" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> @@ -24,6 +26,14 @@ // for error handling String errorMessage = (String)request.getAttribute("error:message"); + + //****JBEPP-180: fix the nested textarea issue ******** + Pattern p = Pattern.compile("(?i)</textarea>"); + Matcher m = p.matcher(sContent); + if(m.find()) { + sContent=m.replaceAll("</textarea>"); + } + //***************************************************** %>

14 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r13900 - branches.

by portal-commits＠lists.jboss.org

Author: ghjboss Date: 2010-03-05 11:10:30 -0500 (Fri, 05 Mar 2010) New Revision: 13900 Added: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-180/ Log: fix for JBEPP-180. Copied: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-180 (from rev 13899, tags/Enterprise_Portal_Platform_4_3_GA_CP03)

14 years, 1 month

1
0
0 / 0

← Newer
1
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits March 2010