hyperic-hq-discuss — Hyperic HQ SVN Commits

[Hyperic-hq-discuss] hq r14435 - trunk/src/org/hyperic/hq/measurement/server/session

[<sc...@hy...>]

Author: scottmf
Date: 2010-03-29 14:22:09 -0700 (Mon, 29 Mar 2010)
New Revision: 14435
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14435

Modified:
   trunk/src/org/hyperic/hq/measurement/server/session/AgentScheduleSyncZevent.java
   trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java
Log:
[HHQ-3815] changed a couple of the apis to accept more generic collections.  add findEnabledByResources() to MeasurementDAO

Modified: trunk/src/org/hyperic/hq/measurement/server/session/AgentScheduleSyncZevent.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/AgentScheduleSyncZevent.java	2010-03-29 20:57:36 UTC (rev 14434)
+++ trunk/src/org/hyperic/hq/measurement/server/session/AgentScheduleSyncZevent.java	2010-03-29 21:22:09 UTC (rev 14435)
@@ -25,8 +25,9 @@
 
 package org.hyperic.hq.measurement.server.session;
 
-import java.util.List;
+import java.util.Collection;
 
+import org.hyperic.hq.appdef.shared.AppdefEntityID;
 import org.hyperic.hq.zevents.Zevent;
 import org.hyperic.hq.zevents.ZeventManager;
 import org.hyperic.hq.zevents.ZeventPayload;
