Menu
▾
▴
[Hyperic-hq-discuss] hq r13703 - in trunk: . plugins/spring/src/main/java/org/hyperic/hq/plugin/spring plugins/tomcat/etc src/org/hyperic/hq/product/ant src/org/hyperic/hq/product/jmx
Author: jhickey Date: 2009-09-04 12:01:07 -0700 (Fri, 04 Sep 2009) New Revision: 13703 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13703 Modified: trunk/build.xml trunk/plugins/spring/src/main/java/org/hyperic/hq/plugin/spring/SpringStandaloneApplicationDetector.java trunk/plugins/tomcat/etc/hq-plugin.xml trunk/src/org/hyperic/hq/product/ant/PluginJar.java trunk/src/org/hyperic/hq/product/jmx/MBeanUtil.java trunk/src/org/hyperic/hq/product/jmx/MxServerDetector.java Log: HHQ-3343 for Tomcat, backed out PluginJar change from HHQ-3337 per review comments Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-09-04 18:59:18 UTC (rev 13702) +++ trunk/build.xml 2009-09-04 19:01:07 UTC (rev 13703) @@ -1038,7 +1038,9 @@ <hqplugin name="samba"/> - <hqplugin name="spring" resourceDir="src/main/resources"/> + <hqplugin name="spring"> + <fileset dir="plugins/spring/src/main/resources" includes="**"/> + </hqplugin> <hqplugin name="sybase"/> Modified: trunk/plugins/spring/src/main/java/org/hyperic/hq/plugin/spring/SpringStandaloneApplicationDetector.java =================================================================== --- trunk/plugins/spring/src/main/java/org/hyperic/hq/plugin/spring/SpringStandaloneApplicationDetector.java 2009-09-04 18:59:18 UTC (rev 13702) +++ trunk/plugins/spring/src/main/java/org/hyperic/hq/plugin/spring/SpringStandaloneApplicationDetector.java 2009-09-04 19:01:07 UTC (rev 13703) @@ -22,10 +22,6 @@ */ public class SpringStandaloneApplicationDetector extends MxServerDetector { - public List discoverServices(final ConfigResponse serverConfig) throws PluginException { - return super.discoverServices(serverConfig); - } - public List getServerResources(ConfigResponse platformConfig) throws PluginException { List servers = new ArrayList(); List procs = getServerProcessList(); Modified: trunk/plugins/tomcat/etc/hq-plugin.xml =================================================================== --- trunk/plugins/tomcat/etc/hq-plugin.xml 2009-09-04 18:59:18 UTC (rev 13702) +++ trunk/plugins/tomcat/etc/hq-plugin.xml 2009-09-04 19:01:07 UTC (rev 13703) @@ -38,6 +38,9 @@ <filter name="template" value="${OBJECT_NAME}:${alias}"/> + <property name="template" value="${OBJECT_NAME}:${alias}" /> + <property name="measurement-class" value="org.hyperic.hq.product.jmx.MxMeasurementPlugin" /> + <property name="control-class" value="org.hyperic.hq.product.jmx.MxControlPlugin" /> <metrics name="Thread Metrics"> <metric name="Thread Count" Modified: trunk/src/org/hyperic/hq/product/ant/PluginJar.java =================================================================== --- trunk/src/org/hyperic/hq/product/ant/PluginJar.java 2009-09-04 18:59:18 UTC (rev 13702) +++ trunk/src/org/hyperic/hq/product/ant/PluginJar.java 2009-09-04 19:01:07 UTC (rev 13703) @@ -51,24 +51,7 @@ private String pluginDir = null; private String pluginPackage = null; private String pluginClass = null; - private String resourceDir = null; - - /** - * @return resourceDir The name of the directory that contains resources. - * May be used instead of placing hq-plugin.xml in the hard-coded "etc" dir - */ - public String getResourceDir() { - return resourceDir; - } - - /** - * @param resourceDir The name of the directory that contains resources. May - * be used instead of placing hq-plugin.xml in the hard-coded "etc" dir - */ - public void setResourceDir(String resourceDir) { - this.resourceDir = resourceDir; - } - + public String getDir() { if (this.pluginDir == null) { String home = getProperty("basedir", "."); @@ -190,16 +173,6 @@ addFileset(set); } - if (this.resourceDir != null) { - File resourceDirFullPath = new File(getDir(), this.resourceDir); - if (resourceDirFullPath.exists()) { - FileSet set = new FileSet(); - set.setDir(resourceDirFullPath); - set.setIncludes("**"); - addFileset(set); - } - } - //<include name="org.hyperic.hq.product/${plugin.package}/**/*.class"/> FileSet classes = new FileSet(); classes.setDir(new File(buildDir, "classes")); Modified: trunk/src/org/hyperic/hq/product/jmx/MBeanUtil.java =================================================================== --- trunk/src/org/hyperic/hq/product/jmx/MBeanUtil.java 2009-09-04 18:59:18 UTC (rev 13702) +++ trunk/src/org/hyperic/hq/product/jmx/MBeanUtil.java 2009-09-04 19:01:07 UTC (rev 13703) @@ -50,6 +50,8 @@ public class MBeanUtil { private static Log log = LogFactory.getLog(MBeanUtil.class); + + public static final String DYNAMIC_SERVICE_DOMAIN = "spring.application"; private static Map converters = new HashMap(); @@ -590,7 +592,7 @@ } //where is commons-anything-tostring.jar? - static String anyToString(Object obj) { + public static String anyToString(Object obj) { if (obj.getClass().isArray()) { if (Object[].class.isAssignableFrom(obj.getClass())) { return Arrays.asList((Object[])obj).toString(); Modified: trunk/src/org/hyperic/hq/product/jmx/MxServerDetector.java =================================================================== --- trunk/src/org/hyperic/hq/product/jmx/MxServerDetector.java 2009-09-04 18:59:18 UTC (rev 13702) +++ trunk/src/org/hyperic/hq/product/jmx/MxServerDetector.java 2009-09-04 19:01:07 UTC (rev 13703) @@ -56,7 +56,6 @@ extends DaemonDetector implements AutoServerDetector { - private static final String DYNAMIC_SERVICE_DOMAIN = "spring.application"; private static final String TEMPLATE_PROPERTY = "template"; private static final String CONTROL_CLASS_PROPERTY = "control-class"; private static final String MEASUREMENT_CLASS_PROPERTY = "measurement-class"; @@ -211,7 +210,7 @@ return query.toString(); } - protected class MxProcess { + public class MxProcess { long _pid; String _installpath; String[] _args; @@ -500,7 +499,7 @@ } try { - final Set objectNames = mServer.queryNames(new ObjectName(DYNAMIC_SERVICE_DOMAIN + ":*"), null); + final Set objectNames = mServer.queryNames(new ObjectName(MBeanUtil.DYNAMIC_SERVICE_DOMAIN + ":*"), null); serviceTypes = serviceTypeFactory.create(getProductPlugin(), (ServerTypeInfo)getTypeInfo(), mServer, objectNames); } catch (Exception e) { throw new PluginException(e.getMessage(), e); |