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-03 00:50:27
|
Branch: refs/heads/hqapi-2.x Home: http://github.com/hyperic/hqapi Commit: e99e706b5a4311907fbae00c722f865b69b81e78 http://github.com/hyperic/hqapi/commit/e99e706b5a4311907fbae00c722f865b69b81e78 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-02 (Tue, 02 Feb 2010) Changed paths: M src/org/hyperic/hq/hqapi1/tools/GroupCommand.java Log Message: ----------- [HHQ-3709] Allow group syncing via command line arguments to include child resources. Commit: 222f7560aadafae1edee2f6471a8b562db9e65ef http://github.com/hyperic/hqapi/commit/222f7560aadafae1edee2f6471a8b562db9e65ef Author: Ryan Morgan <rm...@hy...> Date: 2010-02-02 (Tue, 02 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: e9dac394054fc23082f58b168dfd03b6ef3e1742 http://github.com/hyperic/hqapi/commit/e9dac394054fc23082f58b168dfd03b6ef3e1742 Author: Ryan Morgan <rm...@hy...> Date: 2010-02-02 (Tue, 02 Feb 2010) Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog for HHQ-3709 |
|
From: Doug M. <do...@hy...> - 2010-02-02 22:53:47
|
The shell command sources should also be helpful: http://github.com/hyperic/sigar/tree/master/bindings/java/src/org/hyperic/sigar/cmd/ |
|
From: Doug M. <do...@hy...> - 2010-02-02 22:50:57
|
Hi Gerald, Your synopsis on both classes is correct, there is a bit more detail on SigarProxyCache here: http://forums.hyperic.com/jiveforums/thread.jspa?threadID=628 Glad you appreciate the Humidor name! You would only need a Humidor to share a Sigar object between multiple threads. Sigar uses the reentrant versions of libc (or similar) functions underneath and any state is encapsulated with the underlying sigar_t object (no static variables). So, there is no synchronization required if each thread is using its own instance of a Sigar object. Looks like the ProcessFinder is hardwired to expect a SigarProxyCache impl: /** * @deprecated */ public ProcessFinder(SigarProxy proxy) { this(SigarProxyCache.getSigar(proxy)); } SigarProxy usage with ProcessFinder is also deprecated as of 1.5, when we ported the PTQL impl from Java to C. Even if ProcessFinder handled the Humidor case, the synchronization would be by-passed as would the caching of SigarProxyCache. So, if you're not making concurrent calls to ProcessFinder.find, the fix would be just to pass your Sigar curSigar object instead. Otherwise, you should synchronize the calls to ProcessFinder. And in any case we should add synchronization support to the ProcessFinder so you don't have to worry about it: http://jira.hyperic.com/browse/SIGAR-204 -Doug |
|
From: Gerald T. <gt...@e2...> - 2010-02-02 18:38:54
|
I've checked the online documentation and the Jira on these new objects and I'm a bit fuzzy on how they are used. I'm getting and exception using them and suspect I'm doing it wrong and the docs are a bit sparse. I *THINK* that the Humidor uses the SigarProxyCache underneath it and of course that uses the Sigar class inside it. I *THINK* that the SigarProxyCache just generates proxy objects for caching purposes and the Humidor goes one step further and produces SigarProxyCache object that are thread safe .... but I am not sure on this. I'm specifically interested on how to initialize these objects considering the possible interdependencies. Could someone explain this dynamic for me ... BTW I did appreciate the Humidor class name! -Gerald Talton E2open |
|
From: Gerald T. <gt...@e2...> - 2010-02-02 18:38:53
|
as a followup .. here is the exception:
=======================================================
INFO | jvm 1 | 2010/02/01 14:00:02 | SEVERE: Job (DEFAULT.com.e2open.smi.explorers.vitria threw an exception.
INFO | jvm 1 | 2010/02/01 14:00:02 | org.quartz.SchedulerException: Job threw an unhandled exception. [See nested exception: java.lang.ClassCastException: org.hyperic.sigar.Humidor$MyHandler]
INFO | jvm 1 | 2010/02/01 14:00:02 | at org.quartz.core.JobRunShell.run(JobRunShell.java:206)
INFO | jvm 1 | 2010/02/01 14:00:02 | at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:520)
INFO | jvm 1 | 2010/02/01 14:00:02 | * Nested Exception (Underlying Cause) ---------------
INFO | jvm 1 | 2010/02/01 14:00:02 | java.lang.ClassCastException: org.hyperic.sigar.Humidor$MyHandler
INFO | jvm 1 | 2010/02/01 14:00:02 | at org.hyperic.sigar.SigarProxyCache.getHandler(SigarProxyCache.java:86)
INFO | jvm 1 | 2010/02/01 14:00:02 | at org.hyperic.sigar.SigarProxyCache.getSigar(SigarProxyCache.java:98)
INFO | jvm 1 | 2010/02/01 14:00:02 | at org.hyperic.sigar.ptql.ProcessFinder.<init>(ProcessFinder.java:35)
INFO | jvm 1 | 2010/02/01 14:00:02 | at org.hyperic.sigar.ptql.ProcessFinder.find(ProcessFinder.java:64)
INFO | jvm 1 | 2010/02/01 14:00:02 | at com.e2open.smi.bundles.sigar.SigarService.processFinderFindPidsByString(SigarService.java:644)
INFO | jvm 1 | 2010/02/01 14:00:02 | at com.e2open.smi.explorers.vitria.VitriaExplorer.isVitriaRunning(VitriaExplorer.java:39)
INFO | jvm 1 | 2010/02/01 14:00:02 | at com.e2open.smi.explorers.vitria.VitriaExplorer.doExploration(VitriaExplorer.java:24)
INFO | jvm 1 | 2010/02/01 14:00:02 | at com.e2open.smi.bundles.expmgr.Explorer.explore(Explorer.java:85)
INFO | jvm 1 | 2010/02/01 14:00:02 | at com.e2open.smi.bundles.expmgr.ExplorerManager$ExplorerJob.execute(ExplorerManager.java:39)
INFO | jvm 1 | 2010/02/01 14:00:02 | at org.quartz.core.JobRunShell.run(JobRunShell.java:195)
INFO | jvm 1 | 2010/02/01 14:00:02 | at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:520)
=======================================================
and here is a code snippet where I initialize Sigar in my object
=======================================================
private Humidor curHumidor;
private SigarProxyCache curProxyCache;
private Sigar curSigar;
public void activate(ComponentContext compctx) throws Exception {
System.out.println("activating SIGAR service");
if (logger != null) logger.info("activating SIGAR service");
this.compctx = compctx;
curSigar = getInstance();
curProxyCache = new SigarProxyCache(curSigar, SigarProxyCache.EXPIRE_DEFAULT );
curHumidor = new Humidor(curSigar);
...
public long[] processFinderFindPidsByString( String ptqlString ) throws SigarException {
long[] pids;
System.out.println("entering SigarService.processFinderFindPidsByString()");
pids = ProcessFinder.find(curHumidor.getSigar(), ptqlString);
System.out.println("entering SigarService.processFinderFindPidsByString()");
return pids;
}
=======================================================
I suspect I'm doing something wrong in the initialization of these classes but have run out of ideas on what to do. Any help is appreciated.
-Gerald Talton
E2open
|
|
From: <bo...@hy...> - 2010-02-02 09:19:45
|
Author: bob Date: 2010-02-02 01:19:37 -0800 (Tue, 02 Feb 2010) New Revision: 14252 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14252 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1338 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-02-01 09:26:07 UTC (rev 14251) +++ trunk/etc/version.properties 2010-02-02 09:19:37 UTC (rev 14252) @@ -1,3 +1,3 @@ -#Mon Feb 01 00:28:06 PST 2010 +#Tue Feb 02 00:29:13 PST 2010 version=4.3.0 -build=1337 +build=1338 |
|
From: <no...@gi...> - 2010-02-01 17:18:20
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: d8706ecdb9c525ee46f6c13c113a633533d8c05d http://github.com/hyperic/hqapi/commit/d8706ecdb9c525ee46f6c13c113a633533d8c05d Author: Jennifer Hickey <jen...@sp...> Date: 2010-02-01 (Mon, 01 Feb 2010) Changed paths: M hqu/hqapi1/app/ServerconfigController.groovy Log Message: ----------- Fixed getOne refactoring error |
|
From: <no...@gi...> - 2010-02-01 16:50:50
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: e3a94666f37e98345f77810150728413a84b17ea http://github.com/hyperic/hqapi/commit/e3a94666f37e98345f77810150728413a84b17ea Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-02-01 (Mon, 01 Feb 2010) Changed paths: M hqu/hqapi1/app/AlertController.groovy M hqu/hqapi1/app/ApplicationController.groovy M hqu/hqapi1/app/ServerconfigController.groovy Log Message: ----------- HE-449 Removed all remaining getOnes |
|
From: <bo...@hy...> - 2010-02-01 09:26:15
|
Author: bob Date: 2010-02-01 01:26:07 -0800 (Mon, 01 Feb 2010) New Revision: 14251 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14251 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1337 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-31 09:22:09 UTC (rev 14250) +++ trunk/etc/version.properties 2010-02-01 09:26:07 UTC (rev 14251) @@ -1,3 +1,3 @@ -#Sun Jan 31 00:27:20 PST 2010 +#Mon Feb 01 00:28:06 PST 2010 version=4.3.0 -build=1336 +build=1337 |
|
From: <no...@gi...> - 2010-02-01 02:51:17
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: a799cbc06c119bacecb8fe464ae2c4db1aedd884 http://github.com/hyperic/hqapi/commit/a799cbc06c119bacecb8fe464ae2c4db1aedd884 Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-01-31 (Sun, 31 Jan 2010) Changed paths: M hqu/hqapi1/app/ApplicationController.groovy Log Message: ----------- HE-449 Removed ApplicationManager getOne |
|
From: <no...@gi...> - 2010-01-31 23:58:42
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: dbbe30e7006c5aed01e481d5a8b3cb0a394446cb http://github.com/hyperic/hqapi/commit/dbbe30e7006c5aed01e481d5a8b3cb0a394446cb Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-01-31 (Sun, 31 Jan 2010) Changed paths: M hqu/hqapi1/app/AlertController.groovy M hqu/hqapi1/app/AlertdefinitionController.groovy Log Message: ----------- Removed getOne methods from AlertDefinitionManager and AlertManager |
|
From: <bo...@hy...> - 2010-01-31 09:22:17
|
Author: bob Date: 2010-01-31 01:22:09 -0800 (Sun, 31 Jan 2010) New Revision: 14250 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14250 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1336 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-30 09:13:15 UTC (rev 14249) +++ trunk/etc/version.properties 2010-01-31 09:22:09 UTC (rev 14250) @@ -1,3 +1,3 @@ -#Sat Jan 30 00:24:13 PST 2010 +#Sun Jan 31 00:27:20 PST 2010 version=4.3.0 -build=1335 +build=1336 |
|
From: <bo...@hy...> - 2010-01-30 09:13:23
|
Author: bob Date: 2010-01-30 01:13:15 -0800 (Sat, 30 Jan 2010) New Revision: 14249 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14249 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1335 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-29 22:56:33 UTC (rev 14248) +++ trunk/etc/version.properties 2010-01-30 09:13:15 UTC (rev 14249) @@ -1,3 +1,3 @@ -#Fri Jan 29 00:26:04 PST 2010 +#Sat Jan 30 00:24:13 PST 2010 version=4.3.0 -build=1334 +build=1335 |
|
From: <dcr...@hy...> - 2010-01-29 22:56:41
|
Author: dcrutchf Date: 2010-01-29 14:56:33 -0800 (Fri, 29 Jan 2010) New Revision: 14248 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14248 Added: trunk/web/images/4.0/backgrounds/button-green-background.jpg trunk/web/images/4.0/backgrounds/button-grey-background.jpg Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties trunk/web/WEB-INF/jsp/login.jsp trunk/web/css/HQ_40.css Log: Tweaked UI a bit Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-29 20:00:31 UTC (rev 14247) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-29 22:56:33 UTC (rev 14248) @@ -135,7 +135,8 @@ login.signin=Sign in login.signin.message=Sign in to Hyperic HQ login.signin.instructions=Please enter your username and password to sign in. -login.signInAsGuest=Sign in as guest user +login.or=Or, +login.signInAsGuest=sign in as guest user login.field.password=Password login.field.username=Username login.error.login=You have entered an invalid username and/or password. Modified: trunk/web/WEB-INF/jsp/login.jsp =================================================================== --- trunk/web/WEB-INF/jsp/login.jsp 2010-01-29 20:00:31 UTC (rev 14247) +++ trunk/web/WEB-INF/jsp/login.jsp 2010-01-29 22:56:33 UTC (rev 14248) @@ -56,11 +56,13 @@ <label for="j_password"><fmt:message key="login.field.password" /></label> <input style="width: 75%;" id="passwordInput" type="password" id="j_password" name="j_password" /> </div> - <div class="button"> + <div class="submitButtonContainer"> + <input type="submit" name="submit" class="button42" value="<fmt:message key="login.signin" />" /> <c:if test="${guestEnabled}"> - <a href="#" id="guestLoginLink" class="guestuser"><fmt:message key="login.signInAsGuest" /></a> + <div class="guestUserLinkContainer"> + <fmt:message key="login.or" /> <a href="#" id="guestLoginLink" class="guestUser"><fmt:message key="login.signInAsGuest" /></a> + </div> </c:if> - <input type="submit" name="submit" class="button42" value="<fmt:message key="login.signin" />" /> </div> </fieldset> </form> Modified: trunk/web/css/HQ_40.css =================================================================== --- trunk/web/css/HQ_40.css 2010-01-29 20:00:31 UTC (rev 14247) +++ trunk/web/css/HQ_40.css 2010-01-29 22:56:33 UTC (rev 14248) @@ -502,9 +502,23 @@ margin-right:5px; } -.loginPanel .guestuser { +.loginPanel input[type="submit"] { + font-size: 1.1em ! important; +} + +.loginPanel .submitButtonContainer { + text-align: right; + margin-right: 10px; +} + +.loginPanel .guestUserLinkContainer { + margin-top: 5px; + text-align: right; +} + +.loginPanel .guestUser { color:#45A8DF; - margin-right:10px; + margin-right:0; } .loginButtons { @@ -2370,9 +2384,9 @@ width:auto; overflow:visible; border: 1px solid #84B96D; - background-color: #2DBF3D; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; + background: #2DBF3D url(../images/4.0/backgrounds/button-green-background.jpg) repeat-x bottom; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; border-radius: 3px; padding: 3px 5px; cursor:pointer; @@ -2380,7 +2394,7 @@ .button42disabled { color: #888; - background-color: #ccc; + background: #bbb url(../images/4.0/backgrounds/button-grey-background.jpg) repeat-x bottom; border-color: #aaa; cursor: default } @@ -2568,4 +2582,26 @@ background: url(../images/icon_available_error.gif) no-repeat; height: 12px; width: 12px; +} + +.formButtonContainer { + margin-top:25px; + text-align:center; + width:100%; +} + +.formButtonContainer input[type=button] { + margin-right:8px; +} + +.formButtonContainer .reset, +.formButtonContainer .cancel { + background: #bbb url(../images/4.0/backgrounds/button-grey-background.jpg) repeat-x bottom; + border-color:#ddd; +} + +.footerMessageContainer { + margin-top:15px; + text-align:center; + width:100%; } \ No newline at end of file Added: trunk/web/images/4.0/backgrounds/button-green-background.jpg =================================================================== (Binary files differ) Property changes on: trunk/web/images/4.0/backgrounds/button-green-background.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/web/images/4.0/backgrounds/button-grey-background.jpg =================================================================== (Binary files differ) Property changes on: trunk/web/images/4.0/backgrounds/button-grey-background.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <rm...@hy...> - 2010-01-29 20:00:40
|
Author: rmorgan Date: 2010-01-29 12:00:31 -0800 (Fri, 29 Jan 2010) New Revision: 14247 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14247 Modified: trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice/SNMPTrapReceiver.java Log: [HHQ-3702] Include community string in debug logging when the log track plugin cannot be found. Modified: trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice/SNMPTrapReceiver.java =================================================================== --- trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice/SNMPTrapReceiver.java 2010-01-29 09:15:05 UTC (rev 14246) +++ trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice/SNMPTrapReceiver.java 2010-01-29 20:00:31 UTC (rev 14247) @@ -259,7 +259,7 @@ if (plugin != null) { if (log.isDebugEnabled()) { - log.debug("No plugin for " + address + ", routing to default platform: " + plugin.getName()); + log.debug("No plugin for '" + address + "', '" + community + "', routing to default platform: " + plugin.getName()); } } } |
|
From: <no...@gi...> - 2010-01-29 18:12:48
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 26a8d901623ffc871bf73f1765197d083f53d45f http://github.com/hyperic/hqapi/commit/26a8d901623ffc871bf73f1765197d083f53d45f Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-01-29 (Fri, 29 Jan 2010) Changed paths: M hqu/hqapi1/app/AlertdefinitionController.groovy Log Message: ----------- Fixed broken getBean reference |
|
From: <no...@gi...> - 2010-01-29 17:23:54
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 3897840beab9c8899c4ae7d8a64c79f57a224064 http://github.com/hyperic/hqapi/commit/3897840beab9c8899c4ae7d8a64c79f57a224064 Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-01-29 (Fri, 29 Jan 2010) Changed paths: M hqu/hqapi1/app/AlertdefinitionController.groovy M hqu/hqapi1/app/EventController.groovy Log Message: ----------- Removed several getOnes Commit: f4640dcc6d99581d1c9d7c06de3dbc3d7d8beb00 http://github.com/hyperic/hqapi/commit/f4640dcc6d99581d1c9d7c06de3dbc3d7d8beb00 Author: Jennifer Hickey <jhickey@calculon.local> Date: 2010-01-29 (Fri, 29 Jan 2010) Changed paths: M build.xml A lib/com.springsource.com.cenqua.clover-2.4.2.jar Log Message: ----------- Merge branch 'evolution' of gi...@gi...:hyperic/hqapi into evolution |
|
From: <bo...@hy...> - 2010-01-29 09:15:16
|
Author: bob Date: 2010-01-29 01:15:05 -0800 (Fri, 29 Jan 2010) New Revision: 14246 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14246 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1334 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-29 05:41:31 UTC (rev 14245) +++ trunk/etc/version.properties 2010-01-29 09:15:05 UTC (rev 14246) @@ -1,3 +1,3 @@ -#Thu Jan 28 00:28:08 PST 2010 +#Fri Jan 29 00:26:04 PST 2010 version=4.3.0 -build=1333 +build=1334 |
|
From: Mirko P. <m.p...@gm...> - 2010-01-29 07:28:31
|
Hi, have a look at the SIGAR tests and the Javadoc: http://github.com/hyperic/sigar/tree/master/bindings/java/src/org/hyperic/sigar/test/ http://www.hyperic.com/support/docs/sigar/ Mirko |
|
From: <pn...@hy...> - 2010-01-29 05:41:39
|
Author: pnguyen Date: 2010-01-28 21:41:31 -0800 (Thu, 28 Jan 2010) New Revision: 14245 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14245 Modified: trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java Log: [HQ-2044] Make "variable bindings" an optional config; Improve validation and error handling. Modified: trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java 2010-01-29 05:18:02 UTC (rev 14244) +++ trunk/src/org/hyperic/hq/bizapp/shared/action/SnmpActionConfig.java 2010-01-29 05:41:31 UTC (rev 14245) @@ -20,7 +20,7 @@ protected String snmpNotificationMechanism; protected String variableBindings; // in JSON format - private String implementor = + private static String implementor = "com.hyperic.hq.bizapp.server.action.alert.SnmpAction"; public SnmpActionConfig() { @@ -95,6 +95,7 @@ StringConfigOption variableBindings = new StringConfigOption(CFG_VARIABLE_BINDINGS, "User Variable Bindings", "[]"); + variableBindings.setOptional(true); res.addOption(variableBindings); return res; |
Author: dcrutchf Date: 2010-01-28 21:18:02 -0800 (Thu, 28 Jan 2010) New Revision: 14244 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14244 Added: trunk/src/org/hyperic/hq/common/AccountDisabledException.java trunk/src/org/hyperic/hq/common/PasswordIsNullException.java trunk/src/org/hyperic/hq/common/ServerStillStartingException.java Modified: trunk/src/org/hyperic/hq/auth/server/session/AuthManagerEJBImpl.java trunk/src/org/hyperic/hq/bizapp/server/session/AuthBossEJBImpl.java trunk/src/org/hyperic/hq/bizapp/server/session/LatherDispatcher.java trunk/src/org/hyperic/hq/ui/login/LoginController.java trunk/src/org/hyperic/hq/ui/security/BaseSessionInitializationStrategy.java trunk/src/org/hyperic/hq/ui/security/InternalAuthenticationProvider.java trunk/src/org/hyperic/hq/ui/security/UISessionInitializationStrategy.java trunk/web/WEB-INF/classes/ApplicationResources.properties trunk/web/WEB-INF/jsp/login.jsp Log: Updated error handling Modified: trunk/src/org/hyperic/hq/auth/server/session/AuthManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/auth/server/session/AuthManagerEJBImpl.java 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/src/org/hyperic/hq/auth/server/session/AuthManagerEJBImpl.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -42,12 +42,14 @@ import org.hyperic.hq.authz.server.session.AuthzSubjectManagerEJBImpl; import org.hyperic.hq.authz.shared.AuthzSubjectManagerLocal; import org.hyperic.hq.authz.shared.PermissionException; +import org.hyperic.hq.common.AccountDisabledException; import org.hyperic.hq.common.ApplicationException; +import org.hyperic.hq.common.PasswordIsNullException; +import org.hyperic.hq.common.ServerStillStartingException; import org.hyperic.hq.common.SystemException; import org.hyperic.hq.common.shared.HQConstants; import org.hyperic.hq.dao.PrincipalDAO; import org.hyperic.hq.product.server.session.ProductManagerEJBImpl; -import org.hyperic.util.ConfigPropertyException; import org.jboss.security.Util; import org.jboss.security.auth.callback.UsernamePasswordHandler; @@ -86,14 +88,18 @@ * @ejb:transaction type="Supports" */ public int getSessionId(String user, String password) - throws SecurityException, LoginException, ConfigPropertyException, - ApplicationException + throws LoginException, + ApplicationException, + PasswordIsNullException, + ServerStillStartingException, + AccountDisabledException { - if(password == null) - throw new LoginException("No password was given"); - + if(password == null) { + throw new PasswordIsNullException("No password was given"); + } + if (!isReady()) { - throw new LoginException("Server still starting"); + throw new ServerStillStartingException("Server still starting"); } UsernamePasswordHandler handler = @@ -112,7 +118,7 @@ try { subject = subjMan.findSubjectByAuth(user, appName); if (!subject.getActive()) { - throw new LoginException("User account has been disabled."); + throw new AccountDisabledException("User account has been disabled."); } } catch (SubjectNotFoundException fe) { // User not found in the authz system. Create it. @@ -121,8 +127,7 @@ subject = subjMan.createSubject(overlord, user, true, appName, "", "", "", "", "", "", false); } catch (CreateException e) { - throw new ApplicationException("Unable to add user to " + - "authorization system", e); + throw new ApplicationException("Unable to add user to authorization system", e); } } Modified: trunk/src/org/hyperic/hq/bizapp/server/session/AuthBossEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/AuthBossEJBImpl.java 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/src/org/hyperic/hq/bizapp/server/session/AuthBossEJBImpl.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -25,7 +25,6 @@ package org.hyperic.hq.bizapp.server.session; -import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Iterator; @@ -45,7 +44,10 @@ import org.hyperic.hq.authz.server.session.AuthzSubject; import org.hyperic.hq.authz.shared.AuthzConstants; import org.hyperic.hq.authz.shared.PermissionException; +import org.hyperic.hq.common.AccountDisabledException; import org.hyperic.hq.common.ApplicationException; +import org.hyperic.hq.common.PasswordIsNullException; +import org.hyperic.hq.common.ServerStillStartingException; import org.hyperic.hq.common.SystemException; import org.hyperic.hq.zevents.ZeventManager; import org.hyperic.hq.zevents.ZeventListener; @@ -128,11 +130,17 @@ * @param username The name of the user. * @param password The password. * @return An integer representing the session ID of the logged-in user. + * @throws AccountDisabledException + * @throws ServerStillStartingException + * @throws PasswordIsNullException * @ejb:interface-method */ public int login ( String username, String password ) - throws SecurityException, LoginException, ApplicationException, - ConfigPropertyException + throws LoginException, + ApplicationException, + PasswordIsNullException, + ServerStillStartingException, + AccountDisabledException { try { int res = getAuthManager().getSessionId(username, password); @@ -153,8 +161,7 @@ * @ejb:interface-method */ public int loginGuest () - throws SecurityException, LoginException, ApplicationException, - ConfigPropertyException + throws LoginException, AccountDisabledException { try { AuthzSubject guest = @@ -163,7 +170,7 @@ if (guest != null && guest.getActive()) { return manager.put(guest); } - throw new LoginException("Guest account not enabled"); + throw new AccountDisabledException("Guest account not enabled"); } catch (AccessLocalException e) { throw new LoginException(e.getMessage()); } Modified: trunk/src/org/hyperic/hq/bizapp/server/session/LatherDispatcher.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/LatherDispatcher.java 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/src/org/hyperic/hq/bizapp/server/session/LatherDispatcher.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -93,7 +93,10 @@ import org.hyperic.hq.bizapp.shared.lather.UpdateAgent_result; import org.hyperic.hq.bizapp.shared.lather.UserIsValid_args; import org.hyperic.hq.bizapp.shared.lather.UserIsValid_result; +import org.hyperic.hq.common.AccountDisabledException; import org.hyperic.hq.common.ApplicationException; +import org.hyperic.hq.common.PasswordIsNullException; +import org.hyperic.hq.common.ServerStillStartingException; import org.hyperic.hq.common.SystemException; import org.hyperic.hq.common.util.Messenger; import org.hyperic.hq.control.shared.ControlManagerLocal; @@ -258,16 +261,26 @@ "' tried to " + operation + " an Agent @ " + ctx.getCallerIP(), exc); throw new PermissionException(); - } catch(ConfigPropertyException exc){ - log.warn("Config property exception when '" + user + - "' tried to " + operation + " an Agent @ " + - ctx.getCallerIP(), exc); - throw new PermissionException(); } catch(SystemException exc){ log.warn("System exception when '" + user + "' tried to " + operation + " an Agent @ " + ctx.getCallerIP(), exc); throw new PermissionException(); + } catch (PasswordIsNullException exc) { + log.warn("Password is null exception when '" + user + + "' tried to " + operation + " an Agent @ " + + ctx.getCallerIP(), exc); + throw new PermissionException(); + } catch (ServerStillStartingException exc) { + log.warn("Server still starting exception when '" + user + + "' tried to " + operation + " an Agent @ " + + ctx.getCallerIP(), exc); + throw new PermissionException(); + } catch (AccountDisabledException exc) { + log.warn("Account disabled exception when '" + user + + "' tried to " + operation + " an Agent @ " + + ctx.getCallerIP(), exc); + throw new PermissionException(); } } Added: trunk/src/org/hyperic/hq/common/AccountDisabledException.java =================================================================== --- trunk/src/org/hyperic/hq/common/AccountDisabledException.java (rev 0) +++ trunk/src/org/hyperic/hq/common/AccountDisabledException.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -0,0 +1,28 @@ +package org.hyperic.hq.common; + +import java.io.Serializable; + +import org.hyperic.util.NestedException; + +public class AccountDisabledException +extends NestedException +implements Serializable +{ + private static final long serialVersionUID = 1L; + + public AccountDisabledException() { + super(); + } + + public AccountDisabledException(String message) { + super(message); + } + + public AccountDisabledException(Throwable throwable) { + super(throwable); + } + + public AccountDisabledException(String message, Throwable throwable) { + super(message, throwable); + } +} \ No newline at end of file Added: trunk/src/org/hyperic/hq/common/PasswordIsNullException.java =================================================================== --- trunk/src/org/hyperic/hq/common/PasswordIsNullException.java (rev 0) +++ trunk/src/org/hyperic/hq/common/PasswordIsNullException.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -0,0 +1,28 @@ +package org.hyperic.hq.common; + +import java.io.Serializable; + +import org.hyperic.util.NestedException; + +public class PasswordIsNullException +extends NestedException +implements Serializable +{ + private static final long serialVersionUID = 1L; + + public PasswordIsNullException() { + super(); + } + + public PasswordIsNullException(String message) { + super(message); + } + + public PasswordIsNullException(Throwable throwable) { + super(throwable); + } + + public PasswordIsNullException(String message, Throwable throwable) { + super(message, throwable); + } +} Added: trunk/src/org/hyperic/hq/common/ServerStillStartingException.java =================================================================== --- trunk/src/org/hyperic/hq/common/ServerStillStartingException.java (rev 0) +++ trunk/src/org/hyperic/hq/common/ServerStillStartingException.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -0,0 +1,28 @@ +package org.hyperic.hq.common; + +import java.io.Serializable; + +import org.hyperic.util.NestedException; + +public class ServerStillStartingException +extends NestedException +implements Serializable +{ + private static final long serialVersionUID = 1L; + + public ServerStillStartingException() { + super(); + } + + public ServerStillStartingException(String message) { + super(message); + } + + public ServerStillStartingException(Throwable throwable) { + super(throwable); + } + + public ServerStillStartingException(String message, Throwable throwable) { + super(message, throwable); + } +} Modified: trunk/src/org/hyperic/hq/ui/login/LoginController.java =================================================================== --- trunk/src/org/hyperic/hq/ui/login/LoginController.java 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/src/org/hyperic/hq/ui/login/LoginController.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -11,9 +12,12 @@ import org.hyperic.hq.authz.server.session.AuthzSubjectManagerEJBImpl; import org.hyperic.hq.authz.shared.AuthzConstants; import org.hyperic.hq.authz.shared.AuthzSubjectManagerLocal; +import org.hyperic.hq.ui.util.RequestUtils; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -52,6 +56,21 @@ AuthzSubjectManagerLocal authzManager = AuthzSubjectManagerEJBImpl.getOne(); AuthzSubject guestUser = authzManager.findSubjectById(AuthzConstants.guestId); + // ...before we return, check for an error message... + boolean loginError = request.getParameter("authfailed") != null; + + if (loginError) { + HttpSession session = request.getSession(false); + + if (session != null) { + AuthenticationException ex = (AuthenticationException) session.getAttribute(AbstractAuthenticationProcessingFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY); + + if (ex != null) { + result.addObject("errorMessage", RequestUtils.message(request, ex.getMessage())); + } + } + } + result.addObject("guestUsername", (guestUser != null) ? guestUser.getName() : "guest"); result.addObject("guestEnabled", (guestUser != null && guestUser.getActive())); Modified: trunk/src/org/hyperic/hq/ui/security/BaseSessionInitializationStrategy.java =================================================================== --- trunk/src/org/hyperic/hq/ui/security/BaseSessionInitializationStrategy.java 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/src/org/hyperic/hq/ui/security/BaseSessionInitializationStrategy.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -27,7 +27,6 @@ import org.hyperic.hq.authz.shared.PermissionException; import org.hyperic.hq.bizapp.shared.AuthBoss; import org.hyperic.hq.bizapp.shared.AuthzBoss; -import org.hyperic.hq.common.ApplicationException; import org.hyperic.hq.common.shared.HQConstants; import org.hyperic.hq.ui.Constants; import org.hyperic.hq.ui.WebUser; @@ -41,17 +40,18 @@ @Component public class BaseSessionInitializationStrategy implements SessionAuthenticationStrategy { private static Log log = LogFactory.getLog(BaseSessionInitializationStrategy.class.getName()); - + public void onAuthentication(Authentication authentication, HttpServletRequest request, HttpServletResponse response) throws SessionAuthenticationException { final boolean debug = log.isDebugEnabled(); if (debug) log.debug("Initializing UI session parameters..."); + String username = authentication.getName(); + // The following is logic taken from the old HQ Authentication Filter try { AuthzSubjectManagerLocal authzSubjectManager = AuthzSubjectManagerEJBImpl.getOne(); - String username = authentication.getName(); int sessionId = SessionManager.getInstance().put(authzSubjectManager.findSubjectByName(username)); HttpSession session = request.getSession(); ServletContext ctx = session.getServletContext(); @@ -103,21 +103,21 @@ if (debug && needsRegistration) log.debug("Authentic user but no HQ entity, must have authenticated outside of HQ...needs registration"); } catch (SessionException e) { - log.error(e); - - throw new SessionAuthenticationException("Session exception occurred"); + if (debug) log.debug("Authentication of user {" + username + "} failed due to an session error."); + + throw new SessionAuthenticationException("login.error.application"); } catch (RemoteException e) { - log.error(e); - - throw new SessionAuthenticationException("Remote exception occurred"); + if (debug) log.debug("Authentication of user {" + username + "} failed due to an remote error."); + + throw new SessionAuthenticationException("login.error.application"); } catch (PermissionException e) { - log.error(e); - - throw new SessionAuthenticationException("Permission exception occurred"); + if (debug) log.debug("Authentication of user {" + username + "} failed due to an permissions error."); + + throw new SessionAuthenticationException("login.error.application"); } catch (FinderException e) { - log.error(e); - - throw new SessionAuthenticationException("Finder exception occurred"); + if (debug) log.debug("Authentication of user {" + username + "} failed due to an finder error."); + + throw new SessionAuthenticationException("login.error.application"); } } Modified: trunk/src/org/hyperic/hq/ui/security/InternalAuthenticationProvider.java =================================================================== --- trunk/src/org/hyperic/hq/ui/security/InternalAuthenticationProvider.java 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/src/org/hyperic/hq/ui/security/InternalAuthenticationProvider.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -13,9 +13,12 @@ import org.hyperic.hq.authz.shared.AuthzSubjectManagerLocal; import org.hyperic.hq.bizapp.server.session.AuthBossEJBImpl; import org.hyperic.hq.bizapp.shared.AuthBossLocal; +import org.hyperic.hq.common.AccountDisabledException; import org.hyperic.hq.common.ApplicationException; -import org.hyperic.util.ConfigPropertyException; +import org.hyperic.hq.common.PasswordIsNullException; +import org.hyperic.hq.common.ServerStillStartingException; import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.AuthenticationServiceException; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; @@ -28,9 +31,11 @@ * */ public class InternalAuthenticationProvider implements AuthenticationProvider { - private static Log log = LogFactory.getLog(InternalAuthenticationProvider.class.getName()); - + private static final Log log = LogFactory.getLog(InternalAuthenticationProvider.class.getName()); + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + final boolean debug = log.isDebugEnabled(); + // TODO: Once this is evolution, remove the getOne in favor of DI AuthBossLocal authBoss = AuthBossEJBImpl.getOne(); AuthzSubjectManagerLocal authzManager = AuthzSubjectManagerEJBImpl.getOne(); @@ -52,33 +57,27 @@ sid = authBoss.login(username, password); } - if (log.isTraceEnabled()) { - log.trace("Logged in as [" + username + "] with session id [" + sid + "]"); - } - } catch (SecurityException e) { - if (log.isDebugEnabled()) { - log.debug("Authentication of user {" + username + "} failed.", e); - } - - throw new BadCredentialsException("Login failed", e); + if (debug) log.debug("Logged in as [" + username + "] with session id [" + sid + "]"); } catch (LoginException e) { - if (log.isDebugEnabled()) { - log.debug("Authentication of user {" + username + "} failed.", e); - } + if (debug) log.debug("Authentication of user {" + username + "} failed due to a login error."); - throw new BadCredentialsException("Login failed", e); + throw new BadCredentialsException("login.error.login", e); } catch (ApplicationException e) { - if (log.isDebugEnabled()) { - log.debug("Authentication of user {" + username + "} failed.", e); - } + if (debug) log.debug("Authentication of user {" + username + "} failed due to an application error."); - throw new BadCredentialsException("Login failed", e); - } catch (ConfigPropertyException e) { - if (log.isDebugEnabled()) { - log.debug("Authentication of user {" + username + "} failed.", e); - } + throw new AuthenticationServiceException("login.error.application", e); + } catch (AccountDisabledException e) { + if (debug) log.debug("Authentication of user {" + username + "} failed because account is disabled."); - throw new BadCredentialsException("Login failed", e); + throw new BadCredentialsException("login.error.accountDisabled", e); + } catch (PasswordIsNullException e) { + if (debug) log.debug("Authentication of user {" + username + "} failed because password being null."); + + throw new BadCredentialsException("login.error.login", e); + } catch (ServerStillStartingException e) { + if (debug) log.debug("Authentication of user {" + username + "} failed because server is still starting up."); + + throw new AuthenticationServiceException("login.error.serverStillStarting", e); } // ...finally, we need to create a list grant authorities for Spring Security... Modified: trunk/src/org/hyperic/hq/ui/security/UISessionInitializationStrategy.java =================================================================== --- trunk/src/org/hyperic/hq/ui/security/UISessionInitializationStrategy.java 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/src/org/hyperic/hq/ui/security/UISessionInitializationStrategy.java 2010-01-29 05:18:02 UTC (rev 14244) @@ -1,14 +1,10 @@ package org.hyperic.hq.ui.security; import java.rmi.RemoteException; -import java.util.HashMap; import java.util.Iterator; -import java.util.List; -import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import javax.ejb.FinderException; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -16,17 +12,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hyperic.hq.auth.shared.SessionException; -import org.hyperic.hq.auth.shared.SessionManager; import org.hyperic.hq.auth.shared.SessionNotFoundException; import org.hyperic.hq.auth.shared.SessionTimeoutException; import org.hyperic.hq.authz.server.session.AuthzSubject; -import org.hyperic.hq.authz.server.session.AuthzSubjectManagerEJBImpl; -import org.hyperic.hq.authz.server.session.Operation; -import org.hyperic.hq.authz.shared.AuthzSubjectManagerLocal; -import org.hyperic.hq.authz.shared.AuthzSubjectValue; import org.hyperic.hq.authz.shared.PermissionException; -import org.hyperic.hq.bizapp.shared.AuthBoss; import org.hyperic.hq.bizapp.shared.AuthzBoss; import org.hyperic.hq.ui.Constants; import org.hyperic.hq.ui.WebUser; @@ -38,7 +27,6 @@ import org.hyperic.util.config.ConfigResponse; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.session.SessionAuthenticationException; -import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy; import org.springframework.stereotype.Component; /* Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties =================================================================== --- trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/web/WEB-INF/classes/ApplicationResources.properties 2010-01-29 05:18:02 UTC (rev 14244) @@ -138,13 +138,12 @@ login.signInAsGuest=Sign in as guest user login.field.password=Password login.field.username=Username -login.username=Login: -login.info.bad=You have entered an incorrect user name or password. -login.disabled=The user account has been disabled. -login.bad.backend=The server is still starting -login.info.general= were gonna need you to log into the EAM application -login.info.session.timeout="your session is timed out. please login agian" +login.error.login=You have entered an invalid username and/or password. +login.error.application=An error occurred while authenticating your credentials. +login.error.accountDisabled=The account associated with this username has been disabled. +login.error.serverStillStarting=The server is still starting. login.title=Sign In - Hyperic HQ + login.message= login.unsupportedBrowser=Browser Not Supported login.browserMessage=The browser that you are using is not supported by Hyperic HQ. You may continue to explore using this browser, but many features and layout elements will not work or display properly. We recommend that you use FireFox 1.5+ or Internet Explorer 6 when using Hyperic HQ. Modified: trunk/web/WEB-INF/jsp/login.jsp =================================================================== --- trunk/web/WEB-INF/jsp/login.jsp 2010-01-28 19:44:49 UTC (rev 14243) +++ trunk/web/WEB-INF/jsp/login.jsp 2010-01-29 05:18:02 UTC (rev 14244) @@ -36,7 +36,16 @@ <fieldset> <c:if test="${not empty param.authfailed}"> <p> - <div class="msgPanel msgError"><fmt:message key="login.info.bad" /></div> + <div class="msgPanel msgError"> + <c:choose> + <c:when test="${not empty errorMessage}"> + <c:out value="${errorMessage}" /> + </c:when> + <c:otherwise> + <fmt:message key="login.error.login" /> + </c:otherwise> + </c:choose> + </div> </p> </c:if> <div class="fieldRow"> |
|
From: <dcr...@hy...> - 2010-01-28 19:44:58
|
Author: dcrutchf Date: 2010-01-28 11:44:49 -0800 (Thu, 28 Jan 2010) New Revision: 14243 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14243 Modified: trunk/web/WEB-INF/jsp/login.jsp trunk/web/css/HQ_40.css Log: Tweaked UI to render guest login as link instead of button Also updated css so that UI spacing is more consistent btw ie and everything else Modified: trunk/web/WEB-INF/jsp/login.jsp =================================================================== --- trunk/web/WEB-INF/jsp/login.jsp 2010-01-28 09:21:35 UTC (rev 14242) +++ trunk/web/WEB-INF/jsp/login.jsp 2010-01-28 19:44:49 UTC (rev 14243) @@ -49,7 +49,7 @@ </div> <div class="button"> <c:if test="${guestEnabled}"> - <input type="button" id="guestLoginBtn" class="button42 guestuser" value="<fmt:message key="login.signInAsGuest" />" /> + <a href="#" id="guestLoginLink" class="guestuser"><fmt:message key="login.signInAsGuest" /></a> </c:if> <input type="submit" name="submit" class="button42" value="<fmt:message key="login.signin" />" /> </div> @@ -88,7 +88,7 @@ }); <c:if test="${guestEnabled}"> - dojo.connect(dojo.byId("guestLoginBtn"), "onclick", function() { + dojo.connect(dojo.byId("guestLoginLink"), "onclick", function() { var username = dojo.byId("usernameInput"); username.value = "<c:out value="${guestUsername}" />"; Modified: trunk/web/css/HQ_40.css =================================================================== --- trunk/web/css/HQ_40.css 2010-01-28 09:21:35 UTC (rev 14242) +++ trunk/web/css/HQ_40.css 2010-01-28 19:44:49 UTC (rev 14243) @@ -479,6 +479,7 @@ .loginPanel .fieldRow { height:33px; + max-height:21px; position:relative; clear:none; } @@ -502,8 +503,8 @@ } .loginPanel .guestuser { - background-color:#38ADEA; - border-color:#60BCEA; + color:#45A8DF; + margin-right:10px; } .loginButtons { |
|
From: <bo...@hy...> - 2010-01-28 09:21:43
|
Author: bob Date: 2010-01-28 01:21:35 -0800 (Thu, 28 Jan 2010) New Revision: 14242 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14242 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1333 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-01-28 03:08:11 UTC (rev 14241) +++ trunk/etc/version.properties 2010-01-28 09:21:35 UTC (rev 14242) @@ -1,3 +1,3 @@ -#Wed Jan 27 00:23:55 PST 2010 +#Thu Jan 28 00:28:08 PST 2010 version=4.3.0 -build=1332 +build=1333 |
|
From: rose j. <rsn...@gm...> - 2010-01-28 08:28:26
|
i want to use the classes. how can i do that? i've set the path but got this error: no sigar-x86-winnt.dll in java.library.path org.hyperic.sigar.SigarException: no sigar-x86-winnt.dll in java.library.path at org.hyperic.sigar.Sigar.loadLibrary(Sigar.java:174) at org.hyperic.sigar.Sigar.<clinit>(Sigar.java:102) at org.hyperic.sigar.cmd.MemWatch.main(MemWatch.java:32) Exception in thread "main" java.lang.Exception: Usage: MemWatch pid at org.hyperic.sigar.cmd.MemWatch.main(MemWatch.java:35) Press any key to continue... may i know what's wrong?what else i have to include in the library? |
|
From: Mirko P. <m.p...@gm...> - 2010-01-28 08:17:07
|
Hi, what do you want to do with SIGAR ? You probably know that SIGAR is already part of Hyperic HQ. It contains all binaries and libraries. A good start would be to read the documentation: http://support.hyperic.com/display/SIGAR/Home Cheers, Mirko |
14 messages has been excluded from this view by a project administrator.
