hyperic-hq-discuss — Hyperic HQ SVN Commits

[Hyperic-hq-discuss] UnsupportedClassVersionError when testing device_iostat.pl plugin

[Nathaniel B. <nb...@ep...>]

Hi-

I am trying to implement the device_iostat.pl plugin and am unable to get it to return results. I'm pretty sure I have the plugin bits in the write places on the server:

agent:
/home/hyperic/hyperic-hq-agent-3.0.1/pdk/scripts/device_iostat.pl

Server:
/u05/hyperic/server-3.0.1/hq-engine/server/default/deploy/hq.ear/hq-plugins/io-device-plugin.xml

When I run the following test, I get an error message that references 'Exception in thread "main" java.lang.UnsupportedClassVersionError: org/hyperic/hq/product/util/PluginMain (Unsupported major.minor version 48.0)'. Here is the output from these java test:

$ java -jar hq-product.jar -Dplugins.include=io-device -Ddevice=cciss/c0d1p1 -Dlog=debug
Exception in thread "main" java.lang.UnsupportedClassVersionError: org/hyperic/hq/product/util/PluginMain (Unsupported major.minor version 48.0)
        at java.lang.ClassLoader.defineClass0(Native Method)
        at java.lang.ClassLoader.defineClass(ClassLoader.java:694)
        at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:133)
        at java.net.URLClassLoader.defineClass(URLClassLoader.java:319)
        at java.net.URLClassLoader.access$400(URLClassLoader.java:92)
        at java.net.URLClassLoader$ClassFinder.run(URLClassLoader.java:677)
        at java.security.AccessController.doPrivileged(Native Method)
        at java.net.URLClassLoader.findClass(URLClassLoader.java:238)
        at java.lang.ClassLoader.loadClass(ClassLoader.java:513)
        at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:440)
        at java.lang.ClassLoader.loadClass(ClassLoader.java:445)

Have I missed a configuration step along the way, or do I need to update java?

Thanks...

Nathaniel

[Hyperic-hq-discuss] [JIRA] Created: (HHQ-747) Postgre DB must be named HQ to suceed.

[mvanbeurden (JIRA) <ji...@hy...>]

Postgre DB must be named HQ to suceed.
--------------------------------------

         Key: HHQ-747
         URL: http://jira.hyperic.com/browse/HHQ-747
     Project: Hyperic HQ
        Type: Bug

  Components: Installer  
    Versions: 3.0.1    
 Environment: FC 4
postgresql.i386 - 8.0.8-1.FC4.1

    Reporter: mvanbeurden
 Assigned to: Charles Lee 


Installing HQ Server with postgresql and the -highavail option requires the database to be named "HQ"

Tried initially with DB named: hyperic and generated the following error:

./setup.sh -highavail

--------------------------------------------------------------------------------
An ERROR occurred, the installation cannot continue.
FATAL EXCEPTION at /usr/local/share/hyperic/3.0.1/server/hyperic-hq-installer/installer-3.0.1-EE/data/setup.xml:142: : The following error occurred while executing this line:
/usr/local/share/hyperic/3.0.1/server/hyperic-hq-installer/installer-3.0.1-EE/data/setup-interactive.xml:15: org.hyperic.util.NestedRuntimeException$NestedEx: Error checking for existing database: Backend start-up failed: FATAL:  database "HQ" does not exist
.
--------------------------------------------------------------------------------
Deleting temporary JRE

After creating a database named HQ the installation suceeded.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://jira.hyperic.com/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira

Re: [Hyperic-hq-discuss] No MYsql Service in HypericHQ 3.0.1

[smith K. <sma...@fi...>]

This is the result using mysql-plugin.jar in HypericHQ 3.0.1

java -jar ../lib/hq-product.jar -p mysql -m discover
1 servers detected

Server: sun MySQL Process 5.x [/usr]
 config...
 product..{process.query=State.Name.eq=mysqld}
 metric...null
 control..null

This is the result using mysql-plugin.jar in HypericHQ 2.7

java -jar ../lib/hq-product.jar -p mysql -m discover
1 servers detected

Server: sun MySQL Process 5.x [/usr]
 config...
 product..{process.query=State.Name.eq=mysqld}
 metric...null
 control..null

The results are same..But the there is no MYsql Service(table)  when use HypericHQ 3.0.1

Re: [Hyperic-hq-discuss] No MYsql Service in HypericHQ 3.0.1

[smith K. <sma...@fi...>]

Mysql server is ok..Mysql 5.0 process is found on HyperHQ..
but there is service about Mysql table service...

This service is ok in HypericHQ 2.7

[Hyperic-hq-discuss] Just installed but can't login as hqadmin

[Jude H. <ju...@ne...>]

Hi,

I just set up my first hyeric HQ on a linux Fedora 5 machine with PostgreSQL 8.1.4 as my database. I took the default hqadmin username and passwd. After I started the hyperic server, I couldn't login from my browser as hqadmin/hqadmin. I keep getting "The username or password provided does not match our records." I got the same message when I start the hyperic client when I was prompted for hqadmin username and password.

Please help, and thanks in advance.

[Hyperic-hq-discuss] hq r3750 - trunk/etc

[<bo...@hy...>]

Author: bob
Date: 2007-03-13 17:38:26 -0800 (Tue, 13 Mar 2007)
New Revision: 3750
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3750

Modified:
   trunk/etc/version.properties
Log:
Release 3.0.2 build #338

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2007-03-14 00:42:08 UTC (rev 3749)
+++ trunk/etc/version.properties	2007-03-14 01:38:26 UTC (rev 3750)
@@ -1,3 +1,3 @@
-#Tue Mar 13 04:12:01 PDT 2007
+#Tue Mar 13 18:03:35 PDT 2007
 version=3.0.2
-build=337
+build=338

[Hyperic-hq-discuss] hq r3749 - in trunk/web: js portal

[<he...@hy...>]

Author: heather
Date: 2007-03-13 16:42:08 -0800 (Tue, 13 Mar 2007)
New Revision: 3749
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3749

Modified:
   trunk/web/js/requests.js
   trunk/web/portal/DashboardLayout.jsp
Log:
fix for metric portlet js error which happened when you removed the metric portlet on refresh

Modified: trunk/web/js/requests.js
===================================================================
--- trunk/web/js/requests.js	2007-03-14 00:39:13 UTC (rev 3748)
+++ trunk/web/js/requests.js	2007-03-14 00:42:08 UTC (rev 3749)
@@ -392,8 +392,9 @@
             metricFunc = 'requestMetricsResponse()';
         }
 
