Menu
▾
▴
hyperic-hq-discuss — Hyperic HQ SVN Commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(927) |
Apr
(419) |
May
(352) |
Jun
(431) |
Jul
(463) |
Aug
(345) |
Sep
(304) |
Oct
(596) |
Nov
(466) |
Dec
(414) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(348) |
Feb
(313) |
Mar
(665) |
Apr
(688) |
May
(434) |
Jun
(311) |
Jul
(540) |
Aug
(554) |
Sep
(467) |
Oct
(341) |
Nov
(365) |
Dec
(272) |
| 2009 |
Jan
(386) |
Feb
(293) |
Mar
(279) |
Apr
(239) |
May
(229) |
Jun
(199) |
Jul
(186) |
Aug
(111) |
Sep
(196) |
Oct
(146) |
Nov
(116) |
Dec
(140) |
| 2010 |
Jan
(170) |
Feb
(159) |
Mar
(151) |
Apr
(161) |
May
(90) |
Jun
(56) |
Jul
(28) |
Aug
(22) |
Sep
(5) |
Oct
|
Nov
(23) |
Dec
(12) |
| 2011 |
Jan
(8) |
Feb
(8) |
Mar
(22) |
Apr
(24) |
May
(4) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2012 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pn...@hy...> - 2010-04-24 02:13:09
|
Author: pnguyen Date: 2010-04-23 17:23:33 -0700 (Fri, 23 Apr 2010) New Revision: 14544 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14544 Modified: trunk/src/org/hyperic/hq/hqu/rendit/metaclass/ResourceCategory.groovy Log: [HHQ-3803, HHQ-3748] Add HQApi support to get metrics data summary for a resource within a specified time range. Functionality added primarily for integration testing. Modified: trunk/src/org/hyperic/hq/hqu/rendit/metaclass/ResourceCategory.groovy =================================================================== --- trunk/src/org/hyperic/hq/hqu/rendit/metaclass/ResourceCategory.groovy 2010-04-23 22:33:05 UTC (rev 14543) +++ trunk/src/org/hyperic/hq/hqu/rendit/metaclass/ResourceCategory.groovy 2010-04-24 00:23:33 UTC (rev 14544) @@ -22,6 +22,7 @@ import org.hyperic.hq.appdef.server.session.ServerManagerEJBImpl as ServerMan import org.hyperic.hq.appdef.server.session.ServiceManagerEJBImpl as ServiceMan import org.hyperic.hq.bizapp.server.session.AppdefBossEJBImpl as AppdefBoss +import org.hyperic.hq.bizapp.server.session.MeasurementBossEJBImpl as MeasurementBoss import org.hyperic.hq.common.VetoException import org.hyperic.hq.events.server.session.AlertDefinitionManagerEJBImpl as DefMan import org.hyperic.hq.events.server.session.AlertManagerEJBImpl as AlertMan @@ -30,8 +31,8 @@ import org.hyperic.hq.control.server.session.ControlManagerEJBImpl as CMan import org.hyperic.hq.control.server.session.ControlScheduleManagerEJBImpl as CSMan import org.hyperic.hq.product.PluginNotFoundException +import org.hyperic.hq.measurement.MeasurementConstants import org.hyperic.hq.measurement.server.session.MeasurementManagerEJBImpl as DMan - import org.hyperic.hibernate.PageInfo import org.hyperic.hq.livedata.shared.LiveDataCommand import org.hyperic.hq.livedata.shared.LiveDataResult @@ -150,6 +151,24 @@ static Collection getMetrics(Resource r) { dman.findMeasurements(null, r) } + + /** + * Get the metrics summary for a resource + */ + static Map getMetricsSummary(Resource r, AuthzSubject user, long begin, long end) { + def mgr = SessionManager.instance + def sessionId = mgr.put(user) + def aeids = [new AppdefEntityID(r)] as AppdefEntityID[] + def boss = MeasurementBoss.one + + return boss.findMetrics(sessionId, + aeids, + MeasurementConstants.FILTER_NONE, + null, + begin, + end, + false) + } /** * Get the availability Measurement for a Resource. |
|
From: <no...@gi...> - 2010-04-23 23:22:13
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 4c666d2a5a05c56bb54d85e7e75fbfb40ac55dfc http://github.com/hyperic/hqapi/commit/4c666d2a5a05c56bb54d85e7e75fbfb40ac55dfc Author: Jennifer Hickey <jen...@sp...> Date: 2010-04-23 (Fri, 23 Apr 2010) Changed paths: M hqapi1-client/pom.xml M hqapi1-plugin/pom.xml M hqapi1/pom.xml M parent/pom.xml M pom.xml Log Message: ----------- Changed hqapi version from 3.0 to 3.2 to match master |
|
From: <gla...@hy...> - 2010-04-23 22:33:14
|
Author: glaullon Date: 2010-04-23 15:33:05 -0700 (Fri, 23 Apr 2010) New Revision: 14543 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14543 Modified: trunk/src/org/hyperic/hq/product/ServerDetector.java Log: [HHQ-3907] ActiveMQ plugin performance and functionality issues [HPD-412] Modified: trunk/src/org/hyperic/hq/product/ServerDetector.java =================================================================== --- trunk/src/org/hyperic/hq/product/ServerDetector.java 2010-04-23 19:53:50 UTC (rev 14542) +++ trunk/src/org/hyperic/hq/product/ServerDetector.java 2010-04-23 22:33:05 UTC (rev 14543) @@ -452,18 +452,26 @@ } } - private File findVersionFile(File dir, String verFile) { - File res = null; - File[] files = dir.listFiles(new RegExprFilenameFilter(verFile)); - if (files.length == 0) { - File[] dirs = dir.listFiles(new DirFilter()); - for (int i = 0; ((i < dirs.length) && (res==null)); i++) { - res = findVersionFile(dirs[i], verFile); + protected File findVersionFile(File dir, Pattern pattern) { + Iterator files = Arrays.asList(dir.listFiles()).iterator(); + Set subDirs = new HashSet(); + while (files.hasNext()) { + File file = (File) files.next(); + if (file.isDirectory()) { + subDirs.add(file); + } else if (pattern.matcher(file.getAbsolutePath()).find()) { + return file; } - } else { - res = files[0]; } - return res; + Iterator it=subDirs.iterator(); + while (it.hasNext()) { + File subDir=(File)it.next(); + File versionFile = findVersionFile(subDir, pattern); + if (versionFile != null) { + return versionFile; + } + } + return null; } /** @@ -482,13 +490,14 @@ if (versionFile != null) { if (versionFile.startsWith("**/")) { // recursive & regexpr versionFile=versionFile.substring(3); - File f=findVersionFile(new File(installpath),versionFile); + Pattern pattern=Pattern.compile(versionFile); + File f=findVersionFile(new File(installpath),pattern); if (f==null) { return false; } getLog().debug(VERSION_FILE + "=" + versionFile + " matches -> " + f); - Matcher m = Pattern.compile(versionFile).matcher(f.getAbsolutePath()); + Matcher m = pattern.matcher(f.getAbsolutePath()); m.find(); if(m.groupCount()!=0){ // have version group if(!getTypeInfo().getVersion().equals(m.group(1))){ @@ -1097,23 +1106,4 @@ return ((AutoinventoryPluginManager)getManager()). getServiceConfigs(type); } - - private class DirFilter implements FileFilter{ - public boolean accept(File file) { - return file.isDirectory(); - } - - } - - private class RegExprFilenameFilter implements FileFilter{ - Pattern pattern; - public RegExprFilenameFilter(String regexp){ - pattern=Pattern.compile(regexp); - } - - public boolean accept(File file) { - return pattern.matcher(file.getAbsolutePath()).find(); - } - - } } |
|
From: <gla...@hy...> - 2010-04-23 19:54:00
|
Author: glaullon Date: 2010-04-23 12:53:50 -0700 (Fri, 23 Apr 2010) New Revision: 14542 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14542 Added: trunk/plugins/activemq/ trunk/plugins/activemq/etc/ trunk/plugins/activemq/etc/hq-plugin.xml trunk/plugins/activemq/src/ trunk/plugins/activemq/src/org/ trunk/plugins/activemq/src/org/hyperic/ trunk/plugins/activemq/src/org/hyperic/hq/ trunk/plugins/activemq/src/org/hyperic/hq/plugin/ trunk/plugins/activemq/src/org/hyperic/hq/plugin/activemq/ trunk/plugins/activemq/src/org/hyperic/hq/plugin/activemq/EmbeddedActiveMQServerDetector.java Removed: trunk/plugins/xml/activemq-plugin.xml Modified: trunk/build.xml Log: [HHQ-3907] ActiveMQ plugin performance and functionality issues [HPD-412] Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-04-23 17:19:55 UTC (rev 14541) +++ trunk/build.xml 2010-04-23 19:53:50 UTC (rev 14542) @@ -1013,9 +1013,9 @@ <include name="xmlrpc-client-3.1.jar"/> <include name="xmlrpc-common-3.1.jar"/> <include name="ws-commons-util-1.0.2.jar"/> - <!-- for vim plugin using vijava 2.0 --> - <include name="com.springsource.com.sun.xml.bind-2.1.7.jar"/> - <include name="com.springsource.javax.xml.bind-2.1.7.jar"/> + <!-- for vim plugin using vijava 2.0 --> + <include name="com.springsource.com.sun.xml.bind-2.1.7.jar"/> + <include name="com.springsource.javax.xml.bind-2.1.7.jar"/> </fileset> <fileset dir="${tapestry_lib}"> <!-- for CollectorThread --> @@ -1062,6 +1062,8 @@ </fileset> </copy> + <hqplugin name="activemq"/> + <hqplugin name="apache"/> <hqplugin name="tomcat"/> Property changes on: trunk/plugins/activemq ___________________________________________________________________ Name: svn:ignore + .classpath Added: trunk/plugins/activemq/etc/hq-plugin.xml =================================================================== --- trunk/plugins/activemq/etc/hq-plugin.xml (rev 0) +++ trunk/plugins/activemq/etc/hq-plugin.xml 2010-04-23 19:53:50 UTC (rev 14542) @@ -0,0 +1,412 @@ +<?xml version="1.0"?> + +<!DOCTYPE plugin [ + <!ENTITY sun-jvm-service SYSTEM "/pdk/plugins/sun-jvm-service.xml"> + <!ENTITY process-metrics SYSTEM "/pdk/plugins/process-metrics.xml"> +]> + +<!-- + NOTE: This copyright does *not* cover user programs that use HQ + program services by normal system calls through the application + program interfaces provided as part of the Hyperic Plug-in Development + Kit or the Hyperic Client Development Kit - this is merely considered + normal use of the program, and does *not* fall under the heading of + "derived work". + + Copyright (C) [2004, 2005, 2006], Hyperic, Inc. + This file is part of HQ. + + HQ is free software; you can redistribute it and/or modify + it under the terms version 2 of the GNU General Public License as + published by the Free Software Foundation. This program is distributed + in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License for more + details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. + --> + +<plugin package="org.hyperic.hq.plugin.activemq" name="activemq"> + + <classpath> + <include name="pdk/lib/mx4j"/> + </classpath> + + <filter name="domain" + value="org.apache.activemq"/> + + <filter name="template" + value="${OBJECT_NAME}:${alias}"/> + + <filter name="QUEUE_OBJECT_NAME" + value="${domain}:Type=Queue,BrokerName=*,Destination=*"/> + + <filter name="TOPIC_OBJECT_NAME" + value="${domain}:Type=Topic,BrokerName=*,Destination=*"/> + + <filter name="BROKER_OBJECT_NAME" + value="${domain}:Type=Broker,BrokerName=*"/> + + <!-- special casing due to 5.1 renaming: + MemoryPercentageUsed -> MemoryPercentUsage --> + <metrics name="ActiveMQ 4.0 Topic"> + <metric name="Availability" + template="${TOPIC_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Enqueue Count" + template="${TOPIC_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Dequeue Count" + template="${TOPIC_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Consumer Count" + template="${TOPIC_OBJECT_NAME}:${alias}"/> + + <metric name="Queue Size" + template="${TOPIC_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Memory Percentage Used" + template="${TOPIC_OBJECT_NAME}:${alias}" + units="percent"/> + </metrics> + + <metrics name="ActiveMQ 4.0 Queue"> + <metric name="Availability" + template="${QUEUE_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Enqueue Count" + template="${QUEUE_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Dequeue Count" + template="${QUEUE_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Consumer Count" + template="${QUEUE_OBJECT_NAME}:${alias}"/> + + <metric name="Queue Size" + template="${QUEUE_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Memory Percentage Used" + template="${QUEUE_OBJECT_NAME}:${alias}" + units="percent"/> + </metrics> + + <metrics name="ActiveMQ 4.0 Broker"> + <metric name="Availability" + template="${BROKER_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Total Consumer Count" + template="${BROKER_OBJECT_NAME}:${alias}"/> + + <metric name="Total Enqueue Count" + template="${BROKER_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Total Dequeue Count" + template="${BROKER_OBJECT_NAME}:${alias}" + collectionType="trendsup"/> + + <metric name="Total Message Count" + template="${BROKER_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Memory Limit" + template="${BROKER_OBJECT_NAME}:${alias}" + units="B"/> + + <metric name="Memory Percentage Used" + template="${BROKER_OBJECT_NAME}:${alias}" + units="percent"/> + </metrics> + + <metrics name="ActiveMQ 5.1 Topic"> + <metric name="Availability" + template="${TOPIC_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Enqueue Count" + template="${TOPIC_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Dequeue Count" + template="${TOPIC_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Consumer Count" + template="${TOPIC_OBJECT_NAME}:${alias}"/> + + <metric name="Queue Size" + template="${TOPIC_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Memory Percent Usage" + template="${TOPIC_OBJECT_NAME}:${alias}" + units="percent"/> + </metrics> + + <metrics name="ActiveMQ 5.1 Queue"> + <metric name="Availability" + template="${QUEUE_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Enqueue Count" + template="${QUEUE_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Dequeue Count" + template="${QUEUE_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Consumer Count" + template="${QUEUE_OBJECT_NAME}:${alias}"/> + + <metric name="Queue Size" + template="${QUEUE_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Memory Percent Usage" + template="${QUEUE_OBJECT_NAME}:${alias}" + units="percent"/> + </metrics> + + <metrics name="ActiveMQ 5.1 Broker"> + <metric name="Availability" + template="${BROKER_OBJECT_NAME}:${alias}" + indicator="true"/> + + <metric name="Total Consumer Count" + template="${BROKER_OBJECT_NAME}:${alias}"/> + + <metric name="Total Enqueue Count" + template="${BROKER_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Total Dequeue Count" + template="${BROKER_OBJECT_NAME}:${alias}" + collectionType="trendsup"/> + + <metric name="Total Message Count" + template="${BROKER_OBJECT_NAME}:${alias}" + indicator="true" + collectionType="trendsup"/> + + <metric name="Memory Limit" + template="${BROKER_OBJECT_NAME}:${alias}" + units="B"/> + + <metric name="Memory Percent Usage" + template="${BROKER_OBJECT_NAME}:${alias}" + units="percent"/> + </metrics> + + <config name="destination"> + <option name="BrokerName" + description="Broker Name" + default=""/> + + <option name="Destination" + description="Destination" + default=""/> + </config> + + <server name="ActiveMQ" + version="4.0"> + + <!-- derive installpath from -Dactivemq.home=... --> + <property name="PROC_HOME_PROPERTY" + value="activemq.home"/> + + <property name="DEFAULT_CONF" + value="conf/activemq.xml"/> + + <property name="DEFAULT_LOG_FILE" + value="var/activemq.log"/> + + <property name="VERSION_FILE" + value="**/lib/.*activemq-.*-(4.\d*).*.jar"/> + + <config> + <option name="process.query" + description="Process Query"/> + </config> + + <plugin type="autoinventory" + class="org.hyperic.hq.product.jmx.MxServerDetector"/> + + <plugin type="measurement" + class="org.hyperic.hq.product.jmx.MxMeasurementPlugin"/> + + <plugin type="log_track" + class="org.hyperic.hq.product.Log4JLogTrackPlugin"/> + + <plugin type="config_track" + class="org.hyperic.hq.product.ConfigFileTrackPlugin"/> + + <metric name="Availability" + template="sigar:Type=ProcState,Arg=%process.query%:State" + indicator="true"/> + + &process-metrics; + + <service name="Connector"> + <property name="OBJECT_NAME" + value="${domain}:Type=Connector,BrokerName=*,ConnectorName=*"/> + + <config> + <option name="BrokerName" + description="Broker Name" + default=""/> + + <option name="ConnectorName" + description="Connector Name" + default=""/> + </config> + + <plugin type="autoinventory"/> + + <plugin type="control" + class="org.hyperic.hq.product.jmx.MxControlPlugin"/> + + <actions include="start,stop"/> + + <metric name="Availability" + indicator="true"/> + + <metric name="Enqueue Count" + indicator="true" + collectionType="trendsup"/> + + <metric name="Dequeue Count" + indicator="true" + collectionType="trendsup"/> + </service> + + <service name="Broker"> + <property name="OBJECT_NAME" value="${BROKER_OBJECT_NAME}"/> + + <config> + <option name="BrokerName" + description="Broker Name" + default=""/> + </config> + + <plugin type="autoinventory"/> + + <plugin type="control" + class="org.hyperic.hq.product.jmx.MxControlPlugin"/> + + <actions include="start,stop,gc,removeTopic,removeQueue"/> + </service> + + <!-- + Tested based on: + http://incubator.apache.org/activemq/run-broker.html + activemq broker:(tcp://localhost:61616,network:static:tcp://localhost:61616)?persistent=false&useJmx=true + --> + + <service name="Queue"> + <property name="OBJECT_NAME" value="${QUEUE_OBJECT_NAME}"/> + + <config include="destination"/> + + <plugin type="autoinventory"/> + + <plugin type="control" + class="org.hyperic.hq.product.jmx.MxControlPlugin"/> + + <actions include="sendTextMessage"/> + </service> + + <!-- same as Queue except for Type=Topic --> + <service name="Topic"> + <property name="OBJECT_NAME" value="${TOPIC_OBJECT_NAME}"/> + + <config include="destination"/> + + <plugin type="autoinventory"/> + + <plugin type="control" + class="org.hyperic.hq.product.jmx.MxControlPlugin"/> + + <actions include="sendTextMessage"/> + </service> + + <!-- &sun-jvm-service; --> + + </server> + + <server name="ActiveMQ" + version="5.0" + include="4.0"> + <property name="VERSION_FILE" + value="**/.*activemq.*(5.\d*).*.jar"/> +</server> + + <server name="ActiveMQ" + version="5.1" + include="5.0"> + </server> + + <server name="ActiveMQ" + version="5.2" + include="5.1"> + </server> + + <server name="ActiveMQ" + version="5.3" + include="5.2"> + </server> + + <server name="ActiveMQ Embedded" + version="5.0" + include="ActiveMQ 5.0"> + <property name="PROC_HOME_PROPERTY" + value="catalina.base"/> + <plugin type="autoinventory" + class="org.hyperic.hq.plugin.activemq.EmbeddedActiveMQServerDetector"/> + </server> + + <server name="ActiveMQ Embedded" + version="5.1" + include="ActiveMQ 5.1"> + <property name="PROC_HOME_PROPERTY" + value="catalina.base"/> + <plugin type="autoinventory" + class="org.hyperic.hq.plugin.activemq.EmbeddedActiveMQServerDetector"/> + </server> + + <server name="ActiveMQ Embedded" + version="5.2" + include="5.1"> + </server> + + <server name="ActiveMQ Embedded" + version="5.3" + include="5.2"> + </server> + +</plugin> Added: trunk/plugins/activemq/src/org/hyperic/hq/plugin/activemq/EmbeddedActiveMQServerDetector.java =================================================================== --- trunk/plugins/activemq/src/org/hyperic/hq/plugin/activemq/EmbeddedActiveMQServerDetector.java (rev 0) +++ trunk/plugins/activemq/src/org/hyperic/hq/plugin/activemq/EmbeddedActiveMQServerDetector.java 2010-04-23 19:53:50 UTC (rev 14542) @@ -0,0 +1,91 @@ +package org.hyperic.hq.plugin.activemq; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.jar.JarFile; +import java.util.regex.Pattern; +import org.hyperic.hq.product.PluginException; +import org.hyperic.hq.product.PluginManager; + +import org.hyperic.hq.product.ServerResource; +import org.hyperic.hq.product.jmx.MxServerDetector; + +/** + * Server detector for activemq brokers embedded in Tomcat/tc Server instances. + * Exists to optimize recursive file scanning and to set unique identifiers for + * any embedded activemq instances that are discovered + * @author jhickey + * + */ +public class EmbeddedActiveMQServerDetector + extends MxServerDetector { + + boolean recursive = false; + private final static String RECURSIVE_PROP = "activemq.search.recursive"; + + public void init(PluginManager manager) throws PluginException { + super.init(manager); + + recursive = "true".equalsIgnoreCase(manager.getProperty(RECURSIVE_PROP, "false")); + getLog().debug(RECURSIVE_PROP + "=" + recursive); + } + + protected File findVersionFile(File dir, Pattern pattern) { + // In an Embedded ActiveMQ instance, we know we are starting with + // CATALINA_BASE + // Give preferential search treatment to lib/ and webapps/*/WEB-INF/lib for + // performance gains + File libDir = new File(dir, "lib"); + if (libDir.exists()) { + File versionFile = super.findVersionFile(libDir, pattern); + if (versionFile != null) { + return versionFile; + } + } + + File webappsDir = new File(dir, "webapps"); + if (webappsDir.exists()) { + Iterator apps = Arrays.asList(webappsDir.listFiles()).iterator(); + while (apps.hasNext()) { + File app = (File) apps.next(); + if (app.isDirectory()) { + File wlibDir = new File(webappsDir, "WEB-INF" + File.separator + "lib"); + if (wlibDir.exists()) { + File versionFile = super.findVersionFile(wlibDir, pattern); + if (versionFile != null) { + return versionFile; + } + } + } else if (app.getName().endsWith(".war")) { + try { + JarFile war = new JarFile(app); + Enumeration files = war.entries(); + while (files.hasMoreElements()) { + final String fileName = files.nextElement().toString(); + if (pattern.matcher(fileName).find()) { + return new File(app + "!" + fileName); + } + } + } catch (IOException ex) { + getLog().debug("Error: '"+app+"': "+ex.getMessage(),ex); + } + } + } + } + + if (recursive) { + return super.findVersionFile(dir, pattern); + } + return null; + } + + protected ServerResource getServerResource(MxProcess process) { + ServerResource server = super.getServerResource(process); + String catalinaBase = server.getInstallPath(); + server.setIdentifier(catalinaBase + " Embedded ActiveMQ"); + return server; + } +} Deleted: trunk/plugins/xml/activemq-plugin.xml =================================================================== --- trunk/plugins/xml/activemq-plugin.xml 2010-04-23 17:19:55 UTC (rev 14541) +++ trunk/plugins/xml/activemq-plugin.xml 2010-04-23 19:53:50 UTC (rev 14542) @@ -1,405 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE plugin [ - <!ENTITY sun-jvm-service SYSTEM "/pdk/plugins/sun-jvm-service.xml"> - <!ENTITY process-metrics SYSTEM "/pdk/plugins/process-metrics.xml"> -]> - -<!-- - NOTE: This copyright does *not* cover user programs that use HQ - program services by normal system calls through the application - program interfaces provided as part of the Hyperic Plug-in Development - Kit or the Hyperic Client Development Kit - this is merely considered - normal use of the program, and does *not* fall under the heading of - "derived work". - - Copyright (C) [2004, 2005, 2006], Hyperic, Inc. - This file is part of HQ. - - HQ is free software; you can redistribute it and/or modify - it under the terms version 2 of the GNU General Public License as - published by the Free Software Foundation. This program is distributed - in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU General Public License for more - details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. - --> - -<plugin package="org.hyperic.hq.plugin.activemq" name="activemq"> - - <classpath> - <include name="pdk/lib/mx4j"/> - </classpath> - - <filter name="domain" - value="org.apache.activemq"/> - - <filter name="template" - value="${OBJECT_NAME}:${alias}"/> - - <filter name="QUEUE_OBJECT_NAME" - value="${domain}:Type=Queue,BrokerName=*,Destination=*"/> - - <filter name="TOPIC_OBJECT_NAME" - value="${domain}:Type=Topic,BrokerName=*,Destination=*"/> - - <filter name="BROKER_OBJECT_NAME" - value="${domain}:Type=Broker,BrokerName=*"/> - - <!-- special casing due to 5.1 renaming: - MemoryPercentageUsed -> MemoryPercentUsage --> - <metrics name="ActiveMQ 4.0 Topic"> - <metric name="Availability" - template="${TOPIC_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Enqueue Count" - template="${TOPIC_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Dequeue Count" - template="${TOPIC_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Consumer Count" - template="${TOPIC_OBJECT_NAME}:${alias}"/> - - <metric name="Queue Size" - template="${TOPIC_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Memory Percentage Used" - template="${TOPIC_OBJECT_NAME}:${alias}" - units="percent"/> - </metrics> - - <metrics name="ActiveMQ 4.0 Queue"> - <metric name="Availability" - template="${QUEUE_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Enqueue Count" - template="${QUEUE_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Dequeue Count" - template="${QUEUE_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Consumer Count" - template="${QUEUE_OBJECT_NAME}:${alias}"/> - - <metric name="Queue Size" - template="${QUEUE_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Memory Percentage Used" - template="${QUEUE_OBJECT_NAME}:${alias}" - units="percent"/> - </metrics> - - <metrics name="ActiveMQ 4.0 Broker"> - <metric name="Availability" - template="${BROKER_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Total Consumer Count" - template="${BROKER_OBJECT_NAME}:${alias}"/> - - <metric name="Total Enqueue Count" - template="${BROKER_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Total Dequeue Count" - template="${BROKER_OBJECT_NAME}:${alias}" - collectionType="trendsup"/> - - <metric name="Total Message Count" - template="${BROKER_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Memory Limit" - template="${BROKER_OBJECT_NAME}:${alias}" - units="B"/> - - <metric name="Memory Percentage Used" - template="${BROKER_OBJECT_NAME}:${alias}" - units="percent"/> - </metrics> - - <metrics name="ActiveMQ 5.1 Topic"> - <metric name="Availability" - template="${TOPIC_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Enqueue Count" - template="${TOPIC_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Dequeue Count" - template="${TOPIC_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Consumer Count" - template="${TOPIC_OBJECT_NAME}:${alias}"/> - - <metric name="Queue Size" - template="${TOPIC_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Memory Percent Usage" - template="${TOPIC_OBJECT_NAME}:${alias}" - units="percent"/> - </metrics> - - <metrics name="ActiveMQ 5.1 Queue"> - <metric name="Availability" - template="${QUEUE_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Enqueue Count" - template="${QUEUE_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Dequeue Count" - template="${QUEUE_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Consumer Count" - template="${QUEUE_OBJECT_NAME}:${alias}"/> - - <metric name="Queue Size" - template="${QUEUE_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Memory Percent Usage" - template="${QUEUE_OBJECT_NAME}:${alias}" - units="percent"/> - </metrics> - - <metrics name="ActiveMQ 5.1 Broker"> - <metric name="Availability" - template="${BROKER_OBJECT_NAME}:${alias}" - indicator="true"/> - - <metric name="Total Consumer Count" - template="${BROKER_OBJECT_NAME}:${alias}"/> - - <metric name="Total Enqueue Count" - template="${BROKER_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Total Dequeue Count" - template="${BROKER_OBJECT_NAME}:${alias}" - collectionType="trendsup"/> - - <metric name="Total Message Count" - template="${BROKER_OBJECT_NAME}:${alias}" - indicator="true" - collectionType="trendsup"/> - - <metric name="Memory Limit" - template="${BROKER_OBJECT_NAME}:${alias}" - units="B"/> - - <metric name="Memory Percent Usage" - template="${BROKER_OBJECT_NAME}:${alias}" - units="percent"/> - </metrics> - - <config name="destination"> - <option name="BrokerName" - description="Broker Name" - default=""/> - - <option name="Destination" - description="Destination" - default=""/> - </config> - - <server name="ActiveMQ" - version="4.0"> - - <!-- derive installpath from -Dactivemq.home=... --> - <property name="PROC_HOME_PROPERTY" - value="activemq.home"/> - - <property name="DEFAULT_CONF" - value="conf/activemq.xml"/> - - <property name="DEFAULT_LOG_FILE" - value="var/activemq.log"/> - - <property name="VERSION_FILE" - value="**/lib/.*activemq-core-4.\d*.*.jar"/> - - <config> - <option name="process.query" - description="Process Query"/> - </config> - - <plugin type="autoinventory" - class="org.hyperic.hq.product.jmx.MxServerDetector"/> - - <plugin type="measurement" - class="org.hyperic.hq.product.jmx.MxMeasurementPlugin"/> - - <plugin type="log_track" - class="org.hyperic.hq.product.Log4JLogTrackPlugin"/> - - <plugin type="config_track" - class="org.hyperic.hq.product.ConfigFileTrackPlugin"/> - - <metric name="Availability" - template="sigar:Type=ProcState,Arg=%process.query%:State" - indicator="true"/> - - &process-metrics; - - <service name="Connector"> - <property name="OBJECT_NAME" - value="${domain}:Type=Connector,BrokerName=*,ConnectorName=*"/> - - <config> - <option name="BrokerName" - description="Broker Name" - default=""/> - - <option name="ConnectorName" - description="Connector Name" - default=""/> - </config> - - <plugin type="autoinventory"/> - - <plugin type="control" - class="org.hyperic.hq.product.jmx.MxControlPlugin"/> - - <actions include="start,stop"/> - - <metric name="Availability" - indicator="true"/> - - <metric name="Enqueue Count" - indicator="true" - collectionType="trendsup"/> - - <metric name="Dequeue Count" - indicator="true" - collectionType="trendsup"/> - </service> - - <service name="Broker"> - <property name="OBJECT_NAME" value="${BROKER_OBJECT_NAME}"/> - - <config> - <option name="BrokerName" - description="Broker Name" - default=""/> - </config> - - <plugin type="autoinventory"/> - - <plugin type="control" - class="org.hyperic.hq.product.jmx.MxControlPlugin"/> - - <actions include="start,stop,gc,removeTopic,removeQueue"/> - </service> - - <!-- - Tested based on: - http://incubator.apache.org/activemq/run-broker.html - activemq broker:(tcp://localhost:61616,network:static:tcp://localhost:61616)?persistent=false&useJmx=true - --> - - <service name="Queue"> - <property name="OBJECT_NAME" value="${QUEUE_OBJECT_NAME}"/> - - <config include="destination"/> - - <plugin type="autoinventory"/> - - <plugin type="control" - class="org.hyperic.hq.product.jmx.MxControlPlugin"/> - - <actions include="sendTextMessage"/> - </service> - - <!-- same as Queue except for Type=Topic --> - <service name="Topic"> - <property name="OBJECT_NAME" value="${TOPIC_OBJECT_NAME}"/> - - <config include="destination"/> - - <plugin type="autoinventory"/> - - <plugin type="control" - class="org.hyperic.hq.product.jmx.MxControlPlugin"/> - - <actions include="sendTextMessage"/> - </service> - - <!-- &sun-jvm-service; --> - - </server> - - <server name="ActiveMQ" - version="5.0" - include="4.0"> - <property name="VERSION_FILE" - value="**/.*activemq-core-(5.\d*).*.jar"/> -</server> - - <server name="ActiveMQ" - version="5.1" - include="5.0"> - </server> - - <server name="ActiveMQ" - version="5.2" - include="5.1"> - </server> - - <server name="ActiveMQ" - version="5.3" - include="5.2"> - </server> - - <server name="ActiveMQ Embedded" - version="5.0" - include="ActiveMQ 5.0"> - <property name="PROC_HOME_PROPERTY" - value="catalina.base"/> - </server> - <server name="ActiveMQ Embedded" - version="5.1" - include="ActiveMQ 5.1"> - <property name="PROC_HOME_PROPERTY" - value="catalina.base"/> - </server> - <server name="ActiveMQ Embedded" - version="5.2" - include="5.1"> - </server> - <server name="ActiveMQ Embedded" - version="5.3" - include="5.2"> - </server> - -</plugin> |
|
From: <dcr...@hy...> - 2010-04-23 17:20:02
|
Author: dcrutchf Date: 2010-04-23 10:19:55 -0700 (Fri, 23 Apr 2010) New Revision: 14541 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14541 Modified: trunk/plugins/websphere/etc/hq-plugin.xml Log: [HHQ-3837] - Help information needs to be updated for WebSphere 7.0 Plugin Modified: trunk/plugins/websphere/etc/hq-plugin.xml =================================================================== --- trunk/plugins/websphere/etc/hq-plugin.xml 2010-04-23 17:18:57 UTC (rev 14540) +++ trunk/plugins/websphere/etc/hq-plugin.xml 2010-04-23 17:19:55 UTC (rev 14541) @@ -258,15 +258,15 @@ <![CDATA[ <p><h4>Enable WebSphere PMI</h4></p> - WebSphere 6.x has PMI enabled at the Basic level by default, + WebSphere ${product.version} has PMI enabled at the Basic level by default, which is sufficient for HQ to collect the metrics enabled by default. The PMI level may need to be increased to collect certain metrics not enabled by default. <ul> - <li>Using a Web browser open http://${admin.host}:9060/admin </li> + <li>Using a Web browser open the administration view </li> <li><b>Server</b> -> <b>Application Servers</b> -> - <b>${server.name}</b> -> <b>Performance Monitoring</b> </li> + <b>${server.name}</b> -> <b>Performance Monitoring Infrastructure</b> </li> <li>Check the Startup button </li> <li>Set level to Basic or higher </li> <li>Click OK </li> @@ -275,7 +275,29 @@ </ul> ]]> </help> + + <help name="enable-pmi-7"> + <![CDATA[ + <p><h4>Enable WebSphere PMI</h4></p> + WebSphere ${product.version} has PMI enabled at the Basic level by default, + which is sufficient for HQ to collect the metrics enabled by + default. The PMI level may need to be increased to collect + certain metrics not enabled by default. + + <ul> + <li>Using a Web browser open the administration view </li> + <li><b>Server</b> -> <b>Application Servers</b> -> + <b>${server.name}</b> -> <b>Performance Monitoring Infrastructure</b> </li> + <li>Select the Runtime or Configuration tab </li> + <li>Set level to Basic or higher </li> + <li>Click OK </li> + <li>Click Save to apply changes to the master configuration </li> + <li>Restart server </li> + </ul> + ]]> + </help> + <help name="agent-setup-6"> <![CDATA[ <p> @@ -286,9 +308,28 @@ ${CMD.prompt} ${CMD.env.set} HQ_JAVA_HOME=${was.install.root}${FILE.sep}java ${CMD.prompt} hq-agent.${CMD.ext} start </pre> + + <p> + <h4>Add the following property definition to the agent.properties file for an an HQ Agent that will manage WebSphere ${product.version}:</h4> + </p> + + <pre>websphere.useext=true</pre> ]]> </help> + <help name="agent-setup-7"> + <![CDATA[ + <p> + <h4>The HQ Agent must be run using the IBM JDK to monitor WebSphere:</h4> + </p> + + <pre> + ${CMD.prompt} ${CMD.env.set} HQ_JAVA_HOME=${was.install.root}${FILE.sep}java + ${CMD.prompt} hq-agent.${CMD.ext} start + </pre> + ]]> + </help> + <!-- same as above with ssl.client.props --> <help name="config-auth-6"> <![CDATA[ @@ -309,17 +350,20 @@ ]]> </help> + <help name="WebSphere Admin 7.0" + include="agent-setup-7,enable-pmi-7,config-auth-6"/> + <help name="WebSphere Admin 6.0" include="agent-setup-6,enable-pmi-6,config-auth-6"/> <help name="WebSphere Admin 6.1" include="agent-setup-6,enable-pmi-6,config-auth-6"/> - <help name="WebSphere Admin 6.0 Win32,config-auth-6" - include="enable-pmi-6"/> + <help name="WebSphere Admin 6.0 Win32" + include="enable-pmi-6,config-auth-6"/> - <help name="WebSphere Admin 6.1 Win32,config-auth-6" - include="enable-pmi-6"/> + <help name="WebSphere Admin 6.1 Win32" + include="enable-pmi-6,config-auth-6"/> <help name="websphere-server"> <![CDATA[ |
|
From: <sc...@hy...> - 2010-04-23 17:19:05
|
Author: scottmf Date: 2010-04-23 10:18:57 -0700 (Fri, 23 Apr 2010) New Revision: 14540 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14540 Modified: trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java Log: [HHQ-3918] add missing api from MeasurementManager, slight code modification in Diagnostic Modified: trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java 2010-04-23 00:05:27 UTC (rev 14539) +++ trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java 2010-04-23 17:18:57 UTC (rev 14540) @@ -114,12 +114,12 @@ final Map avails = aMan.getLastAvail(resources, measCache); final List children = new ArrayList(); final Map childrenToPlatform = getChildren(platforms, measCache, avails, children); - final List measurements = new ArrayList(mMan.getEnabledMeasurements(children).values()); + final Collection measurements = mMan.getEnabledMeasurements(children).values(); final Map values = getLastMetricValues(measurements); buf.append(getStatus(measurements, values, avails, childrenToPlatform)); } - private StringBuilder getStatus(List measurementLists, Map values, Map avails, + private StringBuilder getStatus(Collection measurementLists, Map values, Map avails, Map childrenToPlatform) { final Map platHierarchyNotReporting = new HashMap(); for (final Iterator it=measurementLists.iterator(); it.hasNext(); ) { @@ -207,10 +207,10 @@ /** * @return {@link Map} of {@link Integer} of measurementIds to {@link MetricValue} */ - private Map getLastMetricValues(List measurements) { + private Map getLastMetricValues(Collection measLists) { final MetricDataCache cache = MetricDataCache.getInstance(); final List mids = new ArrayList(); - for (final Iterator it=measurements.iterator(); it.hasNext(); ) { + for (final Iterator it=measLists.iterator(); it.hasNext(); ) { final List measList = (List) it.next(); for (final Iterator mit=measList.iterator(); mit.hasNext(); ) { final Measurement m = (Measurement) mit.next(); Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java 2010-04-23 00:05:27 UTC (rev 14539) +++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java 2010-04-23 17:18:57 UTC (rev 14540) @@ -650,6 +650,16 @@ } /** + * @param aeids {@link List} of {@link Resource}s + * @return {@link Map} of {@link Integer} representing resourceId to + * {@link List} of {@link Measurement}s + * @ejb:interface-method + */ + public Map getEnabledMeasurements(List resources) { + return getMeasurementDAO().findEnabledByResources(resources); + } + + /** * @param aeids {@link List} of {@link AppdefEntityID}s * @return {@link Map} of {@link Integer} representing resourceId to * {@link List} of {@link Measurement}s |
|
From: <sc...@hy...> - 2010-04-23 00:05:35
|
Author: scottmf Date: 2010-04-22 17:05:27 -0700 (Thu, 22 Apr 2010) New Revision: 14539 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14539 Added: trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceEdgeDAO.java trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java trunk/src/org/hyperic/hq/measurement/server/session/MetricDataCache.java Log: [HHQ-3918] created report for enabled metrics not being reported by their agent Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceEdgeDAO.java =================================================================== --- trunk/src/org/hyperic/hq/authz/server/session/ResourceEdgeDAO.java 2010-04-22 23:55:18 UTC (rev 14538) +++ trunk/src/org/hyperic/hq/authz/server/session/ResourceEdgeDAO.java 2010-04-23 00:05:27 UTC (rev 14539) @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -38,7 +39,6 @@ import org.hyperic.hibernate.Util; import org.hyperic.hibernate.dialect.HQDialect; import org.hyperic.hq.appdef.shared.AppdefEntityConstants; -import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.authz.shared.AuthzConstants; import org.hyperic.hq.dao.HibernateDAO; @@ -88,16 +88,32 @@ return res; } - Collection findDescendantEdges(Resource r, ResourceRelation rel) { - String sql = "from ResourceEdge e where e.from = :from " + + /** + * @return {@link Collection} of {@link ResourceEdge}s + */ + Collection findDescendantEdges(List resources, ResourceRelation rel) { + String sql = "from ResourceEdge e " + + "where e.from in (:resources) " + "and distance > :distance " + "and rel_id = :rel_id "; + List rtn = new ArrayList(); + Query query = getSession().createQuery(sql); + int size = resources.size(); + for (int i=0; i<size; i+=BATCH_SIZE) { + int end = Math.min(i+BATCH_SIZE, size); + rtn.addAll(query.setParameterList("resources", resources.subList(i, end)) + .setInteger("distance", 0) + .setInteger("rel_id", rel.getId().intValue()) + .list()); + } + return rtn; + } - return getSession().createQuery(sql) - .setParameter("from", r) - .setInteger("distance", 0) - .setInteger("rel_id", rel.getId().intValue()) - .list(); + /** + * @return {@link Collection} of {@link ResourceEdge}s + */ + Collection findDescendantEdges(Resource r, ResourceRelation rel) { + return findDescendantEdges(Collections.singletonList(r), rel); } List findDescendantEdgesByNetworkRelation(Integer resourceId, Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java 2010-04-22 23:55:18 UTC (rev 14538) +++ trunk/src/org/hyperic/hq/authz/server/session/ResourceManagerEJBImpl.java 2010-04-23 00:05:27 UTC (rev 14539) @@ -665,16 +665,23 @@ } /** + * @param parentList {@link List} of {@link Resource}s * @return {@link Collection} of {@link ResourceEdge}s * @ejb:interface-method */ - public Collection findResourceEdges(ResourceRelation relation, - Resource parent) { - return getResourceEdgeDAO() - .findDescendantEdges(parent, relation); + public Collection findResourceEdges(ResourceRelation relation, List parentList) { + return getResourceEdgeDAO().findDescendantEdges(parentList, relation); } /** + * @return {@link Collection} of {@link ResourceEdge}s + * @ejb:interface-method + */ + public Collection findResourceEdges(ResourceRelation relation, Resource parent) { + return getResourceEdgeDAO().findDescendantEdges(parent, relation); + } + + /** * * @ejb:interface-method */ Added: trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java (rev 0) +++ trunk/src/org/hyperic/hq/measurement/MetricsNotComingInDiagnostic.java 2010-04-23 00:05:27 UTC (rev 14539) @@ -0,0 +1,257 @@ +/* + * NOTE: This copyright does *not* cover user programs that use HQ + * program services by normal system calls through the application + * program interfaces provided as part of the Hyperic Plug-in Development + * Kit or the Hyperic Client Development Kit - this is merely considered + * normal use of the program, and does *not* fall under the heading of + * "derived work". + * + * Copyright (C) [2004-2010], Hyperic, Inc. + * This file is part of HQ. + * + * HQ is free software; you can redistribute it and/or modify + * it under the terms version 2 of the GNU General Public License as + * published by the Free Software Foundation. This program is distributed + * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + */ + +package org.hyperic.hq.measurement; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.ejb.FinderException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hyperic.hq.appdef.server.session.Platform; +import org.hyperic.hq.appdef.server.session.PlatformManagerEJBImpl; +import org.hyperic.hq.appdef.shared.PlatformManagerLocal; +import org.hyperic.hq.appdef.shared.PlatformNotFoundException; +import org.hyperic.hq.appdef.shared.PlatformValue; +import org.hyperic.hq.authz.server.session.AuthzSubject; +import org.hyperic.hq.authz.server.session.AuthzSubjectManagerEJBImpl; +import org.hyperic.hq.authz.server.session.Resource; +import org.hyperic.hq.authz.server.session.ResourceEdge; +import org.hyperic.hq.authz.server.session.ResourceManagerEJBImpl; +import org.hyperic.hq.authz.shared.PermissionException; +import org.hyperic.hq.authz.shared.ResourceManagerLocal; +import org.hyperic.hq.common.DiagnosticObject; +import org.hyperic.hq.hibernate.SessionManager; +import org.hyperic.hq.hibernate.SessionManager.SessionRunner; +import org.hyperic.hq.measurement.server.session.AvailabilityManagerEJBImpl; +import org.hyperic.hq.measurement.server.session.Measurement; +import org.hyperic.hq.measurement.server.session.MeasurementManagerEJBImpl; +import org.hyperic.hq.measurement.server.session.MetricDataCache; +import org.hyperic.hq.measurement.shared.AvailabilityManagerLocal; +import org.hyperic.hq.measurement.shared.MeasurementManagerLocal; +import org.hyperic.hq.product.MetricValue; +import org.hyperic.util.pager.PageControl; + +public class MetricsNotComingInDiagnostic implements DiagnosticObject { + + private static final Log log = LogFactory.getLog(MetricsNotComingInDiagnostic.class); + private static MetricsNotComingInDiagnostic instance = new MetricsNotComingInDiagnostic(); + private static final long started = now(); + // 60 minutes + private static final long THRESHOLD = 1000*60*60; + + private MetricsNotComingInDiagnostic() {} + + public static MetricsNotComingInDiagnostic getInstance() { + return instance; + } + + public String getName() { + return "Enabled Metrics Not Coming In"; + } + + public String getShortName() { + return "EnabledMetricsNotComingIn"; + } + + public String getStatus() { + if ((now() - THRESHOLD) < started) { + return "Server must be up for " + THRESHOLD/1000/60 + + " minutes before this report is valid"; + } + final StringBuilder rtn = new StringBuilder(); + try { + SessionManager.runInSession(new SessionRunner() { + public void run() throws Exception { + setStatusBuf(rtn); + } + public String getName() { + return MetricsNotComingInDiagnostic.class.getSimpleName(); + } + }); + } catch (Exception e) { + log.error(e,e); + } + return rtn.toString(); + } + + public void setStatusBuf(StringBuilder buf) { + final Collection platforms = getAllPlatforms(); + final AvailabilityManagerLocal aMan = AvailabilityManagerEJBImpl.getOne(); + final MeasurementManagerLocal mMan = MeasurementManagerEJBImpl.getOne(); + final Collection resources = getResources(platforms); + final Map measCache = mMan.getAvailMeasurements(resources); + final Map avails = aMan.getLastAvail(resources, measCache); + final List children = new ArrayList(); + final Map childrenToPlatform = getChildren(platforms, measCache, avails, children); + final List measurements = new ArrayList(mMan.getEnabledMeasurements(children).values()); + final Map values = getLastMetricValues(measurements); + buf.append(getStatus(measurements, values, avails, childrenToPlatform)); + } + + private StringBuilder getStatus(List measurementLists, Map values, Map avails, + Map childrenToPlatform) { + final Map platHierarchyNotReporting = new HashMap(); + for (final Iterator it=measurementLists.iterator(); it.hasNext(); ) { + final List mList = (List) it.next(); + for (final Iterator mit=mList.iterator(); mit.hasNext(); ) { + final Measurement m = (Measurement) mit.next(); + if (m != null && !m.getTemplate().isAvailability() + && !values.containsKey(m.getId())) { + final Platform platform = (Platform) childrenToPlatform.get(m.getResource()); + if (platform == null) { + continue; + } + List tmp; + if (null == (tmp = (List)platHierarchyNotReporting.get(platform))) { + tmp = new ArrayList(); + platHierarchyNotReporting.put(platform, tmp); + } + tmp.add(new StringBuilder(128) + .append("\nmid=").append(m.getId()) + .append(", name=").append(m.getTemplate().getName()) + .append(", resid=").append(m.getResource().getId()) + .append(", resname=").append(m.getResource().getName()) + .toString()); + } + } + } + final StringBuilder rtn = new StringBuilder(platHierarchyNotReporting.size()*128); + rtn.append("\nEnabled metrics not reported in for ") + .append(THRESHOLD/1000/60).append(" minutes (by platform hierarchy)\n"); + rtn.append("------------------------------------------------------------------------\n"); + for (final Iterator it=platHierarchyNotReporting.entrySet().iterator(); it.hasNext(); ) { + final Entry entry = (Entry) it.next(); + final Platform platform = (Platform) entry.getKey(); + final List children = (List) entry.getValue(); + rtn.append("\nfqdn=").append(platform.getFqdn()) + .append(" (").append(children.size()).append(" not collecting):"); + for (final Iterator xx=children.iterator(); xx.hasNext(); ) { + rtn.append(xx.next().toString()); + } + } + return rtn.append("\n"); + } + + /** + * @return {@link Map} of {@link Resource}s to their top level {@link Platform} + */ + private Map getChildren(Collection platforms, Map measCache, Map avails, List children) { + final Map rtn = new HashMap(platforms.size()); + final long now = now(); + final List resources = new ArrayList(platforms.size()); + for (final Iterator it=platforms.iterator(); it.hasNext(); ) { + final Platform platform = (Platform) it.next(); + if ((now - platform.getCreationTime()) < THRESHOLD || + !platformIsAvailable(platform, measCache, avails)) { + continue; + } + resources.add(platform.getResource()); + } + final ResourceManagerLocal rMan = ResourceManagerEJBImpl.getOne(); + final PlatformManagerLocal pMan = PlatformManagerEJBImpl.getOne(); + final Collection edges = rMan.findResourceEdges(rMan.getContainmentRelation(), resources); + for (final Iterator it=edges.iterator(); it.hasNext(); ) { + final ResourceEdge edge = (ResourceEdge) it.next(); + try { + final Platform platform = pMan.findPlatformById(edge.getFrom().getInstanceId()); + final Resource child = edge.getTo(); + children.add(child); + rtn.put(child, platform); + } catch (PlatformNotFoundException e) { + log.debug(e); + } + } + return rtn; + } + + private Collection getResources(Collection platforms) { + final Collection resources = new ArrayList(platforms.size()); + for (final Iterator it=platforms.iterator(); it.hasNext(); ) { + final Platform platform = (Platform) it.next(); + resources.add(platform.getResource()); + } + return resources; + } + + /** + * @return {@link Map} of {@link Integer} of measurementIds to {@link MetricValue} + */ + private Map getLastMetricValues(List measurements) { + final MetricDataCache cache = MetricDataCache.getInstance(); + final List mids = new ArrayList(); + for (final Iterator it=measurements.iterator(); it.hasNext(); ) { + final List measList = (List) it.next(); + for (final Iterator mit=measList.iterator(); mit.hasNext(); ) { + final Measurement m = (Measurement) mit.next(); + mids.add(m.getId()); + } + } + return cache.getAll(mids, now()-THRESHOLD); + } + + private static long now() { + return System.currentTimeMillis(); + } + + private boolean platformIsAvailable(Platform platform, Map measCache, Map avails) { + final Resource resource = platform.getResource(); + final Measurement availMeas = (Measurement) ((List)measCache.get(resource.getId())).get(0); + MetricValue val = (MetricValue) avails.get(availMeas.getId()); + return (val.getValue() == MeasurementConstants.AVAIL_DOWN) ? false : true; + } + + private Collection getAllPlatforms() { + AuthzSubject overlord = AuthzSubjectManagerEJBImpl.getOne().getOverlordPojo(); + PlatformManagerLocal pMan = PlatformManagerEJBImpl.getOne(); + Collection platforms; + try { + platforms = pMan.getAllPlatforms(overlord, PageControl.PAGE_ALL); + } catch (PermissionException e1) { + return Collections.EMPTY_LIST; + } catch (FinderException e1) { + return Collections.EMPTY_LIST; + } + Collection rtn = new ArrayList(platforms.size()); + for (final Iterator it=platforms.iterator(); it.hasNext(); ) { + PlatformValue p = (PlatformValue) it.next(); + try { + rtn.add(pMan.findPlatformById(p.getId())); + } catch (PlatformNotFoundException e) { + continue; + } + } + return rtn; + } + +} Modified: trunk/src/org/hyperic/hq/measurement/server/session/MetricDataCache.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/MetricDataCache.java 2010-04-22 23:55:18 UTC (rev 14538) +++ trunk/src/org/hyperic/hq/measurement/server/session/MetricDataCache.java 2010-04-23 00:05:27 UTC (rev 14539) @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; @@ -126,6 +127,34 @@ } /** + * Get {@link MetricValue}s from the cache within the specified time range, from timestamp + * to currentTimeMillis. + * + * @param mids {@link List} of {@link Integer}s representing MeasurementIds. + * @param timestamp the start of the time range (inclusive) in millis. + * @return {@link Map} of {@link Integer} of measurementIds to {@link MetricValue} + * from the cache. If the mid does not exist or the timestamp of value is out of the + * specified window the returned Map will not include any representation of the mid. + */ + public Map getAll(List mids, long timestamp) { + final Map rtn = new HashMap(mids.size()); + synchronized (_cacheLock) { + for (final Iterator it=mids.iterator(); it.hasNext(); ) { + final Integer mid = (Integer) it.next(); + final Element elem = _cache.get(mid); + if (elem == null) { + continue; + } + final MetricValue val = (MetricValue) elem.getObjectValue(); + if (val != null && val.getTimestamp() >= timestamp) { + rtn.put(mid, val); + } + } + } + return rtn; + } + + /** * Get a MetricValue from the cache. * * @param mid The measurement id. |
|
From: <pn...@hy...> - 2010-04-22 23:55:27
|
Author: pnguyen Date: 2010-04-22 16:55:18 -0700 (Thu, 22 Apr 2010) New Revision: 14538 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14538 Modified: trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java Log: [HHQ-3754] Lower the timeout to 30 seconds and add more debugging. Modified: trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java 2010-04-22 19:15:40 UTC (rev 14537) +++ trunk/src/org/hyperic/hq/bizapp/server/session/UpdateBossEJBImpl.java 2010-04-22 23:55:18 UTC (rev 14538) @@ -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 @@ -58,8 +58,8 @@ import org.hyperic.hq.hqu.server.session.UIPlugin; import org.hyperic.hq.hqu.server.session.UIPluginManagerEJBImpl; import org.hyperic.util.thread.LoggingThreadGroup; +import org.hyperic.util.timer.StopWatch; - /** * @ejb:bean name="UpdateBoss" * jndi-name="ejb/bizapp/UpdateBoss" @@ -75,6 +75,7 @@ private final UpdateStatusDAO _updateDAO = new UpdateStatusDAO(DAOFactory.getDAOFactory()); private final String CHECK_URL = "http://updates.hyperic.com/hq-updates"; + private final int HTTP_TIMEOUT_MILLIS = 30000; private final Log _log = LogFactory.getLog(UpdateBossEJBImpl.class); @@ -160,6 +161,8 @@ * @ejb:interface-method */ public void fetchReport() { + final boolean debug = _log.isDebugEnabled(); + final StopWatch watch = new StopWatch(); UpdateStatus status = getOrCreateStatus(); Properties req; byte[] reqBytes; @@ -184,29 +187,47 @@ return; } - _log.debug("Generated report. Size=" + reqBytes.length + - " report:\n" + req); + if (debug) { + _log.debug("Generated report. Size=" + reqBytes.length + + " report:\n" + req); + } - PostMethod post = new PostMethod(getCheckURL()); + String url = getCheckURL(); + PostMethod post = new PostMethod(url); post.addRequestHeader("x-hq-guid", req.getProperty("hq.guid")); HttpClient c = new HttpClient(); - c.setTimeout(5 * 60 * 1000); + c.setConnectionTimeout(HTTP_TIMEOUT_MILLIS); + c.setTimeout(HTTP_TIMEOUT_MILLIS); ByteArrayInputStream bIs = new ByteArrayInputStream(reqBytes); post.setRequestBody(bIs); - String response; - int statusCode; + String response = null; + int statusCode = -1; try { + if (debug) watch.markTimeBegin("post"); statusCode = c.executeMethod(post); + if (debug) watch.markTimeEnd("post"); response = post.getResponseBodyAsString(); } catch(Exception e) { - _log.debug("Unable to get updates", e); + if (debug) { + _log.debug("Unable to get updates from " + + url, e); + } return; } finally { post.releaseConnection(); + + if (debug) { + _log.debug("fetchReport: " + watch + + ", currentReport {" + status.getReport() + + "}, latestReport {url=" + url + + ", statusCode=" + statusCode + + ", response=" + response + + "}"); + } } processReport(statusCode, response); |
|
From: <gla...@hy...> - 2010-04-22 19:15:49
|
Author: glaullon Date: 2010-04-22 12:15:40 -0700 (Thu, 22 Apr 2010) New Revision: 14537 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14537 Modified: trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/WeblogicDetector.java trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/ApplicationQuery.java trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/DynamicServiceQuery.java trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicDiscover.java trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicQuery.java trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicRuntimeDiscoverer.java Log: [SUPPORT-7512] WebLogic 9.2.3 services not auto-discovered Modified: trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/WeblogicDetector.java =================================================================== --- trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/WeblogicDetector.java 2010-04-22 17:39:44 UTC (rev 14536) +++ trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/WeblogicDetector.java 2010-04-22 19:15:40 UTC (rev 14537) @@ -30,6 +30,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -49,6 +50,7 @@ import org.hyperic.hq.product.ServerResource; import org.hyperic.hq.plugin.weblogic.jmx.WeblogicRuntimeDiscoverer; +import org.hyperic.sigar.SigarException; public class WeblogicDetector extends ServerDetector @@ -70,8 +72,7 @@ private static final String PROP_MX_SERVER = "-Dweblogic.management.server"; - private static final Log _log = LogFactory.getLog("WeblogicDetector"); - private Log log = _log; //XXX cleanup + private static final Log log = LogFactory.getLog(WeblogicDetector.class); public WeblogicDetector() { super(); @@ -338,18 +339,26 @@ long[] pids = getPids(PTQL_QUERY); for (int i=0; i<pids.length; i++) { - //nothin in the ProcArgs to indicate installpath - String cwd = getProcCwd(pids[i]); + log.debug("pid = '"+pids[i]+"'"); + String cwd = null; + try { + cwd = getSigar().getProcExe(pids[i]).getCwd(); + log.debug("cwd = '"+cwd+"'"); + } catch (SigarException e) { + log.debug("Error getting process info, pid: '"+pids[i]+"', reason: '"+e.getMessage()+"'"); + } boolean haveCwd = cwd != null; //9.1-specific since config.xml no longer tells us //this is an admin server, check the args for this prop, //which if found means this is a node server, skip it. String[] args = getProcArgs(pids[i]); + log.debug("args = "+Arrays.asList(args)); for (int j=0; j<args.length; j++) { String arg = args[j]; if (arg.startsWith(PROP_MX_SERVER)) { haveCwd = false; + log.debug(PROP_MX_SERVER+" found"); break; } else if (!haveCwd && arg.startsWith("-D")) { @@ -359,6 +368,7 @@ String path = arg.substring(ix+1).trim(); if (isAdminDir(path)) { cwd = path; + log.debug("cwd = '"+cwd+"'"); haveCwd = true; } } @@ -422,7 +432,7 @@ installpath = getInstallRoot(arg); if (installpath != null) { - _log.debug(WeblogicProductPlugin.PROP_INSTALLPATH + "=" + + log.debug(WeblogicProductPlugin.PROP_INSTALLPATH + "=" + installpath + " (derived from " + args[j] + ")"); break; } Modified: trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/ApplicationQuery.java =================================================================== --- trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/ApplicationQuery.java 2010-04-22 17:39:44 UTC (rev 14536) +++ trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/ApplicationQuery.java 2010-04-22 19:15:40 UTC (rev 14537) @@ -26,24 +26,23 @@ package org.hyperic.hq.plugin.weblogic.jmx; import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import javax.management.AttributeNotFoundException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.hyperic.hq.plugin.weblogic.WeblogicMetric; import org.hyperic.hq.plugin.weblogic.WeblogicProductPlugin; public class ApplicationQuery extends ServiceQuery { - public static final String MBEAN_TYPE = "ApplicationRuntime"; + private static final Log log = LogFactory.getLog("ApplicationQuery"); + public static final String MBEAN_TYPE = "ApplicationRuntime"; public static final String MBEAN_TYPE_61 = "ApplicationConfig"; private static final String ATTR_EAR = "EAR"; - - private static final String[] ATTRS = { - "Path", ATTR_NOTES, - }; - private static final String[] EAR_ATTRS = { ATTR_EAR }; private static final WeblogicQuery[] COMPONENTS = { @@ -57,7 +56,7 @@ private String mbeanName; public String[] getAttributeNames() { - return ATTRS; + return EAR_ATTRS; } public WeblogicQuery[] getChildQueries() { @@ -85,9 +84,12 @@ return WeblogicMetric.PROP_APP; } - public boolean getAttributes(MBeanServer mServer, - ObjectName name) { + public boolean isEAR(){ + return "true".equalsIgnoreCase(getAttribute(ATTR_EAR)); + } + public boolean getAttributes(MBeanServer mServer, + ObjectName name) { String appName = name.getKeyProperty("Name"); ServerQuery server = (ServerQuery)getParent(); @@ -101,35 +103,13 @@ } if (server.getDiscover().isInternalApp(appName)) { + log.debug(appName+" is a internal Application"); return false; } - if (isServer91()) { - super.getAttributes(mServer, name, EAR_ATTRS); - if ("false".equals(getAttribute(ATTR_EAR))) { - //internal stuff and wierdo data source containers - return false; - } - } - setName(appName); + super.getAttributes(mServer, name); - String appMBeanName = - name.getDomain() + ":" + - "Name=" + appName + "," + - "Type=Application"; - - ObjectName appMBean; - try { - appMBean = new ObjectName(appMBeanName); - } catch (MalformedObjectNameException e) { - //notgonnahappen - WeblogicDiscover.getLog().error(e.getMessage(), e); - return true; - } - - super.getAttributes(mServer, appMBean, ATTRS); - return true; } } Modified: trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/DynamicServiceQuery.java =================================================================== --- trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/DynamicServiceQuery.java 2010-04-22 17:39:44 UTC (rev 14536) +++ trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/DynamicServiceQuery.java 2010-04-22 19:15:40 UTC (rev 14537) @@ -113,15 +113,15 @@ //returned by the server this should not happen. //however, it is possible when nodes are not properly //configured. - logAttrFailure(name, e); + logAttrFailure(name, attrNames,e); return false; } catch (ReflectionException e) { //this should not happen either - logAttrFailure(name, e); + logAttrFailure(name, attrNames,e); return false; }catch (IOException e) { //this should not happen either - logAttrFailure(name, e); + logAttrFailure(name, attrNames,e); return false; } Modified: trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicDiscover.java =================================================================== --- trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicDiscover.java 2010-04-22 17:39:44 UTC (rev 14536) +++ trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicDiscover.java 2010-04-22 19:15:40 UTC (rev 14537) @@ -191,18 +191,14 @@ WeblogicQuery type = query.cloneInstance(); if (type.getAttributes(mServer, obj)) { types.add(type); - } - else { - continue; - } + WeblogicQuery[] childQueries = query.getChildQueries(); - WeblogicQuery[] childQueries = query.getChildQueries(); - - for (int i = 0; i < childQueries.length; i++) { - WeblogicQuery childQuery = childQueries[i]; - childQuery.setParent(type); - childQuery.setVersion(type.getVersion()); - find( mServer, childQuery, types); + for (int i = 0; i < childQueries.length; i++) { + WeblogicQuery childQuery = childQueries[i]; + childQuery.setParent(type); + childQuery.setVersion(type.getVersion()); + find( mServer, childQuery, types); + } } } } Modified: trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicQuery.java =================================================================== --- trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicQuery.java 2010-04-22 17:39:44 UTC (rev 14536) +++ trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicQuery.java 2010-04-22 19:15:40 UTC (rev 14537) @@ -27,6 +27,7 @@ import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -37,6 +38,8 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import javax.management.ReflectionException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hyperic.hq.plugin.weblogic.WeblogicConfig; import org.hyperic.hq.plugin.weblogic.WeblogicProductPlugin; @@ -54,6 +57,8 @@ private static final String[] NOOP_ATTRIBUTE_NAMES = new String[0]; private static final Properties NOOP_PROPERTIES = new Properties(); + private static final Log log = LogFactory.getLog(WeblogicQuery.class); + public WeblogicQuery cloneInstance() { WeblogicQuery query; @@ -85,9 +90,11 @@ return getAttributes(mServer, name, getAttributeNames()); } - protected void logAttrFailure(ObjectName name, Exception e) { - String msg = "Failed to get attributes for " + name; - WeblogicDiscover.getLog().debug(msg, e); + protected void logAttrFailure(ObjectName name, String[] attrNames, Exception e) { + if (log.isDebugEnabled()) { + String msg = "attributes " + Arrays.asList(attrNames) + " not found for '" + name+"' : "+e; + log.debug(msg); + } } public boolean getAttributes(MBeanServer mServer, @@ -111,11 +118,11 @@ //returned by the server this should not happen. //however, it is possible when nodes are not properly //configured. - logAttrFailure(name, e); + logAttrFailure(name,attrNames, e); return false; } catch (ReflectionException e) { //this should not happen either - logAttrFailure(name, e); + logAttrFailure(name,attrNames, e); return false; } Modified: trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicRuntimeDiscoverer.java =================================================================== --- trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicRuntimeDiscoverer.java 2010-04-22 17:39:44 UTC (rev 14536) +++ trunk/plugins/weblogic/src/org/hyperic/hq/plugin/weblogic/jmx/WeblogicRuntimeDiscoverer.java 2010-04-22 19:15:40 UTC (rev 14537) @@ -299,10 +299,20 @@ pluginUpdater.updateServiceTypes(plugin.getProductPlugin(), serviceTypes); } - for (int k = 0; k < services.size(); k++) { - aServices.add(generateService((ServiceQuery) services.get(k))); - } + for (int k = 0; k < services.size(); k++) { + boolean valid = true; + ServiceQuery service = (ServiceQuery) services.get(k); + if (service instanceof ApplicationQuery) { + valid = ((ApplicationQuery) service).isEAR(); + } + if (valid) { + aServices.add(generateService(service)); + } else { + log.debug("skipped service:"+service.getName()); + } + } + AIServiceValue[] aiservices = (AIServiceValue[]) aServices.toArray(new AIServiceValue[0]); aServer.setAIServiceValues(aiservices); |
|
From: <cw...@hy...> - 2010-04-22 18:23:24
|
Author: cwitt Date: 2010-04-22 00:46:13 -0700 (Thu, 22 Apr 2010) New Revision: 14534 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14534 Added: trunk/installer/rpm/expect/install_ee.exp Modified: trunk/installer/rpm/ trunk/installer/rpm/expect/install.exp trunk/installer/rpm/noarch-EE.spec trunk/installer/rpm/noarch-dotorg.spec trunk/installer/rpm/x86-EE-server.spec trunk/installer/rpm/x86-server.spec trunk/installer/rpm/x86_64-EE-server.spec trunk/installer/rpm/x86_64-server.spec Log: Resolve issue where hq-install.log was not properly copied into server dir prior to hq-installer destruction. Accounted for lack of click-through license in dotorg in expect script so install no longer hangs. Property changes on: trunk/installer/rpm ___________________________________________________________________ Name: svn:ignore + support_files support_files_EE Modified: trunk/installer/rpm/expect/install.exp =================================================================== --- trunk/installer/rpm/expect/install.exp 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/expect/install.exp 2010-04-22 07:46:13 UTC (rev 14534) @@ -4,8 +4,6 @@ spawn ./setup.sh -expect "accept" -send "y\r" expect "choices" send "1\r" expect "installation path" Added: trunk/installer/rpm/expect/install_ee.exp =================================================================== --- trunk/installer/rpm/expect/install_ee.exp (rev 0) +++ trunk/installer/rpm/expect/install_ee.exp 2010-04-22 07:46:13 UTC (rev 14534) @@ -0,0 +1,19 @@ +#!/usr/bin/expect -f + +set timeout -1 + +spawn ./setup.sh + +expect "accept" +send "y\r" +expect "choices" +send "1\r" +expect "installation path" +send "[lindex $argv 0]\r" +expect { + "send email messages" { + send "\r" + } eof { + exit + } +} Property changes on: trunk/installer/rpm/expect/install_ee.exp ___________________________________________________________________ Name: svn:executable + * Modified: trunk/installer/rpm/noarch-EE.spec =================================================================== --- trunk/installer/rpm/noarch-EE.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/noarch-EE.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,7 +1,7 @@ %define HQ_Component_Name hyperic-hq-agent -%define HQ_Component_Version 4.1.2 +%define HQ_Component_Version 4.2.0.7 %define HQ_Component_Edition EE -%define HQ_Component_Build 1053-noJRE +%define HQ_Component_Build 1285-noJRE %define HQ_Component_Release 1 %define HQ_User hyperic @@ -151,6 +151,16 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 19 2009 Hyperic Support <su...@hy...> 4.2.0.1 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 * Fri Mar 6 2009 Hyperic Support <su...@hy...> 4.1.0 Modified: trunk/installer/rpm/noarch-dotorg.spec =================================================================== --- trunk/installer/rpm/noarch-dotorg.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/noarch-dotorg.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,6 +1,6 @@ %define HQ_Component_Name hyperic-hq-agent -%define HQ_Component_Version 4.1.2 -%define HQ_Component_Build 1053-noJRE +%define HQ_Component_Version 4.2.0.7 +%define HQ_Component_Build 1285-noJRE %define HQ_Component_Release 1 %define HQ_User hyperic @@ -150,6 +150,16 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 19 2009 Hyperic Support <su...@hy...> 4.2.0.1 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 * Fri Mar 6 2009 Hyperic Support <su...@hy...> 4.1.0 Modified: trunk/installer/rpm/x86-EE-server.spec =================================================================== --- trunk/installer/rpm/x86-EE-server.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/x86-EE-server.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,7 +1,7 @@ %define HQ_Component_Name hyperic-hq-installer -%define HQ_Component_Version 4.1.2 +%define HQ_Component_Version 4.2.0.7 %define HQ_Component_Edition EE -%define HQ_Component_Build 1053-x86-linux +%define HQ_Component_Build 1285-x86-linux %define HQ_Component_Release EE.1 %define HQ_User hyperic @@ -116,12 +116,13 @@ else cd %{prefix}/%{name} installer-%{version}-%{HQ_Component_Edition}/data/hqdb/tune-os.sh > /dev/null 2> /dev/null - /bin/su hyperic -c "expect/install.exp %{prefix}" - #/bin/su hyperic -c "expect/install.exp %{prefix}" > /dev/null 2> /dev/null + /bin/su hyperic -c "expect/install_ee.exp %{prefix}" + #/bin/su hyperic -c "expect/install_ee.exp %{prefix}" > /dev/null 2> /dev/null #echo "%{prefix}/server-current/hqdb/bin/postgres -D %{prefix}/server-current/hqdb/data -i" > %{prefix}/server-%{version}-%{HQ_Component_Edition}/hqdb/data/postmaster.opts cd $RPM_BUILD_ROOT/%{prefix} /bin/su hyperic -c "/bin/ln -snf server-%{version}-%{HQ_Component_Edition} server-current" fi +%{__cp} %{prefix}/%{name}/installer-%{version}-%{HQ_Component_Edition}/logs/hq-install.log %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log %{__rm} -Rf %{prefix}/%{name} %postun @@ -163,6 +164,26 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Tue Mar 9 2010 Hyperic Support <su...@hy...> 4.2.0 +* Tue Jan 26 2010 Hyperic Support <su...@hy...> 4.2.0 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Wed Dec 16 2009 Hyperic Support <su...@hy...> 4.2.0 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 19 2009 Hyperic Support <su...@hy...> 4.2.0.1 +* Mon Nov 9 2009 Hyperic Support <su...@hy...> 4.2.0 +* Mon Nov 9 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4.1 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4 +* Thu Oct 1 2009 Hyperic Support <su...@hy...> 4.1.2.1 +* Tue Aug 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Fri May 1 2009 Hyperic Support <su...@hy...> 4.1.1 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 Modified: trunk/installer/rpm/x86-server.spec =================================================================== --- trunk/installer/rpm/x86-server.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/x86-server.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,6 +1,6 @@ %define HQ_Component_Name hyperic-hq-installer -%define HQ_Component_Version 4.1.2 -%define HQ_Component_Build 1053-x86-linux +%define HQ_Component_Version 4.2.0.7 +%define HQ_Component_Build 1285-x86-linux %define HQ_Component_Release 1 %define HQ_User hyperic @@ -121,6 +121,7 @@ cd $RPM_BUILD_ROOT/%{prefix} /bin/su hyperic -c "/bin/ln -snf server-%{version} server-current" fi +%{__cp} %{prefix}/%{name}/installer-%{version}/logs/hq-install.log %{prefix}/server-%{version}/hq-install.log %{__rm} -Rf %{prefix}/%{name} %postun @@ -140,14 +141,14 @@ %{__rm} -f /tmp/hyperic-hq-server-was-running-%{version}-%{release} echo echo "The new version of HQ Server has been started using your existing configuration." - echo "The installation log can be found in %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log." + echo "The installation log can be found in %{prefix}/server-%{version}/hq-install.log." echo "Manually starting the HQ Server should be done using the hyperic user." echo elif [ -f /etc/init.d/hyperic-hq-server ]; then echo echo "The HQ Server has successfully been installed, and the service has been" echo "configured to start at boot." - echo "The installation log can be found in %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log." + echo "The installation log can be found in %{prefix}/server-%{version}/hq-install.log." echo "Manually starting the HQ Server should be done using the hyperic user." echo fi @@ -162,6 +163,15 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 * Fri Mar 6 2009 Hyperic Support <su...@hy...> 4.1.0 Modified: trunk/installer/rpm/x86_64-EE-server.spec =================================================================== --- trunk/installer/rpm/x86_64-EE-server.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/x86_64-EE-server.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,7 +1,7 @@ %define HQ_Component_Name hyperic-hq-installer -%define HQ_Component_Version 4.1.2 +%define HQ_Component_Version 4.2.0.7 %define HQ_Component_Edition EE -%define HQ_Component_Build 1053-x86_64-linux +%define HQ_Component_Build 1285-x86_64-linux %define HQ_Component_Release EE.1 %define HQ_User hyperic @@ -115,13 +115,13 @@ else cd %{prefix}/%{name} installer-%{version}-%{HQ_Component_Edition}/data/hqdb/tune-os.sh > /dev/null 2> /dev/null - /bin/su hyperic -c "expect/install.exp %{prefix}" - #/bin/su hyperic -c "expect/install.exp %{prefix}" > /dev/null 2> /dev/null + /bin/su hyperic -c "expect/install_ee.exp %{prefix}" + #/bin/su hyperic -c "expect/install_ee.exp %{prefix}" > /dev/null 2> /dev/null #echo "%{prefix}/server-current/hqdb/bin/postgres -D %{prefix}/server-current/hqdb/data -i" > %{prefix}/server-%{version}-%{HQ_Component_Edition}/hqdb/data/postmaster.opts cd $RPM_BUILD_ROOT/%{prefix} /bin/su hyperic -c "/bin/ln -snf server-%{version}-%{HQ_Component_Edition} server-current" fi -#%{__cp} %{prefix}/%{name}/installer-3.2.0-EE/hq-install.log %{prefix}/server-%{version}-%{HQ_Component_Edition}/ +%{__cp} %{prefix}/%{name}/installer-%{version}-%{HQ_Component_Edition}/logs/hq-install.log %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log %{__rm} -Rf %{prefix}/%{name} %postun @@ -163,6 +163,26 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Tue Mar 9 2010 Hyperic Support <su...@hy...> 4.2.0 +* Tue Jan 26 2010 Hyperic Support <su...@hy...> 4.2.0 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Wed Dec 16 2009 Hyperic Support <su...@hy...> 4.2.0 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 19 2009 Hyperic Support <su...@hy...> 4.2.0.1 +* Mon Nov 9 2009 Hyperic Support <su...@hy...> 4.2.0 +* Mon Nov 9 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4.1 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4 +* Thu Oct 1 2009 Hyperic Support <su...@hy...> 4.1.2.1 +* Tue Aug 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Fri May 1 2009 Hyperic Support <su...@hy...> 4.1.1 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 Modified: trunk/installer/rpm/x86_64-server.spec =================================================================== --- trunk/installer/rpm/x86_64-server.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/x86_64-server.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,6 +1,6 @@ %define HQ_Component_Name hyperic-hq-installer -%define HQ_Component_Version 4.1.2 -%define HQ_Component_Build 1053-x86_64-linux +%define HQ_Component_Version 4.2.0.7 +%define HQ_Component_Build 1285-x86_64-linux %define HQ_Component_Release 1 %define HQ_User hyperic @@ -120,6 +120,7 @@ cd $RPM_BUILD_ROOT/%{prefix} /bin/su hyperic -c "/bin/ln -snf server-%{version} server-current" fi +%{__cp} %{prefix}/%{name}/installer-%{version}/logs/hq-install.log %{prefix}/server-%{version}/hq-install.log %{__rm} -Rf %{prefix}/%{name} %postun @@ -139,14 +140,14 @@ %{__rm} -f /tmp/hyperic-hq-server-was-running-%{version}-%{release} echo echo "The new version of HQ Server has been started using your existing configuration." - echo "The installation log can be found in %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log." + echo "The installation log can be found in %{prefix}/server-%{version}/hq-install.log." echo "Manually starting the HQ Server should be done using the hyperic user." echo elif [ -f /etc/init.d/hyperic-hq-server ]; then echo echo "The HQ Server has successfully been installed, and the service has been" echo "configured to start at boot." - echo "The installation log can be found in %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log." + echo "The installation log can be found in %{prefix}/server-%{version}/hq-install.log." echo "Manually starting the HQ Server should be done using the hyperic user." echo fi @@ -161,6 +162,15 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 * Fri Mar 6 2009 Hyperic Support <su...@hy...> 4.1.0 |
|
From: <sc...@hy...> - 2010-04-22 17:39:56
|
Author: scottmf Date: 2010-04-22 10:39:44 -0700 (Thu, 22 Apr 2010) New Revision: 14536 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14536 Modified: trunk/plugins/mysql_stats/etc/hq-plugin.xml Log: [HHQ-3881] updated plugin docs to show an example of a user that is able to monitor mysql with a non-root privileges Modified: trunk/plugins/mysql_stats/etc/hq-plugin.xml =================================================================== --- trunk/plugins/mysql_stats/etc/hq-plugin.xml 2010-04-22 07:53:31 UTC (rev 14535) +++ trunk/plugins/mysql_stats/etc/hq-plugin.xml 2010-04-22 17:39:44 UTC (rev 14536) @@ -2113,10 +2113,18 @@ monitoring are: </p> <ul> - <li>The configured mysql has the ability to connect to the MySQL server specified by the ${jdbcUrl}</li> - <li>The user ${jdbcUser} is able to execute the following statements: - 'SHOW GLOBAL STATUS', 'SHOW SLAVE STATUS' (minimal privileges needed: - SELECT, REPLICATION CLIENT)</li> + <li>The configured mysql must have the ability to connect to the MySQL server specified by the ${jdbcUrl}</li> + <li> + The user ${jdbcUser} is able to execute the following statements: + 'SHOW GLOBAL STATUS', 'SHOW SLAVE STATUS', 'SHOW DATABASES' + (minimal privileges needed: SELECT, REPLICATION CLIENT) + <ul> + Examples: <br> + mysql> create user 'hqagent'@'localhost' identified by 'hqagent'; <br> + mysql> grant show databases on *.* to 'hqagent'@'localhost'; <br> + mysql> grant select on *.* to 'hqagent'@'localhost'; <br> + </ul> + </li> <li>To enable full process monitoring of the MySQL daemon the agent user must either own the process or have permissions to view all process stats.</li> </ul> <p>Shared properties (values propagate to child services):</p> |
|
From: <no...@gi...> - 2010-04-22 16:27:38
|
Branch: refs/heads/evolution Home: http://github.com/hyperic/hqapi Commit: 5564ddc04523f1462e44c348d20f9151ae4822a7 http://github.com/hyperic/hqapi/commit/5564ddc04523f1462e44c348d20f9151ae4822a7 Author: Ben Hale <bh...@vm...> Date: 2010-04-22 (Thu, 22 Apr 2010) Changed paths: M parent/pom.xml Log Message: ----------- Added some missing repositories |
|
From: <bo...@hy...> - 2010-04-22 07:53:42
|
Author: bob Date: 2010-04-22 00:53:31 -0700 (Thu, 22 Apr 2010) New Revision: 14535 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14535 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1416 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-04-22 07:46:13 UTC (rev 14534) +++ trunk/etc/version.properties 2010-04-22 07:53:31 UTC (rev 14535) @@ -1,3 +1,3 @@ -#Wed Apr 21 00:18:03 PDT 2010 +#Thu Apr 22 00:16:53 PDT 2010 version=4.3.0 -build=1415 +build=1416 |
|
From: <bo...@hy...> - 2010-04-22 04:35:25
|
Author: bob Date: 2010-04-21 21:35:17 -0700 (Wed, 21 Apr 2010) New Revision: 14533 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14533 Modified: tags/HQ_4_2_0_GA/etc/version.properties Log: Release 4.2.0 build #1264 Modified: tags/HQ_4_2_0_GA/etc/version.properties =================================================================== --- tags/HQ_4_2_0_GA/etc/version.properties 2010-04-22 03:54:37 UTC (rev 14532) +++ tags/HQ_4_2_0_GA/etc/version.properties 2010-04-22 04:35:17 UTC (rev 14533) @@ -1,3 +1,3 @@ -#Mon Mar 08 09:23:06 PST 2010 +#Wed Apr 21 20:03:29 PDT 2010 version=4.2.0 -build=1263 +build=1264 |
|
From: <bo...@hy...> - 2010-04-22 03:54:47
|
Author: bob Date: 2010-04-21 20:54:37 -0700 (Wed, 21 Apr 2010) New Revision: 14532 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14532 Modified: tags/HQ_4_2_0_PATCH7/etc/version.properties Log: Release 4.2.0.7 build #1285 Modified: tags/HQ_4_2_0_PATCH7/etc/version.properties =================================================================== --- tags/HQ_4_2_0_PATCH7/etc/version.properties 2010-04-22 02:37:04 UTC (rev 14531) +++ tags/HQ_4_2_0_PATCH7/etc/version.properties 2010-04-22 03:54:37 UTC (rev 14532) @@ -1,3 +1,3 @@ -#Wed Mar 24 20:44:14 PDT 2010 +#Wed Apr 21 19:47:52 PDT 2010 version=4.2.0.7 -build=1284 +build=1285 |
|
From: <bo...@hy...> - 2010-04-22 02:37:12
|
Author: bob Date: 2010-04-21 19:37:04 -0700 (Wed, 21 Apr 2010) New Revision: 14531 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14531 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Updating version to 4.2.0.8 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-04-22 02:08:17 UTC (rev 14530) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-04-22 02:37:04 UTC (rev 14531) @@ -1,3 +1,3 @@ #Wed Apr 21 17:17:51 PDT 2010 -version=4.2.0.7 +version=4.2.0.8 build=1286 |
|
From: <kp...@hy...> - 2010-04-22 02:08:26
|
Author: kparikh Date: 2010-04-21 19:08:17 -0700 (Wed, 21 Apr 2010) New Revision: 14530 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14530 Added: tags/HQ_4_2_0_PATCH7/ Log: Copied: tags/HQ_4_2_0_PATCH7 (from rev 14421, branches/HQ_4_2_0_PATCH) |
|
From: <bo...@hy...> - 2010-04-22 00:50:46
|
Author: bob Date: 2010-04-21 17:50:36 -0700 (Wed, 21 Apr 2010) New Revision: 14529 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14529 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.7 build #1286 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-04-21 23:49:56 UTC (rev 14528) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-04-22 00:50:36 UTC (rev 14529) @@ -1,3 +1,3 @@ -#Wed Apr 21 10:53:20 PDT 2010 +#Wed Apr 21 17:17:51 PDT 2010 version=4.2.0.7 -build=1285 +build=1286 |
|
From: <dcr...@hy...> - 2010-04-21 23:50:04
|
Author: dcrutchf Date: 2010-04-21 16:49:56 -0700 (Wed, 21 Apr 2010) New Revision: 14528 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14528 Modified: branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html branches/HQ_4_0_3_1/web/common/Error.html Log: updated dojo references Modified: branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java =================================================================== --- branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java 2010-04-21 23:47:37 UTC (rev 14527) +++ branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java 2010-04-21 23:49:56 UTC (rev 14528) @@ -46,7 +46,7 @@ /** * Dojo Version */ - public static final String DOJO_VERSION = "1.1"; + public static final String DOJO_VERSION = "1.1.2"; @Asset("context:js/dojo/" + DOJO_VERSION + "/dojo/resources/dojo.css") public abstract IAsset getDojoStyleSheet(); Modified: branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html =================================================================== --- branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html 2010-04-21 23:47:37 UTC (rev 14527) +++ branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html 2010-04-21 23:49:56 UTC (rev 14528) @@ -8,14 +8,14 @@ <block jwcid="afterDelegate@Block"> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="/js/dojo/1.1/dojo/dojo.js.uncompressed.js" type="text/javascript"></script> +<script src="/js/dojo/1.1.2/dojo/dojo.js" type="text/javascript"></script> <script type="text/javascript" src="/js/lib/lib.js"></script> </block> <body jwcid="@Body" class="tundra"> Modified: branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html =================================================================== --- branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html 2010-04-21 23:47:37 UTC (rev 14527) +++ branches/HQ_4_0_3_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html 2010-04-21 23:49:56 UTC (rev 14528) @@ -8,14 +8,14 @@ <block jwcid="afterDelegate@Block"> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="/js/dojo/1.1/dojo/dojo.js.uncompressed.js" type="text/javascript"></script> +<script src="/js/dojo/1.1.2/dojo/dojo.js" type="text/javascript"></script> <script type="text/javascript" src="/js/lib/lib.js"></script> </block> <body jwcid="@Body" class="ognl:'white '+...@or...seLayout@DOJO_THEME"> Modified: branches/HQ_4_0_3_1/web/common/Error.html =================================================================== --- branches/HQ_4_0_3_1/web/common/Error.html 2010-04-21 23:47:37 UTC (rev 14527) +++ branches/HQ_4_0_3_1/web/common/Error.html 2010-04-21 23:49:56 UTC (rev 14528) @@ -6,9 +6,9 @@ <link rel="icon" href="/images/4.0/icons/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/css/HQ_40.css" /> <link rel="stylesheet" type="text/css" - href="/js/dojo/1.1/dijit/themes/tundra/tundra.css" /> + href="/js/dojo/1.1.2/dijit/themes/tundra/tundra.css" /> <link rel="stylesheet" type="text/css" - href="/js/dojo/1.1/dojo/resources/dojo.css" /> + href="/js/dojo/1.1.2/dojo/resources/dojo.css" /> </head> <body class="tundra" id="Body"> <div id="header"> |
|
From: <dcr...@hy...> - 2010-04-21 23:47:46
|
Author: dcrutchf Date: 2010-04-21 16:47:37 -0700 (Wed, 21 Apr 2010) New Revision: 14527 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14527 Modified: branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html branches/HQ_4_1_2_1/web/common/Error.html Log: updated dojo references Modified: branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java =================================================================== --- branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java 2010-04-21 23:43:54 UTC (rev 14526) +++ branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java 2010-04-21 23:47:37 UTC (rev 14527) @@ -46,7 +46,7 @@ /** * Dojo Version */ - public static final String DOJO_VERSION = "1.1"; + public static final String DOJO_VERSION = "1.1.2"; @Asset("context:js/dojo/" + DOJO_VERSION + "/dojo/resources/dojo.css") public abstract IAsset getDojoStyleSheet(); Modified: branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html =================================================================== --- branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html 2010-04-21 23:43:54 UTC (rev 14526) +++ branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html 2010-04-21 23:47:37 UTC (rev 14527) @@ -8,14 +8,14 @@ <block jwcid="afterDelegate@Block"> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="/js/dojo/1.1/dojo/dojo.js.uncompressed.js" type="text/javascript"></script> +<script src="/js/dojo/1.1.2/dojo/dojo.js" type="text/javascript"></script> <script type="text/javascript" src="/js/lib/lib.js"></script> </block> <body jwcid="@Body" class="tundra"> Modified: branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html =================================================================== --- branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html 2010-04-21 23:43:54 UTC (rev 14526) +++ branches/HQ_4_1_2_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html 2010-04-21 23:47:37 UTC (rev 14527) @@ -8,14 +8,14 @@ <block jwcid="afterDelegate@Block"> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="/js/dojo/1.1/dojo/dojo.js.uncompressed.js" type="text/javascript"></script> +<script src="/js/dojo/1.1.2/dojo/dojo.js" type="text/javascript"></script> <script type="text/javascript" src="/js/lib/lib.js"></script> </block> <body jwcid="@Body" class="ognl:'white '+...@or...seLayout@DOJO_THEME"> Modified: branches/HQ_4_1_2_1/web/common/Error.html =================================================================== --- branches/HQ_4_1_2_1/web/common/Error.html 2010-04-21 23:43:54 UTC (rev 14526) +++ branches/HQ_4_1_2_1/web/common/Error.html 2010-04-21 23:47:37 UTC (rev 14527) @@ -6,9 +6,9 @@ <link rel="icon" href="/images/4.0/icons/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/css/HQ_40.css" /> <link rel="stylesheet" type="text/css" - href="/js/dojo/1.1/dijit/themes/tundra/tundra.css" /> + href="/js/dojo/1.1.2/dijit/themes/tundra/tundra.css" /> <link rel="stylesheet" type="text/css" - href="/js/dojo/1.1/dojo/resources/dojo.css" /> + href="/js/dojo/1.1.2/dojo/resources/dojo.css" /> </head> <body class="tundra" id="Body"> <div id="header"> |
|
From: <dcr...@hy...> - 2010-04-21 23:44:03
|
Author: dcrutchf Date: 2010-04-21 16:43:54 -0700 (Wed, 21 Apr 2010) New Revision: 14526 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14526 Added: branches/HQ_4_1_4_1/.classpath branches/HQ_4_1_4_1/.project Modified: branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html branches/HQ_4_1_4_1/web/common/Error.html Log: Updated dojo references Added: branches/HQ_4_1_4_1/.classpath =================================================================== --- branches/HQ_4_1_4_1/.classpath (rev 0) +++ branches/HQ_4_1_4_1/.classpath 2010-04-21 23:43:54 UTC (rev 14526) @@ -0,0 +1,240 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="installer/src"/> + <classpathentry kind="src" path="plugins/spring/src/main/java"/> + <classpathentry kind="src" path="build/src"/> + <classpathentry kind="src" path="plugins/alfresco/src"/> + <classpathentry kind="src" path="plugins/apache/src"/> + <classpathentry kind="src" path="plugins/bind/src"/> + <classpathentry kind="src" path="plugins/coldfusion/src"/> + <classpathentry kind="src" path="plugins/db2/src"/> + <classpathentry kind="src" path="plugins/dotnet/src"/> + <classpathentry kind="src" path="plugins/exchange/src"/> + <classpathentry kind="src" path="plugins/groovy-scripting/src"/> + <classpathentry kind="src" path="plugins/hqagent/src"/> + <classpathentry kind="src" path="plugins/iis/src"/> + <classpathentry kind="src" path="plugins/informix/src"/> + <classpathentry kind="src" path="plugins/iplanet/src"/> + <classpathentry kind="src" path="plugins/jboss/src"/> + <classpathentry kind="src" path="plugins/memcached/src"/> + <classpathentry kind="src" path="plugins/mssql/src"/> + <classpathentry kind="src" path="plugins/mysql_stats/src"/> + <classpathentry kind="src" path="plugins/mysql/src"/> + <classpathentry kind="src" path="plugins/nagios/src"/> + <classpathentry kind="src" path="plugins/netdevice/src"/> + <classpathentry kind="src" path="plugins/netservices/src"/> + <classpathentry kind="src" path="plugins/ntds/src"/> + <classpathentry kind="src" path="plugins/ntp/src"/> + <classpathentry kind="src" path="plugins/oc4j/src"/> + <classpathentry kind="src" path="plugins/openldap/src"/> + <classpathentry kind="src" path="plugins/oracle/src"/> + <classpathentry kind="src" path="plugins/perlbal/src"/> + <classpathentry kind="src" path="plugins/postfix/src"/> + <classpathentry kind="src" path="plugins/postgresql/src"/> + <classpathentry kind="src" path="plugins/samba/src"/> + <classpathentry kind="src" path="plugins/servlet/src"/> + <classpathentry kind="src" path="plugins/sqlquery/src"/> + <classpathentry kind="src" path="plugins/sybase/src"/> + <classpathentry kind="src" path="plugins/system/src"/> + <classpathentry kind="src" path="plugins/tomcat/src"/> + <classpathentry kind="src" path="plugins/vim/src"/> + <classpathentry kind="lib" path="plugins/vim/lib/mo.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tomcat-jk.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-beanutils-1.8.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-digester-1.8.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-validator-1.3.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/oro-2.0.8.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/struts-core-1.3.10.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/struts-el-1.3.10.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/struts-extras-1.3.10.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/struts-taglib-1.3.10.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/struts-tiles-1.3.10.jar" sourcepath="/Users/david/Development/opensource/struts-1.3.10/src/tiles/src/main/java"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-chain-1.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jstl-1.1.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/standard-1.1.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.aop-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.asm-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.beans-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.context-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.context.support-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.core-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.expression-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.jdbc-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.transaction-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.web-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/spring-security-config-3.0.0.RELEASE.jar" sourcepath="/Users/david/Development/opensource/spring-security-3.0.0.RELEASE/dist/spring-security-config-3.0.0.RELEASE-sources.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/spring-security-core-3.0.0.RELEASE.jar" sourcepath="/Users/david/Development/opensource/spring-security-3.0.0.RELEASE/dist/spring-security-core-3.0.0.RELEASE-sources.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/spring-security-taglibs-3.0.0.RELEASE.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/spring-security-web-3.0.0.RELEASE.jar" sourcepath="/Users/david/Development/opensource/spring-security-3.0.0.RELEASE/dist/spring-security-web-3.0.0.RELEASE-sources.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/spring-security/org.springframework.web.servlet-3.0.0.RELEASE.jar"/> + <classpathentry kind="src" path="plugins/vmware/src"/> + <classpathentry kind="src" path="plugins/weblogic/doc"/> + <classpathentry kind="src" path="plugins/weblogic/src"/> + <classpathentry kind="src" path="plugins/websphere/src"/> + <classpathentry kind="src" path="plugins/xen/src"/> + <classpathentry kind="src" path="plugins/zimbra/src"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="tools/txsnatch/src"/> + <classpathentry kind="src" path="unittest/src"/> + <classpathentry kind="lib" path="hq_bin/db2monitor_bin/lib/db2monitor.jar"/> + <classpathentry kind="lib" path="hq_bin/lather_bin/lather.jar"/> + <classpathentry kind="lib" path="hq_bin/sigar_bin/lib/sigar.jar"/> + <classpathentry kind="lib" path="hq_bin/wrapper_bin/lib/wrapper.jar"/> + <classpathentry kind="lib" path="plugins/weblogic/build-lib/weblogic-jmx.jar"/> + <classpathentry kind="lib" path="plugins/websphere/build-lib/websphere-jmx.jar"/> + <classpathentry kind="lib" path="plugins/websphere/build-lib/websphere-pmi.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/ant-contrib.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/ant-launcher.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/ant-nodeps.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/ant-trax.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/ant.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/cactus-1.7.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/cactus-ant-1.7.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-codec-1.3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-collections-3.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-fileupload-1.2.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-httpclient-3.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-lang-2.3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-modeler.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/db2_jdbc/db2jcc_license_cu.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/db2_jdbc/db2jcc.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/dbunit-2.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/dnsjava-2.0.3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/easymock-2.3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/easymockclassextension-2.3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/ehcache-1.5.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/getopt.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/groovy-all-1.6.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/henplus.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/antlr-2.7.6.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/asm-attrs.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/asm.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/cglib-2.1.3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/concurrent-1.3.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/dom4j-1.6.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/freemarker.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/hibernate-tools.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/hibernate3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/hibernate/javassist.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/informix_jdbc/ifxjdbc.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jaas.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/javax.servlet.jar" sourcepath="/Users/david/Downloads/apache-tomcat-6.0.13-src/java"/> + <classpathentry kind="lib" path="thirdparty/lib/jboss-common.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jboss-jmx.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jboss-remoting.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jdom-1.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jgroups-all.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jmock-core-1.2.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/JMTUnit.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jsch-0.1.34.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jsdoc/jsrun.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/json.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jsr107cache-1.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/jug-asl-2.0.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/junit-3.8.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/junit-4.4.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/log4j-1.2.14.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/minify/jargs-1.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/minify/rhino-1.6R7.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/minify/yuicompressor-2.3.5.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mockejb.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mockrunner-ejb.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mssql_jdbc/msbase.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mssql_jdbc/mssqlserver.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mssql_jdbc/msutil.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mx4j-jmx.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mx4j/mx4j-jmx.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mx4j/mx4j-remote.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mx4j/mx4j-rjmx.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mx4j/mx4j-tools.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/mx4j/mx4j.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/oracle_jdbc/ojdbc14.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/oracle_jdbc/oracle12.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/postgresql/postgresql-7.4.3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/postgresql/postgresql-8.1-407.jdbc3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/postgresql/postgresql-8.2-505.jdbc3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/quartz-1.6.5.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/quartz-jboss-1.6.5.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/quartz-oracle-1.6.5.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/strutstest-2.1.3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/sybase_jdbc/jconn3.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/sybase_jdbc/sybase-jConnect-5_5-jconn2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/backport-util-concurrent-3.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/commons-fileupload-1.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/commons-io-1.4.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/commons-pool-1.4.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/hivemind-1.1.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/hivemind-lib-1.1.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/javassist-3.6.ga.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/ognl-2.7.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/oro-2.0.8.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/portlet-api-1.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/tacos-core-4.1.2-20080213.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapdoc-0.7.0-20070512.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-annotations-4.1.5.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-contrib-4.1.5.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-framework-4.1.5.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-portlet-4.1.5.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-prop-1.0.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/tapestry/tapestry-test-4.1.4-JUnit.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/urlrewrite-3.1.0.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/velocity-1.3.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/ws-commons-util-1.0.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xalan.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-apache-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-bea-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-caucho-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-ejb-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-exolab-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-hp-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-ibm-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-java-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-jboss-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-jdo-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-jmx-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-macromedia-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-mvcsoft-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-mx4j-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-orion-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-pramati-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-web-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-webwork-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet-xdoclet-module.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xdoclet.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xdoclet/xjavadoc.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xml-apis.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xmlrpc-client-3.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xmlrpc-common-3.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xpp3_min-1.1.4c.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xslt/xercesImpl-2.6.2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xslt/xml-apis-1.0.b2.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/xstream-1.3.1.jar"/> + <classpathentry kind="lib" path="tools/perftest/lib/commons-cli-1.1.jar"/> + <classpathentry kind="lib" path="tools/perftest/lib/commons-collections.jar"/> + <classpathentry kind="lib" path="tools/perftest/lib/commons-httpclient-3.0.1.jar"/> + <classpathentry kind="lib" path="tools/perftest/lib/commons-io-1.3.2.jar"/> + <classpathentry kind="lib" path="tools/perftest/lib/htmlunit-1.11.jar"/> + <classpathentry kind="lib" path="tools/perftest/lib/jaxen-1.1.1.jar"/> + <classpathentry kind="lib" path="tools/perftest/lib/js.jar"/> + <classpathentry kind="lib" path="tools/perftest/lib/nekohtml.jar"/> + <classpathentry kind="lib" path="unittest/lib/hibernate3.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jbosssx.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/mail.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jsp-api.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jmx-adaptor-plugin.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-jsr77.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/lib/jboss-system.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jboss-web.deployer/jbossweb.jar" sourcepath="/DOWNLOADS/apache-tomcat-6.0.13-src/java"/> + <classpathentry kind="lib" path="thirdparty/lib/tomcat/catalina.jar"/> + <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-j2ee.jar"/> + <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jnpserver.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/com.springsource.com.sun.xml.bind-2.1.7.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/com.springsource.javax.xml.bind-2.1.7.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/com.springsource.javax.xml.stream-1.0.1.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/snmp4j-1.11.jar"/> + <classpathentry kind="lib" path="thirdparty/lib/commons-logging-1.0.4.jar"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Added: branches/HQ_4_1_4_1/.project =================================================================== --- branches/HQ_4_1_4_1/.project (rev 0) +++ branches/HQ_4_1_4_1/.project 2010-04-21 23:43:54 UTC (rev 14526) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>hq</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.groovy.core.groovyNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + </natures> +</projectDescription> Modified: branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java =================================================================== --- branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java 2010-04-21 23:40:07 UTC (rev 14525) +++ branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/BaseLayout.java 2010-04-21 23:43:54 UTC (rev 14526) @@ -46,7 +46,7 @@ /** * Dojo Version */ - public static final String DOJO_VERSION = "1.1"; + public static final String DOJO_VERSION = "1.1.2"; @Asset("context:js/dojo/" + DOJO_VERSION + "/dojo/resources/dojo.css") public abstract IAsset getDojoStyleSheet(); Modified: branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html =================================================================== --- branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html 2010-04-21 23:40:07 UTC (rev 14525) +++ branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html 2010-04-21 23:43:54 UTC (rev 14526) @@ -8,14 +8,14 @@ <block jwcid="afterDelegate@Block"> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="/js/dojo/1.1/dojo/dojo.js.uncompressed.js" type="text/javascript"></script> +<script src="/js/dojo/1.1.2/dojo/dojo.js" type="text/javascript"></script> <script type="text/javascript" src="/js/lib/lib.js"></script> </block> <body jwcid="@Body" class="tundra"> Modified: branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html =================================================================== --- branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html 2010-04-21 23:40:07 UTC (rev 14525) +++ branches/HQ_4_1_4_1/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html 2010-04-21 23:43:54 UTC (rev 14526) @@ -8,14 +8,14 @@ <block jwcid="afterDelegate@Block"> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="/js/dojo/1.1/dojo/dojo.js.uncompressed.js" type="text/javascript"></script> +<script src="/js/dojo/1.1.2/dojo/dojo.js" type="text/javascript"></script> <script type="text/javascript" src="/js/lib/lib.js"></script> </block> <body jwcid="@Body" class="ognl:'white '+...@or...seLayout@DOJO_THEME"> Modified: branches/HQ_4_1_4_1/web/common/Error.html =================================================================== --- branches/HQ_4_1_4_1/web/common/Error.html 2010-04-21 23:40:07 UTC (rev 14525) +++ branches/HQ_4_1_4_1/web/common/Error.html 2010-04-21 23:43:54 UTC (rev 14526) @@ -6,9 +6,9 @@ <link rel="icon" href="/images/4.0/icons/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/css/HQ_40.css" /> <link rel="stylesheet" type="text/css" - href="/js/dojo/1.1/dijit/themes/tundra/tundra.css" /> + href="/js/dojo/1.1.2/dijit/themes/tundra/tundra.css" /> <link rel="stylesheet" type="text/css" - href="/js/dojo/1.1/dojo/resources/dojo.css" /> + href="/js/dojo/1.1.2/dojo/resources/dojo.css" /> </head> <body class="tundra" id="Body"> <div id="header"> |
|
From: <dcr...@hy...> - 2010-04-21 23:40:17
|
Author: dcrutchf Date: 2010-04-21 16:40:07 -0700 (Wed, 21 Apr 2010) New Revision: 14525 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14525 Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/BaseLayout.java branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html branches/HQ_4_2_0_PATCH/web/common/Error.html Log: update dojo references Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/BaseLayout.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/BaseLayout.java 2010-04-21 18:30:04 UTC (rev 14524) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/BaseLayout.java 2010-04-21 23:40:07 UTC (rev 14525) @@ -46,7 +46,7 @@ /** * Dojo Version */ - public static final String DOJO_VERSION = "1.1"; + public static final String DOJO_VERSION = "1.1.2"; @Asset("context:js/dojo/" + DOJO_VERSION + "/dojo/resources/dojo.css") public abstract IAsset getDojoStyleSheet(); Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html 2010-04-21 18:30:04 UTC (rev 14524) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/layout/Layout1Col.html 2010-04-21 23:40:07 UTC (rev 14525) @@ -8,14 +8,14 @@ <block jwcid="afterDelegate@Block"> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="/js/dojo/1.1/dojo/dojo.js.uncompressed.js" type="text/javascript"></script> +<script src="/js/dojo/1.1.2/dojo/dojo.js" type="text/javascript"></script> <script type="text/javascript" src="/js/lib/lib.js"></script> </block> <body jwcid="@Body" class="tundra"> Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html 2010-04-21 18:30:04 UTC (rev 14524) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/ui/tapestry/components/layout/Layout2Col.html 2010-04-21 23:40:07 UTC (rev 14525) @@ -8,14 +8,14 @@ <block jwcid="afterDelegate@Block"> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="/js/dojo/1.1/dojo/dojo.js.uncompressed.js" type="text/javascript"></script> +<script src="/js/dojo/1.1.2/dojo/dojo.js" type="text/javascript"></script> <script type="text/javascript" src="/js/lib/lib.js"></script> </block> <body jwcid="@Body" class="ognl:'white '+...@or...seLayout@DOJO_THEME"> Modified: branches/HQ_4_2_0_PATCH/web/common/Error.html =================================================================== --- branches/HQ_4_2_0_PATCH/web/common/Error.html 2010-04-21 18:30:04 UTC (rev 14524) +++ branches/HQ_4_2_0_PATCH/web/common/Error.html 2010-04-21 23:40:07 UTC (rev 14525) @@ -6,9 +6,9 @@ <link rel="icon" href="/images/4.0/icons/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/css/HQ_40.css" /> <link rel="stylesheet" type="text/css" - href="/js/dojo/1.1/dijit/themes/tundra/tundra.css" /> + href="/js/dojo/1.1.2/dijit/themes/tundra/tundra.css" /> <link rel="stylesheet" type="text/css" - href="/js/dojo/1.1/dojo/resources/dojo.css" /> + href="/js/dojo/1.1.2/dojo/resources/dojo.css" /> </head> <body class="tundra" id="Body"> <div id="header"> |
|
From: Yu <sig...@hy...> - 2010-04-21 18:59:20
|
hi, how to set username and password? |
|
From: rahma <sig...@hy...> - 2010-04-21 18:59:18
|
waw the code is too complicated and many file to be used!!!!!!!!!!!!!!!!! |
|
From: Shashidhar <sig...@hy...> - 2010-04-21 18:59:18
|
Hello All
I am trying to configure my Tomcat with HQ. So that I can monitor my web applications in side tomcat.
I couldn't able to see metrics and HQ Says "This resource has not been configured. Please set its Configuration Properties.". Under Configuration Properties, I see below help from HQ:
in /bin/catalina.sh add:
[ $1 != "stop" ] && JAVA_OPTS="-Dcom.sun.management.jmxremote \
-Dcom.sun.management.jmxremote.port=6969 \
-Dcom.sun.management.jmxremote.ssl=false \
-Dcom.sun.management.jmxremote.authenticate=false $JAVA_OPTS"
export JAVA_OPTS
From there restart Tomcat and that is it.
Unfortunately I couldn't locate catalina.sh at my installation path. Since I installed Tomcat6.0 with executable I only see services and 2 jars under /bin.
Could any advice me where can I add above information so that I can enable JMX?
Appreciate your early response.
Thanks,
Shashi
|
14 messages has been excluded from this view by a project administrator.
