Menu
▾
▴
hyperic-hq-discuss — Hyperic HQ SVN Commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(927) |
Apr
(419) |
May
(352) |
Jun
(431) |
Jul
(463) |
Aug
(345) |
Sep
(304) |
Oct
(596) |
Nov
(466) |
Dec
(414) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(348) |
Feb
(313) |
Mar
(665) |
Apr
(688) |
May
(434) |
Jun
(311) |
Jul
(540) |
Aug
(554) |
Sep
(467) |
Oct
(341) |
Nov
(365) |
Dec
(272) |
| 2009 |
Jan
(386) |
Feb
(293) |
Mar
(279) |
Apr
(239) |
May
(229) |
Jun
(199) |
Jul
(186) |
Aug
(111) |
Sep
(196) |
Oct
(146) |
Nov
(116) |
Dec
(140) |
| 2010 |
Jan
(170) |
Feb
(159) |
Mar
(151) |
Apr
(161) |
May
(90) |
Jun
(56) |
Jul
(28) |
Aug
(22) |
Sep
(5) |
Oct
|
Nov
(23) |
Dec
(12) |
| 2011 |
Jan
(8) |
Feb
(8) |
Mar
(22) |
Apr
(24) |
May
(4) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2012 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <no...@gi...> - 2010-02-10 20:46:38
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: 2ae29afb36307750afc1320b9ece4c6d53d9ea2f http://github.com/hyperic/hqapi/commit/2ae29afb36307750afc1320b9ece4c6d53d9ea2f Author: Ryan Morgan <rm...@hy...> Date: 2010-02-10 (Wed, 10 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --clear option for command line group syncing. Commit: 1c4c6b6a0bf5d93e2a857940de66fc126fa259d5 http://github.com/hyperic/hqapi/commit/1c4c6b6a0bf5d93e2a857940de66fc126fa259d5 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-10 (Wed, 10 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-1.0' into hqapi-2.x Commit: e00a908394c8ba84b0887453cdb2044e50203b3c http://github.com/hyperic/hqapi/commit/e00a908394c8ba84b0887453cdb2044e50203b3c Author: Ryan Morgan <rm...@hy...> Date: 2010-02-10 (Wed, 10 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-2.x' |
|
From: <no...@gi...> - 2010-02-10 20:46:37
|
Branch: refs/heads/hqapi-2.x Home: http://github.com/hyperic/hqapi Commit: 2ae29afb36307750afc1320b9ece4c6d53d9ea2f http://github.com/hyperic/hqapi/commit/2ae29afb36307750afc1320b9ece4c6d53d9ea2f Author: Ryan Morgan <rm...@hy...> Date: 2010-02-10 (Wed, 10 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --clear option for command line group syncing. Commit: 1c4c6b6a0bf5d93e2a857940de66fc126fa259d5 http://github.com/hyperic/hqapi/commit/1c4c6b6a0bf5d93e2a857940de66fc126fa259d5 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-10 (Wed, 10 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-1.0' into hqapi-2.x |
|
From: <no...@gi...> - 2010-02-10 20:46:36
|
Branch: refs/heads/hqapi-1.0 Home: http://github.com/hyperic/hqapi Commit: 2ae29afb36307750afc1320b9ece4c6d53d9ea2f http://github.com/hyperic/hqapi/commit/2ae29afb36307750afc1320b9ece4c6d53d9ea2f Author: Ryan Morgan <rm...@hy...> Date: 2010-02-10 (Wed, 10 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --clear option for command line group syncing. |
|
From: <rm...@hy...> - 2010-02-10 19:17:12
|
Author: rmorgan Date: 2010-02-10 11:17:04 -0800 (Wed, 10 Feb 2010) New Revision: 14274 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14274 Modified: trunk/src/org/hyperic/hq/product/servlet/filter/JMXFilterInitServlet.java Log: [HHQ-3726] Switch usage from Hashtable to WeakHashMap so that references to the classloader can be garbage collected on application reloads. We wrap the WeaskHashMap with a syncronized map to preserve prior behavior with the Hashtable. Modified: trunk/src/org/hyperic/hq/product/servlet/filter/JMXFilterInitServlet.java =================================================================== --- trunk/src/org/hyperic/hq/product/servlet/filter/JMXFilterInitServlet.java 2010-02-10 09:26:50 UTC (rev 14273) +++ trunk/src/org/hyperic/hq/product/servlet/filter/JMXFilterInitServlet.java 2010-02-10 19:17:04 UTC (rev 14274) @@ -27,9 +27,10 @@ import java.io.File; import java.util.ArrayList; -import java.util.Hashtable; +import java.util.WeakHashMap; +import java.util.Collections; +import java.util.Map; -import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import javax.management.ObjectName; @@ -63,11 +64,11 @@ private static JMXFilterInitServlet singleton; // ContextName -> JMXFilter - private static Hashtable filters = new Hashtable(); + private static Map filters = Collections.synchronizedMap(new WeakHashMap()); // CL -> JMXSessionListener - private static Hashtable listeners = new Hashtable(); + private static Map listeners = Collections.synchronizedMap(new WeakHashMap()); - private static Hashtable contextInfoByCL = new Hashtable(); + private static Map contextInfoByCL = Collections.synchronizedMap(new WeakHashMap()); public static void registerFilter( JMXFilter f ) { // XXX: We could use the thread class loader to make sure we don't |
|
From: <bo...@hy...> - 2010-02-10 09:26:59
|
Author: bob Date: 2010-02-10 01:26:50 -0800 (Wed, 10 Feb 2010) New Revision: 14273 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14273 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1346 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-10 01:28:47 UTC (rev 14272) +++ trunk/etc/version.properties 2010-02-10 09:26:50 UTC (rev 14273) @@ -1,3 +1,3 @@ -#Tue Feb 09 00:35:16 PST 2010 +#Wed Feb 10 00:31:22 PST 2010 version=4.3.0 -build=1345 +build=1346 |
|
From: Mirko P. <m.p...@gm...> - 2010-02-10 08:01:48
|
Hi, the sourcecode contains some examples: http://github.com/hyperic/sigar/tree/master/bindings/dotnet/ Cheers, Mirko |
|
From: Grave_Jumper <sig...@hy...> - 2010-02-10 07:57:20
|
These files fixed the issue. Thanks to you guys for the help. |
|
From: <no...@gi...> - 2010-02-10 02:33:46
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: 1e8853652ef82061f4288470fc4ec2826fad25ea http://github.com/hyperic/hqapi/commit/1e8853652ef82061f4288470fc4ec2826fad25ea Author: pnguyen <pnguyen@192.168.2.208> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/test/AlertDefinitionSync_test.java Log Message: ----------- Update integration test for sync-ing alert definitions with the proper permission settings |
|
From: <no...@gi...> - 2010-02-10 02:17:06
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: a5ab88e4590f61ee1f7e3f1a45bc0741a66af6cc http://github.com/hyperic/hqapi/commit/a5ab88e4590f61ee1f7e3f1a45bc0741a66af6cc Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Fix spelling. Commit: 51a1f8955d5aa3901ef531f7ed8e0b09848c0818 http://github.com/hyperic/hqapi/commit/51a1f8955d5aa3901ef531f7ed8e0b09848c0818 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy Log Message: ----------- [HHQ-3725] Do not add duplicate resources to groups. Commit: 0b0cf3d750a985397087dbba7b146bbcf9597231 http://github.com/hyperic/hqapi/commit/0b0cf3d750a985397087dbba7b146bbcf9597231 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Fix conflict. Commit: 43d94b11a54db2588dd2a6c3d5e80ea215d03717 http://github.com/hyperic/hqapi/commit/43d94b11a54db2588dd2a6c3d5e80ea215d03717 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --delete option to command line group syncing. Commit: f901a979a5736f7f2fc75c629b35ac308e369624 http://github.com/hyperic/hqapi/commit/f901a979a5736f7f2fc75c629b35ac308e369624 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-1.0' into hqapi-2.x Commit: 522a1de695a9a747ad15bbb9b626125997e84017 http://github.com/hyperic/hqapi/commit/522a1de695a9a747ad15bbb9b626125997e84017 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-2.x' |
|
From: <no...@gi...> - 2010-02-10 02:17:06
|
Branch: refs/heads/hqapi-1.0 Home: http://github.com/hyperic/hqapi Commit: 43d94b11a54db2588dd2a6c3d5e80ea215d03717 http://github.com/hyperic/hqapi/commit/43d94b11a54db2588dd2a6c3d5e80ea215d03717 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --delete option to command line group syncing. |
|
From: <no...@gi...> - 2010-02-10 02:17:06
|
Branch: refs/heads/hqapi-2.x Home: http://github.com/hyperic/hqapi Commit: 43d94b11a54db2588dd2a6c3d5e80ea215d03717 http://github.com/hyperic/hqapi/commit/43d94b11a54db2588dd2a6c3d5e80ea215d03717 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --delete option to command line group syncing. Commit: f901a979a5736f7f2fc75c629b35ac308e369624 http://github.com/hyperic/hqapi/commit/f901a979a5736f7f2fc75c629b35ac308e369624 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-1.0' into hqapi-2.x |
|
From: <tr...@hy...> - 2010-02-10 01:28:55
|
Author: trader Date: 2010-02-09 17:28:47 -0800 (Tue, 09 Feb 2010) New Revision: 14272 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14272 Modified: trunk/installer/data/hq-engine/hq-ds.xml trunk/installer/src/org/hyperic/HQMain.java Log: HPD-171, HHQ-3514: DB Connections don't do any validation Modified: trunk/installer/data/hq-engine/hq-ds.xml =================================================================== --- trunk/installer/data/hq-engine/hq-ds.xml 2010-02-10 01:11:37 UTC (rev 14271) +++ trunk/installer/data/hq-engine/hq-ds.xml 2010-02-10 01:28:47 UTC (rev 14272) @@ -18,6 +18,7 @@ <!-- look at your Driver docs to see what these might be --> <connection-property name="char.encoding">UTF-8</connection-property> <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <check-valid-connection-sql>@@@server.connection-validation-sql@@@</check-valid-connection-sql> <!--pooling parameters--> <min-pool-size>@@@server.database-minpoolsize@@@</min-pool-size> Modified: trunk/installer/src/org/hyperic/HQMain.java =================================================================== --- trunk/installer/src/org/hyperic/HQMain.java 2010-02-10 01:11:37 UTC (rev 14271) +++ trunk/installer/src/org/hyperic/HQMain.java 2010-02-10 01:28:47 UTC (rev 14272) @@ -115,6 +115,15 @@ symbols.setProperty("server.database-url", jdbcUrl + "?protocolVersion=2"); } + + // Database connection validation: "select 1" except in the case of Oracle, + // where it's "select 1 from dual" + String validationSQL = "select 1"; + if ("Oracle".equals(symbols.getProperty("server.database"))) { + validationSQL += " from dual"; + } + symbols.setProperty("server.connection-validation-sql", validationSQL); + } finally { if (fi != null) fi.close(); } |
|
From: <dcr...@hy...> - 2010-02-10 01:11:45
|
Author: dcrutchf Date: 2010-02-09 17:11:37 -0800 (Tue, 09 Feb 2010) New Revision: 14271 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14271 Modified: trunk/web/portal/MainLayout.jsp Log: Fixed footer placement issue Modified: trunk/web/portal/MainLayout.jsp =================================================================== --- trunk/web/portal/MainLayout.jsp 2010-02-10 01:02:28 UTC (rev 14270) +++ trunk/web/portal/MainLayout.jsp 2010-02-10 01:11:37 UTC (rev 14271) @@ -83,6 +83,7 @@ <tiles:insert attribute="header" /> <div id="migContainer"> <tiles:insert attribute='body' /> + <img src="/images/spacer.gif" width="1" height="60" alt="" border="0" class="footerSpacer" style="clear: both;" id="footerSpacer" /> <tiles:insert attribute="footer" /> </div> </body> |
|
From: <no...@gi...> - 2010-02-10 01:10:50
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: 357bc7f2fa816fcf2691d52dad1d6fb04f924caf http://github.com/hyperic/hqapi/commit/357bc7f2fa816fcf2691d52dad1d6fb04f924caf Author: pnguyen <pnguyen@192.168.2.208> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/test/AlertDefinitionDelete_test.java Log Message: ----------- Update integration test for alert definition deletes with the proper permission settings |
|
From: <no...@gi...> - 2010-02-10 01:08:42
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: a5ab88e4590f61ee1f7e3f1a45bc0741a66af6cc http://github.com/hyperic/hqapi/commit/a5ab88e4590f61ee1f7e3f1a45bc0741a66af6cc Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Fix spelling. Commit: 51a1f8955d5aa3901ef531f7ed8e0b09848c0818 http://github.com/hyperic/hqapi/commit/51a1f8955d5aa3901ef531f7ed8e0b09848c0818 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy Log Message: ----------- [HHQ-3725] Do not add duplicate resources to groups. Commit: 0b0cf3d750a985397087dbba7b146bbcf9597231 http://github.com/hyperic/hqapi/commit/0b0cf3d750a985397087dbba7b146bbcf9597231 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Fix conflict. Commit: ac5f72ce299d15b8d8031547411e334fb1b16d8b http://github.com/hyperic/hqapi/commit/ac5f72ce299d15b8d8031547411e334fb1b16d8b Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Merge branch 'hqapi-2.x' |
|
From: <no...@gi...> - 2010-02-10 01:08:41
|
Branch: refs/heads/hqapi-2.x Home: http://github.com/hyperic/hqapi Commit: a5ab88e4590f61ee1f7e3f1a45bc0741a66af6cc http://github.com/hyperic/hqapi/commit/a5ab88e4590f61ee1f7e3f1a45bc0741a66af6cc Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Fix spelling. Commit: 51a1f8955d5aa3901ef531f7ed8e0b09848c0818 http://github.com/hyperic/hqapi/commit/51a1f8955d5aa3901ef531f7ed8e0b09848c0818 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy Log Message: ----------- [HHQ-3725] Do not add duplicate resources to groups. Commit: 0b0cf3d750a985397087dbba7b146bbcf9597231 http://github.com/hyperic/hqapi/commit/0b0cf3d750a985397087dbba7b146bbcf9597231 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Fix conflict. |
|
From: <no...@gi...> - 2010-02-10 01:08:40
|
Branch: refs/heads/hqapi-1.0 Home: http://github.com/hyperic/hqapi Commit: a5ab88e4590f61ee1f7e3f1a45bc0741a66af6cc http://github.com/hyperic/hqapi/commit/a5ab88e4590f61ee1f7e3f1a45bc0741a66af6cc Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/ErrorCode.java M src/org/hyperic/hq/hqapi1/HQConnection.java Log Message: ----------- Fix spelling. Commit: 51a1f8955d5aa3901ef531f7ed8e0b09848c0818 http://github.com/hyperic/hqapi/commit/51a1f8955d5aa3901ef531f7ed8e0b09848c0818 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-09 (Tue, 09 Feb 2010) Changed paths: M hqu/hqapi1/app/GroupController.groovy Log Message: ----------- [HHQ-3725] Do not add duplicate resources to groups. |
Author: dcrutchf Date: 2010-02-09 17:02:28 -0800 (Tue, 09 Feb 2010) New Revision: 14270 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14270 Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java trunk/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java trunk/src/org/hyperic/hq/events/server/session/SessionBase.java trunk/src/org/hyperic/hq/ui/AttrConstants.java trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java trunk/web/css/HQ_40.css trunk/web/resource/common/monitor/alerts/config/ViewDefinitionProperties.jsp Log: Fixed an issue found by running the hqapi integration tests Also refactored a bit to make things a bit clearer Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2010-02-09 17:56:00 UTC (rev 14269) +++ trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionManagerEJBImpl.java 2010-02-10 01:02:28 UTC (rev 14270) @@ -216,14 +216,13 @@ PermissionException { if (EventConstants.TYPE_ALERT_DEF_ID.equals(a.getParentId())) { - // ...check that user has modify permission on alert definition's resource... - canModifyAlertDefinition(subj, new AppdefEntityTypeID(a.getAppdefType(), - a.getAppdefId())); + // ...check that user has access to resource type alert definitions alert definition's resource... + canCreateResourceTypeAlertDefinitionTemplate(subj); // Subject permissions should have already been checked when creating // the parent (resource type) alert definition. } else if (!a.parentIdHasBeenSet()) { - // ...check that user has modify permission on alert definition's resource... - canModifyAlertDefinition(subj, new AppdefEntityID(a.getAppdefType(), + // ...check that user has create permission on alert definition's resource... + canCreateAlertDefinition(subj, new AppdefEntityID(a.getAppdefType(), a.getAppdefId())); } @@ -765,8 +764,8 @@ continue; } - // ...check that user has modify permission on alert definitions... - canModifyAlertDefinition(subj, alertDefinition.getAppdefEntityId()); + // ...check that user has delete permission on alert definitions... + canDeleteAlertDefinition(subj, alertDefinition.getAppdefEntityId()); AlertAudit.deleteAlert(alertDefinition, subj); Modified: trunk/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java 2010-02-09 17:56:00 UTC (rev 14269) +++ trunk/src/org/hyperic/hq/events/server/session/AlertManagerEJBImpl.java 2010-02-10 01:02:28 UTC (rev 14270) @@ -183,8 +183,8 @@ */ public int deleteAlerts(AuthzSubject subj, AppdefEntityID id) throws PermissionException { - // ...check that user has modify permission on alert definition's resource... - canModifyAlertDefinition(subj, id); + // ...check that user has delete permission on alert definition's resource... + canDeleteAlertDefinition(subj, id); return getAlertDAO().deleteByResource(findResource(id)); } @@ -196,8 +196,8 @@ */ public int deleteAlerts(AuthzSubject subj, AlertDefinition ad) throws RemoveException, PermissionException { - // ...check that user has modify permission on alert definition's resource... - canModifyAlertDefinition(subj, ad.getAppdefEntityId()); + // ...check that user has delete permission on alert definition's resource... + canDeleteAlertDefinition(subj, ad.getAppdefEntityId()); return getAlertDAO().deleteByAlertDefinition(ad); } Modified: trunk/src/org/hyperic/hq/events/server/session/SessionBase.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/SessionBase.java 2010-02-09 17:56:00 UTC (rev 14269) +++ trunk/src/org/hyperic/hq/events/server/session/SessionBase.java 2010-02-10 01:02:28 UTC (rev 14270) @@ -138,23 +138,26 @@ String rtName, Integer instId, String opName) throws PermissionException { - PermissionManager permMgr = PermissionManagerFactory.getInstance(); - - if (!resourceTypes.containsKey(rtName)) { - resourceTypes.put(rtName, - new ResourceTypeDAO(DAOFactory.getDAOFactory()).findByName(rtName)); + // ...check permission if user is NOT a super user... + if (!PermissionManagerFactory.getInstance().hasAdminPermission(subjectId)) { + PermissionManager permMgr = PermissionManagerFactory.getInstance(); + + if (!resourceTypes.containsKey(rtName)) { + resourceTypes.put(rtName, + new ResourceTypeDAO(DAOFactory.getDAOFactory()).findByName(rtName)); + } + ResourceType resType = (ResourceType) resourceTypes.get(rtName); + + if (!operations.containsKey(opName)) { + operations.put(opName, + new OperationDAO(DAOFactory.getDAOFactory()) + .findByTypeAndName(resType, opName)); + } + Operation operation = (Operation) operations.get(opName); + + permMgr.check(subjectId, resType.getId(), instId, operation.getId()); + // Permission Check Succesful } - ResourceType resType = (ResourceType) resourceTypes.get(rtName); - - if (!operations.containsKey(opName)) { - operations.put(opName, - new OperationDAO(DAOFactory.getDAOFactory()) - .findByTypeAndName(resType, opName)); - } - Operation operation = (Operation) operations.get(opName); - - permMgr.check(subjectId, resType.getId(), instId, operation.getId()); - // Permission Check Succesful } protected Resource findResource(AppdefEntityID id) { @@ -163,27 +166,78 @@ private static ResourceOperationsHelper resourceOperationsHelper = new ResourceOperationsHelper(); - public static void canViewResourceTypeAlertDefinition(AuthzSubject user, AppdefEntityTypeID entityTypeId) + public static void canViewResourceTypeAlertDefinitionTemplate(AuthzSubject user) throws PermissionException { + // ...right now, you have to be a member of the super user's role to do anything with + // resource type alert templates... + // TODO ...if this changes in the future, we can make the change here and the rest should just work... if (!PermissionManagerFactory.getInstance().hasAdminPermission(user.getId())) { throw new PermissionException("User must be in Super User role to manage resource type alert definitions"); } } + public static void canModifyResourceTypeAlertDefinitionTemplate(AuthzSubject user) + throws PermissionException { + // ...right now, you have to be a member of the super user's role to do anything with + // resource type alert templates... + // TODO ...if this changes in the future, we can make the change here and the rest should just work... + if (!PermissionManagerFactory.getInstance().hasAdminPermission(user.getId())) { + throw new PermissionException("User must be in Super User role to manage resource type alert definitions"); + } + } + + public static void canCreateResourceTypeAlertDefinitionTemplate(AuthzSubject user) + throws PermissionException { + // ...right now, you have to be a member of the super user's role to do anything with + // resource type alert templates... + // TODO ...if this changes in the future, we can make the change here and the rest should just work... + if (!PermissionManagerFactory.getInstance().hasAdminPermission(user.getId())) { + throw new PermissionException("User must be in Super User role to manage resource type alert definitions"); + } + } + + public static void canDeleteResourceTypeAlertDefinitionTemplate(AuthzSubject user) + throws PermissionException { + // ...right now, you have to be a member of the super user's role to do anything with + // resource type alert templates... + // TODO ...if this changes in the future, we can make the change here and the rest should just work... + if (!PermissionManagerFactory.getInstance().hasAdminPermission(user.getId())) { + throw new PermissionException("User must be in Super User role to manage resource type alert definitions"); + } + } + public static void canViewAlertDefinition(AuthzSubject user, AppdefEntityID entityId) throws PermissionException { // ...we need to check the resource associated with the alert definition to determine - // if the user can view the alert definition, must have read permission on resource... + // if the user can view the alert definition. Must have read permission on resource... checkAlertDefinitionPermission(user, entityId, resourceOperationsHelper.getReadOperation(entityId.getType())); } public static void canModifyAlertDefinition(AuthzSubject user, AppdefEntityID entityId) throws PermissionException { // ...we need to check the resource associated with the alert definition to determine - // if the user can modify the alert definition... + // if the user can modify the alert definition. Must have modify permission on resource... checkAlertDefinitionPermission(user, entityId, resourceOperationsHelper.getUpdateOperation(entityId.getType())); } + public static void canCreateAlertDefinition(AuthzSubject user, AppdefEntityID entityId) + throws PermissionException { + // ...we need to check the resource associated with the alert definition to determine + // if the user can modify the alert definition. Must have modify permission on resource... + // TODO ...If we introduce finer grained permission for Alert definition, we can make the change here + // and the rest should just work... + checkAlertDefinitionPermission(user, entityId, resourceOperationsHelper.getUpdateOperation(entityId.getType())); + } + + public static void canDeleteAlertDefinition(AuthzSubject user, AppdefEntityID entityId) + throws PermissionException { + // ...we need to check the resource associated with the alert definition to determine + // if the user can modify the alert definition. Must have modify permission on resource... + // TODO ...If we introduce finer grained permission for Alert definition, we can make the change here + // and the rest should just work... + checkAlertDefinitionPermission(user, entityId, resourceOperationsHelper.getUpdateOperation(entityId.getType())); + } + private static void checkAlertDefinitionPermission(AuthzSubject user, AppdefEntityID id, String operationName) throws PermissionException { int resourceType = id.getType(); Modified: trunk/src/org/hyperic/hq/ui/AttrConstants.java =================================================================== --- trunk/src/org/hyperic/hq/ui/AttrConstants.java 2010-02-09 17:56:00 UTC (rev 14269) +++ trunk/src/org/hyperic/hq/ui/AttrConstants.java 2010-02-10 01:02:28 UTC (rev 14270) @@ -463,7 +463,7 @@ public static final String CAN_TAKE_ACTION_ON_ALERT_ATTR = "canTakeAction"; public static final String CAN_MODIFY_ALERT_ATTR = "canModify"; - public static final String IS_SUPER_USER = "isSuperUser"; + public static final String CAN_VIEW_RESOURCE_TYPE_ALERT_TEMPLATE_ATTR = "canViewResourceTypeAlertTemplate"; /** * The request or session scope attribute under which actions Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java =================================================================== --- trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java 2010-02-09 17:56:00 UTC (rev 14269) +++ trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java 2010-02-10 01:02:28 UTC (rev 14270) @@ -38,6 +38,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.tiles.actions.TilesAction; import org.hyperic.hq.appdef.shared.AppdefEntityID; +import org.hyperic.hq.appdef.shared.AppdefEntityTypeID; import org.hyperic.hq.authz.server.session.AuthzSubject; import org.hyperic.hq.authz.server.session.RoleManagerEJBImpl; import org.hyperic.hq.authz.shared.PermissionException; @@ -143,10 +144,18 @@ AuthzBoss authzBoss = ContextUtils.getAuthzBoss(ctx); AuthzSubject subject = authzBoss.getCurrentSubject(sessionID); - if (PermissionManagerFactory.getInstance().hasAdminPermission(subject.getId())) { - request.setAttribute(Constants.IS_SUPER_USER, true); - } else { - request.setAttribute(Constants.IS_SUPER_USER, false); + try { + request.setAttribute(Constants.CAN_VIEW_RESOURCE_TYPE_ALERT_TEMPLATE_ATTR, false); + + // ...is this alert definition spawned from a resource alert template?.. + if (adv.getParentId() > 0) { + // ...if so, check to see if we have permission to view it... + SessionBase.canViewResourceTypeAlertDefinitionTemplate(subject); + + request.setAttribute(Constants.CAN_VIEW_RESOURCE_TYPE_ALERT_TEMPLATE_ATTR, true); + } + } catch(PermissionException pe) { + // ...no permission, keep it moving... } SessionBase.canModifyAlertDefinition(subject, new AppdefEntityID(adv.getAppdefType(), adv.getAppdefId())); Modified: trunk/web/css/HQ_40.css =================================================================== --- trunk/web/css/HQ_40.css 2010-02-09 17:56:00 UTC (rev 14269) +++ trunk/web/css/HQ_40.css 2010-02-10 01:02:28 UTC (rev 14270) @@ -2388,7 +2388,7 @@ -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 3px; - padding: 3px 5px; + padding: 3px 15px; cursor:pointer; } Modified: trunk/web/resource/common/monitor/alerts/config/ViewDefinitionProperties.jsp =================================================================== --- trunk/web/resource/common/monitor/alerts/config/ViewDefinitionProperties.jsp 2010-02-09 17:56:00 UTC (rev 14269) +++ trunk/web/resource/common/monitor/alerts/config/ViewDefinitionProperties.jsp 2010-02-10 01:02:28 UTC (rev 14270) @@ -56,7 +56,7 @@ <tr valign="top"> <td width="20%" class="BlockLabel"><fmt:message key="common.label.Name"/></td> <td width="30%" class="BlockContent"><c:out value="${alertDef.name}"/> - <c:if test="${alertDef.parentId > 0 && isSuperUser}"> + <c:if test="${canViewResourceTypeAlertTemplate}"> <br/> <html:link page="/alerts/Config.do?mode=viewDefinition&aetid=${Resource.appdefResourceTypeValue.appdefTypeKey}&ad=${alertDef.parentId}"> <fmt:message key="alert.config.props.PB.ViewTypeDef"/> |
|
From: <dcr...@hy...> - 2010-02-09 17:56:08
|
Author: dcrutchf Date: 2010-02-09 09:56:00 -0800 (Tue, 09 Feb 2010) New Revision: 14269 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14269 Modified: trunk/web/css/win.css Log: style tweak Modified: trunk/web/css/win.css =================================================================== --- trunk/web/css/win.css 2010-02-09 17:48:02 UTC (rev 14268) +++ trunk/web/css/win.css 2010-02-09 17:56:00 UTC (rev 14269) @@ -2087,7 +2087,7 @@ font-size:12px; margin:0 0 6px; padding:4px; - height:19px; + height:22px; } #DashboardForm select{ padding:1px; |
|
From: <dcr...@hy...> - 2010-02-09 17:48:10
|
Author: dcrutchf Date: 2010-02-09 09:48:02 -0800 (Tue, 09 Feb 2010) New Revision: 14268 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14268 Modified: trunk/web/css/HQ_40.css Log: style tweak Modified: trunk/web/css/HQ_40.css =================================================================== --- trunk/web/css/HQ_40.css 2010-02-09 09:26:07 UTC (rev 14267) +++ trunk/web/css/HQ_40.css 2010-02-09 17:48:02 UTC (rev 14268) @@ -2585,7 +2585,9 @@ } .formButtonContainer { - margin-top:25px; + background-color:#fff; + margin-bottom:10px; + padding:10px 0; text-align:center; width:100%; } |
|
From: <bo...@hy...> - 2010-02-09 09:26:16
|
Author: bob Date: 2010-02-09 01:26:07 -0800 (Tue, 09 Feb 2010) New Revision: 14267 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14267 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1345 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-09 01:54:48 UTC (rev 14266) +++ trunk/etc/version.properties 2010-02-09 09:26:07 UTC (rev 14267) @@ -1,3 +1,3 @@ -#Mon Feb 08 00:34:09 PST 2010 +#Tue Feb 09 00:35:16 PST 2010 version=4.3.0 -build=1344 +build=1345 |
|
From: <dcr...@hy...> - 2010-02-09 02:23:47
|
Author: dcrutchf Date: 2010-02-08 17:54:48 -0800 (Mon, 08 Feb 2010) New Revision: 14266 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14266 Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties Log: Updated copyright to 2010 Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-02-09 01:50:36 UTC (rev 14265) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-02-09 01:54:48 UTC (rev 14266) @@ -252,7 +252,7 @@ # FOOTER footer.HQ=About HQ -footer.Copyright=© 2004-2009 Hyperic, Inc. +footer.Copyright=© 2004-2010 Hyperic, Inc. footer.version=Version footer.pageVersionPrefix=(page footer.pageVersionSuffix=) |
|
From: <no...@gi...> - 2010-02-09 01:21:31
|
Branch: refs/heads/master Home: http://github.com/hyperic/hqapi Commit: 93774bad181cc87708f3fad5fce701fcec713067 http://github.com/hyperic/hqapi/commit/93774bad181cc87708f3fad5fce701fcec713067 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-08 (Mon, 08 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --platform flag for command line group syncing. Commit: 63d8a3ea53804db0078a3d1c0201860f038c2021 http://github.com/hyperic/hqapi/commit/63d8a3ea53804db0078a3d1c0201860f038c2021 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-08 (Mon, 08 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-1.0' into hqapi-2.x Commit: 5fa921f61dc8204f9c85b450c07e0114202de00b http://github.com/hyperic/hqapi/commit/5fa921f61dc8204f9c85b450c07e0114202de00b Author: Ryan Morgan <rm...@hy...> Date: 2010-02-08 (Mon, 08 Feb 2010) Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for --platform flag support for group sync. Commit: a3f0030d97815bf54bd08fc531b4b3a87c8c591b http://github.com/hyperic/hqapi/commit/a3f0030d97815bf54bd08fc531b4b3a87c8c591b Author: Ryan Morgan <rm...@hy...> Date: 2010-02-08 (Mon, 08 Feb 2010) Changed paths: M ChangeLog M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-2.x' |
|
From: <no...@gi...> - 2010-02-09 00:54:10
|
Branch: refs/heads/hqapi-1.0 Home: http://github.com/hyperic/hqapi Commit: 93774bad181cc87708f3fad5fce701fcec713067 http://github.com/hyperic/hqapi/commit/93774bad181cc87708f3fad5fce701fcec713067 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-08 (Mon, 08 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --platform flag for command line group syncing. |
|
From: <no...@gi...> - 2010-02-09 00:54:00
|
Branch: refs/heads/hqapi-2.x Home: http://github.com/hyperic/hqapi Commit: 93774bad181cc87708f3fad5fce701fcec713067 http://github.com/hyperic/hqapi/commit/93774bad181cc87708f3fad5fce701fcec713067 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-08 (Mon, 08 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Add --platform flag for command line group syncing. Commit: 63d8a3ea53804db0078a3d1c0201860f038c2021 http://github.com/hyperic/hqapi/commit/63d8a3ea53804db0078a3d1c0201860f038c2021 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-08 (Mon, 08 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- Merge branch 'hqapi-1.0' into hqapi-2.x Commit: 5fa921f61dc8204f9c85b450c07e0114202de00b http://github.com/hyperic/hqapi/commit/5fa921f61dc8204f9c85b450c07e0114202de00b Author: Ryan Morgan <rm...@hy...> Date: 2010-02-08 (Mon, 08 Feb 2010) Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for --platform flag support for group sync. |
14 messages has been excluded from this view by a project administrator.
