From portal-commits at lists.jboss.org Mon Feb 8 16:44:27 2010
Content-Type: multipart/mixed; boundary="===============2134230569492140031=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r13895 - branches.
Date: Mon, 08 Feb 2010 16:44:27 -0500
Message-ID: <201002082144.o18LiRpN032068@svn01.web.mwc.hst.phx2.redhat.com>
--===============2134230569492140031==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ghjboss
Date: 2010-02-08 16:44:27 -0500 (Mon, 08 Feb 2010)
New Revision: 13895
Added:
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/
Log:
create the branch for CP-03 for the jira JBEPP-157
Copied: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157 (from rev=
13894, tags/Enterprise_Portal_Platform_4_3_GA_CP03)
--===============2134230569492140031==--
From portal-commits at lists.jboss.org Mon Feb 8 18:03:16 2010
Content-Type: multipart/mixed; boundary="===============9214947555038987368=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r13896 -
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/src/main/org/jboss/portal/core/identity.
Date: Mon, 08 Feb 2010 18:03:15 -0500
Message-ID: <201002082303.o18N3FVX020397@svn01.web.mwc.hst.phx2.redhat.com>
--===============9214947555038987368==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ghjboss
Date: 2010-02-08 18:03:15 -0500 (Mon, 08 Feb 2010)
New Revision: 13896
Modified:
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/src/main/=
org/jboss/portal/core/identity/UserActivity.java
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/src/main/=
org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java
Log:
fix for JBEPP-157
Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/sr=
c/main/org/jboss/portal/core/identity/UserActivity.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/src/main=
/org/jboss/portal/core/identity/UserActivity.java 2010-02-08 21:44:27 UTC (=
rev 13895)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/src/main=
/org/jboss/portal/core/identity/UserActivity.java 2010-02-08 23:03:15 UTC (=
rev 13896)
@@ -24,6 +24,8 @@
=
import javax.management.Notification;
=
+import org.jboss.portal.core.identity.UsersActivityStatsServiceImpl;
+
/**
* @author Boleslaw Dawidowicz
* @author Luca Stancapiano
@@ -70,8 +72,10 @@
{
throw new IllegalArgumentException("Id (notification message) can=
not be null");
}
- this.id =3D notification.getMessage().substring(0, notification.getM=
essage().indexOf("_"));
- this.sessionId =3D notification.getMessage().substring(notification.=
getMessage().indexOf("_"));
+ /************************ JBEPP-157 ********************************=
***************************************************************************=
***************************************************************************=
**/
+ this.id =3D notification.getMessage().substring(0, notification.getM=
essage().indexOf(UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARAT=
OR));
+ this.sessionId =3D notification.getMessage().substring(notification.=
getMessage().indexOf(UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEP=
ARATOR)+UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARATOR.length=
());
+ /*******************************************************************=
***************************************************************************=
***************************************************************************=
**/
this.timestamp =3D notification.getTimeStamp();
this.type =3D Integer.parseInt(notification.getType());
}
Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/sr=
c/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/src/main=
/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2010-02-=
08 21:44:27 UTC (rev 13895)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/core/src/main=
/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2010-02-=
08 23:03:15 UTC (rev 13896)
@@ -54,7 +54,9 @@
{
/** Our logger. */
private static final Logger log =3D Logger.getLogger(UsersActivityStats=
ServiceImpl.class);
-
+ /***************************** JBEPP-157 ******************************=
*****/
+ public static final String USERS_ACTIVITY_STATS_SEPARATOR =3D "__SEPARA=
TOR__";
+ /**********************************************************************=
*****/
// TODO: some value just to begin - find some good default
private int userTrackerThreadsNumber =3D 10;
=
@@ -177,10 +179,11 @@
{
try
{
+ /****************** JBEPP-157 **************************************=
*************************************************/
Notification notification =3D new Notification(Integer.toString(u=
serActivity.getType()), this.getServiceName(),
- userActivity.getTimestamp(), userActivity.getTimestamp(), u=
serActivity.getId() + "_"
+ userActivity.getTimestamp(), userActivity.getTimestamp(), u=
serActivity.getId() + USERS_ACTIVITY_STATS_SEPARATOR
+ userActivity.getSessionId());
-
+ /****************************************************************=
****************************************************/
if (activityBroadcasterName !=3D null)
{
log.debug("Broadcasting user activity notification ");
--===============9214947555038987368==--
From portal-commits at lists.jboss.org Tue Feb 9 11:58:03 2010
Content-Type: multipart/mixed; boundary="===============5161259892346306091=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r13897 - branches.
Date: Tue, 09 Feb 2010 11:58:03 -0500
Message-ID: <201002091658.o19Gw3CG021234@svn01.web.mwc.hst.phx2.redhat.com>
--===============5161259892346306091==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ghjboss
Date: 2010-02-09 11:58:02 -0500 (Tue, 09 Feb 2010)
New Revision: 13897
Added:
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/
Log:
fix for JBEPP-159
Copied: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159 (from rev=
13896, tags/Enterprise_Portal_Platform_4_3_GA_CP03)
--===============5161259892346306091==--
From portal-commits at lists.jboss.org Tue Feb 9 12:59:43 2010
Content-Type: multipart/mixed; boundary="===============4966740239066555178=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r13898 -
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/org/jboss/portal/core/identity.
Date: Tue, 09 Feb 2010 12:59:42 -0500
Message-ID: <201002091759.o19Hxguw006706@svn01.web.mwc.hst.phx2.redhat.com>
--===============4966740239066555178==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ghjboss
Date: 2010-02-09 12:59:42 -0500 (Tue, 09 Feb 2010)
New Revision: 13898
Modified:
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/=
org/jboss/portal/core/identity/UserActivity.java
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main/=
org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java
Log:
fix for JBEPP-159
Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/sr=
c/main/org/jboss/portal/core/identity/UserActivity.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main=
/org/jboss/portal/core/identity/UserActivity.java 2010-02-09 16:58:02 UTC (=
rev 13897)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main=
/org/jboss/portal/core/identity/UserActivity.java 2010-02-09 17:59:42 UTC (=
rev 13898)
@@ -70,8 +70,10 @@
{
throw new IllegalArgumentException("Id (notification message) can=
not be null");
}
- this.id =3D notification.getMessage().substring(0, notification.getM=
essage().indexOf("_"));
- this.sessionId =3D notification.getMessage().substring(notification.=
getMessage().indexOf("_"));
+ /************************ JBEPP-159 ********************************=
***************************************************************************=
***************************************************************************=
**/
+ this.id =3D notification.getMessage().substring(0, notification.getM=
essage().indexOf(UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARAT=
OR));
+ this.sessionId =3D notification.getMessage().substring(notification.=
getMessage().indexOf(UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEP=
ARATOR)+UsersActivityStatsServiceImpl.USERS_ACTIVITY_STATS_SEPARATOR.length=
());
+ /*******************************************************************=
***************************************************************************=
***************************************************************************=
**/
this.timestamp =3D notification.getTimeStamp();
this.type =3D Integer.parseInt(notification.getType());
}
Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/sr=
c/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main=
/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2010-02-=
09 16:58:02 UTC (rev 13897)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-159/core/src/main=
/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2010-02-=
09 17:59:42 UTC (rev 13898)
@@ -54,7 +54,9 @@
{
/** Our logger. */
private static final Logger log =3D Logger.getLogger(UsersActivityStats=
ServiceImpl.class);
-
+ /***************************** JBEPP-159 ******************************=
*****/
+ public static final String USERS_ACTIVITY_STATS_SEPARATOR =3D "__SEPARA=
TOR__";
+ /**********************************************************************=
*****/
// TODO: some value just to begin - find some good default
private int userTrackerThreadsNumber =3D 10;
=
@@ -177,10 +179,11 @@
{
try
{
+ /****************** JBEPP-159 **************************************=
*************************************************/
Notification notification =3D new Notification(Integer.toString(u=
serActivity.getType()), this.getServiceName(),
- userActivity.getTimestamp(), userActivity.getTimestamp(), u=
serActivity.getId() + "_"
- + userActivity.getSessionId());
-
+ userActivity.getTimestamp(), userActivity.getTimestamp(), =
userActivity.getId() + USERS_ACTIVITY_STATS_SEPARATOR
+ + userActivity.getSessionId());
+ /****************************************************************=
****************************************************/
if (activityBroadcasterName !=3D null)
{
log.debug("Broadcasting user activity notification ");
--===============4966740239066555178==--
From portal-commits at lists.jboss.org Tue Feb 9 13:06:28 2010
Content-Type: multipart/mixed; boundary="===============6171453929201638670=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r13899 - branches.
Date: Tue, 09 Feb 2010 13:06:28 -0500
Message-ID: <201002091806.o19I6STD013530@svn01.web.mwc.hst.phx2.redhat.com>
--===============6171453929201638670==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: ghjboss
Date: 2010-02-09 13:06:27 -0500 (Tue, 09 Feb 2010)
New Revision: 13899
Removed:
branches/Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP-157/
Log:
this branch is a duplicate of Enterprise_Portal_Platform_4_3_GA_CP03_JBEPP_=
159 which is a support patch
--===============6171453929201638670==--