-        if (metricValues.values) {
+        if (metricTable && metricValues.values) {
 
+
             var tbody = metricTable.getElementsByTagName('tbody')[0];
             var browser = BrowserDetect.browser;
             

Modified: trunk/web/portal/DashboardLayout.jsp
===================================================================
--- trunk/web/portal/DashboardLayout.jsp	2007-03-14 00:39:13 UTC (rev 3748)
+++ trunk/web/portal/DashboardLayout.jsp	2007-03-14 00:42:08 UTC (rev 3749)
@@ -93,10 +93,10 @@
         for(i=0;i<nodes.length;i++) {
             if(/metricTable/.test(nodes[i].id)) {
             setInterval("requestMetricsResponse<c:out value="${portlet.token}"/>()", 60000);
+            
             }
         }
 
-
         for(i=0;i<nodes.length;i++) {
             if(/availTable/.test(nodes[i].id)) {
             setInterval("requestAvailSummary<c:out value="${portlet.token}"/>()", 60000);

[Hyperic-hq-discuss] hq r3748 - trunk/web/common

[<cl...@hy...>]

Author: clee
Date: 2007-03-13 16:39:13 -0800 (Tue, 13 Mar 2007)
New Revision: 3748
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3748

Modified:
   trunk/web/common/Header.jsp
Log:
Actually, need to send update=true to acknowledge


Modified: trunk/web/common/Header.jsp
===================================================================
--- trunk/web/common/Header.jsp	2007-03-14 00:36:40 UTC (rev 3747)
+++ trunk/web/common/Header.jsp	2007-03-14 00:39:13 UTC (rev 3748)
@@ -38,7 +38,7 @@
           
  function getUpdateStatus(opt) {
    if (opt=="<fmt:message key="header.Acknowledge"/>") {
-     var pars =  "update=false";
+     var pars =  "update=true";
      var updateUrl = 'Dashboard.do?';
      var url = updateUrl + pars;
      //window.location = url;

[Hyperic-hq-discuss] hq r3747 - in trunk/web: WEB-INF/classes common

[<cl...@hy...>]

Author: clee
Date: 2007-03-13 16:36:40 -0800 (Tue, 13 Mar 2007)
New Revision: 3747
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3747

Modified:
   trunk/web/WEB-INF/classes/ApplicationResources.properties
   trunk/web/common/Header.jsp
Log:
Change wording for update buttons


Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2007-03-14 00:31:05 UTC (rev 3746)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2007-03-14 00:36:40 UTC (rev 3747)
@@ -108,9 +108,11 @@
 login.title=HQ Login
 login.message= 
 
-#
+# Header
 header.RecentAlerts=Recent Alerts
 header.NoRecentAlerts=(There are no alerts in the last 2 hours.)
+header.RemindLater=Remind Later
+header.Acknowledge=Acknowledge
 
 #
 securityAlert.SecurityAlert.Title=HQ Security Alert

Modified: trunk/web/common/Header.jsp
===================================================================
--- trunk/web/common/Header.jsp	2007-03-14 00:31:05 UTC (rev 3746)
+++ trunk/web/common/Header.jsp	2007-03-14 00:36:40 UTC (rev 3747)
@@ -37,7 +37,7 @@
   var help = "<hq:help/>";
           
  function getUpdateStatus(opt) {
-   if (opt=="Ignore Announcement") {
+   if (opt=="<fmt:message key="header.Acknowledge"/>") {
      var pars =  "update=false";
      var updateUrl = 'Dashboard.do?';
      var url = updateUrl + pars;
@@ -157,7 +157,7 @@
 <div id="update" class="menu" style="border:1px solid black;padding-top:15px;padding-bottom:15px;font-weight:bold;font-size:12px;">
 <c:out value="${HQUpdateReport}" escapeXml="false"/>
     <form name="updateForm" action="">
-        <div style="text-align:center;padding-left:15px;padding-right:15px;"><input type="button" value="Acknowledge" onclick="getUpdateStatus(this.value);"><span style="padding-left:15px;"><input type="button" value="Ignore Announcement" onclick="getUpdateStatus(this.value);"></span>
+        <div style="text-align:center;padding-left:15px;padding-right:15px;"><input type="button" value="<fmt:message key="header.RemindLater"/>" onclick="getUpdateStatus(this.value);"><span style="padding-left:15px;"><input type="button" value="<fmt:message key="header.Acknowledge"/>" onclick="getUpdateStatus(this.value);"></span>
         </div>
 
     </form>

[Hyperic-hq-discuss] hq r3746 - trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery

[<cl...@hy...>]

Author: clee
Date: 2007-03-13 16:31:05 -0800 (Tue, 13 Mar 2007)
New Revision: 3746
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3746

Modified:
   trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/EditAutoDiscoveryPrepAction.java
Log:
[HQ-580]
sid removed from form

Modified: trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/EditAutoDiscoveryPrepAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/EditAutoDiscoveryPrepAction.java	2007-03-14 00:11:14 UTC (rev 3745)
+++ trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/EditAutoDiscoveryPrepAction.java	2007-03-14 00:31:05 UTC (rev 3746)
@@ -69,9 +69,6 @@
     {
         PlatformAutoDiscoveryForm aForm = (PlatformAutoDiscoveryForm) form;
 
-        AIScheduleValue sVal = (AIScheduleValue)request.getAttribute(Constants.AISCHEDULE_ATTR);
-        schedule.set(sVal);
-        aForm.setSid(sVal.getId());
         loadScanConfig(aForm, request);
 
         return super.workflow(context, mapping, form, request,response);

Re: [Hyperic-hq-discuss] Install: Weblogic 9.2 Not found

[Doug M. <do...@hy...>]

You shouldn't have to delete anything, but if you deleted the server =20
from inventory in the UI when the agent was not running, you may also =20=

need to:
del data\*

This cleans out the agent's local storage where this configuration is =20=

stored.
You may also need to add the following to agent.properties and =20
restart the agent if your managed app server is not auto-discovered:

weblogic.discover.fqdn=3Dsame

We've been run into this problem, where the plugin depends on the =20
servers ListenAddress to match up with a platform in the HQ =20
inventory.  This property will force the app server to be reported =20
under the same platform as the admin server.

On Mar 9, 2007, at 4:38 PM, tom wrote:

> This gets me a lot farther.
> I can now see the weblogic 9.2 admin server but not application =20
> server that host my web app. I have tried to all kinds of auto =20
> discover and manual config but nothing get it to work
>
> When I first set config in HQ after a successful Auto Detect I =20
> mistyped the server URL.
> After correcting the typo I still can not get the Agent to aut =20
> detect the weblogic  (no admin) server.  I tried deleting, =20
> restarting, =85. But I still get the message below on the client
>
> My typo is: lwdscsoda03
> corrected is wdscsoda03
>
>
> 2007-03-09 16:32:13,207 INFO  [RuntimeAutodiscoverer] Running =20
> runtime autodiscovery for Weblogic Admin 9.2
> 2007-03-09 16:32:15,550 WARN  [RuntimeAutodiscoverer] Error running =20=

> autodiscoverer for plugin: Weblogic Admin 9.2: =20
> java.net.UnknownHostException: lwdscsoda03: lwdscsoda03
> org.hyperic.hq.product.PluginException: =20
> java.net.UnknownHostException: lwdscsoda03: lwdscsoda03
>         at =20
> org.hyperic.hq.plugin.weblogic.jmx.WeblogicRuntimeDiscoverer.discoverA=20=

> s(WeblogicRuntimeDiscoverer.java:129)
>         at =20
> org.hyperic.hq.plugin.weblogic.jmx.WeblogicRuntimeDiscoverer.discoverR=20=

> esources(WeblogicRuntimeDiscoverer.java:102)
>         at =20
> org.hyperic.hq.autoinventory.agent.server.RuntimeAutodiscoverer.doRunt=20=

> imeScan_internal(RuntimeAutodiscoverer.java:292)
>         at =20
> org.hyperic.hq.autoinventory.agent.server.RuntimeAutodiscoverer.doRunt=20=

> imeScan(RuntimeAutodiscoverer.java:220)
>         at org.hyperic.hq.autoinventory.ScanManager.mainRunLoop=20
> (ScanManager.java:165)
>         at org.hyperic.hq.autoinventory.ScanManager.access$000=20
> (ScanManager.java:41)
>         at org.hyperic.hq.autoinventory.ScanManager$1.run=20
> (ScanManager.java:107)
> Caused by: java.lang.SecurityException: =20
> java.net.UnknownHostException: lwdscsoda03: lwdscsoda03
>         at org.hyperic.hq.plugin.weblogic.WeblogicAuth.getSubject=20
> (WeblogicAuth.java:148)
>         at org.hyperic.hq.plugin.weblogic.WeblogicAuth.runAs=20
> (WeblogicAuth.java:125)
>         at =20
> org.hyperic.hq.plugin.weblogic.jmx.WeblogicRuntimeDiscoverer.discoverA=20=

> s(WeblogicRuntimeDiscoverer.java:127)
>
>

[Hyperic-hq-discuss] hq r3745 - in trunk: src/org/hyperic/hq/ui/action/resource/platform/autodiscovery web/WEB-INF/classes web/resource/platform/autodiscovery

[<cl...@hy...>]

Author: clee
Date: 2007-03-13 16:11:14 -0800 (Tue, 13 Mar 2007)
New Revision: 3745
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3745

Modified:
   trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/EditAutoDiscoveryAction.java
   trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/NewAutoDiscoveryAction.java
   trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/PlatformAutoDiscoveryForm.java
   trunk/web/WEB-INF/classes/ApplicationResources.properties
   trunk/web/resource/platform/autodiscovery/NewAutoDiscovery.jsp
Log:
[HQ-580]
Remove scheduling and recurrence for auto-discovery


Modified: trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/EditAutoDiscoveryAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/EditAutoDiscoveryAction.java	2007-03-13 22:59:04 UTC (rev 3744)
+++ trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/EditAutoDiscoveryAction.java	2007-03-14 00:11:14 UTC (rev 3745)
@@ -25,6 +25,8 @@
 
 package org.hyperic.hq.ui.action.resource.platform.autodiscovery;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.hyperic.hq.autoinventory.ScanConfiguration;
 import org.hyperic.hq.autoinventory.ScanMethod;
 import org.hyperic.hq.autoinventory.ScanMethodConfig;
@@ -32,26 +34,12 @@
 import org.hyperic.hq.bizapp.shared.AIBoss;
 import org.hyperic.util.config.ConfigResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.ActionMapping;
-
 public class EditAutoDiscoveryAction extends NewAutoDiscoveryAction {
     
     private static final Log log
         = LogFactory.getLog(EditAutoDiscoveryAction.class.getName());
 
     /**
-     * removes a AIScheduleValue object if already created.
-     */
-    protected void removeAISchedule(AIBoss aiboss, 
-                                    int sessionId, Integer sid)
-        throws Exception {
-        Integer[] ids = {sid};
-        aiboss.deleteAIJob(sessionId, ids);
-    }
-    
-    /**
      * load the AIScheduleValue if needed
      */
     private AIScheduleValue getAIScheduleValue(AIBoss aiboss,

Modified: trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/NewAutoDiscoveryAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/NewAutoDiscoveryAction.java	2007-03-13 22:59:04 UTC (rev 3744)
+++ trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/NewAutoDiscoveryAction.java	2007-03-14 00:11:14 UTC (rev 3745)
@@ -25,8 +25,14 @@
 
 package org.hyperic.hq.ui.action.resource.platform.autodiscovery;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -37,12 +43,10 @@
 import org.hyperic.hq.appdef.shared.ServerTypeValue;
 import org.hyperic.hq.autoinventory.ScanConfiguration;
 import org.hyperic.hq.autoinventory.ScanMethod;
-import org.hyperic.hq.autoinventory.ScanStateCore;
 import org.hyperic.hq.autoinventory.ServerSignature;
 import org.hyperic.hq.bizapp.shared.AIBoss;
 import org.hyperic.hq.bizapp.shared.AppdefBoss;
 import org.hyperic.hq.common.DuplicateObjectException;
-import org.hyperic.hq.scheduler.ScheduleValue;
 import org.hyperic.hq.scheduler.ScheduleWillNeverFireException;
 import org.hyperic.hq.ui.Constants;
 import org.hyperic.hq.ui.action.BaseAction;
@@ -53,13 +57,6 @@
 import org.hyperic.util.config.ConfigResponse;
 import org.hyperic.util.pager.PageControl;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-
 /**
  * Action class which saves an auto-discovery.  The autodiscovery
  * can be an new/edit auto-discovery.
@@ -86,17 +83,11 @@
 
             Integer platformId = newForm.getRid();
             Integer platformType = newForm.getType();
-            Integer sid = newForm.getSid();
             
             HashMap forwardParams = new HashMap(3);
             forwardParams.put(Constants.RESOURCE_PARAM, platformId);
             forwardParams.put(Constants.RESOURCE_TYPE_ID_PARAM, platformType );
 
-            // Bug #7109, save the ai schedule id for edit ai schedule. needed
-            // when the user clicks on the reset button.
-            if (sid != null && sid.intValue() > 0)            
-                forwardParams.put(Constants.SCHEDULE_PARAM, sid );
-
             ActionForward forward =
                 checkSubmit(request, mapping, form,
                             forwardParams, YES_RETURN_PATH);
@@ -186,7 +177,6 @@
         AppdefBoss boss = ContextUtils.getAppdefBoss(ctx);
         AIBoss aiboss = ContextUtils.getAIBoss(ctx);
         int sessionId = RequestUtils.getSessionIdInt(request);
-        Integer scheduleId = newForm.getSid();
         
         // update the ScanConfiguration from the form obect
         List stValues =
@@ -221,37 +211,16 @@
         }        
         scanConfig.setServerSignatures(serverDetectorArray);
 
-        // probably need to add a new scan and remove the old one in
-        // one transaction.                                   
-        removeAISchedule(aiboss, sessionId, scheduleId);
-        
-        if (newForm.getIsNow()) {
-            aiboss.startScan(sessionId,
-                             pValue.getId().intValue(), 
-                             scanConfig.getCore(),
-                             null, null, /* No scanName or scanDesc for 
-                                            immediate, one-time scans */
-                             null);
-                             
-            waitForScanStart(sessionId, aiboss, pValue.getId().intValue());
-        } else {
-            ScheduleValue val = newForm.createSchedule();
-            aiboss.startScan(sessionId, 
-                             pValue.getId().intValue(), 
-                             scanConfig.getCore(),
-                             newForm.getName(),
-                             newForm.getDescription(),
-                             val);
-        }
+        aiboss.startScan(sessionId,
+                         pValue.getId().intValue(), 
+                         scanConfig.getCore(),
+                         null, null, /* No scanName or scanDesc for 
+                                        immediate, one-time scans */
+                         null);
+                         
+        waitForScanStart(sessionId, aiboss, pValue.getId().intValue());
     }
 
-    /**
-     * removes a AIScheduleValue object if new
-     */
-    protected void removeAISchedule(AIBoss aiboss, 
-                                    int sessionId, Integer sid) 
-        throws Exception {}
-    
     private void waitForScanStart(int sessionId, AIBoss boss, int platformId)
         throws Exception {
         Thread.sleep(2000);

Modified: trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/PlatformAutoDiscoveryForm.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/PlatformAutoDiscoveryForm.java	2007-03-13 22:59:04 UTC (rev 3744)
+++ trunk/src/org/hyperic/hq/ui/action/resource/platform/autodiscovery/PlatformAutoDiscoveryForm.java	2007-03-14 00:11:14 UTC (rev 3745)
@@ -34,6 +34,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.util.ImageButtonBean;
+import org.apache.struts.util.LabelValueBean;
 import org.hyperic.hq.appdef.shared.AppdefResourceTypeValue;
 import org.hyperic.hq.appdef.shared.ServerTypeValue;
 import org.hyperic.hq.common.SystemException;
@@ -46,13 +51,6 @@
 import org.hyperic.util.config.InvalidOptionException;
 import org.hyperic.util.config.InvalidOptionValueException;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.ImageButtonBean;
-import org.apache.struts.util.LabelValueBean;
-
 public class PlatformAutoDiscoveryForm extends ResourceForm {
 
     /**
@@ -73,10 +71,6 @@
     
     private ImageButtonBean scheduleTypeChange;    
         
-    /**
-     * schedule id
-     */    
-    private Integer sid;
     private String scanMethod;
 
     //-------------------------------------constructors
@@ -199,9 +193,6 @@
         this.serverTypesLB = serverTypesLB;
     }
 
-    public Integer getSid() { return sid; }
-    public void setSid(Integer integer) { sid = integer; }
-
     /**
      * This validate method tries to
      *   
@@ -239,16 +230,6 @@
                 List configs = BizappUtils.buildLoadConfigOptions(schema, newResponse ); 
                 this.configOptions = configs;
             }
-
-            if (!getIsNow()) // check to see if name has been set
-            {
-                if (scanName == null || scanName.equalsIgnoreCase(""))
-                    errors.add("name", new ActionError("resource.common.inventory.error.NameIsRequired"));
-
-                // Make sure that the description is not too long, just cut it
-                if (scanDesc != null && scanDesc.length() > 200)
-                    scanDesc = scanDesc.substring(0, 199);
-            }
         }
 
         if (errors != null && !errors.isEmpty() )

Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2007-03-13 22:59:04 UTC (rev 3744)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2007-03-14 00:11:14 UTC (rev 3745)
@@ -1479,10 +1479,10 @@
 resource.autodiscovery.autoDiscoveryProperties.DateCompleted=Date Completed:
 
 resource.autodiscovery.AutoDiscoveryHeaderTab=Quick Auto-Discovery Scan
-resource.autodiscovery.AutoDiscoveryHeader.windows=Click 'OK' to start an immediate system scan.  This will include a scan of the Windows registry and process table.<br>If you also want to perform a filesystem scan or if you'd like to schedule a recurring scan, fill out the remainder of the form below.
-resource.autodiscovery.AutoDiscoveryHeader.unix=Click 'OK' to start an immediate system scan.  This will include a scan of the system process-table.<br>If you also want to perform a filesystem scan or if you'd like to schedule a recurring scan, fill out the remainder of the form below.
-resource.autodiscovery.AutoDiscoveryHeader.windows.AIonly=Click 'OK' to start an immediate system scan.  This will include a scan of the Windows registry and process table.<br>If you also want to perform a filesystem scan, fill out the remainder of the form below.
-resource.autodiscovery.AutoDiscoveryHeader.unix.AIonly=Click 'OK' to start an immediate system scan.  This will include a scan of the system process-table.<br>If you also want to perform a filesystem scan, fill out the remainder of the form below.
+resource.autodiscovery.AutoDiscoveryHeader.windows=Click 'OK' to start an immediate system scan on all resource types.  This will include a scan of the Windows registry and process table.<br>If you also want to perform a filesystem scan or if you'd like to limit the resource types to be discovered, fill out the remainder of the form below.
+resource.autodiscovery.AutoDiscoveryHeader.unix=Click 'OK' to start an immediate system scan on all resource types.  This will include a scan of the system process-table.<br>If you also want to perform a filesystem scan or if you'd like to limit the resource types to be discovered, fill out the remainder of the form below.
+resource.autodiscovery.AutoDiscoveryHeader.windows.AIonly=Click 'OK' to start an immediate system scan on all resource types.  This will include a scan of the Windows registry and process table.<br>If you also want to perform a filesystem scan, fill out the remainder of the form below.
+resource.autodiscovery.AutoDiscoveryHeader.unix.AIonly=Click 'OK' to start an immediate system scan on all resource types.  This will include a scan of the system process-table.<br>If you also want to perform a filesystem scan, fill out the remainder of the form below.
 
 resource.autodiscovery.scan.NoScanConfig=This scan method does not have any scan properties.
 resource.autodiscovery.ScanTab=Extended Filesystem Scan Configuration

Modified: trunk/web/resource/platform/autodiscovery/NewAutoDiscovery.jsp
===================================================================
--- trunk/web/resource/platform/autodiscovery/NewAutoDiscovery.jsp	2007-03-13 22:59:04 UTC (rev 3744)
+++ trunk/web/resource/platform/autodiscovery/NewAutoDiscovery.jsp	2007-03-14 00:11:14 UTC (rev 3745)
@@ -61,13 +61,6 @@
 </tiles:insert>
 &nbsp;<br>
 	
-<!-- SCHEDULE ACTION PROPERTIES -->
-<tiles:insert page="/resource/platform/autodiscovery/AutoDiscoveryPropertiesForm.jsp"/>
-&nbsp;<br>
-<c:if test="${not onlyAIplatform}">
-  <tiles:insert definition=".schedule"/>
-</c:if>
-
 <!-- FORM BUTTONS -->
 <tiles:insert definition=".form.buttons"/>
 

[Hyperic-hq-discuss] hq r3744 - trunk/web/common

[<he...@hy...>]

Author: heather
Date: 2007-03-13 14:59:04 -0800 (Tue, 13 Mar 2007)
New Revision: 3744
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3744

Modified:
   trunk/web/common/Header.jsp
Log:
removing the icon on ignore

Modified: trunk/web/common/Header.jsp
===================================================================
--- trunk/web/common/Header.jsp	2007-03-13 22:43:33 UTC (rev 3743)
+++ trunk/web/common/Header.jsp	2007-03-13 22:59:04 UTC (rev 3744)
@@ -37,12 +37,13 @@
   var help = "<hq:help/>";
           
  function getUpdateStatus(opt) {
-   if (opt=="Ignore") {
+   if (opt=="Ignore Announcement") {
      var pars =  "update=false";
      var updateUrl = 'Dashboard.do?';
      var url = updateUrl + pars;
      //window.location = url;
        new Ajax.Request( url, {method: 'post'} );
+       $('hb').innerHTML = '<html:img page="/images/spacer.gif" width="1" height="1" alt="" border="0"/>'
       }
      menuLayers.hide();
    }
@@ -87,7 +88,7 @@
                 <c:if test="${not empty HQUpdateReport}">
                  <div style="position:absolute;top:10px;right:30px;" id="hb">
 		        <html:img page="/images/transmit.gif" border="0" width="16" height="16" onmouseover="menuLayers.show('update', event)" onmouseout="menuLayers.hide()"/></div>
-                 </c:if>
+                </c:if>
 
                  <div style="display:none;position:absolute;top:10px;right:10px;" id="loading">
 		        <html:img page="/images/ajax-loader.gif" border="0" width="16" height="16" /></div>
@@ -156,7 +157,7 @@
 <div id="update" class="menu" style="border:1px solid black;padding-top:15px;padding-bottom:15px;font-weight:bold;font-size:12px;">
 <c:out value="${HQUpdateReport}" escapeXml="false"/>
     <form name="updateForm" action="">
-        <div style="text-align:center;padding-left:15px;padding-right:15px;"><input type="button" value="Ok" onclick="getUpdateStatus(this.value);"><span style="padding-left:15px;"><input type="button" value="Ignore" onclick="getUpdateStatus(this.value);"></span>
+        <div style="text-align:center;padding-left:15px;padding-right:15px;"><input type="button" value="Acknowledge" onclick="getUpdateStatus(this.value);"><span style="padding-left:15px;"><input type="button" value="Ignore Announcement" onclick="getUpdateStatus(this.value);"></span>
         </div>
 
     </form>

[Hyperic-hq-discuss] hq r3743 - trunk/web/common

[<he...@hy...>]

Author: heather
Date: 2007-03-13 14:43:33 -0800 (Tue, 13 Mar 2007)
New Revision: 3743
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3743

Modified:
   trunk/web/common/Header.jsp
Log:
changed the hb buttons to submit via an ajax call, also refromatted the div a little

Modified: trunk/web/common/Header.jsp
===================================================================
--- trunk/web/common/Header.jsp	2007-03-13 22:08:49 UTC (rev 3742)
+++ trunk/web/common/Header.jsp	2007-03-13 22:43:33 UTC (rev 3743)
@@ -37,14 +37,17 @@
   var help = "<hq:help/>";
           
  function getUpdateStatus(opt) {
-   if (opt=="Ok") {
-     var pars =  "update=true";
+   if (opt=="Ignore") {
+     var pars =  "update=false";
      var updateUrl = 'Dashboard.do?';
      var url = updateUrl + pars;
-     window.location = url;
+     //window.location = url;
+       new Ajax.Request( url, {method: 'post'} );
+      }
+     menuLayers.hide();
    }
-   menuLayers.hide();
- }
+
+
 </script>
 <table width="100%" border="0" cellspacing="0" cellpadding="0" style="border-top:2px solid #3399ff;border-bottom:2px solid #3399ff;" height="56">
 
@@ -80,8 +83,12 @@
     <table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%">
         <tr>
             <td class="MastheadBgTop" colspan="5" nowrap style="border-bottom:1px solid #ffffff;" height="34">
-                <c:if test="${not empty HQUpdateReport}"><div style="position:absolute;top:10px;right:30px;" id="hb">
-		        <html:img page="/images/transmit.gif" border="0" width="16" height="16" onmouseover="menuLayers.show('update', event)" onmouseout="menuLayers.hide()"/></div></c:if>
+
+                <c:if test="${not empty HQUpdateReport}">
+                 <div style="position:absolute;top:10px;right:30px;" id="hb">
+		        <html:img page="/images/transmit.gif" border="0" width="16" height="16" onmouseover="menuLayers.show('update', event)" onmouseout="menuLayers.hide()"/></div>
+                 </c:if>
+
                  <div style="display:none;position:absolute;top:10px;right:10px;" id="loading">
 		        <html:img page="/images/ajax-loader.gif" border="0" width="16" height="16" /></div>
 		        <div style="clear:both;"></div>
@@ -146,12 +153,12 @@
 
 </table>
 <c:if test="${not empty HQUpdateReport}">
-<div id="update" class="menu" style="border:1px solid black;padding:7px;font-weight:bold;background:white;color:#e15700;font-size:12px;">
+<div id="update" class="menu" style="border:1px solid black;padding-top:15px;padding-bottom:15px;font-weight:bold;font-size:12px;">
 <c:out value="${HQUpdateReport}" escapeXml="false"/>
     <form name="updateForm" action="">
-        <div style="float:right;padding-left:10px;"><input type="button" value="Cancel" onclick="getUpdateStatus(this.value);"></div>
-        <div style="float:left;padding-left:15px;padding-right:10px;"><input type="button" value="Ok" onclick="getUpdateStatus(this.value);"></div>
-        <div style="clear:both;"></div>
+        <div style="text-align:center;padding-left:15px;padding-right:15px;"><input type="button" value="Ok" onclick="getUpdateStatus(this.value);"><span style="padding-left:15px;"><input type="button" value="Ignore" onclick="getUpdateStatus(this.value);"></span>
+        </div>
+
     </form>
 </div>
 </c:if>

[Hyperic-hq-discuss] Postgres 8.2.3 tricks

[Dan G. <dg...@hi...>]

In case anyone is using PG 8.2.3 with HQ I'd recommend the following:

 - setting autovacuum to something with a high-ish cost_delay as even if you have it set to off, there is a built in function that will cause it to run to avoid DB wrap-around

- Check your max_stack_depth if you have more than 200 platforms and increase it so something like 4096

[Hyperic-hq-discuss] hq r3742 - trunk/web/js

[<he...@hy...>]

Author: heather
Date: 2007-03-13 14:08:49 -0800 (Tue, 13 Mar 2007)
New Revision: 3742
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3742

Modified:
   trunk/web/js/requests.js
Log:
moved a function that was failing and blocking other functions on the page

Modified: trunk/web/js/requests.js
===================================================================
--- trunk/web/js/requests.js	2007-03-13 22:08:16 UTC (rev 3741)
+++ trunk/web/js/requests.js	2007-03-13 22:08:49 UTC (rev 3742)
@@ -1,109 +1,4 @@
-var BrowserDetect = {
-	init: function () {
-		this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
-		this.version = this.searchVersion(navigator.userAgent)
-			|| this.searchVersion(navigator.appVersion)
-			|| "an unknown version";
-		this.OS = this.searchString(this.dataOS) || "an unknown OS";
-	},
-	searchString: function (data) {
-		for (var i=0;i<data.length;i++)	{
-			var dataString = data[i].string;
-			var dataProp = data[i].prop;
-			this.versionSearchString = data[i].versionSearch || data[i].identity;
-			if (dataString) {
-				if (dataString.indexOf(data[i].subString) != -1)
-					return data[i].identity;
-			}
-			else if (dataProp)
-				return data[i].identity;
-		}
-	},
-	searchVersion: function (dataString) {
-		var index = dataString.indexOf(this.versionSearchString);
-		if (index == -1) return;
-		return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
-	},
-	dataBrowser: [
-		{ 	string: navigator.userAgent,
-			subString: "OmniWeb",
-			versionSearch: "OmniWeb/",
-			identity: "OmniWeb"
-		},
-		{
-			string: navigator.vendor,
-			subString: "Apple",
-			identity: "Safari"
-		},
-		{
-			prop: window.opera,
-			identity: "Opera"
-		},
-		{
-			string: navigator.vendor,
-			subString: "iCab",
-			identity: "iCab"
-		},
-		{
-			string: navigator.vendor,
-			subString: "KDE",
-			identity: "Konqueror"
-		},
-		{
-			string: navigator.userAgent,
-			subString: "Firefox",
-			identity: "Firefox"
-		},
-		{
-			string: navigator.vendor,
-			subString: "Camino",
-			identity: "Camino"
-		},
-		{		// for newer Netscapes (6+)
-			string: navigator.userAgent,
-			subString: "Netscape",
-			identity: "Netscape"
-		},
-		{
-			string: navigator.userAgent,
-			subString: "MSIE",
-			identity: "Explorer",
-			versionSearch: "MSIE"
-		},
-		{
-			string: navigator.userAgent,
-			subString: "Gecko",
-			identity: "Mozilla",
-			versionSearch: "rv"
-		},
-		{ 		// for older Netscapes (4-)
-			string: navigator.userAgent,
-			subString: "Mozilla",
-			identity: "Netscape",
-			versionSearch: "Mozilla"
-		}
-	],
-	dataOS : [
-		{
-			string: navigator.platform,
-			subString: "Win",
-			identity: "Windows"
-		},
-		{
-			string: navigator.platform,
-			subString: "Mac",
-			identity: "Mac"
-		},
-		{
-			string: navigator.platform,
-			subString: "Linux",
-			identity: "Linux"
-		}
-	]
 
-};
-BrowserDetect.init();
-
 {
     Ajax.Responders.register({
         onCreate: function() {
@@ -129,7 +24,6 @@
         var noProblemResources = $('noProblemResources');
         $('modifiedProblemTime').innerHTML = 'Updated: ' + refreshTime();
 
-
             if (mList && mList.length > 0) {
 
                 var tbody = problemTable.getElementsByTagName('tbody')[0];
@@ -225,6 +119,7 @@
 
 
     function showRecentAlerts(originalRequest) {
+
         var alertText = eval("(" + originalRequest.responseText + ")");
         var aList = alertText.criticalAlerts;
         var token = alertText.token;
@@ -368,6 +263,7 @@
     }
 
     function showAvailSummary(originalRequest) {
+
         var availText = eval("(" + originalRequest.responseText + ")");
         var availList = availText.availSummary;
         var browseUrl = $('browseUrl').href;
@@ -585,6 +481,7 @@
     }
 
     function showFavoriteResponse(originalRequest) {
+       
         var faveText = eval('(' + originalRequest.responseText + ')');
         var fList = faveText.favorites;
         var table = document.getElementById('favoriteTable');
@@ -720,13 +617,7 @@
 
     }
 
-function onchange_time(el) {
-        //alert(el+", value="+ el.options[el.selectedIndex].value );
 
-        var index= el.options[el.selectedIndex].value;
-        //alert('Then wait: ' + (index / 60000) + ' minutes');
-    }
-
 function refreshTime() {
     var curDateTime = new Date()
     var curHour = curDateTime.getHours()
@@ -769,3 +660,109 @@
        }
 
 }
+
+var BrowserDetect = {
+	init: function () {
+		this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
+		this.version = this.searchVersion(navigator.userAgent)
+			|| this.searchVersion(navigator.appVersion)
+			|| "an unknown version";
+		this.OS = this.searchString(this.dataOS) || "an unknown OS";
+	},
+	searchString: function (data) {
+		for (var i=0;i<data.length;i++)	{
+			var dataString = data[i].string;
+			var dataProp = data[i].prop;
+			this.versionSearchString = data[i].versionSearch || data[i].identity;
+			if (dataString) {
+				if (dataString.indexOf(data[i].subString) != -1)
+					return data[i].identity;
+			}
+			else if (dataProp)
+				return data[i].identity;
+		}
+	},
+	searchVersion: function (dataString) {
+		var index = dataString.indexOf(this.versionSearchString);
+		if (index == -1) return;
+		return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
+	},
+	dataBrowser: [
+		{ 	string: navigator.userAgent,
+			subString: "OmniWeb",
+			versionSearch: "OmniWeb/",
+			identity: "OmniWeb"
+		},
+		{
+			string: navigator.vendor,
+			subString: "Apple",
+			identity: "Safari"
+		},
+		{
+			prop: window.opera,
+			identity: "Opera"
+		},
+		{
+			string: navigator.vendor,
+			subString: "iCab",
+			identity: "iCab"
+		},
+		{
+			string: navigator.vendor,
+			subString: "KDE",
+			identity: "Konqueror"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "Firefox",
+			identity: "Firefox"
+		},
+		{
+			string: navigator.vendor,
+			subString: "Camino",
+			identity: "Camino"
+		},
+		{		// for newer Netscapes (6+)
+			string: navigator.userAgent,
+			subString: "Netscape",
+			identity: "Netscape"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "MSIE",
+			identity: "Explorer",
+			versionSearch: "MSIE"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "Gecko",
+			identity: "Mozilla",
+			versionSearch: "rv"
+		},
+		{ 		// for older Netscapes (4-)
+			string: navigator.userAgent,
+			subString: "Mozilla",
+			identity: "Netscape",
+			versionSearch: "Mozilla"
+		}
+	],
+	dataOS : [
+		{
+			string: navigator.platform,
+			subString: "Win",
+			identity: "Windows"
+		},
+		{
+			string: navigator.platform,
+			subString: "Mac",
+			identity: "Mac"
+		},
+		{
+			string: navigator.platform,
+			subString: "Linux",
+			identity: "Linux"
+		}
+	]
+
+};
+BrowserDetect.init();

[Hyperic-hq-discuss] hq r3741 - trunk/web/portal

[<he...@hy...>]

Author: heather
Date: 2007-03-13 14:08:16 -0800 (Tue, 13 Mar 2007)
New Revision: 3741
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3741

Modified:
   trunk/web/portal/DashboardLayout.jsp
Log:
fix for the dashboard not refreshing

Modified: trunk/web/portal/DashboardLayout.jsp
===================================================================
--- trunk/web/portal/DashboardLayout.jsp	2007-03-13 21:59:09 UTC (rev 3740)
+++ trunk/web/portal/DashboardLayout.jsp	2007-03-13 22:08:16 UTC (rev 3741)
@@ -83,6 +83,7 @@
 </script>
 <script language="JavaScript" type="text/javascript">
     function refreshPortlets() {
+        
         var problemPortlet = $('problemResourcesTable');
         var favoritePortlet = $('favoriteTable');
         
@@ -91,29 +92,29 @@
 
         for(i=0;i<nodes.length;i++) {
             if(/metricTable/.test(nodes[i].id)) {
-            setTimeout("requestMetricsResponse<c:out value="${portlet.token}"/>()", 60000);    
+            setInterval("requestMetricsResponse<c:out value="${portlet.token}"/>()", 60000);
             }
         }
 
 
         for(i=0;i<nodes.length;i++) {
             if(/availTable/.test(nodes[i].id)) {
-            setTimeout("requestAvailSummary<c:out value="${portlet.token}"/>()", 60000);
+            setInterval("requestAvailSummary<c:out value="${portlet.token}"/>()", 60000);
             }
          }
 
         for(i=0;i<getRecentForm.length;i++) {
             if(/RemoveAlerts/.test(getRecentForm[i].action)) {
-            setTimeout("requestRecentAlerts<c:out value="${portlet.token}"/>()", 60000);
+            setInterval("requestRecentAlerts<c:out value="${portlet.token}"/>()", 60000);
             }
         }
 
         if (problemPortlet){
-        setTimeout("requestProblemResponse()", 60000);
+        setInterval("requestProblemResponse()", 60000);
         }
 
         if (favoritePortlet) {
-        setTimeout("requestFavoriteResources()", 60000);
+        setInterval("requestFavoriteResources()", 60000);
         }
     }
 

[Hyperic-hq-discuss] [JIRA] Created: (HHQ-746) Log tracking can be enabled without specifying a log file

[Noah S. (JIRA) <ji...@hy...>]

Log tracking can be enabled without specifying a log file
---------------------------------------------------------

         Key: HHQ-746
         URL: http://jira.hyperic.com/browse/HHQ-746
     Project: Hyperic HQ
        Type: Developer

    Versions: 3.0.1    
 Environment: Server: 3.0.2 .org build 337
    Reporter: Noah Salzman
 Assigned to: Charles Lee 
    Priority: Minor


When configuring a resource, users are allowed to enable log tracking without setting a file to track.

A more generic way of stating this bug would be: resource configuration settings don't have a mechanism for checking or enforcing dependencies on other settings.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://jira.hyperic.com/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira

[Hyperic-hq-discuss] hq r3740 - trunk/src/org/hyperic/hq/bizapp/server/session

[<jt...@hy...>]

Author: jtravis
Date: 2007-03-13 13:59:09 -0800 (Tue, 13 Mar 2007)
New Revision: 3740
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3740

Modified:
   trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java
Log:
Use new updates URL

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java	2007-03-13 21:52:35 UTC (rev 3739)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java	2007-03-13 21:59:09 UTC (rev 3740)
@@ -69,7 +69,8 @@
     private static final UpdateStatusDAO _updateDAO = 
         new UpdateStatusDAO(DAOFactory.getDAOFactory());
     private static final int CHECK_INTERVAL = 1000 * 60 * 60 * 24; 
-    private static final String CHECK_URL = "http://support.hyperic.com/uns"; 
+    private static final String CHECK_URL = 
+        "http://updates.hyperic.com/hq-updates"; 
         
     private static final Log _log = LogFactory.getLog(UpdateBossEJBImpl.class);
     

[Hyperic-hq-discuss] hq r3739 - in trunk: . etc

[<jt...@hy...>]

Author: jtravis
Date: 2007-03-13 13:52:35 -0800 (Tue, 13 Mar 2007)
New Revision: 3739
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3739

Added:
   trunk/etc/tweak.properties
Modified:
   trunk/build.xml
   trunk/etc/ehcache.xml
Log:
Add tweak properties and ehcache properties

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2007-03-13 21:52:03 UTC (rev 3738)
+++ trunk/build.xml	2007-03-13 21:52:35 UTC (rev 3739)
@@ -295,7 +295,7 @@
 
     <copy todir="${ear.dir}/META-INF" overwrite="true">
         <fileset dir="etc" 
-                 includes="application.xml,jboss-app.xml,startup_classes.txt" />
+                 includes="application.xml,jboss-app.xml,startup_classes.txt,tweak.properties" />
         <fileset dir="${build.dir}/classes/META-INF">
             <include name="**/*.hbm.xml" />
             <include name="*.cfg.xml" />

Modified: trunk/etc/ehcache.xml
===================================================================
--- trunk/etc/ehcache.xml	2007-03-13 21:52:03 UTC (rev 3738)
+++ trunk/etc/ehcache.xml	2007-03-13 21:52:35 UTC (rev 3739)
@@ -581,4 +581,11 @@
          timeToLiveSeconds="0"
          memoryStoreEvictionPolicy="LRU"/>
 
+  <!-- Update Cache -->
+  <cache name="org.hyperic.hq.bizapp.server.session.UpdateStatus"
+         maxElementsInMemory="1"
+         eternal="true"
+         timeToIdleSeconds="0"
+         timeToLiveSeconds="0"
+         memoryStoreEvictionPolicy="LRU"/>
 </ehcache>

Added: trunk/etc/tweak.properties
===================================================================
--- trunk/etc/tweak.properties	                        (rev 0)
+++ trunk/etc/tweak.properties	2007-03-13 21:52:35 UTC (rev 3739)
@@ -0,0 +1,2 @@
+#hq.updateNotify.interval=360000
+#hq.updateNotify.url=http://updates.hyperic.com

[Hyperic-hq-discuss] hq r3738 - trunk/src/org/hyperic/hq/bizapp/server/session

[<jt...@hy...>]

Author: jtravis
Date: 2007-03-13 13:52:03 -0800 (Tue, 13 Mar 2007)
New Revision: 3738
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3738

Modified:
   trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java
Log:
More tweaks.  Make sure to deal with resource stream being null in case something weird happens.  Also set the report to blank when update status is none

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java	2007-03-13 21:27:04 UTC (rev 3737)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java	2007-03-13 21:52:03 UTC (rev 3738)
@@ -74,12 +74,15 @@
     private static final Log _log = LogFactory.getLog(UpdateBossEJBImpl.class);
     
     private static Properties getTweakProperties() 
-        throws IOException
+        throws Exception
     {
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
         InputStream is = 
             loader.getResourceAsStream("META-INF/tweak.properties");
         Properties res = new Properties();
+
+        if (is == null)
+            return res;
         
         try {
             res.load(is);
@@ -95,7 +98,7 @@
             String res = p.getProperty("hq.updateNotify.url");
             if (res != null)
                 return res;
-        } catch(IOException e) {
+        } catch(Exception e) {
             _log.warn("Unable to get notification url", e);
         }
         return CHECK_URL;
@@ -227,6 +230,9 @@
             return;
         }
         
+        if (curStatus.getMode().equals(UpdateStatusMode.NONE))
+            return;
+        
         response = response.trim();
 
         curReport = curStatus.getReport() == null ? "" : curStatus.getReport();
@@ -265,6 +271,11 @@
         UpdateStatus status = getOrCreateStatus();
         
         status.setMode(mode);
+        
+        if (mode.equals(UpdateStatusMode.NONE)) {
+            status.setIgnored(true);
+            status.setReport("");
+        }
     }
 
     /**

[Hyperic-hq-discuss] hq r3737 - trunk/src/org/hyperic/hq/common

[<jt...@hy...>]

Author: jtravis
Date: 2007-03-13 13:27:04 -0800 (Tue, 13 Mar 2007)
New Revision: 3737
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3737

Modified:
   trunk/src/org/hyperic/hq/common/DiagnosticThread.java
Log:
Catch exception so we don't bomb out

Modified: trunk/src/org/hyperic/hq/common/DiagnosticThread.java
===================================================================
--- trunk/src/org/hyperic/hq/common/DiagnosticThread.java	2007-03-13 21:20:54 UTC (rev 3736)
+++ trunk/src/org/hyperic/hq/common/DiagnosticThread.java	2007-03-13 21:27:04 UTC (rev 3737)
@@ -113,6 +113,8 @@
             } catch (InterruptedException e) {
                 _log.warn("Diagnostic thread interrupted, shutting down.");
                 break;
+            } catch (Exception e) {
+                _log.warn("Error encountered while collecting diagnostics", e);
             }
         }
     }

[Hyperic-hq-discuss] hq r3736 - trunk/src/org/hyperic/hq/bizapp/server/session

[<jt...@hy...>]

Author: jtravis
Date: 2007-03-13 13:20:54 -0800 (Tue, 13 Mar 2007)
New Revision: 3736
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3736

Modified:
   trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java
Log:
Add custom http header for guid, make sure we catch exceptions so the thread doesn't die, use tweak.properties to configure URL and refresh interval on the fly

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java	2007-03-13 21:00:36 UTC (rev 3735)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java	2007-03-13 21:20:54 UTC (rev 3736)
@@ -28,6 +28,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
@@ -70,8 +71,48 @@
     private static final int CHECK_INTERVAL = 1000 * 60 * 60 * 24; 
     private static final String CHECK_URL = "http://support.hyperic.com/uns"; 
         
-    private final Log _log = LogFactory.getLog(UpdateBossEJBImpl.class);
+    private static final Log _log = LogFactory.getLog(UpdateBossEJBImpl.class);
     
+    private static Properties getTweakProperties() 
+        throws IOException
+    {
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        InputStream is = 
+            loader.getResourceAsStream("META-INF/tweak.properties");
+        Properties res = new Properties();
+        
+        try {
+            res.load(is);
+        } finally {
+            try {is.close();} catch(IOException e) {}
+        }
+        return res;
+    }
+    
+    private static String getCheckURL() {
+        try {
+            Properties p = getTweakProperties();
+            String res = p.getProperty("hq.updateNotify.url");
+            if (res != null)
+                return res;
+        } catch(IOException e) {
+            _log.warn("Unable to get notification url", e);
+        }
+        return CHECK_URL;
+    }
+    
+    private static long getCheckInterval() {
+        try {
+            Properties p = getTweakProperties();
+            String res = p.getProperty("hq.updateNotify.interval");
+            if (res != null)
+                return Long.parseLong(res);
+        } catch(Exception e) {
+            _log.warn("Unable to get notification interval", e);
+        }
+        return CHECK_INTERVAL;
+    }
+
     /**
      * @ejb:interface-method
      * @ejb:transaction type="REQUIRED"
@@ -152,7 +193,8 @@
         _log.debug("Generated report.  Size=" + reqBytes.length + 
                    " report:\n" + req);
         
-        PostMethod post = new PostMethod(CHECK_URL);
+        PostMethod post = new PostMethod(getCheckURL());
+        post.addRequestHeader("x-hq-guid", req.getProperty("hq.guid"));
         HttpClient c = new HttpClient();
         c.setTimeout(5 * 60 * 1000); 
         
@@ -178,21 +220,21 @@
 
     private void processReport(int statusCode, String response) {  
         UpdateStatus curStatus = getOrCreateStatus();
+        String curReport;
         
         if (response.length() >= 4000) { 
             _log.warn("Update report exceeded 4k");
             return;
         }
+        
+        response = response.trim();
 
-        // TODO:  Check status code so we only save valid stuffs
-        if (curStatus.getReport() != null && 
-            curStatus.getReport().equals(response))
-        {
+        curReport = curStatus.getReport() == null ? "" : curStatus.getReport();
+        if (curReport.equals(response))
             return;
-        }
         
         curStatus.setReport(response);
-        curStatus.setIgnored(false);
+        curStatus.setIgnored(response.trim().length() == 0);
     }
     
     /**
@@ -256,10 +298,11 @@
     private static class UpdateFetcher implements Runnable {
         public void run() {
             while(true) {
-                UpdateBossEJBImpl.getOne().fetchReport();
                 try {
-                    Thread.sleep(CHECK_INTERVAL);
-                } catch(InterruptedException e) {
+                    UpdateBossEJBImpl.getOne().fetchReport();
+                    Thread.sleep(getCheckInterval());
+                } catch(Exception e) {
+                    _log.warn("Error getting update notification", e);
                 }
             }
         }

[Hyperic-hq-discuss] hq r3735 - in trunk: src/org/hyperic/hq/ui/action/admin/config web/WEB-INF/classes web/admin/config

[<cl...@hy...>]

Author: clee
Date: 2007-03-13 13:00:36 -0800 (Tue, 13 Mar 2007)
New Revision: 3735
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3735

Modified:
   trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigAction.java
   trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java
   trunk/src/org/hyperic/hq/ui/action/admin/config/SystemConfigForm.java
   trunk/web/WEB-INF/classes/ApplicationResources.properties
   trunk/web/admin/config/EditServerConfigForm.jsp
Log:
Add Announcement properties to server settings


Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigAction.java	2007-03-13 20:26:14 UTC (rev 3734)
+++ trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigAction.java	2007-03-13 21:00:36 UTC (rev 3735)
@@ -36,7 +36,9 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.hyperic.hq.bizapp.server.session.UpdateStatusMode;
 import org.hyperic.hq.bizapp.shared.ConfigBoss;
+import org.hyperic.hq.bizapp.shared.UpdateBoss;
 import org.hyperic.hq.ui.action.BaseAction;
 import org.hyperic.hq.ui.util.ContextUtils;
 import org.hyperic.hq.ui.util.RequestUtils;
@@ -65,14 +67,22 @@
         ConfigBoss boss = ContextUtils.getConfigBoss(ctx);
         
         if (cForm.isOkClicked()) {
-            if (log.isTraceEnabled()) log.trace("Getting config");
+            if (log.isTraceEnabled())
+                log.trace("Getting config");
             Properties props = cForm.saveConfigProperties(boss.getConfig());
 
-            if (log.isTraceEnabled()) log.trace("Setting config");
+            if (log.isTraceEnabled())
+                log.trace("Setting config");
             boss.setConfig(props);
 
-            if (log.isTraceEnabled()) log.trace("Restarting config service");
+            if (log.isTraceEnabled())
+                log.trace("Restarting config service");
             boss.restartConfig();
+
+            // Set the update mode
+            UpdateBoss uboss = ContextUtils.getUpdateBoss(ctx);
+            uboss.setUpdateMode(
+                UpdateStatusMode.findByCode(cForm.getUpdateMode()));
         }
 
         RequestUtils.setConfirmation(request,

Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java	2007-03-13 20:26:14 UTC (rev 3734)
+++ trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java	2007-03-13 21:00:36 UTC (rev 3735)
@@ -31,10 +31,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.hyperic.hq.bizapp.shared.ConfigBoss;
-import org.hyperic.hq.common.shared.HQConstants;
-import org.hyperic.hq.ui.util.ContextUtils;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.action.ActionForm;
@@ -42,6 +38,11 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.tiles.ComponentContext;
 import org.apache.struts.tiles.actions.TilesAction;
+import org.hyperic.hq.bizapp.server.session.UpdateStatusMode;
+import org.hyperic.hq.bizapp.shared.ConfigBoss;
+import org.hyperic.hq.bizapp.shared.UpdateBoss;
+import org.hyperic.hq.common.shared.HQConstants;
+import org.hyperic.hq.ui.util.ContextUtils;
 
 public class EditConfigPrepAction extends TilesAction {
 
@@ -64,6 +65,11 @@
         Properties props = boss.getConfig();
         cForm.loadConfigProperties(props);
         
+        // Set the update mode
+        UpdateBoss uboss = ContextUtils.getUpdateBoss(ctx);
+        UpdateStatusMode upMode = uboss.getUpdateMode();
+        cForm.setUpdateMode(upMode.getCode());
+        
         // See if the property exists
         if (props.containsKey(HQConstants.SNMPVersion)) {
             String ver = props.getProperty(HQConstants.SNMPVersion);

Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/SystemConfigForm.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/admin/config/SystemConfigForm.java	2007-03-13 20:26:14 UTC (rev 3734)
+++ trunk/src/org/hyperic/hq/ui/action/admin/config/SystemConfigForm.java	2007-03-13 21:00:36 UTC (rev 3735)
@@ -48,6 +48,7 @@
     private String alertPurgeVal = "0";
     private String alertPurge    = "";
     private boolean reindex = false;
+    private int    updateMode = 0;
     protected String elPurgeVal = "0";
 
     public String toString() {
@@ -58,6 +59,7 @@
         buf.append(" helpUserId=").append(helpUserId);
         buf.append(" helpPassword=").append(helpPassword);
         buf.append(" deleteUnits=").append(deleteUnits);
+        buf.append(" updateMode=").append(updateMode);
 
         return buf.toString();
     }
@@ -80,6 +82,7 @@
         alertPurge = "";
         alertPurgeVal = null;
         elPurgeVal = "0";
+        updateMode = 0;
     }
 
     public void loadConfigProperties (Properties prop){
@@ -107,7 +110,7 @@
         alertPurge = findTimeUnit(alertPurgeLong.longValue());
         alertPurgeVal = calcTimeUnit(alertPurgeLong.longValue());
 
-        String elPurgeValStr = prop.getProperty(org.hyperic.hq.common.shared.HQConstants.EventLogPurge);
+        String elPurgeValStr = prop.getProperty(HQConstants.EventLogPurge);
         Long elPurgeLong = new Long(elPurgeValStr);
         elPurgeVal = calcTimeUnit(elPurgeLong.longValue());
     }
@@ -184,7 +187,7 @@
             convertToMillisecond(Long.parseLong(elPurgeVal),
                                  Constants.DAYS_LABEL);
         
-        prop.setProperty(org.hyperic.hq.common.shared.HQConstants.EventLogPurge,
+        prop.setProperty(HQConstants.EventLogPurge,
                          String.valueOf(elPurgeLong));
 
         return prop;
@@ -297,4 +300,12 @@
     public void setElPurgeVal(String elPurgeVal) {
         this.elPurgeVal = elPurgeVal;
     }
+
+    public int getUpdateMode() {
+        return updateMode;
+    }
+
+    public void setUpdateMode(int updateMode) {
+        this.updateMode = updateMode;
+    }
 }

Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2007-03-13 20:26:14 UTC (rev 3734)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2007-03-13 21:00:36 UTC (rev 3735)
@@ -490,9 +490,11 @@
 
 admin.settings.RestartNote=<b>NOTE:</b>Any changes to HQ Server Settings will take effect after the next server restart.
 admin.settings.EmailConfigTab=HQ Email Configuration Properties
+admin.settings.UpdateConfigTab=HQ Announcements Properties
 admin.settings.SMTPHostLabel=SMTP Host:
 admin.settings.BaseURL=Base URL:
 admin.settings.SenderEmailAddressLabel=From Email Address:
+admin.settings.AnnouncementType=HQ Version and Security Announcements:
 admin.settings.MiscConfigTab=Miscellaneous Configuration Properties
 admin.settings.DisableGuide=Disable HQ Guide for All Users (restart the HQ server after changing this setting)
 
@@ -512,6 +514,8 @@
 admin.settings.Reindex=Reindex Metric Data Tables Nightly:
 admin.settings.EventLogPurge=Delete Events and Logs Older Than:
 
+admin.settings.All=All
+admin.settings.Major=Major
 admin.settings.Day=day
 admin.settings.Days=days
 admin.settings.Hour=hour
@@ -2650,7 +2654,7 @@
 inform.config.escalation.scheme.newAction.noactions=Currently there are no actions for this escalation. Click on the "Create Action" button below to create an action to perform when this escalation is invoked.
 inform.config.escalation.scheme.inProgressEscalation=If you edit an escalation that is currently in progress, the escalation will be stopped.
 inform.config.escalation.scheme.NoOP=Suppress Additional Alerts
-inform.config.admin.HQServerConfig= - Change settings for email, data compression, database maintenance and authentication services
+inform.config.admin.HQServerConfig= - Change settings for email, announcements, data compression, database maintenance and authentication services
 inform.config.admin.MonitoringDefaults= - Define monitoring policies for the entire environment
 inform.config.admin.PolicyDefaults= - Define monitoring and alerting policies for the entire environment
 inform.config.admin.EscalationScheme= - Define global escalation schemes that can be applied to individual alerts

Modified: trunk/web/admin/config/EditServerConfigForm.jsp
===================================================================
--- trunk/web/admin/config/EditServerConfigForm.jsp	2007-03-13 20:26:14 UTC (rev 3734)
+++ trunk/web/admin/config/EditServerConfigForm.jsp	2007-03-13 21:00:36 UTC (rev 3735)
@@ -69,7 +69,7 @@
 <!--  /  -->
 
 <!--  EMAIL CONFIG CONTENTS -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
+<table width="100%" cellpadding="0" cellspacing="0" border="0" class="TableBottomLine">
   <tr>
     <td width="30%" class="BlockLabel"><fmt:message key="admin.settings.BaseURL"/></td>
     <td width="40%" class="BlockContent"><html:text size="31" property="baseUrl" /></td>
@@ -80,7 +80,27 @@
     <td class="BlockContent"><html:text size="31" property="senderEmail" /></td>
     <td class="BlockContent" colspan="2"></td>
   </tr>
+</table>
+<!--  /  -->
+
+<!--  UPDATE CONFIG TITLE -->
+<tiles:insert definition=".header.tab">  
+  <tiles:put name="tabKey" value="admin.settings.UpdateConfigTab"/>  
+</tiles:insert>
+<!--  /  -->
+
+<!--  UPDATE CONFIG CONTENTS -->
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
   <tr>
+    <td width="30%" class="BlockLabel"><fmt:message key="admin.settings.AnnouncementType"/></td>
+    <td width="40%" class="BlockContent">
+    <html:radio property="updateMode" value="0"/><fmt:message key="admin.settings.All"/>
+    <html:radio property="updateMode" value="1"/><fmt:message key="admin.settings.Major"/>
+    <html:radio property="updateMode" value="2"/><fmt:message key="common.label.None"/>
+    </td>
+    <td width="30%" class="BlockContent" colspan="2"></td>
+  </tr>
+  <tr>
     <td colspan="4" class="BlockBottomLine"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td>
   </tr>
 <!--  /  -->

[Hyperic-hq-discuss] hq r3734 - trunk/web/portal

[<he...@hy...>]

Author: heather
Date: 2007-03-13 12:26:14 -0800 (Tue, 13 Mar 2007)
New Revision: 3734
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3734

Modified:
   trunk/web/portal/DashboardLayout.jsp
Log:
hq-579 and hq-578 metric portlet not refreshing and if you remove availability portlet you get an js error

Modified: trunk/web/portal/DashboardLayout.jsp
===================================================================
--- trunk/web/portal/DashboardLayout.jsp	2007-03-13 20:23:59 UTC (rev 3733)
+++ trunk/web/portal/DashboardLayout.jsp	2007-03-13 20:26:14 UTC (rev 3734)
@@ -85,17 +85,33 @@
     function refreshPortlets() {
         var problemPortlet = $('problemResourcesTable');
         var favoritePortlet = $('favoriteTable');
+        
+        var nodes = document.getElementsByTagName('table');
+        var getRecentForm = document.getElementsByTagName('form')
 
+        for(i=0;i<nodes.length;i++) {
+            if(/metricTable/.test(nodes[i].id)) {
+            setTimeout("requestMetricsResponse<c:out value="${portlet.token}"/>()", 60000);    
+            }
+        }
 
-        setTimeout("requestAvailSummary<c:out value="${portlet.token}"/>()", 60000);
-       
 
+        for(i=0;i<nodes.length;i++) {
+            if(/availTable/.test(nodes[i].id)) {
+            setTimeout("requestAvailSummary<c:out value="${portlet.token}"/>()", 60000);
+            }
+         }
+
+        for(i=0;i<getRecentForm.length;i++) {
+            if(/RemoveAlerts/.test(getRecentForm[i].action)) {
+            setTimeout("requestRecentAlerts<c:out value="${portlet.token}"/>()", 60000);
+            }
+        }
+
         if (problemPortlet){
         setTimeout("requestProblemResponse()", 60000);
-            }
+        }
 
-        setTimeout("requestRecentAlerts<c:out value="${portlet.token}"/>()", 60000);
-
         if (favoritePortlet) {
         setTimeout("requestFavoriteResources()", 60000);
         }