From: <cl...@hy...> - 2008-03-18 22:06:24
|
Author: clee Date: 2008-03-18 15:06:19 -0700 (Tue, 18 Mar 2008) New Revision: 8311 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=8311 Modified: branches/HQ_3_2/src/org/hyperic/hq/events/ext/AbstractTrigger.java branches/HQ_3_2/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java branches/HQ_3_2/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java Log: [HQ-1233] Change APIs to use subject POJO [merge from HEAD] Modified: branches/HQ_3_2/src/org/hyperic/hq/events/ext/AbstractTrigger.java =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/events/ext/AbstractTrigger.java 2008-03-18 21:53:27 UTC (rev 8310) +++ branches/HQ_3_2/src/org/hyperic/hq/events/ext/AbstractTrigger.java 2008-03-18 22:06:19 UTC (rev 8311) @@ -328,9 +328,9 @@ try { succeeded = aman.updateAlertDefinitionInternalEnable( - AuthzSubjectManagerEJBImpl.getOne().findOverlord(), - alertDef, - false); + AuthzSubjectManagerEJBImpl.getOne().getOverlordPojo(), + alertDef, + false); } finally { if (succeeded) { setUncommitedAlertDefEnabledStatusToDisabled(); Modified: branches/HQ_3_2/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2008-03-18 21:53:27 UTC (rev 8310) +++ branches/HQ_3_2/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2008-03-18 22:06:19 UTC (rev 8311) @@ -440,7 +440,7 @@ * @return <code>true</code> if the enable/disable succeeded. * @ejb:interface-method */ - public boolean updateAlertDefinitionInternalEnable(AuthzSubjectValue subj, + public boolean updateAlertDefinitionInternalEnable(AuthzSubject subj, AlertDefinition def, boolean enable) throws PermissionException { @@ -448,7 +448,7 @@ boolean succeeded = false; if (def.isEnabled() != enable) { - canManageAlerts(subj, def); + canManageAlerts(subj.getId(), def.getAppdefEntityId()); def.setEnabledStatus(enable); succeeded = true; } @@ -463,7 +463,7 @@ * @return <code>true</code> if the enable/disable succeeded. * @ejb:interface-method */ - public boolean updateAlertDefinitionInternalEnable(AuthzSubjectValue subj, + public boolean updateAlertDefinitionInternalEnable(AuthzSubject subj, Integer defId, boolean enable) throws FinderException, PermissionException { @@ -482,7 +482,7 @@ * @ejb:transaction type="REQUIRESNEW" * @ejb:interface-method */ - public boolean updateAlertDefinitionInternalEnableForceNewTxn(AuthzSubjectValue subj, + public boolean updateAlertDefinitionInternalEnableForceNewTxn(AuthzSubject subj, Integer defId, boolean enable) throws PermissionException { Modified: branches/HQ_3_2/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java 2008-03-18 21:53:27 UTC (rev 8310) +++ branches/HQ_3_2/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java 2008-03-18 22:06:19 UTC (rev 8311) @@ -218,7 +218,7 @@ * * @ejb:interface-method */ - public Alert findLastUnfixedByDefinition(AuthzSubjectValue subj, Integer id) + public Alert findLastUnfixedByDefinition(AuthzSubject subj, Integer id) { try { AlertDefinition def = getAlertDefDAO().findById(id); |