From: <cl...@hy...> - 2008-02-21 06:21:18
|
Author: clee Date: 2008-02-20 22:21:16 -0800 (Wed, 20 Feb 2008) New Revision: 7799 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7799 Modified: trunk/src/org/hyperic/hq/appdef/server/session/ResourceCreatedZevent.java trunk/src/org/hyperic/hq/appdef/server/session/ResourceDeletedZevent.java trunk/src/org/hyperic/hq/appdef/server/session/ResourceRefreshZevent.java trunk/src/org/hyperic/hq/appdef/server/session/ResourceUpdatedZevent.java trunk/src/org/hyperic/hq/measurement/server/session/AgentScheduleSyncZevent.java trunk/src/org/hyperic/hq/measurement/server/session/DownMetricZevent.java trunk/src/org/hyperic/hq/measurement/server/session/MeasurementScheduleZevent.java trunk/src/org/hyperic/hq/measurement/server/session/MeasurementZevent.java trunk/src/org/hyperic/hq/zevents/HeartBeatZevent.java Log: Restore the static registration routines, because not all events have listeners registered for them Modified: trunk/src/org/hyperic/hq/appdef/server/session/ResourceCreatedZevent.java =================================================================== --- trunk/src/org/hyperic/hq/appdef/server/session/ResourceCreatedZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/appdef/server/session/ResourceCreatedZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -27,8 +27,13 @@ import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.authz.shared.AuthzSubjectValue; +import org.hyperic.hq.zevents.ZeventManager; public class ResourceCreatedZevent extends ResourceZevent { + static { + ZeventManager.getInstance() + .registerEventClass(ResourceCreatedZevent.class); + } public ResourceCreatedZevent(AuthzSubjectValue subject, AppdefEntityID id) { super(subject, id); Modified: trunk/src/org/hyperic/hq/appdef/server/session/ResourceDeletedZevent.java =================================================================== --- trunk/src/org/hyperic/hq/appdef/server/session/ResourceDeletedZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/appdef/server/session/ResourceDeletedZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -27,11 +27,16 @@ import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.authz.shared.AuthzSubjectValue; +import org.hyperic.hq.zevents.ZeventManager; /** * Event that indicates a resource has been deleted. */ public class ResourceDeletedZevent extends ResourceZevent { + static { + ZeventManager.getInstance() + .registerEventClass(ResourceDeletedZevent.class); + } public ResourceDeletedZevent(AuthzSubjectValue subject, AppdefEntityID id) { super(subject, id); Modified: trunk/src/org/hyperic/hq/appdef/server/session/ResourceRefreshZevent.java =================================================================== --- trunk/src/org/hyperic/hq/appdef/server/session/ResourceRefreshZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/appdef/server/session/ResourceRefreshZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -27,12 +27,17 @@ import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.authz.shared.AuthzSubjectValue; +import org.hyperic.hq.zevents.ZeventManager; /** * A ResourceRefresh event indicates that the agent that monitors this resource * has been re-initialized. */ public class ResourceRefreshZevent extends ResourceZevent { + static { + ZeventManager.getInstance() + .registerEventClass(ResourceRefreshZevent.class); + } public ResourceRefreshZevent(AuthzSubjectValue subject, AppdefEntityID id) { super(subject, id); Modified: trunk/src/org/hyperic/hq/appdef/server/session/ResourceUpdatedZevent.java =================================================================== --- trunk/src/org/hyperic/hq/appdef/server/session/ResourceUpdatedZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/appdef/server/session/ResourceUpdatedZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -27,11 +27,16 @@ import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.authz.shared.AuthzSubjectValue; +import org.hyperic.hq.zevents.ZeventManager; /** * Event that indicates a resource has been updated. */ public class ResourceUpdatedZevent extends ResourceZevent { + static { + ZeventManager.getInstance() + .registerEventClass(ResourceUpdatedZevent.class); + } public ResourceUpdatedZevent(AuthzSubjectValue subject, AppdefEntityID id) { super(subject, id); Modified: trunk/src/org/hyperic/hq/measurement/server/session/AgentScheduleSyncZevent.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/AgentScheduleSyncZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/measurement/server/session/AgentScheduleSyncZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -26,7 +26,9 @@ package org.hyperic.hq.measurement.server.session; import org.hyperic.hq.appdef.shared.AppdefEntityID; +import org.hyperic.hq.zevents.HeartBeatZevent; import org.hyperic.hq.zevents.Zevent; +import org.hyperic.hq.zevents.ZeventManager; import org.hyperic.hq.zevents.ZeventPayload; import org.hyperic.hq.zevents.ZeventSourceId; @@ -36,6 +38,11 @@ */ public class AgentScheduleSyncZevent extends Zevent { + static { + ZeventManager.getInstance() + .registerEventClass(AgentScheduleSyncZevent.class); + } + private static class AgentScheduleSyncZeventSource implements ZeventSourceId { Modified: trunk/src/org/hyperic/hq/measurement/server/session/DownMetricZevent.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/DownMetricZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/measurement/server/session/DownMetricZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -26,11 +26,16 @@ package org.hyperic.hq.measurement.server.session; import org.hyperic.hq.zevents.Zevent; +import org.hyperic.hq.zevents.ZeventManager; import org.hyperic.hq.zevents.ZeventPayload; import org.hyperic.hq.zevents.ZeventSourceId; public class DownMetricZevent extends Zevent { + static { + ZeventManager.getInstance().registerEventClass(DownMetricZevent.class); + } + private static class DownMetricZeventSource implements ZeventSourceId { Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementScheduleZevent.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementScheduleZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementScheduleZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -26,11 +26,17 @@ package org.hyperic.hq.measurement.server.session; import org.hyperic.hq.zevents.Zevent; +import org.hyperic.hq.zevents.ZeventManager; import org.hyperic.hq.zevents.ZeventPayload; import org.hyperic.hq.zevents.ZeventSourceId; public class MeasurementScheduleZevent extends Zevent { - + + static { + ZeventManager.getInstance() + .registerEventClass(MeasurementScheduleZevent.class); + } + public static class MeasurementScheduleZeventSource implements ZeventSourceId { Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementZevent.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -31,11 +31,9 @@ import org.hyperic.hq.zevents.ZeventPayload; import org.hyperic.hq.zevents.ZeventSourceId; -public class MeasurementZevent - extends Zevent -{ +public class MeasurementZevent extends Zevent { + static { - // Pretty sure this is fine to do here. Handy, even! ZeventManager.getInstance().registerEventClass(MeasurementZevent.class); } Modified: trunk/src/org/hyperic/hq/zevents/HeartBeatZevent.java =================================================================== --- trunk/src/org/hyperic/hq/zevents/HeartBeatZevent.java 2008-02-21 06:05:06 UTC (rev 7798) +++ trunk/src/org/hyperic/hq/zevents/HeartBeatZevent.java 2008-02-21 06:21:16 UTC (rev 7799) @@ -34,8 +34,12 @@ public static final int HEART_BEAT_INTERVAL_MILLIS=30*1000; + static { + ZeventManager.getInstance().registerEventClass(HeartBeatZevent.class); + } + /** - * There is only ever one instance of this source id so we can use object + * There is only ever one instance of this source id so we can use object * identity for checking equality. */ public static class HeartBeatZeventSource |