Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2107] i want to know how many plugins are being deployed - the list is too long to count quickly by eye now;
|
From: <jma...@rh...> - 2008-11-23 14:03:13
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2107] i want to know how many plugins are being deployed - the list is too long to count quickly by eye now; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2107</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2008-11-23 08:03:10 -0600 (Sun, 23 Nov 2008)</dd> </dl> <h3>Log Message</h3> <pre>i want to know how many plugins are being deployed - the list is too long to count quickly by eye now; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservercorepluginProductPluginDeployerjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservercorepluginProductPluginDeployerjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java (2106 => 2107)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java 2008-11-23 11:39:44 UTC (rev 2106) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java 2008-11-23 14:03:10 UTC (rev 2107) </span><span class="lines">@@ -240,7 +240,6 @@ </span><span class="cx"> dependencyGraph.addPlugin(descriptor.getName(), dependencies); </span><span class="rem">- </span><span class="cx"> try { String md5 = MD5Generator.getDigestString(deploymentInfo.url.openStream()); Plugin plugin = metadataManager.getPlugin(pluginName); </span><span class="lines">@@ -278,8 +277,8 @@ </span><span class="cx"> Subject superuser = LookupUtil.getSubjectManager().getOverlord(); SystemManagerLocal systemManager = LookupUtil.getSystemManager(); </span><span class="rem">- systemManager.vacuum(superuser, new String[]{"RHQ_MEASUREMENT_DEF", "RHQ_CONFIG_DEF", - "RHQ_RESOURCE_TYPE", "RHQ_RESOURCE_TYPE_PARENTS"}); </span><span class="add">+ systemManager.vacuum(superuser, new String[] { "RHQ_MEASUREMENT_DEF", "RHQ_CONFIG_DEF", + "RHQ_RESOURCE_TYPE", "RHQ_RESOURCE_TYPE_PARENTS" }); </span><span class="cx"> } else { log.warn(error.toString()); log.warn(dependencyGraph.toString()); </span><span class="lines">@@ -339,7 +338,8 @@ </span><span class="cx"> } long endDeployTime = System.currentTimeMillis(); </span><span class="rem">- log.info("PluginDependencyGraph deploy time was " + (endDeployTime - startDeployTime) + " millis"); </span><span class="add">+ log.info("PluginDependencyGraph deploy time for " + dependencyGraph.getPlugins().size() + " plugins was " + + (endDeployTime - startDeployTime) + " millis"); </span><span class="cx"> } private LatchedPluginDeploymentService getServiceIfExists(String name, </span><span class="lines">@@ -582,21 +582,21 @@ </span><span class="cx"> } } </span><span class="rem">- private ComparableVersion getPluginVersion(DeploymentInfo deploymentInfo, PluginDescriptor descriptor) throws DeploymentException { </span><span class="add">+ private ComparableVersion getPluginVersion(DeploymentInfo deploymentInfo, PluginDescriptor descriptor) + throws DeploymentException { </span><span class="cx"> String pluginJarFileName = deploymentInfo.url.getFile(); String version = descriptor.getVersion(); if (version == null) { log.debug("No version is specified in the plugin descriptor; falling back to '" </span><span class="rem">- + Attributes.Name.IMPLEMENTATION_VERSION - + "' attribute from MANIFEST.MF of plugin jar (" + pluginJarFileName + ")..."); </span><span class="add">+ + Attributes.Name.IMPLEMENTATION_VERSION + "' attribute from MANIFEST.MF of plugin jar (" + + pluginJarFileName + ")..."); </span><span class="cx"> Manifest manifest = deploymentInfo.getManifest(); version = manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION); } ComparableVersion comparableVersion; if (version == null) { throw new DeploymentException("No version is defined for plugin jar '" + pluginJarFileName </span><span class="rem">- + "'. A version must be defined either via the MANIFEST.MF '" - + Attributes.Name.IMPLEMENTATION_VERSION </span><span class="add">+ + "'. A version must be defined either via the MANIFEST.MF '" + Attributes.Name.IMPLEMENTATION_VERSION </span><span class="cx"> + "' attribute or via the plugin descriptor 'version' attribute."); } try { </span> </pre> </div> </div> </body> </html> |