@@ -56,26 +57,27 @@
         implements ZeventPayload
     {
         // List<AppdefEntityID>
-        private final List _entityIDs;
+        private final Collection _entityIDs;
 
-        public AgentScheduleSyncZeventPayload(List ids) {
+        public AgentScheduleSyncZeventPayload(Collection ids) {
             _entityIDs = ids;
         }
 
-        public List getEntityIds() {
+        public Collection getEntityIds() {
             return _entityIDs;
         }
     }
 
-    public List getEntityIds() {
+    public Collection getEntityIds() {
         return ((AgentScheduleSyncZeventPayload)getPayload()).getEntityIds();
     }
 
     /**
-     * @param ids List of {@link AppdefEntityID}
+     * @param aeids {@link Collection} of {@link AppdefEntityID}
      */
-    public AgentScheduleSyncZevent(List aeids) {
+    public AgentScheduleSyncZevent(Collection aeids) {
         super(new AgentScheduleSyncZeventSource(),
               new AgentScheduleSyncZeventPayload(aeids));
     }
+
 }

Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java	2010-03-29 20:57:36 UTC (rev 14434)
+++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementDAO.java	2010-03-29 21:22:09 UTC (rev 14435)
@@ -261,6 +261,44 @@
         return count;
     }
 
+    /**
+     * @param {@link Collection} of {@link Resource}s
+     * @return {@link Map} of {@link Integer} representing resourceId to
+     * {@link List} of {@link Measurement}s
+     */
+    public Map findEnabledByResources(List resources) {
+        if (resources == null || resources.size() == 0) {
+            return Collections.EMPTY_MAP;
+        }
+        final String sql = new StringBuilder(256)
+            .append("select m from Measurement m ")
+            .append("where m.enabled = '1' and ")
+            .append("m.resource in (:rids) ")
+            .toString();
+        final Map rtn = new HashMap();
+        final Query query = getSession().createQuery(sql);
+        final int size = resources.size();
+        for (int i=0; i<size; i+=BATCH_SIZE) {
+            int end = Math.min(size, i+BATCH_SIZE);
+            final List sublist = resources.subList(i, end);
+            final List resultset = query.setParameterList("rids", sublist).list();
+            for (final Iterator it=resultset.iterator(); it.hasNext(); ) {
+                final Measurement m = (Measurement) it.next();
+                final Resource r = m.getResource();
+                if (r == null || r.isInAsyncDeleteState()) {
+                    continue;
+                }
+                List tmp = (List) rtn.get(r.getId());
+                if (tmp == null) {
+                    tmp = new ArrayList();
+                    rtn.put(r.getId(), tmp);
+                }
+                tmp.add(m);
+            }
+        }
+        return rtn;
+    }
+
     public List findEnabledByResource(Resource resource) {
         if (resource == null || resource.isInAsyncDeleteState()) {
             return Collections.EMPTY_LIST;

[Hyperic-hq-discuss] hq r14434 - trunk/src/org/hyperic/hq/appdef/server/session

[<sc...@hy...>]

Author: scottmf
Date: 2010-03-29 13:57:36 -0700 (Mon, 29 Mar 2010)
New Revision: 14434
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14434

Modified:
   trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java
Log:
[HHQ-3815] corrected bad merge.  should have been part of r14433

Modified: trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java	2010-03-29 18:46:47 UTC (rev 14433)
+++ trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java	2010-03-29 20:57:36 UTC (rev 14434)
@@ -566,45 +566,6 @@
             wasUpdated = true;
         }
         return wasUpdated;
-
-        if (wasUpdated) {
-            if (sendConfigEvent) {
-                List events = new ArrayList();
-                events.add(new ResourceUpdatedZevent(subject, appdefID));
-
-                if (appdefID.isPlatform()) {
-                    try {
-                        Platform p = getPlatformManagerLocal().findPlatformById(appdefID.getId());
-                        for (Iterator i = p.getServers().iterator(); i.hasNext() ;) {
-                            Server s = (Server)i.next();
-                            events.add(new ResourceUpdatedZevent(subject, s.getEntityId()));
-                            for (Iterator it = s.getServices().iterator(); it.hasNext();) {
-                                Service svc = (Service)it.next();
-                                events.add(new ResourceUpdatedZevent(subject, svc.getEntityId()));
-                            }
-                        }
-                    } catch (org.hyperic.hq.appdef.shared.PlatformNotFoundException e) {
-                        log.warn("Error sending config event for: " + appdefID, e);
-                    }
-                } else if (appdefID.isServer()) {
-                    try {
-                        Server s = getServerManagerLocal().findServerById(appdefID.getId());
-                        for (Iterator i = s.getServices().iterator(); i.hasNext();) {
-                            Service svc = (Service)i.next();
-                            events.add(new ResourceUpdatedZevent(subject, svc.getEntityId()));
-                        }
-                    } catch (org.hyperic.hq.appdef.shared.ServerNotFoundException e) {
-                        log.warn("Error sending config event for: " + appdefID, e);
-                    }
-                }
-
-                ZeventManager.getInstance().enqueueEventsAfterCommit(events);
-            }
-            
-            return appdefID;
-        } else {
-            return null;
-        }
     }
 
     /** Update the appdef entities based on TypeInfo

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

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

Author: bob
Date: 2010-03-29 00:51:19 -0700 (Mon, 29 Mar 2010)
New Revision: 14432
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14432

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1392

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-03-28 07:51:38 UTC (rev 14431)
+++ trunk/etc/version.properties	2010-03-29 07:51:19 UTC (rev 14432)
@@ -1,3 +1,3 @@
-#Sun Mar 28 00:17:33 PDT 2010
+#Mon Mar 29 00:18:38 PDT 2010
 version=4.3.0
-build=1391
+build=1392

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

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

Author: bob
Date: 2010-03-28 00:51:38 -0700 (Sun, 28 Mar 2010)
New Revision: 14431
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14431

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1391

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-03-27 07:50:49 UTC (rev 14430)
+++ trunk/etc/version.properties	2010-03-28 07:51:38 UTC (rev 14431)
@@ -1,3 +1,3 @@
-#Sat Mar 27 00:17:21 PDT 2010
+#Sun Mar 28 00:17:33 PDT 2010
 version=4.3.0
-build=1390
+build=1391

Re: [Hyperic-hq-discuss] Trying to figure out sigar.jar

[Joey <joe...@su...>]

Never mind I figured it out thanks

[Hyperic-hq-discuss] Trying to figure out sigar.jar

[Joey <joe...@su...>]

>From my computer running commands from the command line works fine... 
like: java -jar sigar.jar cpuinfo this command returns all of my cpuinfo. But, I'm trying to build an application in Java with the libraries import in. When I run this command it returns a 0 instead of my MHz :

import org.hyperic.sigar.*;

        try {
            CpuInfo getcpu = new CpuInfo();
            int cpuspeed = getcpu.getMhz();
            System.out.println(cpuspeed);
        } catch (Exception ex) {
            Logger.getLogger(NewJFrame.class.getName()).log(Level.SEVERE, null, ex);
        }

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

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

Author: bob
Date: 2010-03-27 00:50:49 -0700 (Sat, 27 Mar 2010)
New Revision: 14430
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14430

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1390

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-03-27 00:26:16 UTC (rev 14429)
+++ trunk/etc/version.properties	2010-03-27 07:50:49 UTC (rev 14430)
@@ -1,3 +1,3 @@
-#Fri Mar 26 00:16:57 PDT 2010
+#Sat Mar 27 00:17:21 PDT 2010
 version=4.3.0
-build=1389
+build=1390

[Hyperic-hq-discuss] hq r14429 - trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice

[<pn...@hy...>]

Author: pnguyen
Date: 2010-03-26 17:26:16 -0700 (Fri, 26 Mar 2010)
New Revision: 14429
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14429

Modified:
   trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice/SNMPTrapReceiver.java
Log:
[HHQ-3761] Add more informational debug statements

Modified: trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice/SNMPTrapReceiver.java
===================================================================
--- trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice/SNMPTrapReceiver.java	2010-03-26 23:17:07 UTC (rev 14428)
+++ trunk/plugins/netdevice/src/org/hyperic/hq/plugin/netdevice/SNMPTrapReceiver.java	2010-03-27 00:26:16 UTC (rev 14429)
@@ -272,7 +272,11 @@
             String msg = getMessage(event);
 
             if (log.isDebugEnabled()) {
-                log.debug("Msg=" + msg);
+                log.debug("plugin=" + plugin.getName()
+                            + ", address=" + address
+                            + ", community=" + community
+                            + ", trapsReceived=" + getTrapsReceived()
+                            + ", msg=" + msg);
             }
 
             plugin.reportEvent(System.currentTimeMillis(), LogTrackPlugin.LOGLEVEL_ERROR, address, msg);

[Hyperic-hq-discuss] hq r14428 - trunk/src/org/hyperic/hq/measurement/server/session

[<tr...@hy...>]

Author: trader
Date: 2010-03-26 16:17:07 -0700 (Fri, 26 Mar 2010)
New Revision: 14428
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14428

Modified:
   trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java
Log:
HHQ-3612: better error logging from ReportProcessor.  Just fix the error message.  Leftover: there is a FIXME comment regarding a minor re-factoring that would make the code less convoluted.

Modified: trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java	2010-03-26 21:54:39 UTC (rev 14427)
+++ trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java	2010-03-26 23:17:07 UTC (rev 14428)
@@ -212,6 +212,10 @@
                 }
                 continue;
             }
+            
+            // FIXME: reosurceMatchesAgent() and the call to getAgent() can be
+            // consolidated, the agent match can be checked by getting the agent
+            // for the instanceID from the resource
             if (!resourceMatchesAgent(res, agentToken)) {
                 String ipAddr = "<Unknown IP address>";
                 String portString = "<Unknown port>";

[Hyperic-hq-discuss] hq r14427 - trunk/src/org/hyperic/hq/measurement/server/session

[<tr...@hy...>]

Author: trader
Date: 2010-03-26 14:54:39 -0700 (Fri, 26 Mar 2010)
New Revision: 14427
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14427

Modified:
   trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java
Log:


Modified: trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java	2010-03-26 07:55:00 UTC (rev 14426)
+++ trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java	2010-03-26 21:54:39 UTC (rev 14427)
@@ -55,6 +55,7 @@
 import org.hyperic.hq.measurement.data.DSNList;
 import org.hyperic.hq.measurement.data.MeasurementReport;
 import org.hyperic.hq.measurement.data.ValueList;
+import org.hyperic.hq.measurement.monitor.MonitorAgentException;
 import org.hyperic.hq.measurement.shared.MeasurementManagerLocal;
 import org.hyperic.hq.measurement.shared.ReportProcessorLocal;
 import org.hyperic.hq.measurement.shared.ReportProcessorUtil;
@@ -212,9 +213,23 @@
                 continue;
             }
             if (!resourceMatchesAgent(res, agentToken)) {
-                _log.warn("measurement (id=" + m.getId() + ") was sent to the " +
-                    "HQ server from agent (agentToken=" + agentToken + ")" +
-                    " but resource (id=" + res.getId() + ") is not associated " +
+                String ipAddr = "<Unknown IP address>";
+                String portString = "<Unknown port>";
+                try {
+                    Agent agt = getAgent(agentToken);
+                    ipAddr = agt.getAddress();
+                    portString = agt.getPort().toString();
+                } catch (MonitorAgentException mae) {
+                    // leave values as default
+                    _log.debug("Error trying to construct string for WARN message below", mae);
+                }
+                
+                _log.warn("measurement (id=" + m.getId() + ", name=" +
+                    m.getTemplate().getName() + ") was sent to the " +
+                    "HQ server from agent (agentToken=" + agentToken + ", name=" +
+                    ipAddr + ", port=" + portString + ")" +
+                    " but resource (id=" + res.getId() + ", name=" +
+                    res.getName() + ") is not associated " +
                     " with that agent.  Dropping measurement.");
                 continue;
             }

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

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

Author: bob
Date: 2010-03-26 00:55:00 -0700 (Fri, 26 Mar 2010)
New Revision: 14426
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14426

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1389

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-03-26 00:18:54 UTC (rev 14425)
+++ trunk/etc/version.properties	2010-03-26 07:55:00 UTC (rev 14426)
@@ -1,3 +1,3 @@
-#Thu Mar 25 00:19:13 PDT 2010
+#Fri Mar 26 00:16:57 PDT 2010
 version=4.3.0
-build=1388
+build=1389

[Hyperic-hq-discuss] [hyperic/hqapi] de626f: [HQ-2038] Improve error handling when resource gro...

[<no...@gi...>]

Branch: refs/heads/master
Home:   http://github.com/hyperic/hqapi

Commit: de626f221bfae0a18e7d3a733edaf669cc96e549
    http://github.com/hyperic/hqapi/commit/de626f221bfae0a18e7d3a733edaf669cc96e549
Author: pnguyen <pnguyen@192.168.1.66>
Date:   2010-03-25 (Thu, 25 Mar 2010)

Changed paths:
  M ChangeLog
  M hqu/hqapi1/app/GroupController.groovy
  M src/org/hyperic/hq/hqapi1/ErrorCode.java
  M src/org/hyperic/hq/hqapi1/test/HQApiTestBase.java
  M src/org/hyperic/hq/hqapi1/test/MaintenanceSchedule_test.java
  M src/org/hyperic/hq/hqapi1/test/RoleTestBase.java

Log Message:
-----------
[HQ-2038] Improve error handling when resource group membership is being updated while scheduled downtime is in progress.

[Hyperic-hq-discuss] hq r14425 - in trunk: src/org/hyperic/hq/authz src/org/hyperic/hq/authz/server/session src/org/hyperic/hq/bizapp/server/session src/org/hyperic/hq/ui/action/resource/common/inventory src/org/hyperic/hq/ui/action/resource/group/inventory src/org/hyperic/hq/ui/service web/WEB-INF web/WEB-INF/classes web/js/lib web/resource/group/inventory

[<pn...@hy...>]

Author: pnguyen
Date: 2010-03-25 17:18:54 -0700 (Thu, 25 Mar 2010)
New Revision: 14425
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14425

Modified:
   trunk/src/org/hyperic/hq/authz/Resources.properties
   trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java
   trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java
   trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/AddResourceGroupsAction.java
   trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/RemoveResourceGroupsAction.java
   trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/AddGroupResourcesAction.java
   trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/RemoveAction.java
   trunk/src/org/hyperic/hq/ui/service/RESTService.java
   trunk/web/WEB-INF/classes/ApplicationResources.properties
   trunk/web/WEB-INF/struts-config.xml
   trunk/web/js/lib/lib.js
   trunk/web/resource/group/inventory/ListResources.jsp
Log:
[HQ-2038] Prevent resource group membership from being updated if scheduled downtime is in progress

Modified: trunk/src/org/hyperic/hq/authz/Resources.properties
===================================================================
--- trunk/src/org/hyperic/hq/authz/Resources.properties	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/src/org/hyperic/hq/authz/Resources.properties	2010-03-26 00:18:54 UTC (rev 14425)
@@ -18,4 +18,6 @@
 subject.field.dept=department
 subject.field.active=active status
 
-resourceGroup.sortField.name=Name
\ No newline at end of file
+resourceGroup.sortField.name=Name
+resourceGroup.update.error.downtime.running=Cannot update resource list for {0} while downtime is in progress.
+resourceGroup.update.error.downtime.scheduler.failure=Failure getting the downtime schedule for {0}.
\ No newline at end of file

Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java	2010-03-26 00:18:54 UTC (rev 14425)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of
  * "derived work".
  * 
- * Copyright (C) [2004-2009], Hyperic, Inc.
+ * Copyright (C) [2004-2010], Hyperic, Inc.
  * This file is part of HQ.
  * 
  * HQ is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 
 package org.hyperic.hq.authz.server.session;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -33,6 +34,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 import javax.ejb.CreateException;
 import javax.ejb.FinderException;
@@ -71,6 +73,7 @@
 import org.hyperic.hq.common.DuplicateObjectException;
 import org.hyperic.hq.common.SystemException;
 import org.hyperic.hq.common.VetoException;
+import org.hyperic.hq.events.MaintenanceEvent;
 import org.hyperic.hq.events.server.session.EventLogManagerEJBImpl;
 import org.hyperic.hq.events.shared.EventLogManagerLocal;
 import org.hyperic.hq.grouping.CritterList;
@@ -81,6 +84,7 @@
 import org.hyperic.util.pager.PageControl;
 import org.hyperic.util.pager.PageList;
 import org.hyperic.util.pager.Pager;
+import org.quartz.SchedulerException;
 
 /**
  * Use this session bean to manipulate ResourceGroups,
@@ -100,6 +104,7 @@
     extends AuthzSession 
     implements SessionBean 
 {
+    private final String BUNDLE = "org.hyperic.hq.authz.Resources";
     private Pager _groupPager;
     private Pager _ownedGroupPager;
     private final String GROUP_PAGER = 
@@ -167,6 +172,37 @@
     }
 
     /**
+     * Do not allow resources to be added or removed from a group
+     * if the group has a downtime schedule in progress.
+     */
+    private void checkGroupMaintenance(AuthzSubject subj, ResourceGroup group) 
+        throws PermissionException, VetoException {
+    
+        try {
+            MaintenanceEvent event = PermissionManagerFactory.getInstance()
+                                        .getMaintenanceEventManager()
+                                            .getMaintenanceEvent(subj, group.getId());
+
+            if (event != null && MaintenanceEvent.STATE_RUNNING.equals(event.getState())) {
+                String msg = ResourceBundle.getBundle(BUNDLE)
+                                .getString("resourceGroup.update.error.downtime.running");
+                
+                throw new VetoException(
+                            MessageFormat.format(msg, new String[] {group.getName()}));
+            }
+        } catch (SchedulerException se) {
+            // This should not happen. Indicates a serious system error.
+            
+            String msg = ResourceBundle.getBundle(BUNDLE)
+                            .getString("resourceGroup.update.error.downtime.scheduler.failure");
+                        
+            throw new SystemException(
+                        MessageFormat.format(msg, new String[] {group.getName()}),
+                        se); 
+        }
+    }
+    
+    /**
      * Find the group that has the given ID.  Does not do any authz checking
      * @ejb:interface-method
      */
@@ -302,14 +338,17 @@
      */
     public void addResources(AuthzSubject subj, ResourceGroup group,
                              List resources)
-        throws PermissionException
+        throws PermissionException, VetoException
     {
         checkGroupPermission(subj, group.getId(),
                              AuthzConstants.perm_modifyResourceGroup);
+        
+        checkGroupMaintenance(subj, group);
+        
         addResources(group, resources);
     }
 
-    private void addResources(ResourceGroup group, List resources) {
+    private void addResources(ResourceGroup group, Collection resources) {
         getResourceGroupDAO().addMembers(group, resources);
         GroupingStartupListener.getCallbackObj().groupMembersChanged(group);
     }
@@ -320,18 +359,87 @@
      */
     public ResourceGroup addResource(AuthzSubject whoami, ResourceGroup group, 
                                      Resource resource)
-        throws PermissionException 
+        throws PermissionException, VetoException 
     {
         checkGroupPermission(whoami, group.getId(),
                              AuthzConstants.perm_modifyResourceGroup);
 
-        getResourceGroupDAO().addMembers(group, 
-                                         Collections.singleton(resource));
-        GroupingStartupListener.getCallbackObj().groupMembersChanged(group);
+        checkGroupMaintenance(whoami, group);
+        
+        addResources(group, Collections.singletonList(resource));
+        
         return group;
     }
- 
+
     /**
+     * Add a resource to a collection of groups
+     * 
+     * @param whoami The current running user.
+     * @param resource The resource
+     * @param groups The groups to add to.
+     * 
+     * @ejb:interface-method
+     */
+    public void addResource(AuthzSubject whoami, 
+                            Resource resource,
+                            Collection groups)
+        throws PermissionException, VetoException
+    {
+        // Do all of the pre-condition checks first before
+        // iterating through addResources() because
+        // ResourceGroupDAO().addMembers() will commit
+        // the changes after each iteration.
+
+        for (Iterator i = groups.iterator(); i.hasNext();) {
+            ResourceGroup g = (ResourceGroup) i.next();
+            
+            checkGroupPermission(whoami, g.getId(),
+                                 AuthzConstants.perm_modifyResourceGroup);
+
+            checkGroupMaintenance(whoami, g);
+        }
+        
+        for (Iterator i = groups.iterator(); i.hasNext();) {
+            ResourceGroup g = (ResourceGroup) i.next();
+            addResources(g, Collections.singletonList(resource));
+        }
+    }
+
+    /**
+     * Remove a resource from a collection of groups
+     * 
+     * @param whoami The current running user.
+     * @param resource The resource
+     * @param groups The groups to remove from.
+     * 
+     * @ejb:interface-method
+     */    
+    public void removeResource(AuthzSubject whoami,
+                               Resource resource,
+                               Collection groups)
+        throws PermissionException, VetoException
+    {
+        // Do all of the pre-condition checks first before
+        // iterating through removeResources() because
+        // ResourceGroupDAO().removeMembers() will commit
+        // the changes after each iteration.
+
+        for (Iterator i = groups.iterator(); i.hasNext();) {
+            ResourceGroup g = (ResourceGroup) i.next();
+            
+            checkGroupPermission(whoami, g.getId(),
+                                 AuthzConstants.perm_modifyResourceGroup);
+
+            checkGroupMaintenance(whoami, g);
+        }
+        
+        for (Iterator i = groups.iterator(); i.hasNext();) {
+            ResourceGroup g = (ResourceGroup) i.next();
+            removeResources(g, Collections.singletonList(resource));
+        }
+    }
+    
+    /**
      * RemoveResources from a group.
      * @param whoami The current running user.
      * @param group The group .
@@ -340,16 +448,21 @@
     public void removeResources(AuthzSubject whoami,
                                 ResourceGroup group,
                                 Collection resources)
-        throws PermissionException 
+        throws PermissionException, VetoException 
     {
         checkGroupPermission(whoami, group.getId(),
                              AuthzConstants.perm_modifyResourceGroup);
-        
-        ResourceGroupDAO grpDao = getResourceGroupDAO();
-        grpDao.removeMembers(group, resources);
+
+        checkGroupMaintenance(whoami, group);
+
+        removeResources(group, resources);
+    }
+
+    private void removeResources(ResourceGroup group, Collection resources) {
+        getResourceGroupDAO().removeMembers(group, resources);
         GroupingStartupListener.getCallbackObj().groupMembersChanged(group);
     }
-
+    
     /**
      * Sets the criteria list for this group.
      * @param whoami The current running user.
@@ -378,11 +491,13 @@
      */
     public void setResources(AuthzSubject whoami,
                              ResourceGroup group, Collection resources) 
-        throws PermissionException 
+        throws PermissionException, VetoException 
     {
         checkGroupPermission(whoami, group.getId(),
                              AuthzConstants.perm_modifyResourceGroup);
 
+        checkGroupMaintenance(whoami, group);
+
         getResourceGroupDAO().setMembers(group, resources);
         GroupingStartupListener.getCallbackObj().groupMembersChanged(group);
     }

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/AppdefBossEJBImpl.java	2010-03-26 00:18:54 UTC (rev 14425)
@@ -2376,7 +2376,7 @@
      */
     public void removeResourcesFromGroup(int sessionId, ResourceGroup group,
                                          Collection resources)
-        throws SessionException, PermissionException
+        throws SessionException, PermissionException, VetoException
     {
         AuthzSubject subject = manager.getSubject(sessionId);
 
@@ -2643,7 +2643,7 @@
      */
     public void addResourcesToGroup(int sessionID, ResourceGroup group,
                                     List aeids)
-        throws SessionException, PermissionException 
+        throws SessionException, PermissionException, VetoException 
     {
         AuthzSubject subject = manager.getSubject(sessionID);
         ResourceGroupManagerLocal groupMan = 
@@ -3317,12 +3317,15 @@
         ResourceGroupManagerLocal groupMan = getResourceGroupManager();
         ResourceManagerLocal resourceMan = getResourceManager();
         Resource resource = resourceMan.findResource(entityId);
+        List groups = new ArrayList(groupIds.length);
         
         for (int i=0; i < groupIds.length; i++) {
             ResourceGroup group = groupMan.findResourceGroupById(subject, 
                                                                  groupIds[i]);
-            groupMan.addResource(subject, group, resource);
+            groups.add(group);
         }
+        
+        groupMan.addResource(subject, resource, groups);
     }
 
     /**
@@ -3375,13 +3378,15 @@
         ResourceGroupManagerLocal groupMan = getResourceGroupManager();
         ResourceManagerLocal resourceMan = getResourceManager();
         Resource resource = resourceMan.findResource(entityId);
-        
+        List groups = new ArrayList(groupIds.length);
+
         for (int i=0;i<groupIds.length;i++) {
             ResourceGroup group = groupMan.findResourceGroupById(subject, 
                                                                  groupIds[i]);
-            groupMan.removeResources(subject, group, 
-                                     Collections.singleton(resource));
+            groups.add(group);
         }
+        
+        groupMan.removeResource(subject, resource, groups);
     }
 
     /**

Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/AddResourceGroupsAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/AddResourceGroupsAction.java	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/AddResourceGroupsAction.java	2010-03-26 00:18:54 UTC (rev 14425)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of
  * "derived work".
  * 
- * Copyright (C) [2004, 2005, 2006], Hyperic, Inc.
+ * Copyright (C) [2004-2010], Hyperic, Inc.
  * This file is part of HQ.
  * 
  * HQ is free software; you can redistribute it and/or modify
@@ -42,6 +42,7 @@
 import org.hyperic.hq.appdef.shared.AppdefEntityConstants;
 import org.hyperic.hq.appdef.shared.AppdefEntityID;
 import org.hyperic.hq.bizapp.shared.AppdefBoss;
+import org.hyperic.hq.common.VetoException;
 import org.hyperic.hq.ui.Constants;
 import org.hyperic.hq.ui.action.BaseAction;
 import org.hyperic.hq.ui.action.BaseValidatorForm;
@@ -140,12 +141,16 @@
             RequestUtils.setConfirmation(request,
                                          "resource.common.inventory.confirm.AddResourceGroups");
             return returnSuccess(request, mapping, forwardParams);
-        } 
-        catch (AppSvcClustDuplicateAssignException e1) {
-            RequestUtils
-                .setError(request,
-                          "resource.common.inventory.error.DuplicateClusterAssignment");
+        } catch (AppSvcClustDuplicateAssignException e1) {
+            RequestUtils.setError(request,
+                                  "resource.common.inventory.error.DuplicateClusterAssignment");
             return returnFailure(request, mapping);
+        } catch (VetoException ve) {
+            RequestUtils.setErrorObject(request, 
+                    "resource.group.inventory.error.UpdateResourceListVetoed",
+                    ve.getMessage());
+            
+            return returnFailure(request, mapping);
         }
 
     }

Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/RemoveResourceGroupsAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/RemoveResourceGroupsAction.java	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/src/org/hyperic/hq/ui/action/resource/common/inventory/RemoveResourceGroupsAction.java	2010-03-26 00:18:54 UTC (rev 14425)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of
  * "derived work".
  * 
- * Copyright (C) [2004-2008], Hyperic, Inc.
+ * Copyright (C) [2004-2010], Hyperic, Inc.
  * This file is part of HQ.
  * 
  * HQ is free software; you can redistribute it and/or modify
@@ -38,6 +38,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.hyperic.hq.appdef.shared.AppdefEntityID;
 import org.hyperic.hq.bizapp.shared.AppdefBoss;
+import org.hyperic.hq.common.VetoException;
 import org.hyperic.hq.ui.Constants;
 import org.hyperic.hq.ui.action.BaseAction;
 import org.hyperic.hq.ui.util.ContextUtils;
@@ -73,20 +74,27 @@
         AppdefEntityID entityId = new AppdefEntityID(resourceType.intValue(), 
                                                      resourceId);
 
-        Integer[] groups = rmForm.getG();
-        if (groups != null) {
-            log.trace("removing groups " + groups +
-                      " for resource [" + resourceId + "]");
-            boss.batchGroupRemove(sessionId.intValue(), entityId,
-                                  groups);
+        try {
+            Integer[] groups = rmForm.getG();
+            if (groups != null) {
+                log.trace("removing groups " + groups +
+                          " for resource [" + resourceId + "]");
+                boss.batchGroupRemove(sessionId.intValue(), entityId,
+                                      groups);
 
-            RequestUtils
-                .setConfirmation(request,
-                                 "resource.common.inventory.confirm.RemoveResourceGroups");
-        }
+                RequestUtils.setConfirmation(request,
+                        "resource.common.inventory.confirm.RemoveResourceGroups");
+            }
 
-        return returnSuccess(request, mapping, forwardParams);
+            return returnSuccess(request, mapping, forwardParams);
         
+        } catch (VetoException ve) {
+            RequestUtils.setErrorObject(request, 
+                    "resource.group.inventory.error.UpdateResourceListVetoed",
+                    ve.getMessage());
+            
+            return returnFailure(request, mapping, forwardParams);
+        }        
     }
 
 }

Modified: trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/AddGroupResourcesAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/AddGroupResourcesAction.java	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/AddGroupResourcesAction.java	2010-03-26 00:18:54 UTC (rev 14425)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of
  * "derived work".
  * 
- * Copyright (C) [2004, 2005, 2006], Hyperic, Inc.
+ * Copyright (C) [2004-2010], Hyperic, Inc.
  * This file is part of HQ.
  * 
  * HQ is free software; you can redistribute it and/or modify
@@ -52,6 +52,7 @@
 import org.hyperic.hq.authz.shared.ResourceGroupManagerLocal;
 import org.hyperic.hq.authz.shared.ResourceManagerLocal;
 import org.hyperic.hq.bizapp.shared.AppdefBoss;
+import org.hyperic.hq.common.VetoException;
 import org.hyperic.hq.ui.Constants;
 import org.hyperic.hq.ui.action.BaseAction;
 import org.hyperic.hq.ui.action.BaseValidatorForm;
@@ -145,6 +146,12 @@
             RequestUtils.setError(request, "resource.common.inventory.error.ResourceNotFound");
                      
             return returnFailure(request, mapping, forwardParams);
+        } catch (VetoException ve) {
+            RequestUtils.setErrorObject(request, 
+                    "resource.group.inventory.error.UpdateResourceListVetoed",
+                    ve.getMessage());
+            
+            return returnFailure(request, mapping);            
         }
     }
     

Modified: trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/RemoveAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/RemoveAction.java	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/src/org/hyperic/hq/ui/action/resource/group/inventory/RemoveAction.java	2010-03-26 00:18:54 UTC (rev 14425)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of
  * "derived work".
  * 
- * Copyright (C) [2004, 2005, 2006], Hyperic, Inc.
+ * Copyright (C) [2004-2010], Hyperic, Inc.
  * This file is part of HQ.
  * 
  * HQ is free software; you can redistribute it and/or modify
@@ -49,6 +49,7 @@
 import org.hyperic.hq.authz.server.session.ResourceManagerEJBImpl;
 import org.hyperic.hq.authz.shared.ResourceManagerLocal;
 import org.hyperic.hq.bizapp.shared.AppdefBoss;
+import org.hyperic.hq.common.VetoException;
 import org.hyperic.hq.ui.Constants;
 import org.hyperic.hq.ui.action.BaseAction;
 import org.hyperic.hq.ui.exception.ParameterNotFoundException;
@@ -97,6 +98,9 @@
             boss.removeResourcesFromGroup(sessionId.intValue(), group,
                                           resources);
             
+            RequestUtils.setConfirmation(request, 
+                    "resource.group.inventory.confirm.RemoveResources");
+
             return returnSuccess(request, mapping,forwardParams);
         } catch (ParameterNotFoundException e2) {
             RequestUtils.setError(request,
@@ -107,6 +111,12 @@
                           "resource.common.inventory.error.ResourceNotFound");
                      
             return returnFailure(request, mapping, forwardParams);
-        } 
+        } catch (VetoException ve) {
+            RequestUtils.setErrorObject(request, 
+                    "resource.group.inventory.error.UpdateResourceListVetoed",
+                    ve.getMessage());
+            
+            return returnFailure(request, mapping, forwardParams);
+        }
     }
 }

Modified: trunk/src/org/hyperic/hq/ui/service/RESTService.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/service/RESTService.java	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/src/org/hyperic/hq/ui/service/RESTService.java	2010-03-26 00:18:54 UTC (rev 14425)
@@ -547,9 +547,6 @@
                 for (int i=0; i<aeidJArray.length(); i++) {
                     AppdefEntityID aeid = new AppdefEntityID(aeidJArray.getString(i));
                     if (!aeid.isGroup()) {
-                        Resource resource = ResourceManagerEJBImpl.getOne()
-                                                .findResource(aeid);                   
-                    
                         AppdefBossEJBImpl.getOne()
                                  .batchGroupAdd(
                                          user.getSessionId(),
@@ -581,7 +578,7 @@
                 }
                 jRes.put("groups", jarr);
             }
-        } catch (Exception e) {
+        } catch (Throwable e) {
             log.debug(e.getLocalizedMessage());
             
             try {
@@ -590,7 +587,7 @@
             } catch (Exception e2) {}
         }
         
-        return (jRes.length() > 0) ? jRes.toString() : ERROR_GENERIC;        
+        return jRes.toString();        
     }
     
     /**

Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-03-26 00:18:54 UTC (rev 14425)
@@ -1438,6 +1438,7 @@
 resource.group.inventory.confirm.EditGeneralProperties=Your changes have been saved.
 resource.group.inventory.confirm.AddResources=The requested resources have been added to the group.
 resource.group.inventory.confirm.AddRoles=The requested roles have been added to the group.
+resource.group.inventory.confirm.RemoveResources=The requested resources have been removed from the group.
 
 resource.group.inventory.error.DuplicateGroupName=Group Name is already used.
 resource.group.inventory.error.GroupNameIsRequired=Group name is required.
@@ -1449,6 +1450,7 @@
 resource.group.inventory.error.EditPermission=You do not have permission to edit this group.
 resource.group.inventory.error.ViewPermission=You do not have permission to view this group.
 resource.group.inventory.error.DuplicateClusterAssignment=One or more services in this group have already been assigned to a cluster.
+resource.group.inventory.error.UpdateResourceListVetoed={0}
 
 resource.group.AddToGroup.Title=Add to Group
 resource.group.AddToGroup.NewGroup=Add to new group

Modified: trunk/web/WEB-INF/struts-config.xml
===================================================================
--- trunk/web/WEB-INF/struts-config.xml	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/web/WEB-INF/struts-config.xml	2010-03-26 00:18:54 UTC (rev 14425)
@@ -1603,12 +1603,13 @@
         <forward name="success" path="/resource/group/Inventory.do?mode=view"/>
       </action>
 
-      <action path="/resource/group/inventory/RemoveApp" 
+      <action path="/resource/group/inventory/RemoveGroupResources" 
               name="RemoveGroupResourcesForm"
               type="org.hyperic.hq.ui.action.resource.group.inventory.RemoveAction"
               scope="request" 
               input="/resource/service/Inventory.do?mode=view">
-              <forward name="success" path="/resource/group/Inventory.do?mode=view" redirect="true"/>
+              <forward name="failure" path="/resource/group/Inventory.do?mode=view"/>
+              <forward name="success" path="/resource/group/Inventory.do?mode=view"/>
       </action>
 
       <!-- / -->

Modified: trunk/web/js/lib/lib.js
===================================================================
--- trunk/web/js/lib/lib.js	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/web/js/lib/lib.js	2010-03-26 00:18:54 UTC (rev 14425)
@@ -2997,9 +2997,14 @@
 					  groupId: "['" + formArray.group.toString().split(",").join("','") + "']"},
             handleAs: 'json',
             load: function(data) {
-			    var successText = "The requested groups have been assigned.";
-			    that.displayConfirmation(that.message_area.AddToExistingGroup, successText);
-	        	setTimeout('MyGroupManager.dialogs.AddToExistingGroup.hide()', 2000);
+			    if (data && data.error) {
+	            	console.debug(data.error_message, data);
+	            	that.displayError(that.message_area.AddToExistingGroup, data.error_message);
+			    } else {
+			    	var successText = "The requested groups have been assigned.";
+			    	that.displayConfirmation(that.message_area.AddToExistingGroup, successText);
+			    	setTimeout('MyGroupManager.dialogs.AddToExistingGroup.hide()', 2000);
+			    }
 			},
             error: function(data) {
 	    		var errorText = "An error occurred processing your request.";

Modified: trunk/web/resource/group/inventory/ListResources.jsp
===================================================================
--- trunk/web/resource/group/inventory/ListResources.jsp	2010-03-25 23:03:40 UTC (rev 14424)
+++ trunk/web/resource/group/inventory/ListResources.jsp	2010-03-26 00:18:54 UTC (rev 14425)
@@ -92,7 +92,7 @@
   </c:if>
 </c:url>
 
-<html:form action="/resource/group/inventory/RemoveApp">
+<html:form action="/resource/group/inventory/RemoveGroupResources">
 <html:hidden property="eid" value="${Resource.entityId}"/>
 
 <!--  RESOURCES, COMPATIBLE CONTENTS -->

[Hyperic-hq-discuss] hq r14424 - trunk/src/org/hyperic/snmp

[<pn...@hy...>]

Author: pnguyen
Date: 2010-03-25 16:03:40 -0700 (Thu, 25 Mar 2010)
New Revision: 14424
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14424

Modified:
   trunk/src/org/hyperic/snmp/SNMPClient.java
   trunk/src/org/hyperic/snmp/SNMPSession_v3.java
Log:
[HHQ-3674] Improve error handling for invalid SNMPv3 addresses

Modified: trunk/src/org/hyperic/snmp/SNMPClient.java
===================================================================
--- trunk/src/org/hyperic/snmp/SNMPClient.java	2010-03-25 17:37:52 UTC (rev 14423)
+++ trunk/src/org/hyperic/snmp/SNMPClient.java	2010-03-25 23:03:40 UTC (rev 14424)
@@ -251,10 +251,10 @@
 
             default:
 
-                throw new SNMPException("unsupported SNMP version");
+                throw new SNMPException("Unsupported SNMP version: " + snmpVersion);
             }
         } catch (SNMPException e) {
-            String msg = "Failed to initialize snmp session";
+            String msg = "Failed to initialize SNMP session: " + e.getMessage();
 
             throw new SNMPException(msg, e);
         }

Modified: trunk/src/org/hyperic/snmp/SNMPSession_v3.java
===================================================================
--- trunk/src/org/hyperic/snmp/SNMPSession_v3.java	2010-03-25 17:37:52 UTC (rev 14423)
+++ trunk/src/org/hyperic/snmp/SNMPSession_v3.java	2010-03-25 23:03:40 UTC (rev 14424)
@@ -154,15 +154,21 @@
 
         initSession(host, port, transport);
         
-        UsmUser usmUser = new UsmUser(securityName, 
-                                      authProtocol, authPassphrase, 
-                                      privProtocol, privPassphrase);
+        // Need this check for unidirectional agents
+        if (this.target.getAddress() == null) {
+            throw new SNMPException("Invalid SNMP address " 
+                                        + transport + ":" + host + "/" + port);
+        }
 
         // Need to add user by engineID.
         byte[] engineID = this.session.discoverAuthoritativeEngineID(
                                     this.target.getAddress(), 
                                     this.target.getTimeout());
 
+        UsmUser usmUser = new UsmUser(securityName, 
+                                      authProtocol, authPassphrase, 
+                                      privProtocol, privPassphrase);
+        
         USM usm = this.session.getUSM();
 
         // Need to call addUser each time, even if user name exists,

[Hyperic-hq-discuss] hq r14423 - in trunk: installer/data src/org/hyperic/hq/authz/shared

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-03-25 10:37:52 -0700 (Thu, 25 Mar 2010)
New Revision: 14423
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14423

Modified:
   trunk/installer/data/db-upgrade.xml
   trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java
Log:
Corrected operation mappings for creating servers and services

Modified: trunk/installer/data/db-upgrade.xml
===================================================================
--- trunk/installer/data/db-upgrade.xml	2010-03-25 07:56:38 UTC (rev 14422)
+++ trunk/installer/data/db-upgrade.xml	2010-03-25 17:37:52 UTC (rev 14423)
@@ -10985,23 +10985,23 @@
   			INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID)
   				SELECT m.role_id, 303 FROM EAM_ROLE r 
   				INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id
-  				WHERE m.operation_id = 304 
+  				WHERE m.operation_id = 308 
   				AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm 
   			         WHERE rm.role_id = r.id AND rm.operation_id = 303) = 0
   		</statement>
   		<statement desc="Adding delete server permission to any role that has create server permission...">
   			INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID)
-  				SELECT m.role_id, 304 FROM EAM_ROLE r 
+  				SELECT m.role_id, 308 FROM EAM_ROLE r 
   				INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id
   				WHERE m.operation_id = 303 
   				AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm 
-  			         WHERE rm.role_id = r.id AND rm.operation_id = 304) = 0
+  			         WHERE rm.role_id = r.id AND rm.operation_id = 308) = 0
   		</statement>
   		<statement desc="Adding update server permission to any role that has create or delete server permission...">
   			INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID)
   				SELECT distinct m.role_id, 307 FROM EAM_ROLE r 
   				INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id
-  				WHERE (m.operation_id = 304 or m.operation_id = 303)
+  				WHERE (m.operation_id = 308 or m.operation_id = 303)
   				AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm 
   			         WHERE rm.role_id = r.id AND rm.operation_id = 307) = 0
   		</statement>
@@ -11009,7 +11009,7 @@
   			INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID)
   				SELECT distinct m.role_id, 311 FROM EAM_ROLE r 
   				INNER JOIN EAM_ROLE_OPERATION_MAP m on r.id = m.role_id
-  				WHERE (m.operation_id = 304 or m.operation_id = 303 or m.operation_id = 307)
+  				WHERE (m.operation_id = 308 or m.operation_id = 303 or m.operation_id = 307)
   				AND (SELECT count(*) FROM EAM_ROLE_OPERATION_MAP rm 
   			         WHERE rm.role_id = r.id AND rm.operation_id = 311) = 0
   		</statement>

Modified: trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java
===================================================================
--- trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java	2010-03-25 07:56:38 UTC (rev 14422)
+++ trunk/src/org/hyperic/hq/authz/shared/ResourceOperationsHelper.java	2010-03-25 17:37:52 UTC (rev 14423)
@@ -47,13 +47,15 @@
         operationsList.add(AuthzConstants.platformOpRemovePlatform);
         operationsList.add(AuthzConstants.platformOpManageAlerts);
         operationsList.add(AuthzConstants.platformOpControlPlatform);
-        operationsList.add(AuthzConstants.serverOpCreateServer);
+        // TODO Create server is add server.  This needs to be cleaned up.
+        operationsList.add(AuthzConstants.platformOpAddServer); 
         operationsList.add(AuthzConstants.serverOpViewServer);
         operationsList.add(AuthzConstants.serverOpModifyServer);
         operationsList.add(AuthzConstants.serverOpRemoveServer);
         operationsList.add(AuthzConstants.serverOpManageAlerts);
         operationsList.add(AuthzConstants.serverOpControlServer);
-        operationsList.add(AuthzConstants.serviceOpCreateService);
+        // TODO Create service is add service.  This needs to be cleaned up.
+        operationsList.add(AuthzConstants.serverOpAddService);
         operationsList.add(AuthzConstants.serviceOpViewService);
         operationsList.add(AuthzConstants.serviceOpModifyService);
         operationsList.add(AuthzConstants.serviceOpRemoveService);

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

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

Author: bob
Date: 2010-03-25 00:56:38 -0700 (Thu, 25 Mar 2010)
New Revision: 14422
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14422

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1388

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-03-25 05:02:41 UTC (rev 14421)
+++ trunk/etc/version.properties	2010-03-25 07:56:38 UTC (rev 14422)
@@ -1,3 +1,3 @@
-#Wed Mar 24 00:17:30 PDT 2010
+#Thu Mar 25 00:19:13 PDT 2010
 version=4.3.0
-build=1387
+build=1388

[Hyperic-hq-discuss] hq r14421 - branches/HQ_4_2_0_PATCH/etc

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

Author: bob
Date: 2010-03-24 22:02:41 -0700 (Wed, 24 Mar 2010)
New Revision: 14421
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14421

Modified:
   branches/HQ_4_2_0_PATCH/etc/version.properties
Log:
Release 4.2.0.7 build #1284

Modified: branches/HQ_4_2_0_PATCH/etc/version.properties
===================================================================
--- branches/HQ_4_2_0_PATCH/etc/version.properties	2010-03-24 23:28:57 UTC (rev 14420)
+++ branches/HQ_4_2_0_PATCH/etc/version.properties	2010-03-25 05:02:41 UTC (rev 14421)
@@ -1,3 +1,3 @@
-#Thu Mar 18 10:09:47 PDT 2010
+#Wed Mar 24 20:44:14 PDT 2010
 version=4.2.0.7
-build=1283
+build=1284

Re: [Hyperic-hq-discuss] Trying to figure out sigar.jar

[Mirko P. <m.p...@gm...>]

Hi,

maybe a look at the sigar commandline sourcecode is helpful:

http://svn.hyperic.org/projects/sigar_mirror/branches/sigar-1.6/bindings/java/src/org/hyperic/sigar/cmd/CpuInfo.java

Cheers,
Mirko

[Hyperic-hq-discuss] hq r14420 - trunk/installer/data

[<rm...@hy...>]

Author: rmorgan
Date: 2010-03-24 16:28:57 -0700 (Wed, 24 Mar 2010)
New Revision: 14420
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14420

Modified:
   trunk/installer/data/db-upgrade.xml
Log:
[HHQ-3826] Remove semi-colins from previous patch. [merge from HQ_4_2_0_PATCH]

Modified: trunk/installer/data/db-upgrade.xml
===================================================================
--- trunk/installer/data/db-upgrade.xml	2010-03-24 23:27:55 UTC (rev 14419)
+++ trunk/installer/data/db-upgrade.xml	2010-03-24 23:28:57 UTC (rev 14420)
@@ -10883,7 +10883,7 @@
         delete from EAM_UI_VIEW where ui_plugin_id in (select id from EAM_UI_PLUGIN where name = 'tomcatappmgmt')
       </statement>
       <statement desc="Remove tc Server Appmgmt UI plugin">
-        delete from EAM_UI_PLUGIN where name = 'tomcatappmgmt';
+        delete from EAM_UI_PLUGIN where name = 'tomcatappmgmt'
       </statement>
 
       <statement desc="Remove tc Server Config UI attachments">
@@ -10893,7 +10893,7 @@
         delete from EAM_UI_VIEW where ui_plugin_id in (select id from EAM_UI_PLUGIN where name = 'tomcatserverconfig')
       </statement>
       <statement desc="Remove tc Server Config UI plugin">
-        delete from EAM_UI_PLUGIN where name = 'tomcatserverconfig';
+        delete from EAM_UI_PLUGIN where name = 'tomcatserverconfig'
       </statement>
     </schema-directSQL>
   </schemaSpec>

[Hyperic-hq-discuss] hq r14419 - branches/HQ_4_2_0_PATCH/installer/data

[<rm...@hy...>]

Author: rmorgan
Date: 2010-03-24 16:27:55 -0700 (Wed, 24 Mar 2010)
New Revision: 14419
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14419

Modified:
   branches/HQ_4_2_0_PATCH/installer/data/db-upgrade.xml
Log:
[HHQ-3826] Remove semi-colins from previous patch.

Modified: branches/HQ_4_2_0_PATCH/installer/data/db-upgrade.xml
===================================================================
--- branches/HQ_4_2_0_PATCH/installer/data/db-upgrade.xml	2010-03-24 22:43:32 UTC (rev 14418)
+++ branches/HQ_4_2_0_PATCH/installer/data/db-upgrade.xml	2010-03-24 23:27:55 UTC (rev 14419)
@@ -10883,7 +10883,7 @@
         delete from EAM_UI_VIEW where ui_plugin_id in (select id from EAM_UI_PLUGIN where name = 'tomcatappmgmt')
       </statement>
       <statement desc="Remove tc Server Appmgmt UI plugin">
-        delete from EAM_UI_PLUGIN where name = 'tomcatappmgmt';
+        delete from EAM_UI_PLUGIN where name = 'tomcatappmgmt'
       </statement>
 
       <statement desc="Remove tc Server Config UI attachments">
@@ -10893,7 +10893,7 @@
         delete from EAM_UI_VIEW where ui_plugin_id in (select id from EAM_UI_PLUGIN where name = 'tomcatserverconfig')
       </statement>
       <statement desc="Remove tc Server Config UI plugin">
-        delete from EAM_UI_PLUGIN where name = 'tomcatserverconfig';
+        delete from EAM_UI_PLUGIN where name = 'tomcatserverconfig'
       </statement>
     </schema-directSQL>
   </schemaSpec>

[Hyperic-hq-discuss] hq r14418 - trunk/installer/data

[<rm...@hy...>]

Author: rmorgan
Date: 2010-03-24 15:43:32 -0700 (Wed, 24 Mar 2010)
New Revision: 14418
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14418

Modified:
   trunk/installer/data/db-upgrade.xml
Log:
[HHQ-3826] Remove UI plugins which have resource view attachments on resource
types no longer defined in the tcserver plugin.  These plugin attachpoints will
be recreated when the new tcserver plugin is deployed.
[merge from 4_2_0_PATCH]



Modified: trunk/installer/data/db-upgrade.xml
===================================================================
--- trunk/installer/data/db-upgrade.xml	2010-03-24 22:43:03 UTC (rev 14417)
+++ trunk/installer/data/db-upgrade.xml	2010-03-24 22:43:32 UTC (rev 14418)
@@ -10874,6 +10874,30 @@
 	    </schema-directSQL>  
    </schemaSpec>
 
+  <schemaSpec version="3.192.1">
+    <schema-directSQL>
+      <statement desc="Remove tc Server Appmgmt UI attachments">
+        delete from EAM_UI_ATTACHMENT where view_id in (select v.id from EAM_UI_VIEW v, EAM_UI_PLUGIN p where v.ui_plugin_id = p.id and p.name = 'tomcatappmgmt')
+      </statement>
+      <statement desc="Remove tc Server Appmgmgt UI views">
+        delete from EAM_UI_VIEW where ui_plugin_id in (select id from EAM_UI_PLUGIN where name = 'tomcatappmgmt')
+      </statement>
+      <statement desc="Remove tc Server Appmgmt UI plugin">
+        delete from EAM_UI_PLUGIN where name = 'tomcatappmgmt';
+      </statement>
+
+      <statement desc="Remove tc Server Config UI attachments">
+        delete from EAM_UI_ATTACHMENT where view_id in (select v.id from EAM_UI_VIEW v, EAM_UI_PLUGIN p where v.ui_plugin_id = p.id and p.name = 'tomcatserverconfig')
+      </statement>
+      <statement desc="Remove tc Server Config UI views">
+        delete from EAM_UI_VIEW where ui_plugin_id in (select id from EAM_UI_PLUGIN where name = 'tomcatserverconfig')
+      </statement>
+      <statement desc="Remove tc Server Config UI plugin">
+        delete from EAM_UI_PLUGIN where name = 'tomcatserverconfig';
+      </statement>
+    </schema-directSQL>
+  </schemaSpec>
+
   <schemaSpec version="3.193">
     <schema-alterColumn table="EAM_MEASUREMENT_TEMPL" column="template"
                         precision="2048" columnType="VARCHAR2" nullable="NOT NULL" />

[Hyperic-hq-discuss] hq r14417 - branches/HQ_4_2_0_PATCH/installer/data

[<rm...@hy...>]

Author: rmorgan
Date: 2010-03-24 15:43:03 -0700 (Wed, 24 Mar 2010)
New Revision: 14417
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14417

Modified:
   branches/HQ_4_2_0_PATCH/installer/data/db-upgrade.xml
Log:
[HHQ-3826] Remove UI plugins which have resource view attachments on resource
types no longer defined in the tcserver plugin.  These plugin attachpoints will
be recreated when the new tcserver plugin is deployed.



Modified: branches/HQ_4_2_0_PATCH/installer/data/db-upgrade.xml
===================================================================
--- branches/HQ_4_2_0_PATCH/installer/data/db-upgrade.xml	2010-03-24 22:37:28 UTC (rev 14416)
+++ branches/HQ_4_2_0_PATCH/installer/data/db-upgrade.xml	2010-03-24 22:43:03 UTC (rev 14417)
@@ -10874,6 +10874,30 @@
 	    </schema-directSQL>  
    </schemaSpec>
 
+  <schemaSpec version="3.192.1">
+    <schema-directSQL>
+      <statement desc="Remove tc Server Appmgmt UI attachments">
+        delete from EAM_UI_ATTACHMENT where view_id in (select v.id from EAM_UI_VIEW v, EAM_UI_PLUGIN p where v.ui_plugin_id = p.id and p.name = 'tomcatappmgmt')
+      </statement>
+      <statement desc="Remove tc Server Appmgmgt UI views">
+        delete from EAM_UI_VIEW where ui_plugin_id in (select id from EAM_UI_PLUGIN where name = 'tomcatappmgmt')
+      </statement>
+      <statement desc="Remove tc Server Appmgmt UI plugin">
+        delete from EAM_UI_PLUGIN where name = 'tomcatappmgmt';
+      </statement>
+
+      <statement desc="Remove tc Server Config UI attachments">
+        delete from EAM_UI_ATTACHMENT where view_id in (select v.id from EAM_UI_VIEW v, EAM_UI_PLUGIN p where v.ui_plugin_id = p.id and p.name = 'tomcatserverconfig')
+      </statement>
+      <statement desc="Remove tc Server Config UI views">
+        delete from EAM_UI_VIEW where ui_plugin_id in (select id from EAM_UI_PLUGIN where name = 'tomcatserverconfig')
+      </statement>
+      <statement desc="Remove tc Server Config UI plugin">
+        delete from EAM_UI_PLUGIN where name = 'tomcatserverconfig';
+      </statement>
+    </schema-directSQL>
+  </schemaSpec>
+
 </dbupgrade>
 </target>
 </project>

[Hyperic-hq-discuss] hq r14416 - trunk/web/css

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-03-24 15:37:28 -0700 (Wed, 24 Mar 2010)
New Revision: 14416
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14416

Modified:
   trunk/web/css/HQ_40.css
Log:
[HHQ-2484] - IE6: Administrator tab wraps to new line

Modified: trunk/web/css/HQ_40.css
===================================================================
--- trunk/web/css/HQ_40.css	2010-03-24 17:40:20 UTC (rev 14415)
+++ trunk/web/css/HQ_40.css	2010-03-24 22:37:28 UTC (rev 14416)
@@ -308,7 +308,7 @@
 }
 .mainMenu a, .mainMenu a:visited {
     font-family: Helvetica, sans-serif;
-    font-size: 1em;
+    font-size: 12px;
 	text-decoration: none;
 	color: #333;
 	padding: .6em 1em;

[Hyperic-hq-discuss] hq r14415 - trunk/src/org/hyperic/hq/application

[<rm...@hy...>]

Author: rmorgan
Date: 2010-03-24 10:40:20 -0700 (Wed, 24 Mar 2010)
New Revision: 14415
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14415

Modified:
   trunk/src/org/hyperic/hq/application/HQApp.java
Log:
[HQ-2094] Add runReport and methods starting with has (for hasAdminPermission) to the
list of read only methods.  Prior to this change, all reports were run in a read/write
session causing the reports to take longer to run than necessary.



Modified: trunk/src/org/hyperic/hq/application/HQApp.java
===================================================================
--- trunk/src/org/hyperic/hq/application/HQApp.java	2010-03-24 07:56:23 UTC (rev 14414)
+++ trunk/src/org/hyperic/hq/application/HQApp.java	2010-03-24 17:40:20 UTC (rev 14415)
@@ -605,8 +605,9 @@
         }
 
         private boolean methIsReadOnly(String methName) {
-            return // 'create' is part of EJB session bean creation
+            return methName.equals("runReport") || // ReportCenter
                    methName.equals("setUserPrefsAfterCommit") ||
+                   // 'create' is part of EJB session bean creation
                    methName.equals("create") ||
                    methName.equals("disconnectAgent") ||
                    // recent alerts & indicators
@@ -623,7 +624,8 @@
                    // masthead
                    methName.equals("resourcesExistOfType") ||
                    methName.equals("search") || 
-                   methName.equals("initializeTriggers") || 
+                   methName.equals("initializeTriggers") ||
+                   methName.startsWith("has") ||
                    methName.startsWith("are") ||
                    methName.startsWith("check") ||
                    methName.startsWith("dispatch") ||

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

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

Author: bob
Date: 2010-03-24 00:56:23 -0700 (Wed, 24 Mar 2010)
New Revision: 14414
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14414

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1387

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-03-24 00:41:56 UTC (rev 14413)
+++ trunk/etc/version.properties	2010-03-24 07:56:23 UTC (rev 14414)
@@ -1,3 +1,3 @@
-#Tue Mar 23 00:22:14 PDT 2010
+#Wed Mar 24 00:17:30 PDT 2010
 version=4.3.0
-build=1386
+build=1387