[portal-commits] JBoss Portal SVN: r8000 - in branches/JBoss_Portal_Branch_2_6/core/src: resources/portal-core-sar/META-INF and 1 other directory.

Author: bdaw Date: 2007-08-19 19:06:08 -0400 (Sun, 19 Aug 2007) New Revision: 8000 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml Log: fix cluster support in users online service Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java 2007-08-19 22:45:01 UTC (rev 7999) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java 2007-08-19 23:06:08 UTC (rev 8000) @@ -32,7 +32,7 @@ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version $Revision: 0.1 $ */ -public interface UserActivityNotificationBroadcasterMBean //extends HAServiceMBean +public interface UserActivityNotificationBroadcasterMBean extends HAServiceMBean { public String getPartitionName(); Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2007-08-19 22:45:01 UTC (rev 7999) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2007-08-19 23:06:08 UTC (rev 8000) @@ -77,7 +77,7 @@ private volatile Set activityResults = new HashSet(); - private UserActivityNotificationBroadcasterMBean activityBroadcaster; + private String activityBroadcasterName; public UsersActivityStatsServiceImpl() { @@ -95,9 +95,9 @@ updaterExecutor.scheduleWithFixedDelay(new Updater(activityQueue), getUpdaterInterval(), getUpdaterInterval(), TimeUnit.MILLISECONDS); - if (activityBroadcaster != null) + if (activityBroadcasterName != null) { - activityBroadcaster.addNotificationListener(this, null, null); + server.addNotificationListener(new ObjectName(activityBroadcasterName), this, null, null); } else { @@ -171,11 +171,14 @@ userActivity.getId()); - if (activityBroadcaster != null) + if (activityBroadcasterName != null) { log.debug("Broadcasting user activity notification "); - activityBroadcaster.sendNotification(notification); + server.invoke(new ObjectName(activityBroadcasterName), + "sendNotification", + new Object[]{notification}, + new String[]{Notification.class.getName()}); } else { @@ -269,14 +272,14 @@ this.activityTimeout = activityTimeout; } - public UserActivityNotificationBroadcasterMBean getActivityBroadcaster() + public String getActivityBroadcasterName() { - return activityBroadcaster; + return activityBroadcasterName; } - public void setActivityBroadcaster(UserActivityNotificationBroadcasterMBean activityBroadcaster) + public void setActivityBroadcasterName(String activityBroadcasterName) { - this.activityBroadcaster = activityBroadcaster; + this.activityBroadcasterName = activityBroadcasterName; } private class Updater implements Runnable Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-08-19 22:45:01 UTC (rev 7999) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-08-19 23:06:08 UTC (rev 8000) @@ -581,9 +581,7 @@ |Uncomment in clustered mode : broadcaster will spread info about user activity in cluster @portal.single.xml.close@ - <depends - optional-attribute-name="ActivityBroadcaster" - proxy-type="attribute">portal:service=HAUserActivityNotificationBroadcaster</depends> + <attribute name="ActivityBroadcasterName">portal:service=HAUserActivityNotificationBroadcaster</attribute> @portal.single.xml.open@ -->