modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Metric.java | 10 ++
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/parser/LqlReplyParser.java | 45 ++++++----
modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml | 8 -
3 files changed, 43 insertions(+), 20 deletions(-)
New commits:
commit 5cfb225399165a474e4502c1bbcd54a613ce9305
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 26 14:35:25 2010 +0200
Small variable introduction and get the resource name from the metric row.
diff --git a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/parser/LqlReplyParser.java b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/parser/LqlReplyParser.java
index 63b1b11..df15cdd 100644
--- a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/parser/LqlReplyParser.java
+++ b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/parser/LqlReplyParser.java
@@ -18,6 +18,7 @@ package org.rhq.plugins.nagios.parser;
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+import java.util.ArrayList;
import java.util.regex.Pattern;
import org.rhq.plugins.nagios.data.NagiosData;
@@ -63,16 +64,17 @@ public class LqlReplyParser
/**
* Method to parse a LQLStatusReply
- * @param nagiosData is concrete instance of a class that has to implement the interface NagiosData
+ * @param data is concrete instance of a class that has to implement the interface NagiosData
*/
public void parseLqlStatusReply(LqlReply statusReply, NagiosData data) throws InvalidReplyTypeException
{
String[] metricNames = null;
String[] metricValues = null;;
- if(statusReply.getContext().getNagiosRequestType() == NagiosRequestTypes.STATUS_REQUEST)
+ ArrayList<String> lqlReply = statusReply.getLqlReply();
+ if(statusReply.getContext().getNagiosRequestType() == NagiosRequestTypes.STATUS_REQUEST)
{
- metricValues = statusReply.getLqlReply().get(0).split(Pattern.quote(";"));
+ metricValues = lqlReply.get(0).split(Pattern.quote(";"));
}
else
{
@@ -81,8 +83,8 @@ public class LqlReplyParser
//Status reply contains always two strings, first string is the name of the metrics
//and the second string are the values that belong to the metrics
- metricNames = statusReply.getLqlReply().get(0).split(Pattern.quote(";"));
- metricValues = statusReply.getLqlReply().get(1).split(Pattern.quote(";"));
+ metricNames = lqlReply.get(0).split(Pattern.quote(";"));
+ metricValues = lqlReply.get(1).split(Pattern.quote(";"));
//First param is not used in status objects and can be null
data.fillWithData(null, metricNames, metricValues);
@@ -90,17 +92,18 @@ public class LqlReplyParser
/**
* Method to parse a LQLStatusReply
- * @param nagiosData is concrete instance of a class that has to implement the interface NagiosData
+ * @param data is concrete instance of a class that has to implement the interface NagiosData
*/
public void parseLqlServiceReply(LqlReply serviceReply, NagiosData data) throws InvalidReplyTypeException
{
- String[] ressourceNames = null;
+ String[] resourceNames = null;
String[] metricNames = null;
String[] metricValues = null;
- if(serviceReply.getContext().getNagiosRequestType() == NagiosRequestTypes.SERVICE_REQUEST)
+ ArrayList<String> lqlReply = serviceReply.getLqlReply();
+ if(serviceReply.getContext().getNagiosRequestType() == NagiosRequestTypes.SERVICE_REQUEST)
{
- metricValues = serviceReply.getLqlReply().get(0).split(Pattern.quote(";"));
+ metricValues = lqlReply.get(0).split(Pattern.quote(";"));
}
else
{
@@ -108,21 +111,31 @@ public class LqlReplyParser
}
//First element is always the number of services running
- int numberOfRessources = Integer.parseInt(serviceReply.getLqlReply().get(0));
+ int numberOfResources = Integer.parseInt(lqlReply.get(0));
//Delete first element after information is stored
- serviceReply.getLqlReply().remove(0);
+ lqlReply.remove(0);
- for(int ressourceCounter = 0; ressourceCounter < numberOfRessources; ressourceCounter++)
+ for(int resourceCounter = 0; resourceCounter < numberOfResources; resourceCounter++)
{
//For each resource get the name --> the first elements contain the names
- ressourceNames = serviceReply.getLqlReply().get(ressourceCounter).split(Pattern.quote(";"));
+ resourceNames = lqlReply.get(resourceCounter).split(Pattern.quote(";"));
//After the names of the resources there are always the names of the metrics
- metricNames = serviceReply.getLqlReply().get(numberOfRessources).split(Pattern.quote(";"));
+ metricNames = lqlReply.get(numberOfResources).split(Pattern.quote(";"));
//After the names of the metrics there are the values to each resource
- metricValues = serviceReply.getLqlReply().get(ressourceCounter + (numberOfRessources + 1)).split(Pattern.quote(";"), metricNames.length);
+ int i = 0;
+ for (String name : metricNames) {
+ if (name.equals("display_name"))
+ break;
+ i++;
+ }
+
+
+ metricValues = lqlReply.get(resourceCounter + (numberOfResources + 1)).split(Pattern.quote(";"), metricNames.length);
+ String resourceName = metricValues[i];
+ resourceNames[0] = resourceName;
//for a service all information are necessary because there is more than one service per host
- data.fillWithData(ressourceNames, metricNames, metricValues);
+ data.fillWithData(resourceNames, metricNames, metricValues);
}
}
}
commit f07fa81922933d4b5316e50addffa259ab1753fe
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 26 14:34:38 2010 +0200
No need to escape backslashes here.
diff --git a/modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml
index b1b44a3..b70bf83 100644
--- a/modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml
@@ -27,16 +27,16 @@
</plugin-configuration>
<service name="Root Partition" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="root partition service">
- <metric property="free_space|plugin_output|.*/ ([\\d]+).*" displayName="free_space" measurementType="dynamic" units="megabytes" displayType="summary"/>
+ <metric property="free_space|plugin_output|.*/ ([\d]+).*" displayName="free_space" measurementType="dynamic" units="megabytes" displayType="summary"/>
</service>
<service name="Current Load" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="current load service">
- <metric property="load_average|plugin_output|.*: ([\\d]+\\.[\\d]+), ([\\d]+\\.[\\d]+), ([\\d]+\\.[\\d]+).*" displayName="loadAverage" measurementType="dynamic" units="none" displayType="summary"/>
+ <metric property="load_average|plugin_output|.*: ([\d]+\\.[\d]+), ([\d]+\.[\d]+), ([\d]+\.[\d]+).*" displayName="loadAverage" measurementType="dynamic" units="none" displayType="summary"/>
</service>
<service name="Current Users" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="current users service">
- <metric property="current_users|plugin_output|.*- ([\\d]+).*" displayName="current_users" measurementType="dynamic" units="none" displayType="summary"/>
+ <metric property="current_users|plugin_output|.*- ([\d]+).*" displayName="User count" measurementType="dynamic" units="none" displayType="summary"/>
</service>
<service name="Total Processes" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="total processes service">
- <metric property="total_processes|plugin_output|.*: ([\\d]+).*" displayName="total_pocesses" measurementType="dynamic" units="none" displayType="summary"/>
+ <metric property="total_processes|plugin_output|.*: ([\d]+).*" displayName="Process count" measurementType="dynamic" units="none" displayType="summary"/>
</service>
</server>
</plugin>
commit 0249e5b627ae0858ba0aa257e36e70c065918cc3
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 26 13:56:26 2010 +0200
Provide toString() for easier debugging.
diff --git a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Metric.java b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Metric.java
index 927904a..c8a1604 100644
--- a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Metric.java
+++ b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Metric.java
@@ -64,4 +64,14 @@ public class Metric
{
this.value = value;
}
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("Metric");
+ sb.append("{id='").append(id).append('\'');
+ sb.append(", value='").append(value).append('\'');
+ sb.append('}');
+ return sb.toString();
+ }
}
1
0
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java | 25 ++++++----
1 file changed, 15 insertions(+), 10 deletions(-)
New commits:
commit ce242a50bb1f164a74ce49591451c25ef5bdf0c3
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 26 12:27:58 2010 +0200
To split by the pipe symbol we need to escape it.
Also add some loggin in case the user-provided reg-ex does not match to help debugging.
diff --git a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
index d8fdc7a..b8bd1b5 100644
--- a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
+++ b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
@@ -137,32 +137,37 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
{
try
{ // Don't let one bad egg spoil the cake
-
- String[] splitter = req.getName().split("|");
+
+ String[] splitter = req.getName().split("\\|");
String property = splitter[1];
String pattern = splitter[2];
-
+
log.info("Name of Metric: " + property);
log.info("RegEx: " + pattern);
if (req.getDataType() == DataType.MEASUREMENT) {
String value = nagiosSystemData.getSingleHostServiceMetric(property, serviceName, "localhost").getValue(); // TODO use 'real' host
-
+
Pattern p = Pattern.compile(pattern);
Matcher m = p.matcher(value);
- String val = m.group(1);
-
- MeasurementDataNumeric res = new MeasurementDataNumeric(req, Double.valueOf(val));
- report.addData(res);
+ if (m.matches()) {
+ String val = m.group(1);
+
+ MeasurementDataNumeric res = new MeasurementDataNumeric(req, Double.valueOf(val));
+ report.addData(res);
+ }
+ else {
+ log.warn("Pattern >>" + pattern + "<< did not match for input >>" + value + "<< and request: >>" + req.getName());
+ }
}
else if(req.getDataType() == DataType.TRAIT)
{
String value = nagiosSystemData.getSingleHostServiceMetric(req.getName(), serviceName, "localhost").getValue(); // TODO use 'real' host
-
+
Pattern p = Pattern.compile(pattern);
Matcher m = p.matcher(value);
String val = m.group(1);
-
+
MeasurementDataTrait res = new MeasurementDataTrait(req, val);
report.addData(res);
}
1
0
[rhq] Branch 'nagios' - 25 commits - modules/core modules/enterprise modules/plugins
by Alexander Kiefer 26 May '10
by Alexander Kiefer 26 May '10
26 May '10
modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java | 2
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java | 15 +-
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java | 1
modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java | 2
modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java | 5
modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java | 7 -
modules/enterprise/gui/base-perspective-jar/pom.xml | 48 ++++--
modules/enterprise/gui/coregui/pom.xml | 11 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 3
modules/enterprise/gui/portal-war/pom.xml | 15 +-
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java | 32 +++-
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 69 ++--------
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml | 4
modules/enterprise/remoting/client-api/pom.xml | 59 ++++----
modules/enterprise/server/ear/pom.xml | 10 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 32 ++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java | 32 +++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 7 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java | 12 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 4
modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java | 2
modules/enterprise/server/plugins/pom.xml | 2
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java | 2
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java | 2
modules/plugins/augeas/pom.xml | 2
modules/plugins/grub/pom.xml | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 41 ++++-
modules/plugins/nagios/.classpath | 1
modules/plugins/nagios/.settings/org.eclipse.jdt.core.prefs | 2
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java | 30 +++-
modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml | 26 +--
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java | 2
modules/plugins/pom.xml | 33 +++-
modules/plugins/script2/pom.xml | 26 +++
modules/plugins/sshd/pom.xml | 2
42 files changed, 321 insertions(+), 245 deletions(-)
New commits:
commit 6e14e4802ad0550c13822220b38a5a9bc6490d17
Author: alexander.kiefer79(a)googlemail.com <di34475@.dh-com.continental.steel>
Date: Wed May 26 10:36:52 2010 +0200
Put RegEx in plugin descriptor, modified ComponentClass to handle them
diff --git a/modules/plugins/nagios/.classpath b/modules/plugins/nagios/.classpath
index 70a3874..cb112c7 100644
--- a/modules/plugins/nagios/.classpath
+++ b/modules/plugins/nagios/.classpath
@@ -2,6 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/modules/plugins/nagios/.settings/org.eclipse.jdt.core.prefs b/modules/plugins/nagios/.settings/org.eclipse.jdt.core.prefs
index 078b951..4156312 100644
--- a/modules/plugins/nagios/.settings/org.eclipse.jdt.core.prefs
+++ b/modules/plugins/nagios/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu Apr 22 22:19:52 CEST 2010
+#Fri May 21 08:40:23 CEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
index 51120a6..d8fdc7a 100644
--- a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
+++ b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
@@ -19,6 +19,8 @@ package org.rhq.plugins.nagios;
*/
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -123,11 +125,6 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
{
//Getting all Nagios system information
nagiosSystemData = nagiosManagementInterface.createNagiosSystemData();
-
-// log.info(nagiosSystemData.getSingleHostServiceMetric("execution_time", "Current Load", "localhost").getValue());
-// log.info(nagiosSystemData.getSingleHostServiceMetric("host_execution_time", "Current Load", "localhost").getValue());
-// log.info(nagiosSystemData.getSingleHostServiceMetric("host_check_period", "Current Load", "localhost").getValue());
-
}
catch (Exception e)
{
@@ -140,16 +137,33 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
{
try
{ // Don't let one bad egg spoil the cake
+
+ String[] splitter = req.getName().split("|");
+ String property = splitter[1];
+ String pattern = splitter[2];
+
+ log.info("Name of Metric: " + property);
+ log.info("RegEx: " + pattern);
if (req.getDataType() == DataType.MEASUREMENT) {
- String value = nagiosSystemData.getSingleHostServiceMetric(req.getName(), serviceName, "localhost").getValue(); // TODO use 'real' host
- MeasurementDataNumeric res = new MeasurementDataNumeric(req, Double.valueOf(value));
+ String value = nagiosSystemData.getSingleHostServiceMetric(property, serviceName, "localhost").getValue(); // TODO use 'real' host
+
+ Pattern p = Pattern.compile(pattern);
+ Matcher m = p.matcher(value);
+ String val = m.group(1);
+
+ MeasurementDataNumeric res = new MeasurementDataNumeric(req, Double.valueOf(val));
report.addData(res);
}
else if(req.getDataType() == DataType.TRAIT)
{
String value = nagiosSystemData.getSingleHostServiceMetric(req.getName(), serviceName, "localhost").getValue(); // TODO use 'real' host
- MeasurementDataTrait res = new MeasurementDataTrait(req, value);
+
+ Pattern p = Pattern.compile(pattern);
+ Matcher m = p.matcher(value);
+ String val = m.group(1);
+
+ MeasurementDataTrait res = new MeasurementDataTrait(req, val);
report.addData(res);
}
else
diff --git a/modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml
index 26d1743..b1b44a3 100644
--- a/modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml
@@ -7,7 +7,7 @@
xmlns:c="urn:xmlns:rhq-configuration"
description="Interface to Nagios monitoring system. Nagios needs to be equipped with
mk_livestatus module for this plugin to work"
- version="3.0.0.B05"
+ version="3.0.0.B04"
>
@@ -26,25 +26,17 @@
description="Port on which mk_livestatus is listening"/>
</plugin-configuration>
- <service name="Root Partition" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="check_disc_root service">
- <metric property="execution_time" displayName="execution_time" measurementType="dynamic" units="milliseconds" displayType="summary"/>
- <metric property="host_execution_time" displayName="host_execution_time" measurementType="dynamic" units="milliseconds" displayType="summary"/>
- <metric property="host_check_period" displayName="host_check_period" dataType="trait" displayType="summary"/>
+ <service name="Root Partition" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="root partition service">
+ <metric property="free_space|plugin_output|.*/ ([\\d]+).*" displayName="free_space" measurementType="dynamic" units="megabytes" displayType="summary"/>
</service>
- <service name="Current Load" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="check_disc_root service">
- <metric property="execution_time" displayName="execution_time" measurementType="dynamic" units="milliseconds" displayType="summary"/>
- <metric property="host_execution_time" displayName="host_execution_time" measurementType="dynamic" units="milliseconds" displayType="summary"/>
- <metric property="host_check_period" displayName="host_check_period" dataType="trait" displayType="summary"/>
+ <service name="Current Load" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="current load service">
+ <metric property="load_average|plugin_output|.*: ([\\d]+\\.[\\d]+), ([\\d]+\\.[\\d]+), ([\\d]+\\.[\\d]+).*" displayName="loadAverage" measurementType="dynamic" units="none" displayType="summary"/>
</service>
- <service name="Current users" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="check_disc_root service">
- <metric property="execution_time" displayName="execution_time" measurementType="dynamic" units="milliseconds" displayType="summary"/>
- <metric property="host_execution_time" displayName="host_execution_time" measurementType="dynamic" units="milliseconds" displayType="summary"/>
- <metric property="host_check_period" displayName="host_check_period" dataType="trait" displayType="summary"/>
+ <service name="Current Users" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="current users service">
+ <metric property="current_users|plugin_output|.*- ([\\d]+).*" displayName="current_users" measurementType="dynamic" units="none" displayType="summary"/>
</service>
- <service name="SSH" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="check_disc_root service">
- <metric property="execution_time" displayName="execution_time" measurementType="dynamic" units="milliseconds" displayType="summary"/>
- <metric property="host_execution_time" displayName="host_execution_time" measurementType="dynamic" units="milliseconds" displayType="summary"/>
- <metric property="host_check_period" displayName="host_check_period" dataType="trait" displayType="summary"/>
+ <service name="Total Processes" class="NagiosMonitorComponent" discovery="NagiosMonitorDiscovery" description="total processes service">
+ <metric property="total_processes|plugin_output|.*: ([\\d]+).*" displayName="total_pocesses" measurementType="dynamic" units="none" displayType="summary"/>
</service>
</server>
</plugin>
commit b2da6e75c1d860df6d4aa925a40b670348e7b904
Merge: 21a6710... b1bddcd...
Author: alexander.kiefer79(a)googlemail.com <di34475@.dh-com.continental.steel>
Date: Wed May 26 10:34:07 2010 +0200
Merge branch 'nagios' of ssh://git.fedorahosted.org/git/rhq/rhq into nagios
commit 21a671064f95793aa5a6163a38b7b134ce25a0a0
Merge: 0cd562b... 3533189...
Author: alexander.kiefer79(a)googlemail.com <di34475@.dh-com.continental.steel>
Date: Thu May 20 11:42:52 2010 +0200
Merge branch 'nagios' of ssh://git.fedorahosted.org/git/rhq/rhq into nagios
commit 0cd562bbad7d94b33a7f92aa3e083b50ceb0ba1c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu May 20 10:07:21 2010 +0200
Disable jdk6 needing plugins
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index e373421..bf15866 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -320,11 +320,13 @@
<version>${project.version}</version>
</artifactItem>
+<!-- TODO:jdk6 - temporarily disabled because of jdk6 requirement
<artifactItem>
<groupId>org.rhq</groupId>
<artifactId>alert-scriptlang</artifactId>
<version>${project.version}</version>
</artifactItem>
+-->
<artifactItem>
<groupId>org.rhq</groupId>
@@ -383,7 +385,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
-
+
<outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
</configuration>
</execution>
@@ -408,7 +410,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
-
+
<outputDirectory>${earDirectory}/rhq-serverplugins</outputDirectory>
</configuration>
</execution>
@@ -547,11 +549,13 @@
<version>${project.version}</version>
</artifactItem>
+<!-- TODO:jdk6 temporarily disabled because of jdk6 requirement
<artifactItem>
<groupId>org.rhq</groupId>
<artifactId>rhq-script2-plugin</artifactId>
<version>${project.version}</version>
</artifactItem>
+-->
<artifactItem>
<groupId>org.rhq</groupId>
@@ -606,6 +610,7 @@
<artifactId>rhq-sshd-plugin</artifactId>
<version>${project.version}</version>
</artifactItem>
+<!-- TODO:jdk6 - temporarily disabled because of jdk6 requirement
<artifactItem>
<groupId>org.rhq</groupId>
@@ -619,6 +624,7 @@
<version>${project.version}</version>
</artifactItem>
+-->
</artifactItems>
<outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
</configuration>
commit a4b4b451c9c31ad933f2230293929b309e4a049a
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu May 20 09:33:39 2010 +0200
Disable the scriptlang sender for now as it requires jdk6
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 06f91cf..1e17ce8 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -76,7 +76,7 @@
<module>alert-microblog</module>
<module>alert-operations</module>
<module>alert-roles</module>
- <module>alert-scriptlang</module>
+<!-- <module>alert-scriptlang</module> disabled foe the moment because of jdk6 requirements -->
<!-- Seeing strange issues with corrupt jar dependencies...
<module>alert-sms</module>
-->
commit e610db209d351fa8ee598bf2c6e8feabe86201a3
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 20:22:50 2010 +0200
Use jdk5 api.
diff --git a/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java b/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java
index 45b03d6..a3081c4 100644
--- a/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java
+++ b/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java
@@ -163,7 +163,7 @@ public class TokenReplacementTest {
String result = PrintTokens.createTokenDescription();
assert result != null;
- assert !result.isEmpty();
+ assert !result.equals("");
assert result.contains("<token ");
}
commit 22fb10f7d01e84829e43d02dbf719e5be94c9d64
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 18:35:14 2010 +0200
Add missing dependency for jdk15
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 91a5440..ad30bfb 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -20,14 +20,14 @@
<developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/gui/base-…</developerConnection>
</scm>
- <properties>
- <jsf.version>1.2_14</jsf.version>
- <facelets.version>1.1.15.B1</facelets.version>
- <!-- NOTE: Seam 2.1.2 and 2.2.0 can't be used in webapps deployed to the RHQ Server
+ <properties>
+ <jsf.version>1.2_14</jsf.version>
+ <facelets.version>1.1.15.B1</facelets.version>
+ <!-- NOTE: Seam 2.1.2 and 2.2.0 can't be used in webapps deployed to the RHQ Server
due to https://jira.jboss.org/jira/browse/JBSEAM-4029. Seam 2.2.1 can be
used once it's released. -->
- <seam.version>2.1.0.SP1</seam.version>
- <jboss-el.version>1.0_02.CR5</jboss-el.version>
+ <seam.version>2.1.0.SP1</seam.version>
+ <jboss-el.version>1.0_02.CR5</jboss-el.version>
<richfaces.version>3.3.2.SR1</richfaces.version>
<rhq.version>3.0.0-SNAPSHOT</rhq.version>
</properties>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-remoting-client-api</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -47,7 +47,7 @@
<artifactId>jsf-facelets</artifactId>
<version>${facelets.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
@@ -56,11 +56,11 @@
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
@@ -78,7 +78,7 @@
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
@@ -105,13 +105,13 @@
<artifactId>jsf-api</artifactId>
<version>${jsf.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-gui</artifactId>
<version>${rhq.version}</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
@@ -123,12 +123,12 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-remoting-client-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
@@ -158,7 +158,7 @@
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
@@ -173,18 +173,26 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
</dependency>
-
+
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-gui</artifactId>
</dependency>
-
+
+ <dependency>
+ <!-- TODO only load in for jdk5 builds -->
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
+
</dependencies>
<repositories>
@@ -198,5 +206,5 @@
</snapshots>
</repository>
</repositories>
-
+
</project>
commit b78f470901ba0ccbbc0d1ed84791c19e95b49a76
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 17:00:37 2010 +0200
Disable the jdk6 plugins completely for the moment.
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 1813d1c..85d6105 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -153,6 +153,7 @@
</modules>
</profile>
+<!--
<profile>
<id>jdk6-only-plugins</id>
<activation>
@@ -167,11 +168,6 @@
<id>jdk6-linux-plugins</id>
<activation>
<jdk>[1.6,)</jdk>
-<!--
- <property>
- <name>java.home</name>
- </property>
--->
</activation>
<modules>
<module>virt</module>
@@ -180,6 +176,7 @@
</modules>
</profile>
+-->
<profile>
<id>misc-plugins</id>
commit 028a70678e4b53ae55afc07616e03bef0befa0de
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 16:28:44 2010 +0200
Fix a typo *sigh*
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 568fe04..3ca3e1d 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -69,32 +69,33 @@
</build>
<profiles>
- <profile>
- <!-- Unlike most of RHQ, this module requires JDK6, so replace the Java 5 bootclasspath that was added to the compiler args by the root POM with a bootclasspath based on the java.home sysprop (which should be Java 6 or later if the enforcer plugin did its job). -->
- <profile>
- <id>check-java-api</id>
+ <!-- Unlike most of RHQ, this module requires JDK6, so replace the Java 5 bootclasspath that was added to the compiler args by the root POM with a bootclasspath based on the java.home sysprop (which should be Java 6 or later if the enforcer plugin did its job). -->
+ <profile>
+ <id>check-java-api</id>
+
+ <activation>
+ <property>
+ <name>java5.home</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jsse.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <activation>
- <property>
- <name>java5.home</name>
- </property>
- </activation>
+ </profile>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jsse.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>
- </compilerArguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
+ <profile>
<id>dev</id>
<properties>
commit ab32e795b9e76153d6292b11f0ab77e6dc69b240
Merge: 4cd12d1... 643b2cb...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 16:16:50 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 4cd12d13e7463b198f6ab95f2848148ac32571ea
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 16:16:09 2010 +0200
Check for jdk5 in the script2 module and disable its build then.
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 038ce5c..568fe04 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -70,6 +70,31 @@
<profiles>
<profile>
+
+ <!-- Unlike most of RHQ, this module requires JDK6, so replace the Java 5 bootclasspath that was added to the compiler args by the root POM with a bootclasspath based on the java.home sysprop (which should be Java 6 or later if the enforcer plugin did its job). -->
+ <profile>
+ <id>check-java-api</id>
+
+ <activation>
+ <property>
+ <name>java5.home</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jsse.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<id>dev</id>
<properties>
commit 643b2cbf99961da02f69337e2d489d0fdb933934
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed May 19 09:08:47 2010 -0400
BZ 587026: use Iterator.remove API to avoid concurrent modification exceptions during the loop over the keyset of the cache
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
index ab94c0a..9b6b93b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.server.perspective;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -228,16 +229,18 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal, Perspect
Subject subject;
synchronized (CACHE) {
- for (Integer sessionId : CACHE.keySet()) {
+ Iterator<Integer> iterator = CACHE.keySet().iterator(); // so we can use iterator.remove and avoid concurrent-mod-exception
+ while (iterator.hasNext()) {
+ Integer sessionId = iterator.next();
try {
subject = subjectManager.getSubjectBySessionId(sessionId);
if (null == subject) {
- log.debug("Removing perspective cache entry for session " + sessionId);
- CACHE.remove(sessionId);
+ log.debug("Removing perspective cache entry for session. " + sessionId);
+ iterator.remove();
}
} catch (Exception e) {
- log.debug("Removing perspective cache entry for session " + sessionId);
- CACHE.remove(sessionId);
+ log.debug("Removing perspective cache entry for session: " + sessionId);
+ iterator.remove();
}
}
}
commit 8d1c051fbb07765ea3e746754ae61aabe2257a12
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 19 08:08:45 2010 -0400
[BZ 591485] Removing calls to delete alert templates when they are enabled/disabled
Fixing some alert property name references in alertHistory.xhtml.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
index 2e8d49c..41cc2fa 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
@@ -205,8 +205,6 @@ public class SubsystemAlertDefinitionUIBean extends SubsystemView {
// then delete templates and group alert defs, which are both tolerant of missing child definitions
groupAlertDefinitionManager.disableGroupAlertDefinitions(subject, groupDefinitions
.toArray(new Integer[groupDefinitions.size()]));
- alertTemplateManager.removeAlertTemplates(subject, typeDefinitions.toArray(new Integer[typeDefinitions
- .size()]));
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disable selected alert definitions.");
} catch (Exception e) {
@@ -244,8 +242,6 @@ public class SubsystemAlertDefinitionUIBean extends SubsystemView {
// then delete templates and group alert defs, which are both tolerant of missing child definitions
groupAlertDefinitionManager.enableGroupAlertDefinitions(subject, groupDefinitions
.toArray(new Integer[groupDefinitions.size()]));
- alertTemplateManager.removeAlertTemplates(subject, typeDefinitions.toArray(new Integer[typeDefinitions
- .size()]));
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enable selected alert definitions.");
} catch (Exception e) {
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml
index 1f81df9..f2ca8fd 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml
@@ -168,7 +168,7 @@
<f:facet name="header">
<h:outputText styleClass="headerText" value="Ack by" />
</f:facet>
- <h:outputText value="#{item.original.alert.ackBy.name}" title="#{item.original.alert.ackBy.firstName} #{item.original.alert.ackBy.lastName}"/>
+ <h:outputText value="#{item.original.alert.acknowledgingSubject}" title="#{item.original.alert.acknowledgingSubject}"/>
</rich:column>
<rich:column>
@@ -177,7 +177,7 @@
<h:outputText styleClass="headerText" value="Ack date" />
</onc:sortableColumnHeader>
</f:facet>
- <h:outputText value="#{item.original.alert.ackTime}">
+ <h:outputText value="#{item.original.alert.acknowledgeTime}">
<f:converter converterId="RelativeDurationConverter" />
</h:outputText>
</rich:column>
commit 5e431bd864c35b6f1917b7edf2d8ba78b13b2faf
Merge: d6a1bdf... 1bf7956...
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 18 14:52:22 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit d6a1bdf05d4a688f11781ed270b1cf5109db27d2
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 18 14:48:42 2010 -0400
[BZ 593000] Adding logic to check for different client jars based on JBoss AS version
There are a couple additional jars specific to AS 6 that that discovery component looks for
in its impl of ClassLoaderFacet.getAdditionalClasspathUrls. Those jars are not found on an
EAP 5 server, which results in an exception being thrown and the plugin components are never
properly initialized.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
index 4174283..c5eb7a9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
@@ -84,14 +84,8 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
private static final String JAVA_HOME_ENV_VAR = "JAVA_HOME";
private static final Map<JBossProductType, ComparableVersion> MINIMUM_PRODUCT_VERSIONS = new HashMap(3);
- static {
- MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.AS, new ComparableVersion("5.2.0.Beta1"));
- MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EAP, new ComparableVersion("5.0.0.Beta"));
- MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EWP, new ComparableVersion("5.0.0.CR1"));
- MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.SOA, new ComparableVersion("5.0.0.Beta"));
- }
- private static final String[] CLIENT_JARS = new String[] {
+ private static final List<String> CLIENT_JARS = Arrays.asList(
// NOTE: The jbossall-client.jar aggregates a whole bunch of other jars from the client dir via its
// MANIFEST.MF Class-Path.
"client/jbossall-client.jar",
@@ -100,11 +94,21 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
"common/lib/jboss-security-aspects.jar",
"lib/jboss-managed.jar",
"lib/jboss-metatype.jar",
- "lib/jboss-dependency.jar",
- // The below jars are required for JBoss AS 6.0 M1, M2, and M3.
- "lib/jboss-classpool.jar",
- "lib/jboss-classpool-scoped.jar"
- };
+ "lib/jboss-dependency.jar"
+ );
+
+ private static final List<String> AS6_CLIENT_JARS = new ArrayList<String>(CLIENT_JARS);
+
+ static {
+ MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.AS, new ComparableVersion("5.2.0.Beta1"));
+ MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EAP, new ComparableVersion("5.0.0.Beta"));
+ MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EWP, new ComparableVersion("5.0.0.CR1"));
+ MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.SOA, new ComparableVersion("5.0.0.Beta"));
+
+ // The below jars are required for JBoss AS 6.0 M1, M2, and M3.
+ AS6_CLIENT_JARS.add("lib/jboss-classpool.jar");
+ AS6_CLIENT_JARS.add("lib/jboss-classpool-scoped.jar");
+ }
private final Log log = LogFactory.getLog(this.getClass());
@@ -151,7 +155,7 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
List<URL> clientJars = new ArrayList<URL>();
- for (String jarFileName : CLIENT_JARS) {
+ for (String jarFileName : getClientJars(pluginConfig)) {
File clientJar = new File(homeDir, jarFileName);
if (!clientJar.exists()) {
throw new FileNotFoundException("Cannot find [" + clientJar + "] - unable to manage server.");
@@ -165,6 +169,17 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
return clientJars;
}
+ private List<String> getClientJars(Configuration pluginConfig) throws IOException {
+ PropertySimple jbossHomeDir = pluginConfig.getSimple("homeDir");
+ JBossInstallationInfo installationInfo = new JBossInstallationInfo(new File(jbossHomeDir.getStringValue()));
+
+ if (installationInfo.getMajorVersion().equals("6")) {
+ return AS6_CLIENT_JARS;
+ }
+
+ return CLIENT_JARS;
+ }
+
private Set<DiscoveredResourceDetails> discoverExternalJBossAsProcesses(ResourceDiscoveryContext discoveryContext) {
Set<DiscoveredResourceDetails> resources = new HashSet<DiscoveredResourceDetails>();
List<ProcessScanResult> autoDiscoveryResults = discoveryContext.getAutoDiscoveredProcesses();
commit 1bf79560371b4ff1901d32d33cec79d98195df8e
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 17:04:20 2010 +0200
More jdk15 exclusions
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 8164624..1813d1c 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -167,13 +167,16 @@
<id>jdk6-linux-plugins</id>
<activation>
<jdk>[1.6,)</jdk>
+<!--
<property>
<name>java.home</name>
</property>
+-->
</activation>
<modules>
<module>virt</module>
<module>kickstart</module>
+ <module>byteman</module>
</modules>
</profile>
@@ -187,7 +190,6 @@
</activation>
<modules>
- <module>byteman</module>
<module>iis</module>
<module>database</module>
<module>postgres</module>
commit efe5b2749e53e9fa350a3b51aaed67e7ebcd588e
Merge: a6285e2... 5415086...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:56:00 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit a6285e2215e932a22cdbf19c8850022207909ed2
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:42:32 2010 +0200
Another dependency for jdk1.5
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 395a90f..605267f 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -20,7 +20,7 @@
<properties>
<scm.module.path>modules/enterprise/remoting/</scm.module.path>
-
+
<i18nlog.version>1.0.9</i18nlog.version>
<log4j.version>1.2.14</log4j.version>
<persistence-api.version>1.0</persistence-api.version>
@@ -57,43 +57,43 @@
<exclusion>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- </exclusion>
- </exclusions>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>gnu-getopt</groupId>
<artifactId>getopt</artifactId>
@@ -101,15 +101,15 @@
<exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-cache</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>jboss</groupId>
<artifactId>jbpm</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-client-api</artifactId>
@@ -133,20 +133,20 @@
<exclusion>
<groupId>org.snmp4j</groupId>
<artifactId>snmp4j</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>rss4j</groupId>
<artifactId>rss4j</artifactId>
- </exclusion>
- </exclusions>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -164,7 +164,7 @@
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
@@ -176,7 +176,7 @@
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
</dependency>
-
+
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -186,7 +186,7 @@
<groupId>hibernate-annotations</groupId>
<artifactId>hibernate-annotations</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
@@ -198,9 +198,16 @@
<groupId>hibernate-annotations</groupId>
<artifactId>hibernate-annotations</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>3.0.1-native-2.0.4.GA</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
</dependencies>
-
+
<profiles>
<profile>
<id>javadoc</id>
@@ -232,7 +239,7 @@
<breakiterator>true</breakiterator>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>../remote-api</link>
+ <link>../remote-api</link>
</links>
</configuration>
<goals>
@@ -247,6 +254,6 @@
</profile>
- </profiles>
+ </profiles>
</project>
commit bbe6e85668779997882df550248002fc3205be46
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:39:36 2010 +0200
Another dependency for jdk1.5
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 1672828..783942c 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -28,7 +28,7 @@
<jsf-facelets.version>1.1.15.B1</jsf-facelets.version>
<seam.version>2.1.0.SP1</seam.version>
- <!-- plugin versions -->
+ <!-- plugin versions -->
<jetty-jspc-maven-plugin.version>7.0.1.v20091125</jetty-jspc-maven-plugin.version>
<product.shortName>RHQ</product.shortName>
@@ -366,6 +366,13 @@
</dependency>
<dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>3.0.1-native-2.0.4.GA</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.5.1</version>
@@ -394,7 +401,7 @@
</dependencies>
-
+
<build>
<finalName>rhq-portal</finalName>
<plugins>
@@ -475,7 +482,7 @@
</build>
-
+
<profiles>
<profile>
@@ -585,7 +592,7 @@
</profiles>
-
+
<repositories>
<repository>
commit 3d1ebb7c6c3fb2c654baf999b6f28713ec9403d1
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:37:53 2010 +0200
Another dependency for jdk1.5
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 3c87ff0..c45e91f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -68,7 +68,7 @@
<!-- =============== 3rd Party Deps =============== -->
-
+
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
@@ -183,6 +183,13 @@
<!-- by JBossAS -->
</dependency>
+ <dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>3.0.1-native-2.0.4.GA</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
</dependencies>
commit 071d1ea3e2ea6c6b68a0e650d0ded7d260ed7fa2
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:37:02 2010 +0200
Actually use 1.6+
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 2ac8f30..8164624 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -156,7 +156,7 @@
<profile>
<id>jdk6-only-plugins</id>
<activation>
- <jdk>1.6</jdk>
+ <jdk>[1.6,)</jdk>
</activation>
<modules>
<module>script2</module>
@@ -166,7 +166,7 @@
<profile>
<id>jdk6-linux-plugins</id>
<activation>
- <jdk>1.6</jdk>
+ <jdk>[1.6,)</jdk>
<property>
<name>java.home</name>
</property>
commit 541508681cfd995aec3da7757fbbd46d4e94e175
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue May 18 10:12:44 2010 -0400
BZ 587026 - fix concurrent mod exception by synchronizing access to the static cache
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
index e2ab6e4..ab94c0a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
@@ -188,7 +188,10 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal, Perspect
private CacheEntry getCacheEntry(Subject subject) {
Integer sessionId = subject.getSessionId();
- CacheEntry cacheEntry = CACHE.get(sessionId);
+ CacheEntry cacheEntry;
+ synchronized (CACHE) {
+ cacheEntry = CACHE.get(sessionId);
+ }
long metadataLastModifiedTime = getPluginMetadataManager().getLastModifiedTime();
if (cacheEntry == null || cacheEntry.getMetadataLastModifiedTime() < metadataLastModifiedTime) {
// Take this opportunity to clean expired sessions from the cache.
@@ -207,7 +210,9 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal, Perspect
List<PageLink> filteredPageLinks = applyActivatorsToPageLinks(context, scopes, basePageLinks);
cacheEntry = new CacheEntry(metadataLastModifiedTime, filteredMenu, filteredTabs, filteredPageLinks);
- CACHE.put(sessionId, cacheEntry);
+ synchronized (CACHE) {
+ CACHE.put(sessionId, cacheEntry);
+ }
}
return cacheEntry;
}
@@ -222,16 +227,18 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal, Perspect
private void cleanCache() {
Subject subject;
- for (Integer sessionId : CACHE.keySet()) {
- try {
- subject = subjectManager.getSubjectBySessionId(sessionId);
- if (null == subject) {
+ synchronized (CACHE) {
+ for (Integer sessionId : CACHE.keySet()) {
+ try {
+ subject = subjectManager.getSubjectBySessionId(sessionId);
+ if (null == subject) {
+ log.debug("Removing perspective cache entry for session " + sessionId);
+ CACHE.remove(sessionId);
+ }
+ } catch (Exception e) {
log.debug("Removing perspective cache entry for session " + sessionId);
CACHE.remove(sessionId);
}
- } catch (Exception e) {
- log.debug("Removing perspective cache entry for session " + sessionId);
- CACHE.remove(sessionId);
}
}
}
commit 8431fffb14edd3a4aba89e6b26bf1718099f3a6f
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 15:55:51 2010 +0200
Move plugins that depend on jdk6 into their own profiles.
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index b1b9275..2ac8f30 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -80,8 +80,8 @@
<!-- !!! -->
<!-- These profile groupings need to also be mirrored in server/ear/pom.xml -->
- <!-- !!! -->
-
+ <!-- !!! -->
+
<modules>
<!-- core plugins -->
<module>platform</module>
@@ -101,7 +101,7 @@
<modules>
<!-- NOTE: Order is important. -->
- <module>augeas</module>
+ <module>augeas</module>
<module>apache</module>
<module>tomcat</module>
<module>jboss-as</module>
@@ -140,7 +140,6 @@
<module>augeas</module>
<module>cron</module>
<module>script</module>
- <module>script2</module>
<module>grub</module>
<!-- not behaving <module>hardware</module> -->
<module>hosts</module>
@@ -151,12 +150,35 @@
<module>postfix</module>
<module>aliases</module>
<module>sshd</module>
- <module>virt</module>
- <module>kickstart</module>
</modules>
</profile>
<profile>
+ <id>jdk6-only-plugins</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <modules>
+ <module>script2</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>jdk6-linux-plugins</id>
+ <activation>
+ <jdk>1.6</jdk>
+ <property>
+ <name>java.home</name>
+ </property>
+ </activation>
+ <modules>
+ <module>virt</module>
+ <module>kickstart</module>
+ </modules>
+
+ </profile>
+
+ <profile>
<id>misc-plugins</id>
<activation>
<property>
commit 4c4ae4916be15b749af7744724fadc932131903b
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 15:37:55 2010 +0200
Revert Ian's commit 804620f9314e4d2b80a980208244b75920b018e7 that
got accidently overwritten by my last commit
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
index 613500f..e877c7f 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
* if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
package org.rhq.core.clientapi.descriptor;
import org.rhq.core.domain.plugin.Plugin;
@@ -30,8 +29,7 @@ import org.rhq.core.util.MessageDigestGenerator;
import java.net.URL;
import java.io.IOException;
-import java.io.File;
-import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import java.util.jar.Attributes;
@@ -94,38 +92,33 @@ public class PluginTransformer {
}
private String getMd5(URL pluginURL) throws IOException {
- File jarFile = toFile(pluginURL);
- return MessageDigestGenerator.getDigestString(jarFile);
+ return MessageDigestGenerator.getDigestString(pluginURL);
}
String getVersion(PluginDescriptor pluginDescriptor, URL pluginURL) throws IOException {
- if (pluginDescriptor.getVersion() != null) {
- return pluginDescriptor.getVersion();
+ String version = pluginDescriptor.getVersion();
+ if (version == null) {
+ version = getVersionFromPluginJarManifest(pluginURL);
}
- File pluginJarFile = toFile(pluginURL);
-
- String version = getVersionFromPluginJarManifest(pluginJarFile);
-
if (version == null) {
- throw new PluginTransformException("No version is defined for plugin jar [" + pluginJarFile
- + "]. A version must be defined either via the MANIFEST.MF [" + Attributes.Name.IMPLEMENTATION_VERSION
- + "] attribute or via the plugin descriptor 'version' attribute.");
+ throw new PluginTransformException("No version is defined for plugin jar [" + pluginURL
+ + "]. A version must be defined either via the MANIFEST.MF '" + Attributes.Name.IMPLEMENTATION_VERSION
+ + "' attribute or via the plugin descriptor 'version' attribute.");
}
return version;
}
- private String getVersionFromPluginJarManifest(File pluginJarFile) throws IOException {
- JarFile jarFile = new JarFile(pluginJarFile);
- Manifest manifest = jarFile.getManifest();
- Attributes attributes = manifest.getMainAttributes();
-
- return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
- }
-
- private File toFile(URL url) {
- return new File(url.getPath());
+ private String getVersionFromPluginJarManifest(URL pluginJarUrl) throws IOException {
+ JarInputStream jarInputStream = new JarInputStream(pluginJarUrl.openStream());
+ jarInputStream.close();
+ Manifest manifest = jarInputStream.getManifest();
+ if (manifest != null) {
+ Attributes attributes = manifest.getMainAttributes();
+ return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+ } else {
+ return null;
+ }
}
-
}
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
index 9a20424..0ffbe96 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -35,7 +36,7 @@ import java.security.NoSuchAlgorithmException;
* An object that generates a message digest or hash for algorithms such as MD5 or SHA. This class is basically a
* wrapper around {@link java.security.MessageDigest} and provides convenience methods making it easier to generate
* hashes.
- *
+ *
* There are static methods in here that use MD5 as the default algorithm. If you want to use another
* algorithm, instantiate an instance of this object and use its instance methods.
*/
@@ -260,6 +261,18 @@ public class MessageDigestGenerator {
}
}
+ public byte[] calcDigest(URL url) throws IOException {
+ InputStream is = null;
+ try {
+ is = url.openStream();
+ return calcDigest(new BufferedInputStream(is, 1024 * 32));
+ } finally {
+ if (is != null) {
+ is.close();
+ }
+ }
+ }
+
/**
* Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
*
@@ -279,6 +292,24 @@ public class MessageDigestGenerator {
}
/**
+ * Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
+ *
+ * @param url the URL whose contents are to be used to calculate the digest.
+ *
+ * @return the URL content's digest as a String
+ *
+ * @throws IOException if the URL could not be read or accessed
+ */
+ public static String getDigestString(URL url) throws IOException {
+ MessageDigestGenerator md5 = new MessageDigestGenerator(MD5);
+ return md5.calcDigestString(url);
+ }
+
+ public String calcDigestString(URL url) throws IOException {
+ return calculateDigestStringFromBytes(calcDigest(url));
+ }
+
+ /**
* Given a digest byte array, this will return its String representation.
*
* @param bytes the digest whose String representation is to be returned
commit 24beba04a8b570d3dfbfcdc0d2b0410c06755e13
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 14:57:22 2010 +0200
First batch of changes from the jdk15 branch to be merged back.
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
index ecaa80b..613500f 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2008 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
* if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+
package org.rhq.core.clientapi.descriptor;
import org.rhq.core.domain.plugin.Plugin;
@@ -29,7 +30,8 @@ import org.rhq.core.util.MessageDigestGenerator;
import java.net.URL;
import java.io.IOException;
-import java.util.jar.JarInputStream;
+import java.io.File;
+import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.jar.Attributes;
@@ -92,33 +94,38 @@ public class PluginTransformer {
}
private String getMd5(URL pluginURL) throws IOException {
- return MessageDigestGenerator.getDigestString(pluginURL);
+ File jarFile = toFile(pluginURL);
+ return MessageDigestGenerator.getDigestString(jarFile);
}
String getVersion(PluginDescriptor pluginDescriptor, URL pluginURL) throws IOException {
- String version = pluginDescriptor.getVersion();
- if (version == null) {
- version = getVersionFromPluginJarManifest(pluginURL);
+ if (pluginDescriptor.getVersion() != null) {
+ return pluginDescriptor.getVersion();
}
-
+
+ File pluginJarFile = toFile(pluginURL);
+
+ String version = getVersionFromPluginJarManifest(pluginJarFile);
+
if (version == null) {
- throw new PluginTransformException("No version is defined for plugin jar [" + pluginURL
- + "]. A version must be defined either via the MANIFEST.MF '" + Attributes.Name.IMPLEMENTATION_VERSION
- + "' attribute or via the plugin descriptor 'version' attribute.");
+ throw new PluginTransformException("No version is defined for plugin jar [" + pluginJarFile
+ + "]. A version must be defined either via the MANIFEST.MF [" + Attributes.Name.IMPLEMENTATION_VERSION
+ + "] attribute or via the plugin descriptor 'version' attribute.");
}
return version;
}
- private String getVersionFromPluginJarManifest(URL pluginJarUrl) throws IOException {
- JarInputStream jarInputStream = new JarInputStream(pluginJarUrl.openStream());
- jarInputStream.close();
- Manifest manifest = jarInputStream.getManifest();
- if (manifest != null) {
- Attributes attributes = manifest.getMainAttributes();
- return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
- } else {
- return null;
- }
+ private String getVersionFromPluginJarManifest(File pluginJarFile) throws IOException {
+ JarFile jarFile = new JarFile(pluginJarFile);
+ Manifest manifest = jarFile.getManifest();
+ Attributes attributes = manifest.getMainAttributes();
+
+ return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
}
+
+ private File toFile(URL url) {
+ return new File(url.getPath());
+ }
+
}
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
index 8ff2ab5..bcd210c 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
@@ -28,22 +28,22 @@ import org.rhq.core.db.DatabaseType;
* The introduction of custom alert senders brought with it the denormalization of the AlertNotification schema.
* Instead of the AlertNotification entity storing the notification-related data itself (through referential integrity)
* it has been subsumed inside of configuration objects, which are then associated back to the entity.
- *
+ *
* Each custom alert sender has full control over the structure within that configuration object. This task represents
- * the work necessary to translate the first-class notification data (previously stored in the rhq_alert_notification
- * table itself) into appropriate configuration objects to be used by the custom senders that will be shipped with the
+ * the work necessary to translate the first-class notification data (previously stored in the rhq_alert_notification
+ * table itself) into appropriate configuration objects to be used by the custom senders that will be shipped with the
* product by default.
- *
+ *
* In particular, this task handles the upgrade tasks for alert notifications setup against the following types of data:
- *
+ *
* <ul>
* <li>RHQ Subjects</li>
* <li>RHQ Roles</li>
* <li>Direct Email Addresses</li>
* <li>SNMP Trap Receivers</li>
* <li>Resource Operations</li>
- * </ul>
- *
+ * </ul>
+ *
* @author Joseph Marques
*/
public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask {
@@ -53,7 +53,6 @@ public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask {
private final long NOW = System.currentTimeMillis();
- @Override
public void execute(DatabaseType databaseType, Connection connection) throws SQLException {
this.databaseType = databaseType;
this.connection = connection;
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java
index c7d56f1..67d1df4 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java
@@ -285,7 +285,7 @@ public class Property implements Serializable, DeepCopyable<Property>, Comparabl
// It's not clear to me why this class implements Externalizable. It seems to write out every field
// using standard serialization. Also, it's sub-classes seem to write out every field. To be safe I'm leaving
// it as is and also applying the new strategy logic, in case there are (future) differences between agent and
- // remoteAPI serialization.
+ // remoteAPI serialization.
public void writeExternal(ObjectOutput out) throws IOException {
ExternalizableStrategy.Subsystem strategy = ExternalizableStrategy.getStrategy();
out.writeChar(strategy.id());
@@ -367,7 +367,6 @@ public class Property implements Serializable, DeepCopyable<Property>, Comparabl
return;
}
- @Override
public int compareTo(Property other) {
return getName().compareTo(other.getName());
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
index 7e47275..bef8a2c 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
@@ -76,7 +76,6 @@ public class SearchSuggestion implements Serializable, Comparable<SearchSuggesti
return endIndex;
}
- @Override
public int compareTo(SearchSuggestion other) {
int kindComparision = (this.kind.ordinal() - other.kind.ordinal());
if (kindComparision != 0) {
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
index e96d86a..9a20424 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2008 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -261,18 +260,6 @@ public class MessageDigestGenerator {
}
}
- public byte[] calcDigest(URL url) throws IOException {
- InputStream is = null;
- try {
- is = url.openStream();
- return calcDigest(new BufferedInputStream(is, 1024 * 32));
- } finally {
- if (is != null) {
- is.close();
- }
- }
- }
-
/**
* Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
*
@@ -292,24 +279,6 @@ public class MessageDigestGenerator {
}
/**
- * Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
- *
- * @param url the URL whose contents are to be used to calculate the digest.
- *
- * @return the URL content's digest as a String
- *
- * @throws IOException if the URL could not be read or accessed
- */
- public static String getDigestString(URL url) throws IOException {
- MessageDigestGenerator md5 = new MessageDigestGenerator(MD5);
- return md5.calcDigestString(url);
- }
-
- public String calcDigestString(URL url) throws IOException {
- return calculateDigestStringFromBytes(calcDigest(url));
- }
-
- /**
* Given a digest byte array, this will return its String representation.
*
* @param bytes the digest whose String representation is to be returned
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java
index 93230ec..d7de282 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java
@@ -39,7 +39,7 @@ import org.rhq.core.util.stream.StreamUtil;
/**
* A visitor object that will extract each zip entry it visits, realizing files that
* need to have their replacement variables replaced.
- *
+ *
* @author John Mazzitelli
*/
public class ExtractorZipFileVisitor implements ZipUtil.ZipEntryVisitor {
@@ -59,7 +59,7 @@ public class ExtractorZipFileVisitor implements ZipUtil.ZipEntryVisitor {
* If you just want this visitor to walk a zip file without realizing any files, pass in
* a null pattern or pass in a null template engine. This will, in effect,
* have this visitor extract all file entries as-is.
- *
+ *
* @param rootDir the top level directory where all zip file entries will be extracted to.
* In other words, all zip file entries' paths are relative to this directory.
* @param filesToRealizeRegex pattern of files that are to be realized prior to hashcodes being computed
@@ -97,7 +97,6 @@ public class ExtractorZipFileVisitor implements ZipUtil.ZipEntryVisitor {
return fileHashcodeMap;
}
- @Override
public boolean visit(ZipEntry entry, ZipInputStream stream) throws Exception {
String pathname = entry.getName();
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java
index 9e85f18..3fae9bd 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java
@@ -35,7 +35,7 @@ import org.rhq.core.util.stream.StreamUtil;
/**
* A visitor object that will perform some in-memory work for each zip entry it visits.
- *
+ *
* @author John Mazzitelli
*/
public class InMemoryZipFileVisitor implements ZipUtil.ZipEntryVisitor {
@@ -53,7 +53,7 @@ public class InMemoryZipFileVisitor implements ZipUtil.ZipEntryVisitor {
* a null pattern or pass in a null template engine. This will, in effect,
* have this visitor collect all zip file entry names and calculate their hashcodes based on
* all content within the zip file.
- *
+ *
* @param filesToRealizeRegex pattern of files that are to be realized prior to hashcodes being computed
* @param templateEngine the template engine that replaces replacement variables in files to be realized
*/
@@ -75,7 +75,6 @@ public class InMemoryZipFileVisitor implements ZipUtil.ZipEntryVisitor {
return fileHashcodeMap;
}
- @Override
public boolean visit(ZipEntry entry, ZipInputStream stream) throws Exception {
if (entry.isDirectory()) {
@@ -86,7 +85,7 @@ public class InMemoryZipFileVisitor implements ZipUtil.ZipEntryVisitor {
String hashcode;
if (this.filesToRealizeRegex != null && this.filesToRealizeRegex.matcher(pathname).matches()) {
- // this entry needs to be realized, do it now, then calc the hashcode
+ // this entry needs to be realized, do it now, then calc the hashcode
// note: tempateEngine will never be null if we got here
int contentSize = (int) entry.getSize();
ByteArrayOutputStream baos = new ByteArrayOutputStream((contentSize > 0) ? contentSize : 32768);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java
index d273596..3fd8517 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java
@@ -141,7 +141,6 @@ public class OperationCreateWizard implements Wizard {
view.closeDialog();
}
- @Override
public void cancel() {
// TODO: revert back to original state
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
index a46900c..32e1d2c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
@@ -27,9 +27,6 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.exception.LoginException;
import org.rhq.enterprise.server.util.LookupUtil;
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-
-import javax.jws.WebParam;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
index 1acc73b..a704fb1 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
@@ -19,14 +19,17 @@
package org.rhq.enterprise.gui.admin.role;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.NavigableSet;
import java.util.Properties;
import java.util.Set;
+import java.util.SortedSet;
import java.util.TreeMap;
+import java.util.TreeSet;
import javax.ejb.EJBException;
import javax.servlet.http.HttpServletRequest;
@@ -66,14 +69,12 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class AddLdapGroupsFormPrepareAction extends TilesAction {
final String LDAP_GROUP_CACHE = "ldapGroupCache";
- RoleManagerLocal roleManager = LookupUtil.getRoleManager();
LdapGroupManagerLocal ldapManager = LookupUtil.getLdapGroupManager();
public ActionForward execute(ComponentContext context, ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response) throws Exception {
Log log = LogFactory.getLog(AddLdapGroupsFormPrepareAction.class.getName());
- Subject whoami = RequestUtils.getSubject(request);
AddLdapGroupsForm addForm = (AddLdapGroupsForm) form;
Integer roleId = addForm.getR();
@@ -95,7 +96,7 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
PageControl pca = WebUtility.getPageControl(request, "a");
PageControl pcp = WebUtility.getPageControl(request, "p");
- //BZ-580127 Refactor so that all lists are initialized regardless of ldap server
+ //BZ-580127 Refactor so that all lists are initialized regardless of ldap server
// availability or state of filter params
List<String> pendingGroupIds = new ArrayList<String>();
Set<Map<String, String>> allGroups = new HashSet<Map<String, String>>();
@@ -247,7 +248,7 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
/** Method duplicates pageControl/pagination mechanism for LdapGroup data. This data has not been moved into the
* database yet so the PageList and PageControl mechanism does not yet work properly.
* There are only two columns so the pagination code uses Maps and Sorted Lists for efficient sorting.
- *
+ *
* @param pagedGroupData Pagelist of Maps to be populated.
* @param fullGroupData Full list of Maps available for paging
* @param pc the pagination control from the web session reflecting user selections.
@@ -306,15 +307,21 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
//detect sort order
boolean descending = false;
- if (sortOrder.DESC == sortOrder) {
+ if (PageOrdering.DESC == sortOrder) {
descending = true;
}
//use sort column to determine which list to use
if (sortColumn.equalsIgnoreCase("lg.name")) {
int i = 0;
- NavigableSet<String> keyList = groupNames.navigableKeySet();
+ List<String> keyList;
+
if (descending) {
- keyList = groupNames.descendingKeySet();
+ keyList = new ArrayList<String>(groupNames.keySet());
+ Collections.reverse(keyList);
+ }
+ else {
+ keyList = new ArrayList<String>(groupNames.keySet());
+ Collections.sort(keyList);
}
for (String key : keyList) {
if ((i >= start) && (i < end)) {
@@ -324,9 +331,14 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
}
} else {
int i = 0;
- NavigableSet<String> keyList = groupDescriptions.navigableKeySet();
+ List<String> keyList;
if (descending) {
- keyList = groupDescriptions.descendingKeySet();
+ keyList = new ArrayList<String>(groupDescriptions.keySet());
+ Collections.reverse(keyList);
+ }
+ else {
+ keyList = new ArrayList<String>( groupDescriptions.keySet());
+ Collections.sort(keyList);
}
for (String key : keyList) {
if ((i >= start) && (i < end)) {
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
index 92d584c..3db7ce6 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
@@ -25,8 +25,6 @@ import java.util.List;
import javax.faces.application.FacesMessage;
import javax.faces.model.SelectItem;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -46,10 +44,8 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCreationDataType;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.gui.util.FacesContextUtility;
-import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
-import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.content.ContentException;
import org.rhq.enterprise.server.content.ContentManagerLocal;
import org.rhq.enterprise.server.content.ContentUIManagerLocal;
@@ -63,9 +59,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
public class CreateNewPackageUIBean {
- @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
- private EntityManager entityManager;
-
/**
* Option value for deploying the package to a repo the resource is already subscribed to.
*/
@@ -83,12 +76,6 @@ public class CreateNewPackageUIBean {
*/
private static final String REPO_OPTION_NEW = "new";
- /**
- * Option value for no repo. This is a standalone war that may not be related to any repo.
- *
- */
- private static final String REPO_OPTION_NONE = "none";
-
private String packageName;
private String version;
private int selectedArchitectureId;
@@ -162,7 +149,6 @@ public class CreateNewPackageUIBean {
String repoOption = request.getParameter("repoOption");
UploadItem fileItem = uploadUIBean.getFileItem();
- boolean usingARepo = true;
// Validate
if (packageName == null || packageName.trim().equals("")) {
@@ -191,21 +177,16 @@ public class CreateNewPackageUIBean {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "A package file must be uploaded");
return null;
}
- if (repoOption.equalsIgnoreCase(REPO_OPTION_NONE)) {
- usingARepo = false;
- }
// Determine which repo the package will go into
String repoId = null;
- if (usingARepo) {
- try {
- repoId = determineRepo(repoOption, subject, resource.getId());
- } catch (ContentException ce) {
- String errorMessages = ThrowableUtil.getAllMessages(ce);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
- + errorMessages);
- return "failure";
- }
+ try {
+ repoId = determineRepo(repoOption, subject, resource.getId());
+ } catch (ContentException ce) {
+ String errorMessages = ThrowableUtil.getAllMessages(ce);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
+ + errorMessages);
+ return "failure";
}
try {
@@ -235,20 +216,6 @@ public class CreateNewPackageUIBean {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
packageVersion = contentManager.createPackageVersion(packageName, packageTypeId, version,
architectureId, packageStream);
-
- //locate the file upload UI bean and populate installedPackage, then persist.
- InstalledPackage installed = new InstalledPackage();
- UploadItem fileItemForPackage = uploadUIBean.getFileItem();
- packageVersion.setFileSize(Long.valueOf(fileItemForPackage.getFileSize()));
- //Calculate SHA256
- String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
- .calcDigestString(packageStream);
- packageVersion.setSHA256(sha256);
- installed.setInstallationDate(fileItemForPackage.getFile().lastModified());
- installed.setUser(subject);
- installed.setPackageVersion(packageVersion);
- entityManager.persist(installed);
-
} catch (Exception e) {
String errorMessages = ThrowableUtil.getAllMessages(e);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to create package [" + packageName
@@ -259,18 +226,16 @@ public class CreateNewPackageUIBean {
int[] packageVersionList = new int[] { packageVersion.getId() };
// Add the package to the repo
- if (usingARepo) {
- try {
- int iRepoId = Integer.parseInt(repoId);
-
- RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
- repoManager.addPackageVersionsToRepo(subject, iRepoId, packageVersionList);
- } catch (Exception e) {
- String errorMessages = ThrowableUtil.getAllMessages(e);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to associate package ["
- + packageName + "] with repository ID [" + repoId + "]. Cause: " + errorMessages);
- return "failure";
- }
+ try {
+ int iRepoId = Integer.parseInt(repoId);
+
+ RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
+ repoManager.addPackageVersionsToRepo(subject, iRepoId, packageVersionList);
+ } catch (Exception e) {
+ String errorMessages = ThrowableUtil.getAllMessages(e);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to associate package ["
+ + packageName + "] with repository ID [" + repoId + "]. Cause: " + errorMessages);
+ return "failure";
}
// Put the package ID in the session so it can fit into the deploy existing package workflow
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
index 28edad0..55fdd56 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
@@ -333,6 +333,7 @@
<rich:column colspan="#{param.debug ? 8 : 7}"
width="100%">
+ <ui:remove>
<!-- The ability to associate/disassociate repos with content sources is not needed for JON. -->
<h:commandButton
action="#{RepoContentSourcesUIBean.associateWithContentProviders}"
@@ -343,6 +344,7 @@
value="DISASSOCIATE SELECTED"
target="selectedRepoContentProviders"
styleClass="on-pager-button buttonsmall" />
+ </ui:remove>
<ui:param name="paginationDataTableName"
value="repoContentProvidersDataTable" />
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
index 755a88f..8601b51 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
@@ -857,7 +857,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
//for oracle and Connection.createBlob is not working on postgres.
//This blob will be not empty because we saved there a bytes from String("a").
Blob blb = rs.getBlob(1);
-
+
StreamUtil.copy(bitsStream, blb.setBinaryStream(1), true);
ps2 = conn.prepareStatement("UPDATE " + PackageBits.TABLE_NAME + " SET bits = ? where id = ?");
ps2.setBlob(1, blb);
@@ -911,7 +911,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
+ "] on content source [" + contentSourceId + "]");
}
}
-
+
if (ps2 != null) {
try {
ps2.close();
@@ -1816,7 +1816,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
return outputPackageVersionBitsRangeHelper(resourceId, packageDetailsKey, outputStream, startByte, endByte,
packageVersion.getId());
}
-
+
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
@TransactionTimeout(90 * 60)
public boolean downloadPackageBits(int resourceId, PackageDetailsKey packageDetailsKey){
@@ -1827,10 +1827,10 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
query.setParameter("version", packageDetailsKey.getVersion());
query.setParameter("resourceId", resourceId);
int packageVersionId = ((Integer) query.getSingleResult()).intValue();
-
+
Query queryA = entityManager.createNamedQuery(PackageBits.QUERY_PACKAGE_BITS_LOADED_STATUS_PACKAGE_VERSION_ID);
queryA.setParameter("id", packageVersionId);
-
+
LoadedPackageBitsComposite composite = (LoadedPackageBitsComposite) queryA.getSingleResult();
boolean packageBitsAreAvailable = composite.isPackageBitsAvailable();
@@ -1890,7 +1890,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
PackageBits bits = null;
bits = contentSourceManager.downloadPackageBits(subjectManager.getOverlord(), pvcs);
}catch(Exception e){
- return false;
+ return false;
}
}
return true;
@@ -1993,31 +1993,33 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
bitsStream = adapterMgr.loadPackageBits(contentSourceId, pvcs.getLocation());
} else {
if (composite.isPackageBitsInDatabase()) {
- // this is DownloadMode.DATABASE - put the bits in the database
+ // this is DownloadMode.DATABASE - put the bits in the database
conn = dataSource.getConnection();
ps = conn.prepareStatement("SELECT BITS FROM " + PackageBits.TABLE_NAME + " WHERE ID = ?");
-
+
ps.setInt(1, composite.getPackageBitsId());
results = ps.executeQuery();
results.next();
Blob blob = results.getBlob(1);
-
+
long bytesRetrieved=0;
if (endByte < 0) {
if (startByte == 0) {
bytesRetrieved = StreamUtil.copy(blob.getBinaryStream(), outputStream, false);
}
- } else {
- long length = (endByte - startByte) + 1;
- InputStream stream = blob.getBinaryStream(startByte, length);
- bytesRetrieved = StreamUtil.copy(stream, outputStream, false);
+ } else {
+ long length = (endByte - startByte) + 1;
+// InputStream stream = blob.getBinaryStream(startByte, length); // JDK 6 api
+ InputStream stream = blob.getBinaryStream();
+
+ bytesRetrieved = StreamUtil.copy(stream, outputStream, startByte , length);
}
log.debug("Retrieved and sent [" + bytesRetrieved + "] bytes for [" + packageDetailsKey + "]");
ps.close();
conn.close();
return bytesRetrieved;
-
+
} else {
// this is DownloadMode.FILESYSTEM - put the bits on the filesystem
File bitsFile = getPackageBitsLocalFileAndCreateParentDir(composite.getPackageVersionId(),
@@ -2252,4 +2254,4 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
return numBytes;
}
}
-
+
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java
index b857325..bb29a47 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java
@@ -207,13 +207,13 @@ public class LdapLoginModule extends UsernamePasswordLoginModule {
//if successful then verified that user and pw are valid ldap credentials
ctx.reconnect(null);
- //if group auth enabled and user acct already exists then insert authorization check
+ //if group auth enabled and user acct already exists then insert authorization check
String groupFilter = (String) options.get("GroupFilter");
String groupMember = (String) options.get("GroupMemberFilter");
SubjectManagerLocal sManager = LookupUtil.getSubjectManager();
Subject ldapSubject = sManager.getSubjectByName(getUsername());
- if (ldapSubject != null && ((groupFilter != null) && !groupFilter.trim().isEmpty())
- && ((groupMember != null) && !groupMember.trim().isEmpty())) {
+ if (ldapSubject != null && ((groupFilter != null) && !groupFilter.trim().equals(""))
+ && ((groupMember != null) && !groupMember.trim().equals(""))) {
//check authorized groups to see if this user is authorized via ldap
//BUT still must always return true as authz is handled by RHQ if roles/groups correct
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
index 63e36db..409d64e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
@@ -61,7 +61,7 @@ import org.rhq.enterprise.server.system.SystemManagerLocal;
import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory;
/**
- * This bean provides functionality to manipulate the ldap auth/authz funcitonality.
+ * This bean provides functionality to manipulate the ldap auth/authz funcitonality.
* That is, adding/modifying/deleting ldap group/users and their
* associated subjects and permissions are performed by this manager.
* @author paji
@@ -189,7 +189,6 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
}
}
- @Override
public PageList<LdapGroup> findLdapGroupsByRole(int roleId, PageControl pageControl) {
Role role = entityManager.find(Role.class, roleId);
if (role == null) {
@@ -280,7 +279,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
}
/**
- * @throws NamingException
+ * @throws NamingException
* @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String)
*/
protected Set<Map<String, String>> buildGroup(Properties options, String filter) {
@@ -347,7 +346,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
log.error(message, fException);
throw new LdapFilterException(message + " " + fException.getMessage());
}
- //TODO: check for ldap connection/unavailable/etc. exceptions.
+ //TODO: check for ldap connection/unavailable/etc. exceptions.
else {
log.error("LDAP communication error: " + e.getMessage(), e);
throw new LdapCommunicationException(e);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
index 231167e..6585739 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
@@ -33,7 +33,7 @@ import org.rhq.enterprise.server.system.ServerVersion;
/**
* The remote interface to the SavedSearchManager.
- *
+ *
* @author Joseph Marques
*/
@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
@@ -45,11 +45,11 @@ public interface SavedSearchManagerRemote {
* Persisted a new {@link SavedSearch} with the given primary key
*
* @param subject the logged in user requesting the {@link SavedSearch} deletion
- * @param savedSearchId the primary key of the {@link SavedSearch} to be deleted
+ * @param savedSearch the primary key of the {@link SavedSearch} to be deleted
*
* @throws PermissionException if the user is not authorized to create the {@link SavedSearch}. Only inventory
* managers can create global saved searches. Regular users can only create {@link SavedSearch}es against
- * their own accounts.
+ * their own accounts.
*/
@WebMethod
public void createSavedSearch( //
@@ -57,11 +57,11 @@ public interface SavedSearchManagerRemote {
@WebParam(name = "savedSearch") SavedSearch savedSearch);
/**
- * Saves all changes to the passed {@link SavedSearch} database, correlating it to the record already
+ * Saves all changes to the passed {@link SavedSearch} database, correlating it to the record already
* persisted with the same primary key
*
* @param subject the logged in user requesting the {@link SavedSearch} persisted modification
- * @param savedSearchId the {@link SavedSearch} which will have its modifications persisted
+ * @param savedSearch the {@link SavedSearch} which will have its modifications persisted
*.
* @throws PermissionException if the user is not authorized to modify the {@link SavedSearch}. Only inventory
* managers can update global saved searches. Regular users can only update {@link SavedSearch}es from
@@ -94,7 +94,7 @@ public interface SavedSearchManagerRemote {
* @param savedSearchId the primary key of the {@link SavedSearch} to be loaded
*
* @return the {@link SavedSearch} or <code>null</code> if it wasn't found
- * @throws PermissionException if the user is not authorized to view the {@link SavedSearch}. Regular users can
+ * @throws PermissionException if the user is not authorized to view the {@link SavedSearch}. Regular users can
* only view {@link SavedSearch}es from their own accounts.
*/
@WebMethod
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
index 05b39e1..8603946 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
@@ -22,17 +22,14 @@ public abstract class AbstractSearchAssistant implements SearchAssistant {
this.maxResultCount = maxResultCount;
}
- @Override
public List<String> getSimpleContexts() {
return Collections.emptyList();
}
- @Override
public List<String> getParameterizedContexts() {
return Collections.emptyList();
}
- @Override
public List<String> getParameters(String context, String filter) {
if (getParameterizedContexts().contains(context) == false) {
throw new IllegalArgumentException("context[" + context
@@ -41,7 +38,6 @@ public abstract class AbstractSearchAssistant implements SearchAssistant {
return Collections.emptyList();
}
- @Override
public List<String> getValues(String context, String param, String filter) {
if (getSimpleContexts().contains(context) && param != null) {
throw new IllegalArgumentException("context[" + context + "] is simple, param[" + param
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
index 0e2b3df..4deaa01 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
@@ -19,7 +19,6 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
"name"));
}
- @Override
public SearchSubsystem getSearchSubsystem() {
return SearchSubsystem.RESOURCE;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
index dcd6c69..edb5059 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
@@ -473,7 +473,7 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot
// we need to undeploy it first - on windows the files are locked and can't be renamed until undeployed
ObjectName name = ObjectNameFactory.create("jboss.system:service=MainDeployer");
MBeanServerConnection mbs = MBeanServerLocator.locateJBoss();
- MainDeployerMBean mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name,
+ MainDeployerMBean mbean = (MainDeployerMBean) MBeanServerInvocationHandler.newProxyInstance(mbs, name,
MainDeployerMBean.class, false);
URL url = deployedInstallWar.toURI().toURL();
String urlString = url.toString().replace("%20", " "); // bug in undeployer doesn't like %20 - it wants a real space
@@ -550,7 +550,7 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot
* @return The License object
*/
public License getLicense() {
- // it's legal to return a null license, which then by-passes the check to
+ // it's legal to return a null license, which then by-passes the check to
// whether the expirationDate in the backing store has been fiddled with
License license = LicenseManager.instance().getLicense();
if (license == null) {
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java
index 37ed7b0..a7f51a8 100644
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java
+++ b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java
@@ -32,7 +32,7 @@ public class RhnHttpURLConnectionFactory {
{
e.printStackTrace();
log.error(e);
- throw new IOException(e);
+ throw new IOException(e.getMessage());
}
log.debug("SSLSocketFactory has been set with a custom version using certPath: " + sslCertPathIn);
}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java
index c036ae6..5fa8a63 100644
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java
+++ b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java
@@ -66,7 +66,7 @@ public class RhnSSLTransport extends XmlRpcSun15HttpTransport
{
e.printStackTrace();
log.error(e);
- throw new IOException(e);
+ throw new IOException(e.getMessage());
}
log.debug("SSLSocketFactory has been set with a custom version using cert path: " + sslCertPath);
}
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 5734463..9a781ba 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>net.augeas</groupId>
<artifactId>augeas</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</dependency>
<dependency>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index a827e5a..f7cf265 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -28,7 +28,7 @@
<dependency>
<groupId>net.augeas</groupId>
<artifactId>augeas</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</dependency>
<dependency>
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java
index 62652a1..0793831 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java
@@ -256,7 +256,7 @@ public class LinuxPlatformComponent extends PlatformComponent implements Content
List<String> pkgs = new ArrayList<String>();
for (ResourcePackageDetails p : packages) {
String pkgInfo = p.getName();
- if ((p.getVersion() != null) && (!p.getVersion().isEmpty())) {
+ if ((p.getVersion() != null) && (!p.getVersion().equals(""))) {
pkgInfo = pkgInfo + "-" + p.getVersion();
}
log.info("Adding <" + pkgInfo + "> to list of packages to deploy, original package object was: " + p);
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 9f8f36b..3579496 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -28,7 +28,7 @@
<dependency>
<groupId>net.augeas</groupId>
<artifactId>augeas</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</dependency>
<dependency>
1
0
26 May '10
modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java | 14
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/ResourcePackageDetails.java | 46 +-
modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java | 90 ++++
modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/RetrieveContentBitsRunner.java | 76 ++--
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 86 +++-
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListPackageHistoryUIBean.java | 28 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java | 99 +++++
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml | 3
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-package-1.xhtml | 31 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 190 +++++++++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java | 11
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 39 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerLocal.java | 6
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/AbstractDeployer.java | 49 ++
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 47 +-
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java | 166 ++++----
18 files changed, 759 insertions(+), 225 deletions(-)
New commits:
commit 06136ac6f6ea806c3887cf2635ab0feb6b91378a
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed May 26 04:22:31 2010 -0400
content synch up issue.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
index 4e16f53..468dfc2 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
@@ -69,6 +69,11 @@ import org.rhq.core.domain.resource.ProductVersion;
+ " AND pv.generalPackage.packageType.name = :packageTypeName "
+ " AND pv.generalPackage.packageType.resourceType.id = :resourceTypeId "
+ " AND pv.architecture.name = :architectureName " + " AND pv.version = :version "),
+ @NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS_SHA, query = "SELECT pv FROM PackageVersion AS pv "
+ + " WHERE pv.generalPackage.name = :packageName "
+ + " AND pv.generalPackage.packageType.name = :packageTypeName " + " AND pv.sha256 = :sha "
+ + " AND pv.generalPackage.packageType.resourceType.id = :resourceTypeId "
+ + " AND pv.architecture.name = :architectureName " + " AND pv.version = :version "),
@NamedQuery(name = PackageVersion.QUERY_FIND_ID_BY_PACKAGE_DETAILS_KEY_AND_RES_ID, query = "SELECT pv.id "
+ " FROM PackageVersion AS pv " + " JOIN pv.generalPackage.packageType.resourceType.resources r "
+ " WHERE pv.generalPackage.name = :packageName "
@@ -249,6 +254,7 @@ public class PackageVersion implements Serializable {
public static final String QUERY_FIND_BY_PACKAGE_SHA = "PackageVersion.findByPackageSha";
public static final String QUERY_FIND_BY_PACKAGE_SHA_RES_TYPE = "PackageVersion.findByPackageShaResType";
public static final String QUERY_FIND_BY_PACKAGE_DETAILS_KEY = "PackageVersion.findByPackageDetailsKey";
+ public static final String QUERY_FIND_BY_PACKAGE_DETAILS_SHA = "PackageVersion.findByPackageDetailsSha";
public static final String QUERY_FIND_ID_BY_PACKAGE_DETAILS_KEY_AND_RES_ID = "PackageVersion.findIdByPackageDetailsKeyAndResId";
public static final String QUERY_FIND_BY_REPO_ID = "PackageVersion.findByRepoId";
public static final String QUERY_FIND_BY_REPO_ID_FILTERED = "PackageVersion.findByRepoIdFiltered";
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index a36770f..5513fc1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -243,13 +243,14 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// See if package version already exists for the resource package
Query packageVersionQuery = entityManager
- .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS_KEY);
+ .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS_SHA);
packageVersionQuery.setFlushMode(FlushModeType.COMMIT);
packageVersionQuery.setParameter("packageName", resourcePackage.getName());
packageVersionQuery.setParameter("packageTypeName", resourcePackage.getPackageTypeName());
packageVersionQuery.setParameter("resourceTypeId", resource.getResourceType().getId());
packageVersionQuery.setParameter("architectureName", resourcePackage.getArchitectureName());
packageVersionQuery.setParameter("version", resourcePackage.getVersion());
+ packageVersionQuery.setParameter("sha", resourcePackage.getSHA256());
List<PackageVersion> existingPackageVersionList = packageVersionQuery.getResultList();
commit 278fae722d5ca8ab81a5c2d77d8d7efda781dc74
Merge: bd8ee1e... fa3fb9c...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed May 26 04:21:35 2010 -0400
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq
commit bd8ee1ee291e656dfec223110ed51d0cb24d2219
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed May 26 02:51:17 2010 -0400
content: reapply ce0d8ab, sp changes, noResultException handling.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
index e488010..fbe9977 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.faces.application.FacesMessage;
import javax.faces.model.SelectItem;
+import javax.persistence.NoResultException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -80,6 +81,12 @@ public class CreateNewPackageUIBean {
*/
private static final String REPO_OPTION_NEW = "new";
+ /**
+ * Option value for no repo. This is a standalone war that may not be related to any repo.
+ *
+ */
+ private static final String REPO_OPTION_NONE = "none";
+
private String packageName;
private String version;
private int selectedArchitectureId;
@@ -153,6 +160,7 @@ public class CreateNewPackageUIBean {
String repoOption = request.getParameter("repoOption");
UploadItem fileItem = uploadUIBean.getFileItem();
+ boolean usingARepo = true;
// Validate
if (packageName == null || packageName.trim().equals("")) {
@@ -182,15 +190,21 @@ public class CreateNewPackageUIBean {
return null;
}
+ if (repoOption.equalsIgnoreCase(REPO_OPTION_NONE)) {
+ usingARepo = false;
+ }
+
// Determine which repo the package will go into
String repoId = null;
- try {
- repoId = determineRepo(repoOption, subject, resource.getId());
- } catch (ContentException ce) {
- String errorMessages = ThrowableUtil.getAllMessages(ce);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
- + errorMessages);
- return "failure";
+ if (usingARepo) {
+ try {
+ repoId = determineRepo(repoOption, subject, resource.getId());
+ } catch (ContentException ce) {
+ String errorMessages = ThrowableUtil.getAllMessages(ce);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
+ + errorMessages);
+ return "failure";
+ }
}
try {
@@ -215,11 +229,9 @@ public class CreateNewPackageUIBean {
workflow and we'll deal with the refactoring later.
jdobies, Feb 27, 2008
*/
- PackageVersion packageVersion;
+ PackageVersion packageVersion = null;
try {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
- packageVersion = contentManager.createPackageVersion(packageName, packageTypeId, version,
- architectureId, packageStream);
//store information about uploaded file for packageDetails as most of it is already available
Map<String, String> packageUploadDetails = new HashMap<String, String>();
@@ -244,26 +256,30 @@ public class CreateNewPackageUIBean {
packageVersion = contentManager.getUploadedPackageVersion(packageName, packageTypeId, version,
architectureId, packageStream, packageUploadDetails, newResourceTypeId);
+ } catch (NoResultException nre) {
+ //eat the exception. Some of the queries return no results if no package yet exists which is fine.
} catch (Exception e) {
String errorMessages = ThrowableUtil.getAllMessages(e);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to create package [" + packageName
- + "] in repo. Cause: " + errorMessages);
+ + "] in repository. Cause: " + errorMessages);
return "failure";
}
int[] packageVersionList = new int[] { packageVersion.getId() };
// Add the package to the repo
- try {
- int iRepoId = Integer.parseInt(repoId);
-
- RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
- repoManager.addPackageVersionsToRepo(subject, iRepoId, packageVersionList);
- } catch (Exception e) {
- String errorMessages = ThrowableUtil.getAllMessages(e);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to associate package ["
- + packageName + "] with repository ID [" + repoId + "]. Cause: " + errorMessages);
- return "failure";
+ if (usingARepo) {
+ try {
+ int iRepoId = Integer.parseInt(repoId);
+
+ RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
+ repoManager.addPackageVersionsToRepo(subject, iRepoId, packageVersionList);
+ } catch (Exception e) {
+ String errorMessages = ThrowableUtil.getAllMessages(e);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to associate package ["
+ + packageName + "] with repository ID [" + repoId + "]. Cause: " + errorMessages);
+ return "failure";
+ }
}
// Put the package ID in the session so it can fit into the deploy existing package workflow
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java
index a55927d..786d579 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java
@@ -29,6 +29,7 @@ import java.util.Map;
import javax.faces.application.FacesMessage;
import javax.faces.model.SelectItem;
+import javax.persistence.NoResultException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -212,6 +213,8 @@ public class CreateNewPackageChildResourceUIBean {
}
+ } catch (NoResultException nre) {
+ //eat the exception. Some of the queries return no results if no package yet exists which is fine.
} catch (Exception e) {
String errorMessages = ThrowableUtil.getAllMessages(e);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
index 55fdd56..28edad0 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
@@ -333,7 +333,6 @@
<rich:column colspan="#{param.debug ? 8 : 7}"
width="100%">
- <ui:remove>
<!-- The ability to associate/disassociate repos with content sources is not needed for JON. -->
<h:commandButton
action="#{RepoContentSourcesUIBean.associateWithContentProviders}"
@@ -344,7 +343,6 @@
value="DISASSOCIATE SELECTED"
target="selectedRepoContentProviders"
styleClass="on-pager-button buttonsmall" />
- </ui:remove>
<ui:param name="paginationDataTableName"
value="repoContentProvidersDataTable" />
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 2136261..a36770f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -191,27 +191,27 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
packageDiscoveredQuery.setParameter("resourceTypeId", resource.getResourceType().getId());
List<PackageVersion> discoveredPackages = packageDiscoveredQuery.getResultList();
if (discoveredPackages.size() > 0) {
- //iterate over packages to determine first one with same file name
- PackageVersion[] discovered = new PackageVersion[discoveredPackages.size()];
- discoveredPackages.toArray(discovered);
- boolean located = false;
- for (int i = 0; (!located && i < discovered.length); i++) {
- packageVersion = discovered[i];
- //check that the returned file name is same as expected otherwise
- //bail(bank1.war != crook1.war for auditing purposes) even though hash is equal.
- if (packageVersion.getFileName().trim().equals(resourcePackage.getFileName().trim())) {
- located = true;
- //now assign PackageVersion details correctly
- PackageDetailsKey discoveredKey = new PackageDetailsKey(packageVersion.getFileName(),
- packageVersion.getVersion(), packageVersion.getGeneralPackage().getPackageType()
- .getName(), resourcePackage.getArchitectureName());
- ResourcePackageDetails retrievedResourcePackage = new ResourcePackageDetails(
- discoveredKey);
- retrievedResourcePackage.setInstallationTimestamp(resourcePackage.getFileCreatedDate());
- //now reassign the resourcePackage to use this newly retrieved id.
- resourcePackage = retrievedResourcePackage;
- }
- }
+ // //iterate over packages to determine first one with same file name
+ // PackageVersion[] discovered = new PackageVersion[discoveredPackages.size()];
+ // discoveredPackages.toArray(discovered);
+ // boolean located = false;
+ // for (int i = 0; (!located && i < discovered.length); i++) {
+ // packageVersion = discovered[i];
+ // //check that the returned file name is same as expected otherwise
+ // //bail(bank1.war != crook1.war for auditing purposes) even though hash is equal.
+ // if (packageVersion.getFileName().trim().equals(resourcePackage.getFileName().trim())) {
+ // located = true;
+ // //now assign PackageVersion details correctly
+ // PackageDetailsKey discoveredKey = new PackageDetailsKey(packageVersion.getFileName(),
+ // packageVersion.getVersion(), packageVersion.getGeneralPackage().getPackageType()
+ // .getName(), resourcePackage.getArchitectureName());
+ // ResourcePackageDetails retrievedResourcePackage = new ResourcePackageDetails(
+ // discoveredKey);
+ // retrievedResourcePackage.setInstallationTimestamp(resourcePackage.getFileCreatedDate());
+ // //now reassign the resourcePackage to use this newly retrieved id.
+ // resourcePackage = retrievedResourcePackage;
+ // }
+ // }
packageVersion = discoveredPackages.get(0);
//check that the returned file name is same as expected otherwise
//bail(bank1.war != crook1.war for auditing purposes) even though hash is equal.
@@ -1608,6 +1608,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
packageVersion.setSHA256(packageUploadDetails.get(ContentManagerBean.UPLOAD_SHA256));
}
entityManager.merge(packageVersion);
+ entityManager.flush();
return packageVersion;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
index 8b0e4d6..3ecd40f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
@@ -30,6 +30,7 @@ import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -319,7 +320,7 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
CreateResourceHistory history = new CreateResourceHistory(parentResource, resourceType, user.getName(),
(InstalledPackage) null);
history.setCreatedResourceName(createResourceName);
- history.setConfiguration(deploymentTimeConfiguration);
+ // history.setConfiguration(deploymentTimeConfiguration);
history.setStatus(CreateResourceStatus.IN_PROGRESS);
entityManager.persist(history);
@@ -529,6 +530,19 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
packageVersionNumber, architectureId, packageBitStream, packageUploadDetails, newResourceTypeId);
}
+ //check that Configuration is persisted correctly.
+ if (deploymentTimeConfiguration.getId() > 0) {
+ entityManager.merge(deploymentTimeConfiguration);
+ } else {
+ entityManager.persist(deploymentTimeConfiguration);
+ }
+ //check that Configuration is persisted correctly.
+ if (pluginConfiguration.getId() > 0) {
+ entityManager.merge(pluginConfiguration);
+ } else {
+ entityManager.persist(pluginConfiguration);
+ }
+
// Persist in separate transaction so it is committed immediately, before the request is sent to the agent
CreateResourceHistory persistedHistory = resourceFactoryManager.persistCreateHistory(user, parentResourceId,
newResourceTypeId, newResourceName, packageVersion, deploymentTimeConfiguration);
@@ -544,6 +558,8 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
AgentClient agentClient = agentManager.getAgentClient(agent);
ResourceFactoryAgentService resourceFactoryAgentService = agentClient.getResourceFactoryAgentService();
resourceFactoryAgentService.createResource(request);
+ } catch (NoResultException nre) {
+ //eat the exception. Some of the queries return no results if no package yet exists which is fine.
} catch (Exception e) {
log.error("Error while sending create resource request to agent service", e);
commit 5db6f43e511700a4de58dace6461a81b308ecc70
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue May 25 15:00:24 2010 -0400
BZ:589173: modified agent side and server side to update pkg version using Sha.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
index 4bfc1db..4e16f53 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
@@ -60,6 +60,10 @@ import org.rhq.core.domain.resource.ProductVersion;
+ " AND pv.architecture.id = :architectureId " + " AND pv.version = :version "),
@NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_SHA, query = "SELECT pv FROM PackageVersion AS pv "
+ " WHERE pv.sha256 = :sha "),
+ @NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_SHA_RES_TYPE, query = "SELECT pv FROM PackageVersion AS pv "
+ + " WHERE pv.sha256 = :sha "
+ + " AND pv.displayName = :displayName "
+ + " AND pv.generalPackage.packageType.resourceType.id = :resourceTypeId "),
@NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS_KEY, query = "SELECT pv FROM PackageVersion AS pv "
+ " WHERE pv.generalPackage.name = :packageName "
+ " AND pv.generalPackage.packageType.name = :packageTypeName "
@@ -243,6 +247,7 @@ public class PackageVersion implements Serializable {
public static final String QUERY_FIND_BY_PACKAGE_VER_ARCH = "PackageVersion.findByPackageVerArch";
public static final String QUERY_FIND_BY_PACKAGE_SHA = "PackageVersion.findByPackageSha";
+ public static final String QUERY_FIND_BY_PACKAGE_SHA_RES_TYPE = "PackageVersion.findByPackageShaResType";
public static final String QUERY_FIND_BY_PACKAGE_DETAILS_KEY = "PackageVersion.findByPackageDetailsKey";
public static final String QUERY_FIND_ID_BY_PACKAGE_DETAILS_KEY_AND_RES_ID = "PackageVersion.findIdByPackageDetailsKeyAndResId";
public static final String QUERY_FIND_BY_REPO_ID = "PackageVersion.findByRepoId";
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
index 9f6ff44..e46f403 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
@@ -23,6 +23,7 @@
package org.rhq.core.pc.content;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -39,6 +40,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -80,6 +83,7 @@ import org.rhq.core.util.MessageDigestGenerator;
public class ContentManager extends AgentService implements ContainerService, ContentAgentService, ContentServices {
private static final int FACET_METHOD_TIMEOUT = 60 * 60 * 1000; // 60 minutes
+ public static final String RHQ_SHA256 = "RHQ-Sha256";
private final Log log = LogFactory.getLog(ContentManager.class);
/**
@@ -661,24 +665,42 @@ public class ContentManager extends AgentService implements ContainerService, Co
for (ResourcePackageDetails detail : recentlyDiscoveredArray) {
try {
- //if the filesize of discovered package is null then it's an exploded and deployed war/ear.
- if ((detail.getFileSize() == null) || (detail.getFileSize() == 0)) {
- //when deployed exploded then don't calculate digest but update string with message to that effect.
- //TODO: is this ok? Once exploded and run at all ... contents could be different.
- detail.setSHA256("(deployed exploded. no message digest possible)");
+ //only operate on .ear/.war
+ String currentFile = detail.getFileName();
+ if (currentFile != null) {
+ currentFile = currentFile.toLowerCase();
}
- //and for each detail where size != null or non empty ... then an un-exploded war/ear
- if ((detail.getFileSize() != null) || (detail.getFileSize() > 0)) {
- File localCopy = null;
- if ((detail.getLocation() != null) && (!detail.getLocation().isEmpty())) {
- localCopy = new File(detail.getLocation());
- //calculate md5
- String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
- .calcDigestString(localCopy);
- //and attach it to the report returned to be picked up on server side in merge
- detail.setSHA256(sha256);
- //attach fileCreatedDate as well
- detail.setInstallationTimestamp(Long.valueOf(System.currentTimeMillis()));
+ if (currentFile != null && (currentFile.endsWith(".ear") || currentFile.endsWith(".war"))) {
+ //if the filesize of discovered package is null then it's an exploded and deployed war/ear.
+ if ((detail.getFileSize() == null) || (detail.getFileSize() == 0)) {
+ //when deployed exploded then don't calculate digest but check for META-INF entry
+ File explodedDirectory = new File(detail.getLocation());
+ File manifestFile = new File(explodedDirectory, "META-INF/MANIFEST.MF");
+ Manifest manifest;
+ if (manifestFile.exists()) {
+ FileInputStream inputStream = new FileInputStream(manifestFile);
+ manifest = new Manifest(inputStream);
+ inputStream.close();
+ Attributes attribs = manifest.getMainAttributes();
+ String retrievedShaValue = attribs.getValue(RHQ_SHA256);
+ if ((retrievedShaValue != null) && (!retrievedShaValue.trim().isEmpty())) {
+ detail.setSHA256(retrievedShaValue);
+ }
+ }
+ }
+ //and for each detail where size != null or non empty ... then an un-exploded war/ear
+ else if ((detail.getFileSize() != null) || (detail.getFileSize() > 0)) {
+ File localCopy = null;
+ if ((detail.getLocation() != null) && (!detail.getLocation().isEmpty())) {
+ localCopy = new File(detail.getLocation());
+ //calculate md5
+ String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
+ .calcDigestString(localCopy);
+ //and attach it to the report returned to be picked up on server side in merge
+ detail.setSHA256(sha256);
+ //attach fileCreatedDate as well
+ detail.setInstallationTimestamp(Long.valueOf(System.currentTimeMillis()));
+ }
}
}
} catch (IOException iex) {
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
index 3db7ce6..e488010 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
@@ -21,7 +21,9 @@ package org.rhq.enterprise.gui.content;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.faces.application.FacesMessage;
import javax.faces.model.SelectItem;
@@ -44,9 +46,11 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCreationDataType;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.gui.util.FacesContextUtility;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
import org.rhq.enterprise.server.content.ContentException;
+import org.rhq.enterprise.server.content.ContentManagerBean;
import org.rhq.enterprise.server.content.ContentManagerLocal;
import org.rhq.enterprise.server.content.ContentUIManagerLocal;
import org.rhq.enterprise.server.content.RepoManagerLocal;
@@ -216,6 +220,30 @@ public class CreateNewPackageUIBean {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
packageVersion = contentManager.createPackageVersion(packageName, packageTypeId, version,
architectureId, packageStream);
+
+ //store information about uploaded file for packageDetails as most of it is already available
+ Map<String, String> packageUploadDetails = new HashMap<String, String>();
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_FILE_SIZE, String.valueOf(fileItem.getFileSize()));
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_FILE_INSTALL_DATE, String.valueOf(System
+ .currentTimeMillis()));
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_OWNER, subject.getName());
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_FILE_NAME, fileItem.getFileName());
+
+ try {//Easier to implement here than in server side bean. Shouldn't affect performance too much.
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_MD5, new MessageDigestGenerator(
+ MessageDigestGenerator.MD5).calcDigestString(fileItem.getFile()));
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_SHA256, new MessageDigestGenerator(
+ MessageDigestGenerator.SHA_256).calcDigestString(fileItem.getFile()));
+ } catch (IOException e1) {
+ log.warn("Error calculating file digest(s) : " + e1.getMessage());
+ e1.printStackTrace();
+ }
+
+ //TODO: need to get parent id instead right? ref to app server inst itself?
+ int newResourceTypeId = resource.getResourceType().getId();
+ packageVersion = contentManager.getUploadedPackageVersion(packageName, packageTypeId, version,
+ architectureId, packageStream, packageUploadDetails, newResourceTypeId);
+
} catch (Exception e) {
String errorMessages = ThrowableUtil.getAllMessages(e);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to create package [" + packageName
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml
index 53f8f4d..ec32881 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml
@@ -43,7 +43,8 @@
<h:form id="uploadForm">
<input type="hidden" name="id" value="${param.id}"/>
- <rich:panel rendered="#{CreateNewPackageUIBean.needRequestPackageDetails}">
+ <!-- <rich:panel rendered="#{CreateNewPackageUIBean.needRequestPackageDetails}">-->
+ <rich:panel >
<f:facet name="header">New Package Details</f:facet>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 507c432..2136261 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -149,8 +149,8 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// For performance tracking
long start = System.currentTimeMillis();
- log.debug("Merging [" + report.getDeployedPackages().size() + "] packages for Resource with id ["
- + resourceId + "]...");
+ log.debug("Merging [" + report.getDeployedPackages().size() + "] packages for Resource with id [" + resourceId
+ + "]...");
// Load the resource and its installed packages
Resource resource = entityManager.find(Resource.class, resourceId);
@@ -185,8 +185,10 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
if ((md5Value == null) || (md5Value.isEmpty())) {
//query for installed packages with SHA256
Query packageDiscoveredQuery = entityManager
- .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_SHA);
+ .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_SHA_RES_TYPE);
packageDiscoveredQuery.setParameter("sha", shaValue);
+ packageDiscoveredQuery.setParameter("displayName", resourcePackage.getFileName());
+ packageDiscoveredQuery.setParameter("resourceTypeId", resource.getResourceType().getId());
List<PackageVersion> discoveredPackages = packageDiscoveredQuery.getResultList();
if (discoveredPackages.size() > 0) {
//iterate over packages to determine first one with same file name
@@ -210,6 +212,17 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
resourcePackage = retrievedResourcePackage;
}
}
+ packageVersion = discoveredPackages.get(0);
+ //check that the returned file name is same as expected otherwise
+ //bail(bank1.war != crook1.war for auditing purposes) even though hash is equal.
+ //now assign PackageVersion details correctly
+ PackageDetailsKey discoveredKey = new PackageDetailsKey(packageVersion.getDisplayName(),
+ packageVersion.getVersion(), packageVersion.getGeneralPackage().getPackageType().getName(),
+ resourcePackage.getArchitectureName());
+ ResourcePackageDetails retrievedResourcePackage = new ResourcePackageDetails(discoveredKey);
+ retrievedResourcePackage.setInstallationTimestamp(resourcePackage.getFileCreatedDate());
+ //now reassign the resourcePackage to use this newly retrieved id.
+ resourcePackage = retrievedResourcePackage;
}
}
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/AbstractDeployer.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/AbstractDeployer.java
index 65f9598..8f98d9c 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/AbstractDeployer.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/AbstractDeployer.java
@@ -23,11 +23,17 @@
package org.rhq.plugins.jbossas5.deploy;
import java.io.File;
-import java.util.Set;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.net.URI;
import java.util.Collection;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.jboss.deployers.spi.management.KnownDeploymentTypes;
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
@@ -40,6 +46,7 @@ import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.domain.resource.CreateResourceStatus;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection;
import org.rhq.plugins.jbossas5.util.ConversionUtils;
import org.rhq.plugins.jbossas5.util.DeploymentUtils;
@@ -53,6 +60,7 @@ import org.rhq.plugins.jbossas5.util.DeploymentUtils;
public abstract class AbstractDeployer implements Deployer {
private static final ProfileKey FARM_PROFILE_KEY = new ProfileKey("farm");
private static final ProfileKey APPLICATIONS_PROFILE_KEY = new ProfileKey("applications");
+ public static final String DEPLOYMENT_NAME_PROPERTY = "deploymentName";
private final Log log = LogFactory.getLog(this.getClass());
@@ -97,25 +105,54 @@ public abstract class AbstractDeployer implements Deployer {
}
if (!farmSupported) {
throw new IllegalStateException("This application server instance is not a node in a cluster, "
- + "so it does not support farmed deployments. Supported deployment profiles are "
- + profileKeys + ".");
+ + "so it does not support farmed deployments. Supported deployment profiles are " + profileKeys
+ + ".");
}
if (deployExploded) {
- throw new IllegalArgumentException("Deploying farmed applications in exploded form is not supported by the Profile Service.");
+ throw new IllegalArgumentException(
+ "Deploying farmed applications in exploded form is not supported by the Profile Service.");
}
deploymentManager.loadProfile(FARM_PROFILE_KEY);
}
try {
DeploymentUtils.deployArchive(deploymentManager, archiveFile, deployExploded);
- }
- finally {
+ } finally {
// Make sure to switch back to the 'applications' profile if we switched to the 'farm' profile above.
if (deployFarmed) {
deploymentManager.loadProfile(APPLICATIONS_PROFILE_KEY);
}
}
+ //if deployed exploded, we need to store the sha of source package for correct versioning
+ if (deployExploded) {
+ String shaString = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
+ .getDigestString(archiveFile);
+ String deploymentName = deployTimeConfig.getSimple(DEPLOYMENT_NAME_PROPERTY).getStringValue();
+ URI deployePackageURI = URI.create(deploymentName);
+ // e.g.: foo.war
+ String path = deployePackageURI.getPath();
+ File location = new File(path);
+ //We've located the deployed
+ if ((location != null) && (location.isDirectory())) {
+ File manifestFile = new File(location, "META-INF/MANIFEST.MF");
+ Manifest manifest;
+ if (manifestFile.exists()) {
+ FileInputStream inputStream = new FileInputStream(manifestFile);
+ manifest = new Manifest(inputStream);
+ inputStream.close();
+ } else {
+ manifest = new Manifest();
+ }
+ Attributes attribs = manifest.getMainAttributes();
+ // attribs.put("RHQ-Sha256", shaString);
+ attribs.putValue("RHQ-Sha256", shaString);
+ FileOutputStream outputStream = new FileOutputStream(manifestFile);
+ manifest.write(outputStream);
+ outputStream.close();
+ }
+ }
+
// Deployment was successful!
createResourceReport.setResourceName(archiveName);
createResourceReport.setResourceKey(archiveName);
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
index 7effdd5..4dc7a41 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
@@ -43,10 +43,11 @@ import java.util.jar.JarFile;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import com.jboss.jbossnetwork.product.jbpm.handlers.ControlActionFacade;
+import com.jboss.jbossnetwork.product.jbpm.handlers.InPluginControlActionFacade;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.on.common.jbossas.JBPMWorkflowManager;
-import org.jboss.on.common.jbossas.JBossASPaths;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
@@ -62,13 +63,16 @@ import org.mc4j.ems.connection.support.ConnectionProvider;
import org.mc4j.ems.connection.support.metadata.ConnectionTypeDescriptor;
import org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor;
-import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
-import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
+import org.jboss.on.common.jbossas.JBPMWorkflowManager;
+import org.jboss.on.common.jbossas.JBossASPaths;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.PackageType;
import org.rhq.core.domain.content.transfer.DeployPackageStep;
+import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
+import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
@@ -94,6 +98,7 @@ import org.rhq.core.pluginapi.support.SnapshotReportRequest;
import org.rhq.core.pluginapi.support.SnapshotReportResults;
import org.rhq.core.pluginapi.support.SupportFacet;
import org.rhq.core.pluginapi.util.FileUtils;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.plugins.jbossas.helper.JavaSystemProperties;
import org.rhq.plugins.jbossas.helper.MainDeployer;
import org.rhq.plugins.jbossas.util.ConnectionFactoryConfigurationEditor;
@@ -109,9 +114,6 @@ import org.rhq.plugins.jmx.JMXComponent;
import org.rhq.plugins.jmx.JMXDiscoveryComponent;
import org.rhq.plugins.jmx.ObjectNameQueryUtility;
-import com.jboss.jbossnetwork.product.jbpm.handlers.ControlActionFacade;
-import com.jboss.jbossnetwork.product.jbpm.handlers.InPluginControlActionFacade;
-
/**
* Supports JBoss 3.2.3 through 4.2.x
*
@@ -261,7 +263,7 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
this.logFileEventDelegate = new LogFileEventResourceComponentHelper(this.resourceContext);
this.logFileEventDelegate.startLogFileEventPollers();
-
+
// prepare to perform async avail checking
String availCheckPeriodProp = pluginConfig.getSimpleValue(AVAIL_CHECK_PERIOD_CONFIG_PROP, null);
if (availCheckPeriodProp != null) {
@@ -279,7 +281,7 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
}
}
- return;
+ return;
}
public void stop() {
@@ -319,12 +321,12 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
// A different server must have been started on our JNP URL - this is definitely something about which
// the user should be informed.
if (!this.loggedHijackedJnpUrlError) {
- String namingURL = this.resourceContext.getPluginConfiguration().
- getSimpleValue(NAMING_URL_CONFIG_PROP, null);
+ String namingURL = this.resourceContext.getPluginConfiguration().getSimpleValue(
+ NAMING_URL_CONFIG_PROP, null);
String message = "Availability check for JBoss AS Resource with configPath [" + this.configPath
- + "] has connected to a different running JBoss AS instance which is installed at ["
- + serverHomeViaJnp + "] using namingURL [" + namingURL
- + "] - returning AvailabilityType.DOWN...";
+ + "] has connected to a different running JBoss AS instance which is installed at ["
+ + serverHomeViaJnp + "] using namingURL [" + namingURL
+ + "] - returning AvailabilityType.DOWN...";
log.error(message);
this.loggedHijackedJnpUrlError = true;
// Throw an exception, so the PC can send the message to the Server for display in the GUI.
@@ -343,7 +345,7 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
File serverHomeViaJnp;
EmsAttribute serverHomeDirAttrib = bean.getAttribute("ServerHomeDir");
if (serverHomeDirAttrib != null) {
- serverHomeViaJnp = (File)serverHomeDirAttrib.refresh();
+ serverHomeViaJnp = (File) serverHomeDirAttrib.refresh();
} else {
// We have a non-null MBean but a null ServerHomeDir attribute. This most likely means we're
// connected to a JBoss 5.x or 6.x instance, because in those versions the ServerConfig MBean no
@@ -356,12 +358,12 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
return serverHomeViaJnp;
}
- private static File toFile(URL url) {
+ private static File toFile(URL url) {
File file;
try {
- file = new File(url.toURI());
- } catch(URISyntaxException e) {
- file = new File(url.getPath());
+ file = new File(url.toURI());
+ } catch (URISyntaxException e) {
+ file = new File(url.getPath());
}
return file;
}
@@ -456,8 +458,8 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
public SnapshotReportResults getSnapshotReport(SnapshotReportRequest request) throws Exception {
Configuration pluginConfig = resourceContext.getPluginConfiguration();
String tmpDir = resourceContext.getTemporaryDirectory().getAbsolutePath();
- JBossASSnapshotReport report = new JBossASSnapshotReport(request.getName(), request.getDescription(), pluginConfig, this.configPath
- .getCanonicalPath(), tmpDir);
+ JBossASSnapshotReport report = new JBossASSnapshotReport(request.getName(), request.getDescription(),
+ pluginConfig, this.configPath.getCanonicalPath(), tmpDir);
File reportFile = report.generate();
InputStream inputStream = new BufferedInputStream(new FileInputStream(reportFile));
SnapshotReportResults results = new SnapshotReportResults(inputStream);
@@ -895,7 +897,8 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
}
InputStream isForTempDir = new BufferedInputStream(new FileInputStream(tempFile));
- deployer.createContent(details, isForTempDir, !zip, createBackup);
+ String shaString = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).getDigestString(tempFile);
+ deployer.createContent(details, isForTempDir, !zip, createBackup, shaString);
String vhost = null;
if (resourceTypeName.equals(RESOURCE_TYPE_WAR)) {
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
index 331dc56..4f112b3 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java
@@ -1,55 +1,58 @@
- /*
- * Jopr Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also 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 and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.plugins.jbossas.util;
-
- import java.io.BufferedInputStream;
- import java.io.File;
- import java.io.FileInputStream;
- import java.io.FileNotFoundException;
- import java.io.IOException;
- import java.io.InputStream;
- import java.util.Set;
-
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
-
- import org.rhq.core.domain.content.PackageDetails;
- import org.rhq.core.domain.content.PackageDetailsKey;
- import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
- import org.rhq.core.pluginapi.util.FileUtils;
- import org.rhq.core.util.ZipUtil;
- import org.rhq.core.util.file.FileUtil;
-
- /**
- * Delegate class used for manipulating artifacts in a JON plugin.
+/*
+ * Jopr Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also 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 and the GNU Lesser General Public License
+ * for more details.
*
- * @author Greg Hinkle
- * @author Jason Dobies
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+package org.rhq.plugins.jbossas.util;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.rhq.core.domain.content.PackageDetails;
+import org.rhq.core.domain.content.PackageDetailsKey;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.pluginapi.util.FileUtils;
+import org.rhq.core.util.ZipUtil;
+import org.rhq.core.util.file.FileUtil;
+
+/**
+* Delegate class used for manipulating artifacts in a JON plugin.
+*
+* @author Greg Hinkle
+* @author Jason Dobies
+*/
public class FileContentDelegate {
// Attributes --------------------------------------------
- private Log log = LogFactory.getLog(FileContentDelegate.class);
+ private Log log = LogFactory.getLog(FileContentDelegate.class);
protected File directory;
@@ -85,17 +88,34 @@ public class FileContentDelegate {
* @param details describes the package being created
* @param content content to be written for the package. NOTE this Stream will be closed by this method.
* @param unzip if <code>true</code>, the content stream will be treated like a ZIP file and be unzipped as
-* it is written, using the package name as the base directory; if <code>false</code> the
+ * it is written, using the package name as the base directory; if <code>false</code> the
* @param createBackup If <code>true</code>, the original file will be backed up to file.bak
+ * @param shaString the SHA-256 of the specified input stream
*/
- public void createContent(PackageDetails details, InputStream content, boolean unzip, boolean createBackup) {
+ public void createContent(PackageDetails details, InputStream content, boolean unzip, boolean createBackup,
+ String shaString) {
File contentFile = getPath(details);
try {
if (createBackup) {
- moveToBackup(contentFile,".bak");
+ moveToBackup(contentFile, ".bak");
}
if (unzip) {
ZipUtil.unzipFile(content, contentFile);
+ File manifestFile = new File(contentFile, "META-INF/MANIFEST.MF");
+ Manifest manifest;
+ if (manifestFile.exists()) {
+ FileInputStream inputStream = new FileInputStream(manifestFile);
+ manifest = new Manifest(inputStream);
+ inputStream.close();
+ } else {
+ manifest = new Manifest();
+ }
+ Attributes attribs = manifest.getMainAttributes();
+ // attribs.put("RHQ-Sha256", shaString);
+ attribs.putValue("RHQ-Sha256", shaString);
+ FileOutputStream outputStream = new FileOutputStream(manifestFile);
+ manifest.write(outputStream);
+ outputStream.close();
} else {
FileUtil.writeFile(content, contentFile);
}
@@ -105,25 +125,25 @@ public class FileContentDelegate {
}
}
- /**
- * Try to move the passed contentFile to a backup named contentFile + suffix
- * @param contentFile File object pointing to the original file
- * @param suffix the suffix to tack on
- */
- private void moveToBackup(File contentFile, String suffix) {
-
- File backupFile = new File(contentFile.getAbsolutePath() + suffix);
- if (backupFile.exists()) {
- // remove
- if (!backupFile.delete())
- log.warn("Removing of old backup file " + backupFile + " failed ");
- }
- if (!contentFile.renameTo(backupFile)) {
- log.warn("Moving " + contentFile + " to backup " + backupFile + " failed");
- }
- }
-
- public File getPath(PackageDetails details) {
+ /**
+ * Try to move the passed contentFile to a backup named contentFile + suffix
+ * @param contentFile File object pointing to the original file
+ * @param suffix the suffix to tack on
+ */
+ private void moveToBackup(File contentFile, String suffix) {
+
+ File backupFile = new File(contentFile.getAbsolutePath() + suffix);
+ if (backupFile.exists()) {
+ // remove
+ if (!backupFile.delete())
+ log.warn("Removing of old backup file " + backupFile + " failed ");
+ }
+ if (!contentFile.renameTo(backupFile)) {
+ log.warn("Moving " + contentFile + " to backup " + backupFile + " failed");
+ }
+ }
+
+ public File getPath(PackageDetails details) {
/* JBNADM-2022 - It still needs to be determined if it is the responsibility of the plugin container or the
* plugin to be concerned with path information in the package name. For now, it's the plugin's
* responsibility. We strip out the path information to keep control of where the JARs are
@@ -174,10 +194,8 @@ public class FileContentDelegate {
try {
FileUtils.purge(contentFile, true);
- }
- catch (IOException e) {
- throw new RuntimeException("Failed to delete underlying file [" + contentFile + "] for " + details
- + ".", e);
+ } catch (IOException e) {
+ throw new RuntimeException("Failed to delete underlying file [" + contentFile + "] for " + details + ".", e);
}
}
@@ -188,4 +206,4 @@ public class FileContentDelegate {
*/
return null;
}
- }
\ No newline at end of file
+}
\ No newline at end of file
commit 123f9e9cd6a5da9f966c8e0d3f0814478459a34e
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Fri May 21 16:49:58 2010 -0400
BZ-583104: populate install date details for content.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
index e993082..9f6ff44 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
@@ -677,6 +677,8 @@ public class ContentManager extends AgentService implements ContainerService, Co
.calcDigestString(localCopy);
//and attach it to the report returned to be picked up on server side in merge
detail.setSHA256(sha256);
+ //attach fileCreatedDate as well
+ detail.setInstallationTimestamp(Long.valueOf(System.currentTimeMillis()));
}
}
} catch (IOException iex) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index bd6d933..507c432 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -183,20 +183,33 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
//discovered with created
String md5Value = resourcePackage.getMD5();
if ((md5Value == null) || (md5Value.isEmpty())) {
- //query for installed packages with SHA256, we'll grab first one. All identical.
+ //query for installed packages with SHA256
Query packageDiscoveredQuery = entityManager
.createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_SHA);
packageDiscoveredQuery.setParameter("sha", shaValue);
List<PackageVersion> discoveredPackages = packageDiscoveredQuery.getResultList();
if (discoveredPackages.size() > 0) {
- packageVersion = discoveredPackages.get(0);
- //now assign PackageVersion details correctly
- PackageDetailsKey discoveredKey = new PackageDetailsKey(packageVersion.getFileName(),
- packageVersion.getVersion(), packageVersion.getGeneralPackage().getPackageType().getName(),
- resourcePackage.getArchitectureName());
- ResourcePackageDetails retrievedResourcePackage = new ResourcePackageDetails(discoveredKey);
- //now reassign the resourcePackage to use this newly retrieved id.
- resourcePackage = retrievedResourcePackage;
+ //iterate over packages to determine first one with same file name
+ PackageVersion[] discovered = new PackageVersion[discoveredPackages.size()];
+ discoveredPackages.toArray(discovered);
+ boolean located = false;
+ for (int i = 0; (!located && i < discovered.length); i++) {
+ packageVersion = discovered[i];
+ //check that the returned file name is same as expected otherwise
+ //bail(bank1.war != crook1.war for auditing purposes) even though hash is equal.
+ if (packageVersion.getFileName().trim().equals(resourcePackage.getFileName().trim())) {
+ located = true;
+ //now assign PackageVersion details correctly
+ PackageDetailsKey discoveredKey = new PackageDetailsKey(packageVersion.getFileName(),
+ packageVersion.getVersion(), packageVersion.getGeneralPackage().getPackageType()
+ .getName(), resourcePackage.getArchitectureName());
+ ResourcePackageDetails retrievedResourcePackage = new ResourcePackageDetails(
+ discoveredKey);
+ retrievedResourcePackage.setInstallationTimestamp(resourcePackage.getFileCreatedDate());
+ //now reassign the resourcePackage to use this newly retrieved id.
+ resourcePackage = retrievedResourcePackage;
+ }
+ }
}
}
}
commit c7a3cd80a75f9f5141a5a95553906eb4e361d134
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu May 20 16:10:29 2010 -0400
BZ-589193: numerous changes for details of content uploaded. UI + mergeDiscovery + agent side.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
index 42e7605..4bfc1db 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
@@ -58,6 +58,8 @@ import org.rhq.core.domain.resource.ProductVersion;
@NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_VER_ARCH, query = "SELECT pv FROM PackageVersion AS pv "
+ " WHERE pv.generalPackage.name = :name " + " AND pv.generalPackage.packageType.id = :packageTypeId "
+ " AND pv.architecture.id = :architectureId " + " AND pv.version = :version "),
+ @NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_SHA, query = "SELECT pv FROM PackageVersion AS pv "
+ + " WHERE pv.sha256 = :sha "),
@NamedQuery(name = PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS_KEY, query = "SELECT pv FROM PackageVersion AS pv "
+ " WHERE pv.generalPackage.name = :packageName "
+ " AND pv.generalPackage.packageType.name = :packageTypeName "
@@ -240,6 +242,7 @@ public class PackageVersion implements Serializable {
private static final long serialVersionUID = 1L;
public static final String QUERY_FIND_BY_PACKAGE_VER_ARCH = "PackageVersion.findByPackageVerArch";
+ public static final String QUERY_FIND_BY_PACKAGE_SHA = "PackageVersion.findByPackageSha";
public static final String QUERY_FIND_BY_PACKAGE_DETAILS_KEY = "PackageVersion.findByPackageDetailsKey";
public static final String QUERY_FIND_ID_BY_PACKAGE_DETAILS_KEY_AND_RES_ID = "PackageVersion.findIdByPackageDetailsKeyAndResId";
public static final String QUERY_FIND_BY_REPO_ID = "PackageVersion.findByRepoId";
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/ResourcePackageDetails.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/ResourcePackageDetails.java
index 01e313d..c1440cc 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/ResourcePackageDetails.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/ResourcePackageDetails.java
@@ -1,25 +1,25 @@
- /*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also 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 and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also 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 and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
package org.rhq.core.domain.content.transfer;
import org.rhq.core.domain.configuration.Configuration;
@@ -67,5 +67,3 @@ public class ResourcePackageDetails extends PackageDetails {
this.installationTimestamp = installationTimestamp;
}
}
-
-
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
index 1e2f6c8..e993082 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
@@ -22,8 +22,11 @@
*/
package org.rhq.core.pc.content;
+import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -45,15 +48,15 @@ import org.rhq.core.clientapi.agent.content.ContentAgentService;
import org.rhq.core.clientapi.server.content.ContentDiscoveryReport;
import org.rhq.core.clientapi.server.content.ContentServerService;
import org.rhq.core.clientapi.server.content.DeletePackagesRequest;
-import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
-import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
+import org.rhq.core.clientapi.server.content.DeployPackagesRequest;
+import org.rhq.core.clientapi.server.content.RetrievePackageBitsRequest;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.PackageType;
import org.rhq.core.domain.content.composite.PackageVersionMetadataComposite;
import org.rhq.core.domain.content.transfer.DeployPackageStep;
-import org.rhq.core.clientapi.server.content.DeployPackagesRequest;
+import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
+import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
-import org.rhq.core.clientapi.server.content.RetrievePackageBitsRequest;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
@@ -72,6 +75,7 @@ import org.rhq.core.pc.util.LoggingThreadFactory;
import org.rhq.core.pluginapi.content.ContentContext;
import org.rhq.core.pluginapi.content.ContentFacet;
import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.util.MessageDigestGenerator;
public class ContentManager extends AgentService implements ContainerService, ContentAgentService, ContentServices {
@@ -264,11 +268,11 @@ public class ContentManager extends AgentService implements ContainerService, Co
OutputStream outputStream, boolean resourceExists) {
ContentContextImpl contextImpl = (ContentContextImpl) context; // this has to be of this type, we gave it to the plugin
ContentServerService serverService = getContentServerService();
-
+
//we need to load the content to server before we will start download the content
// it is because of timeout on remoteStreams
serverService.preLoadRemoteContent(contextImpl.getResourceId(), packageDetailsKey);
-
+
outputStream = remoteOutputStream(outputStream);
long count = 0;
if (resourceExists) {
@@ -612,6 +616,8 @@ public class ContentManager extends AgentService implements ContainerService, Co
if (log.isDebugEnabled()) {
log.debug("Found [" + updatedPackageSet.size() + "] new packages for resource id [" + resourceId + "]");
}
+ //from set of new packages discovered, iterate through pkg details to get information for pkg version mapping.
+ updatedPackageSet = updateResourcePackageDetails(updatedPackageSet);
}
// Add new content (yes, existingInstalledPackagesSet is same as details, but use the container's reference)
@@ -641,6 +647,52 @@ public class ContentManager extends AgentService implements ContainerService, Co
return report;
}
+ /** Goes through newly discovered packages and calculates SHA256 for the packages discovered, updating
+ * ResourcePackageDetails in the process.
+ *
+ * @param discoveredPackageSet
+ * @return updated discoveredPackageSet
+ */
+ private Set<ResourcePackageDetails> updateResourcePackageDetails(Set<ResourcePackageDetails> discoveredPackageSet) {
+ if (discoveredPackageSet != null && discoveredPackageSet.size() > 0) {
+ //iterate through pkg details list
+ ResourcePackageDetails list[] = new ResourcePackageDetails[discoveredPackageSet.size()];
+ ResourcePackageDetails[] recentlyDiscoveredArray = discoveredPackageSet.toArray(list);
+
+ for (ResourcePackageDetails detail : recentlyDiscoveredArray) {
+ try {
+ //if the filesize of discovered package is null then it's an exploded and deployed war/ear.
+ if ((detail.getFileSize() == null) || (detail.getFileSize() == 0)) {
+ //when deployed exploded then don't calculate digest but update string with message to that effect.
+ //TODO: is this ok? Once exploded and run at all ... contents could be different.
+ detail.setSHA256("(deployed exploded. no message digest possible)");
+ }
+ //and for each detail where size != null or non empty ... then an un-exploded war/ear
+ if ((detail.getFileSize() != null) || (detail.getFileSize() > 0)) {
+ File localCopy = null;
+ if ((detail.getLocation() != null) && (!detail.getLocation().isEmpty())) {
+ localCopy = new File(detail.getLocation());
+ //calculate md5
+ String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
+ .calcDigestString(localCopy);
+ //and attach it to the report returned to be picked up on server side in merge
+ detail.setSHA256(sha256);
+ }
+ }
+ } catch (IOException iex) {
+ //log exception but move on, discovery happens often. No reason to hold up anything.
+ if (log.isDebugEnabled()) {
+ log.debug("Problem calculating digest of package [" + detail.getName() + "]."
+ + iex.getMessage());
+ }
+ }
+ }
+ discoveredPackageSet.clear();
+ discoveredPackageSet.addAll(Arrays.asList(recentlyDiscoveredArray));
+ }
+ return discoveredPackageSet;
+ }
+
/**
* Returns the <code>ContentFacet</code> for the component associated with the specified resource ID.
*
@@ -704,4 +756,4 @@ public class ContentManager extends AgentService implements ContainerService, Co
}
}
}
-}
+}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/RetrieveContentBitsRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/RetrieveContentBitsRunner.java
index f260137..e9a82de 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/RetrieveContentBitsRunner.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/RetrieveContentBitsRunner.java
@@ -1,38 +1,41 @@
- /*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also 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 and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also 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 and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
package org.rhq.core.pc.content;
import java.io.InputStream;
+
import org.rhq.core.clientapi.server.content.ContentServerService;
import org.rhq.core.clientapi.server.content.ContentServiceResponse;
import org.rhq.core.clientapi.server.content.RetrievePackageBitsRequest;
import org.rhq.core.domain.content.ContentRequestStatus;
+import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.util.MessageDigestGenerator;
- /**
- * Runnable implementation to allow threaded requests to get a package content.
- *
- * @author Jason Dobies
- */
+/**
+* Runnable implementation to allow threaded requests to get a package content.
+*
+* @author Jason Dobies
+*/
public class RetrieveContentBitsRunner implements Runnable {
// Attributes --------------------------------------------
@@ -78,5 +81,24 @@ public class RetrieveContentBitsRunner implements Runnable {
if (serverService != null) {
serverService.completeRetrievePackageBitsRequest(response, inputStream);
}
+ ResourcePackageDetails pkgDetails = request.getPackageDetails();
+ if ((pkgDetails != null) && ((pkgDetails.getSHA256() == null) || (pkgDetails.getSHA256().trim().isEmpty()))) {
+ InputStream is;
+ try {
+ is = contentManager.performGetPackageBits(request.getResourceId(), request.getPackageDetails());
+ pkgDetails.setSHA256(new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(is));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if ((pkgDetails != null) && ((pkgDetails.getMD5() == null) || (pkgDetails.getMD5().trim().isEmpty()))) {
+ InputStream is;
+ try {
+ is = contentManager.performGetPackageBits(request.getResourceId(), request.getPackageDetails());
+ pkgDetails.setMD5((new MessageDigestGenerator(MessageDigestGenerator.MD5).calcDigestString(is)));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListPackageHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListPackageHistoryUIBean.java
index 354c60c..845c60d 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListPackageHistoryUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListPackageHistoryUIBean.java
@@ -27,6 +27,9 @@ import javax.faces.model.DataModel;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.rhq.core.clientapi.util.units.UnitNumber;
+import org.rhq.core.clientapi.util.units.UnitsConstants;
+import org.rhq.core.clientapi.util.units.UnitsFormat;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.content.InstalledPackage;
@@ -36,9 +39,6 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.gui.util.FacesContextUtility;
-import org.rhq.core.clientapi.util.units.UnitsFormat;
-import org.rhq.core.clientapi.util.units.UnitNumber;
-import org.rhq.core.clientapi.util.units.UnitsConstants;
import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean;
import org.rhq.enterprise.gui.common.paging.PageControlView;
import org.rhq.enterprise.gui.common.paging.PagedListDataModel;
@@ -103,6 +103,7 @@ public class ListPackageHistoryUIBean extends PagedDataTableUIBean {
private List<PackageTableDataValue> toCombinedValues(InstalledPackage current, InstalledPackage old) {
List<PackageTableDataValue> results = new ArrayList<PackageTableDataValue>();
+ // current.getPackageVersion();
results.add(new PackageTableDataValue("Name", current.getPackageVersion().getGeneralPackage().getName(), null));
results.add(new PackageTableDataValue("Version", current.getPackageVersion().getDisplayVersion(),
((old != null) ? old.getPackageVersion().getDisplayVersion() : null)));
@@ -113,18 +114,21 @@ public class ListPackageHistoryUIBean extends PagedDataTableUIBean {
(old != null) ? ((old.getPackageVersion().getFileSize() != null) ? old.getPackageVersion().getFileName()
: null) : null));
- long fileSizeBytes = (current.getPackageVersion().getFileSize() != null) ? current.getPackageVersion().getFileSize() : 0;
- long oldFileSizeBytes = (old != null) ? ((old.getPackageVersion().getFileSize() != null) ? old.getPackageVersion().getFileSize() : 0) : 0;
- results.add(new PackageTableDataValue("File Size",
- UnitsFormat.format(new UnitNumber(fileSizeBytes, UnitsConstants.UNIT_BYTES)).toString(),
- UnitsFormat.format(new UnitNumber(oldFileSizeBytes, UnitsConstants.UNIT_BYTES)).toString()));
+ long fileSizeBytes = (current.getPackageVersion().getFileSize() != null) ? current.getPackageVersion()
+ .getFileSize() : 0;
+ long oldFileSizeBytes = (old != null) ? ((old.getPackageVersion().getFileSize() != null) ? old
+ .getPackageVersion().getFileSize() : 0) : 0;
+ results.add(new PackageTableDataValue("File Size", UnitsFormat.format(
+ new UnitNumber(fileSizeBytes, UnitsConstants.UNIT_BYTES)).toString(), UnitsFormat.format(
+ new UnitNumber(oldFileSizeBytes, UnitsConstants.UNIT_BYTES)).toString()));
results.add(new PackageTableDataValue("SHA256", current.getPackageVersion().getSHA256(), ((old != null) ? old
.getPackageVersion().getSHA256() : null)));
- results.add(new PackageTableDataValue("Installation Date", dateToString(current.getInstallationDate()),
- dateToString((old != null) ? old.getInstallationDate() : null)));
- results.add(new PackageTableDataValue("Owner", (current.getUser() != null) ? current.getUser().toString()
- : null, (old != null) ? ((old.getUser() != null) ? old.getUser().toString() : null) : null));
+ results.add(new PackageTableDataValue("Installation Date", dateToString(current.getPackageVersion()
+ .getFileCreatedDate()), dateToString((old != null) ? old.getPackageVersion().getFileCreatedDate() : null)));
+ //Comment for now. This field is not even in the list of InstalledPackage fields
+ //results.add(new PackageTableDataValue("Owner", (current.getUser() != null) ? current.getUser().toString()
+ // : null, (old != null) ? ((old.getUser() != null) ? old.getUser().toString() : null) : null));
// TODO: figure out how to know if the content is available
/*
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java
index 16b8896..a55927d 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java
@@ -23,7 +23,9 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.faces.application.FacesMessage;
import javax.faces.model.SelectItem;
@@ -46,11 +48,14 @@ import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.gui.configuration.ConfigurationMaskingUtility;
import org.rhq.core.gui.util.FacesContextUtility;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.legacy.ParamConstants;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal;
+import org.rhq.enterprise.server.content.ContentManagerBean;
import org.rhq.enterprise.server.content.ContentManagerLocal;
+import org.rhq.enterprise.server.content.ContentUIManagerLocal;
import org.rhq.enterprise.server.resource.ResourceFactoryManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException;
@@ -78,6 +83,10 @@ public class CreateNewPackageChildResourceUIBean {
private ResourceType resourceType;
private PackageType packageType;
+ private String packageName;
+ private String version = "1.0";//default it to 1.0
+ private int selectedPackageTypeId;
+
private int selectedArchitectureId;
private CreateResourceHistory retryCreateItem;
@@ -105,11 +114,37 @@ public class CreateNewPackageChildResourceUIBean {
uploadUIBean = FacesContextUtility.getManagedBean(UploadNewChildPackageUIBean.class);
UploadItem fileItem = uploadUIBean.getFileItem();
+ //store information about uploaded file for packageDetails as most of it is already available
+ Map<String, String> packageUploadDetails = new HashMap<String, String>();
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_FILE_SIZE, String.valueOf(fileItem.getFileSize()));
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_FILE_INSTALL_DATE, String
+ .valueOf(System.currentTimeMillis()));
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_OWNER, user.getName());
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_FILE_NAME, fileItem.getFileName());
+
+ try {//Easier to implement here than in server side bean. Shouldn't affect performance too much.
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_MD5, new MessageDigestGenerator(
+ MessageDigestGenerator.MD5).calcDigestString(fileItem.getFile()));
+ packageUploadDetails.put(ContentManagerBean.UPLOAD_SHA256, new MessageDigestGenerator(
+ MessageDigestGenerator.SHA_256).calcDigestString(fileItem.getFile()));
+ } catch (IOException e1) {
+ log.warn("Error calculating file digest(s) : " + e1.getMessage());
+ e1.printStackTrace();
+ }
+
// Validate
if ((fileItem == null) || fileItem.getFile() == null) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "A package file must be uploaded");
return null;
}
+ if ((getVersion() == null) || (getVersion().trim().length() == 0)) {//version
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "A package version must be specified.");
+ return null;
+ }
+ if ((getSelectedPackageTypeId() < 0) || (getVersion().trim().length() == 0)) {//type
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "A package type must be specified.");
+ return null;
+ }
ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager();
ConfigurationDefinition pluginConfigurationDefinition = configurationManager
@@ -132,6 +167,9 @@ public class CreateNewPackageChildResourceUIBean {
return OUTCOME_SUCCESS_OR_FAILURE;
}
+ //pull in archictecture selection
+ selectedArchitectureId = getSelectedArchitectureId();
+
// If the type does not support architectures, load the no architecture entity and use that
if (!packageType.isSupportsArchitecture()) {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
@@ -160,9 +198,20 @@ public class CreateNewPackageChildResourceUIBean {
// RHQ-666 - Changed to not request the resource name from the user; simply pass null
// JON 2.0 RC3 - use timestamp versioning; pass null for version
- resourceFactoryManager.createResource(user, parentResource.getId(), getResourceTypeId(), null,
- pluginConfiguration, packageName, null, selectedArchitectureId, deployTimeConfiguration,
- packageContentStream);
+ // resourceFactoryManager.createResource(user, parentResource.getId(), getResourceTypeId(), null,
+ // pluginConfiguration, packageName, null, selectedArchitectureId, deployTimeConfiguration,
+ // packageContentStream);
+ if (packageUploadDetails != null) {
+ resourceFactoryManager.createResource(user, parentResource.getId(), getResourceTypeId(), null,
+ pluginConfiguration, packageName, getVersion(), selectedArchitectureId,
+ deployTimeConfiguration, packageContentStream, packageUploadDetails);
+ } else {
+ resourceFactoryManager.createResource(user, parentResource.getId(), getResourceTypeId(), null,
+ pluginConfiguration, packageName, null, selectedArchitectureId, deployTimeConfiguration,
+ packageContentStream);
+
+ }
+
} catch (Exception e) {
String errorMessages = ThrowableUtil.getAllMessages(e);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
@@ -355,4 +404,45 @@ public class CreateNewPackageChildResourceUIBean {
ParamConstants.RESOURCE_TYPE_ID_PARAM);
}
}
+
+ public String getPackageName() {
+ return packageName;
+ }
+
+ public void setPackageName(String packageName) {
+ this.packageName = packageName;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public int getSelectedPackageTypeId() {
+ return selectedPackageTypeId;
+ }
+
+ public void setSelectedPackageTypeId(int selectedPackageTypeId) {
+ this.selectedPackageTypeId = selectedPackageTypeId;
+ }
+
+ public SelectItem[] getPackageTypes() {
+ Resource resource = EnterpriseFacesContextUtility.getResource();
+
+ ContentUIManagerLocal contentUIManager = LookupUtil.getContentUIManager();
+ List<PackageType> packageTypes = contentUIManager.getPackageTypes(resource.getResourceType().getId());
+
+ SelectItem[] items = new SelectItem[packageTypes.size()];
+ int itemCounter = 0;
+ for (PackageType packageType : packageTypes) {
+ SelectItem item = new SelectItem(packageType.getId(), packageType.getDisplayName());
+ items[itemCounter++] = item;
+ }
+
+ return items;
+ }
+
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-package-1.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-package-1.xhtml
index 67eebb2..6363600 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-package-1.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-package-1.xhtml
@@ -63,6 +63,37 @@
<h:outputText rendered="#{!ResourceUIBean.permissions.content}"
value="You do not have permissions to upload content"/>
+ <rich:panel >
+
+ <f:facet name="header">Package Version Details</f:facet>
+
+ <input type="hidden" name="packageVersion" value="true"/>
+
+ <table>
+ <tr>
+ <td align="right"><b>Version *</b></td>
+ <td align="left"><h:inputText value="#{CreateNewPackageChildResourceUIBean.version}"/></td>
+ </tr>
+ <tr>
+ <td align="right"><b>Architecture </b></td>
+ <td align="left">
+ <h:selectOneMenu value="#{CreateNewPackageChildResourceUIBean.selectedArchitectureId}">
+ <f:selectItems value="#{CreateNewPackageChildResourceUIBean.architectures}" />
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr>
+ <td align="right"><b>Type *</b></td>
+ <td align="left">
+ <h:selectOneMenu value="#{CreateNewPackageChildResourceUIBean.selectedPackageTypeId}">
+ <f:selectItems value="#{CreateNewPackageChildResourceUIBean.packageTypes}" />
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ </table>
+ </rich:panel>
+
+
<onc:config configurationDefinition="#{CreateNewPackageChildResourceUIBean.configurationDefinition}"
configuration="#{CreateNewPackageChildResourceUIBean.configuration}"
nullConfigurationDefinitionMessage="#{CreateNewPackageChildResourceUIBean.nullConfigurationDefinitionMessage}"
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index c2c3ccd..bd6d933 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -111,6 +111,13 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
*/
private static final int REQUEST_TIMEOUT = 1000 * 60 * 60;
+ public static final String UPLOAD_FILE_SIZE = "fileSize";
+ public static final String UPLOAD_FILE_INSTALL_DATE = "fileInstallDate";
+ public static final String UPLOAD_OWNER = "owner";
+ public static final String UPLOAD_FILE_NAME = "fileName";
+ public static final String UPLOAD_MD5 = "md5";
+ public static final String UPLOAD_SHA256 = "sha256";
+
// Attributes --------------------------------------------
private final Log log = LogFactory.getLog(this.getClass());
@@ -165,7 +172,35 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// The report contains an entire snapshot of packages, so each of these has to be represented
// as an InstalledPackage
+ PackageVersion packageVersion = null;
for (ResourcePackageDetails resourcePackage : report.getDeployedPackages()) {
+
+ //check for pkgs detected on agent side but not mapped correctly
+ String shaValue = resourcePackage.getSHA256();
+ if ((shaValue != null) && (!shaValue.isEmpty())
+ && (shaValue.indexOf("(deployed exploded. no message digest possible)") == -1)) {
+ //if SHA set, but no MD5 then agent updated these packagedetails so we can link
+ //discovered with created
+ String md5Value = resourcePackage.getMD5();
+ if ((md5Value == null) || (md5Value.isEmpty())) {
+ //query for installed packages with SHA256, we'll grab first one. All identical.
+ Query packageDiscoveredQuery = entityManager
+ .createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_SHA);
+ packageDiscoveredQuery.setParameter("sha", shaValue);
+ List<PackageVersion> discoveredPackages = packageDiscoveredQuery.getResultList();
+ if (discoveredPackages.size() > 0) {
+ packageVersion = discoveredPackages.get(0);
+ //now assign PackageVersion details correctly
+ PackageDetailsKey discoveredKey = new PackageDetailsKey(packageVersion.getFileName(),
+ packageVersion.getVersion(), packageVersion.getGeneralPackage().getPackageType().getName(),
+ resourcePackage.getArchitectureName());
+ ResourcePackageDetails retrievedResourcePackage = new ResourcePackageDetails(discoveredKey);
+ //now reassign the resourcePackage to use this newly retrieved id.
+ resourcePackage = retrievedResourcePackage;
+ }
+ }
+ }
+
// Load the overall package (used in a few places later in this loop)
Query packageQuery = entityManager.createNamedQuery(Package.QUERY_FIND_BY_NAME_PKG_TYPE_RESOURCE_TYPE);
packageQuery.setFlushMode(FlushModeType.COMMIT);
@@ -192,7 +227,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
List<PackageVersion> existingPackageVersionList = packageVersionQuery.getResultList();
- PackageVersion packageVersion = null;
+ // PackageVersion packageVersion = null;
if (existingPackageVersionList.size() > 0) {
packageVersion = existingPackageVersionList.get(0);
}
@@ -1216,22 +1251,8 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
PackageVersion newPackageVersion = new PackageVersion(existingPackage, version, architecture);
newPackageVersion.setDisplayName(existingPackage.getName());
- // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING
- // Write the content into the newly created package version. This may eventually move, but for now we'll just
- // use the byte array in the package version to store the bits.
- byte[] packageBits;
- try {
- packageBits = StreamUtil.slurp(packageBitStream);
- } catch (RuntimeException re) {
- throw new RuntimeException("Error reading in the package file", re);
- }
+ PackageBits bits = loadPackageBits(packageBitStream);
- PackageBits bits = new PackageBits();
- try {
- bits.setBits(packageBits);
- } catch (Exception e) {
- log.error("Error savinf the package.", e);
- }
newPackageVersion.setPackageBits(bits);
newPackageVersion = persistOrMergePackageVersionSafely(newPackageVersion);
@@ -1489,4 +1510,107 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
return result;
}
+
+ /** Does much of same functionality as createPackageVersion, but uses same named query
+ * as the agent side discovery mechanism, and passes in additional parameters available
+ * when file has been uploaded via the UI.
+ */
+ @Override
+ public PackageVersion getUploadedPackageVersion(String packageName, int packageTypeId, String version,
+ int architectureId, InputStream packageBitStream, Map<String, String> packageUploadDetails,
+ int newResourceTypeId) {
+
+ PackageVersion packageVersion = null;
+
+ //default version to 1.0 if is null, not provided for any reason.
+ if ((version == null) || (version.trim().isEmpty())) {
+ version = "1.0";
+ }
+
+ // See if package version already exists for the resource package
+ Query packageVersionQuery = entityManager.createNamedQuery(PackageVersion.QUERY_FIND_BY_PACKAGE_DETAILS_KEY);
+ packageVersionQuery.setFlushMode(FlushModeType.COMMIT);
+ packageVersionQuery.setParameter("packageName", packageName);
+ PackageType packageType = contentManager.getResourceCreationPackageType(newResourceTypeId);
+ packageVersionQuery.setParameter("packageTypeName", packageType.getName());
+ packageVersionQuery.setParameter("resourceTypeId", newResourceTypeId);
+
+ Architecture architecture = entityManager.find(Architecture.class, architectureId);
+ packageVersionQuery.setParameter("architectureName", architecture.getName());
+ packageVersionQuery.setParameter("version", version);
+
+ // Result of the query should be either 0 or 1
+ List<PackageVersion> existingPackageVersionList = packageVersionQuery.getResultList();
+
+ if (existingPackageVersionList.size() > 0) {
+ packageVersion = existingPackageVersionList.get(0);
+ }
+
+ Package existingPackage = null;
+
+ Query packageQuery = entityManager.createNamedQuery(Package.QUERY_FIND_BY_NAME_PKG_TYPE_ID);
+ packageQuery.setParameter("name", packageName);
+ packageQuery.setParameter("packageTypeId", packageTypeId);
+ List<Package> existingPackageList = packageQuery.getResultList();
+
+ if (existingPackageList.size() == 0) {
+ // If the package doesn't exist, create that here
+ existingPackage = new Package(packageName, packageType);
+ existingPackage = persistOrMergePackageSafely(existingPackage);
+ } else {
+ existingPackage = existingPackageList.get(0);
+ }
+
+ //initialize package version if not already
+ if (packageVersion == null) {
+ packageVersion = new PackageVersion(existingPackage, version, architecture);
+ packageVersion.setDisplayName(existingPackage.getName());
+ entityManager.persist(packageVersion);
+ }
+
+ //get the data and persist/merge packageVersion
+ PackageBits bits = loadPackageBits(packageBitStream);
+ packageVersion.setPackageBits(bits);
+
+ //populate extra details, persist
+ if (packageUploadDetails != null) {
+ packageVersion.setFileCreatedDate(Long.valueOf(packageUploadDetails
+ .get(ContentManagerBean.UPLOAD_FILE_INSTALL_DATE)));
+ packageVersion.setFileName(packageUploadDetails.get(ContentManagerBean.UPLOAD_FILE_NAME));
+ packageVersion.setFileSize(Long.valueOf(packageUploadDetails.get(ContentManagerBean.UPLOAD_FILE_SIZE)));
+ packageVersion.setMD5(packageUploadDetails.get(ContentManagerBean.UPLOAD_MD5));
+ packageVersion.setSHA256(packageUploadDetails.get(ContentManagerBean.UPLOAD_SHA256));
+ }
+ entityManager.merge(packageVersion);
+
+ return packageVersion;
+
+ }
+
+ /** Pulls in package bits from the stream. Currently inefficient.
+ *
+ * @param packageBitStream
+ * @return PackageBits ref populated.
+ */
+ private PackageBits loadPackageBits(InputStream packageBitStream) {
+ PackageBits bits = null;
+ // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING
+ // Write the content into the newly created package version. This may eventually move, but for now we'll just
+ // use the byte array in the package version to store the bits.
+ byte[] packageBits;
+ try {
+ packageBits = StreamUtil.slurp(packageBitStream);
+ } catch (RuntimeException re) {
+ throw new RuntimeException("Error reading in the package file", re);
+ }
+
+ bits = new PackageBits();
+ try {
+ bits.setBits(packageBits);
+ entityManager.persist(bits);
+ } catch (Exception e) {
+ log.error("Error saving the package.", e);
+ }
+ return bits;
+ }
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java
index 7656d93..9d4a4bc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java
@@ -95,6 +95,7 @@ public class ContentManagerHelper {
details.setMetadata(packageVersion.getMetadata());
details.setSHA256(packageVersion.getSHA256());
details.setShortDescription(packageVersion.getShortDescription());
+ details.setInstallationTimestamp(packageVersion.getFileCreatedDate());
return details;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
index 22f69aa..fc128a4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
@@ -20,13 +20,13 @@ package org.rhq.enterprise.server.content;
import java.io.InputStream;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.ejb.Local;
+import org.rhq.core.clientapi.server.content.ContentDiscoveryReport;
import org.rhq.core.clientapi.server.content.ContentServiceResponse;
-import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
-import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.content.Architecture;
import org.rhq.core.domain.content.ContentServiceRequest;
@@ -35,8 +35,9 @@ import org.rhq.core.domain.content.Package;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.PackageType;
import org.rhq.core.domain.content.PackageVersion;
-import org.rhq.core.clientapi.server.content.ContentDiscoveryReport;
import org.rhq.core.domain.content.transfer.DeployPackageStep;
+import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
+import org.rhq.core.domain.content.transfer.RemovePackagesResponse;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
import org.rhq.core.domain.criteria.InstalledPackageCriteria;
import org.rhq.core.domain.criteria.PackageVersionCriteria;
@@ -210,6 +211,10 @@ public interface ContentManagerLocal {
PackageVersion createPackageVersion(String packageName, int packageTypeId, String version, int architectureId,
InputStream packageBitStream);
+ PackageVersion getUploadedPackageVersion(String packageName, int packageTypeId, String version,
+ int architectureId, InputStream packageBitStream, Map<String, String> packageUploadDetails,
+ int newResourceTypeId);
+
/**
* Very simple method that persists the given package version within its own transaction.
*
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
index 65ccce7..8b0e4d6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Calendar;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.ejb.EJB;
@@ -483,6 +484,14 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
public void createResource(Subject user, int parentResourceId, int newResourceTypeId, String newResourceName,
Configuration pluginConfiguration, String packageName, String packageVersionNumber, Integer architectureId,
Configuration deploymentTimeConfiguration, InputStream packageBitStream) {
+ createResource(user, parentResourceId, newResourceTypeId, newResourceName, pluginConfiguration, packageName,
+ packageVersionNumber, architectureId, deploymentTimeConfiguration, packageBitStream, null);
+ }
+
+ public void createResource(Subject user, int parentResourceId, int newResourceTypeId, String newResourceName,
+ Configuration pluginConfiguration, String packageName, String packageVersionNumber, Integer architectureId,
+ Configuration deploymentTimeConfiguration, InputStream packageBitStream,
+ Map<String, String> packageUploadDetails) {
log.info("Received call to create package backed resource under parent [" + parentResourceId + "]");
Resource resource = entityManager.find(Resource.class, parentResourceId);
@@ -510,9 +519,15 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
// default to no required architecture
architectureId = (null != architectureId) ? architectureId : contentManager.getNoArchitecture().getId();
- // Create package and package version
- PackageVersion packageVersion = contentManager.createPackageVersion(packageName, newPackageType.getId(),
- packageVersionNumber, architectureId, packageBitStream);
+ // Create/locate package and package version
+ PackageVersion packageVersion = null;
+ if (packageUploadDetails == null) {
+ packageVersion = contentManager.createPackageVersion(packageName, newPackageType.getId(),
+ packageVersionNumber, architectureId, packageBitStream);
+ } else {
+ packageVersion = contentManager.getUploadedPackageVersion(packageName, newPackageType.getId(),
+ packageVersionNumber, architectureId, packageBitStream, packageUploadDetails, newResourceTypeId);
+ }
// Persist in separate transaction so it is committed immediately, before the request is sent to the agent
CreateResourceHistory persistedHistory = resourceFactoryManager.persistCreateHistory(user, parentResourceId,
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerLocal.java
index f5d267e..ea3784d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerLocal.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.server.resource;
import java.io.InputStream;
+import java.util.Map;
import javax.ejb.Local;
@@ -83,6 +84,11 @@ public interface ResourceFactoryManagerLocal {
Configuration pluginConfiguration, String packageName, String packageVersion, Integer architectureId,
Configuration deploymentTimeConfiguration, InputStream packageBitStream);
+ void createResource(Subject user, int parentResourceId, int newResourceTypeId, String newResourceName,
+ Configuration pluginConfiguration, String packageName, String packageVersion, Integer architectureId,
+ Configuration deploymentTimeConfiguration, InputStream packageBitStream,
+ Map<String, String> packageUploadDetails);
+
// Internal Utilities --------------------------------------------
/**
1
0
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fa3fb9ca9a441325c4d9746180933047eeddbe1f
Merge: 406825b... 5e1253b...
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 25 21:44:55 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 406825bb2a16302184f78dc7d0c032d22728df9a
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 25 21:43:09 2010 -0400
[BZ 588700] Fixing alert dbupgrade so that rhq_config.version has a default value instead of null
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
index bcd210c..d827f9e 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
@@ -202,8 +202,8 @@ public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask {
}
private String getInsertConfigSQL(int id) {
- return "INSERT INTO rhq_config ( id, ctime, mtime )" //
- + " VALUES ( " + id + ", " + NOW + ", " + NOW + " ) ";
+ return "INSERT INTO rhq_config ( id, version, ctime, mtime )" //
+ + " VALUES ( " + id + ", 0, " + NOW + ", " + NOW + " ) ";
}
private String getInsertPropertySQL(int id, int configId, String name, String value) {
1
0
modules/plugins/augeas/pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
New commits:
commit 5e1253bad20204d0a66dc244a684d8cef23f16cf
Merge: 7921efb... 2dccbf9...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue May 25 17:14:34 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 7921efb639edd259791b8f4a2bfd53ae7aef85b6
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed May 19 15:38:43 2010 -0400
add jboss 3rd party uploads repo for augeas v0.0.2 jar
(cherry picked from commit 6a9cbfc3b054b89d8c278eee62df6411daf650e1)
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 9a781ba..963223b 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -93,6 +93,20 @@
</plugins>
</build>
+ <repositories>
+
+ <!-- for the augeas jar -->
+ <repository>
+ <id>jboss-thirdparty-uploads</id>
+ <name>JBoss Third-Party Uploads</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ </repositories>
+
<profiles>
<profile>
1
0
25 May '10
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java | 2 -
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java | 2 -
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java | 3 +
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java | 2 -
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 2 -
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 20 +++++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java | 6 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 11 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 13 ++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 1
11 files changed, 54 insertions(+), 10 deletions(-)
New commits:
commit ebf15313f235a0d1cc6c141a004005cb5182df48
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue May 25 16:52:29 2010 -0400
minor tweaks
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index 22f911a..6d4a3fd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -27,9 +27,27 @@ package org.rhq.enterprise.gui.coregui.client;
*/
public class LinkManager {
+ private static boolean GWT = true;
+
public static String getResourceLink(int resourceId) {
- return "Resource/" + resourceId;
+ if (GWT) {
+ return "Resource/" + resourceId;
+ } else {
+ return "/rhq/resource/summary/overview.xhtml?id=" + resourceId;
+ }
}
+
+
+ public static String getResourceGroupLink(int resouceGroupId) {
+
+ if (GWT) {
+ return "ResourceGroup/" + resouceGroupId;
+ } else {
+ return "/rhq/group/inventory/view.xhtml?groupId=" + resouceGroupId;
+ }
+ }
+
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index c80b21d..0543eac 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -22,6 +22,7 @@ import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.History;
import com.google.gwt.user.client.ui.Hyperlink;
+import com.smartgwt.client.types.ContentsType;
import com.smartgwt.client.types.VerticalAlignment;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
@@ -67,7 +68,17 @@ public class MenuBarView extends VLayout {
});
}
- @Override
+ protected void onDraw2() {
+ super.onDraw();
+
+ HTMLFlow menu = new HTMLFlow();
+ menu.setContentsType(ContentsType.PAGE);
+ menu.setContentsURL("/rhq/common/menu/menu.xhtml");
+ addMember(menu);
+ }
+
+
+ // @Override
protected void onDraw() {
super.onDraw();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
index 8454bc4..2792255 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
@@ -46,6 +46,7 @@ public class TagCloudView extends VLayout {
protected void onDraw() {
super.onDraw();
+ removeMembers(getMembers());
GWTServiceLookup.getTagService().findTagReportCompositesByCriteria(new TagCriteria(),
new AsyncCallback<PageList<TagReportComposite>>() {
commit a118fb535c50f0118790ab3ae3a9f3a9f6e0ec5d
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue May 25 16:51:47 2010 -0400
fix delete for things that have tags related by adding cascading
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java
index dfeed21..bed3a10 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java
@@ -104,7 +104,7 @@ public class Bundle implements Serializable {
@OneToMany(mappedBy = "bundle", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
private List<BundleVersion> bundleVersions = new ArrayList<BundleVersion>();
- @ManyToMany(mappedBy = "bundles", fetch = FetchType.LAZY)
+ @ManyToMany(mappedBy = "bundles", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<Tag> tags;
public Bundle() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java
index b4b95d8..52d854a 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java
@@ -122,7 +122,7 @@ public class BundleDeployment implements Serializable {
@OneToMany(mappedBy = "bundleDeployment", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
private List<BundleResourceDeployment> resourceDeployments;
- @ManyToMany(mappedBy = "bundleDeployments", fetch = FetchType.LAZY)
+ @ManyToMany(mappedBy = "bundleDeployments", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<Tag> tags;
public BundleDeployment() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java
index dea011e..1dc9ec2 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java
@@ -28,6 +28,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -98,7 +99,7 @@ public class BundleDestination implements Serializable {
@OneToMany(mappedBy = "destination", fetch = FetchType.LAZY)
private List<BundleDeployment> deployments;
- @ManyToMany(mappedBy = "bundleDestinations", fetch = FetchType.LAZY)
+ @ManyToMany(mappedBy = "bundleDestinations", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<Tag> tags;
public BundleDestination() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java
index a5f918b..b8417d9 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java
@@ -124,7 +124,7 @@ public class BundleVersion implements Serializable {
@OneToMany(mappedBy = "bundleVersion", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
private List<BundleFile> bundleFiles = new ArrayList<BundleFile>();
- @ManyToMany(mappedBy = "bundleVersions", fetch = FetchType.LAZY)
+ @ManyToMany(mappedBy = "bundleVersions", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<Tag> tags;
public BundleVersion() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index 150266f..d3e69f5 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -1114,7 +1114,7 @@ public class Resource implements Comparable<Resource>, Serializable {
// @OneToMany(mappedBy = "resource", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
// private List<BundleResourceDeployment> resourceDeployments = new ArrayList<BundleResourceDeployment>();
- @ManyToMany(mappedBy = "resources", fetch = FetchType.LAZY)
+ @ManyToMany(mappedBy = "resources", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<Tag> tags;
public Resource() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
index c8b7f1d..c9fb492 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
@@ -448,7 +448,7 @@ public class ResourceGroup extends Group {
@OneToMany(mappedBy = "resourceGroup", cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
private Set<AlertDefinition> alertDefinitions = new LinkedHashSet<AlertDefinition>();
- @ManyToMany(mappedBy = "resourceGroups", fetch = FetchType.LAZY)
+ @ManyToMany(mappedBy = "resourceGroups", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
private Set<Tag> tags;
/* no-arg constructor required by EJB spec */
commit f67db6c1e1b44b11971c450213890720902e2232
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue May 25 16:51:06 2010 -0400
Cleanup the wizard step canvases when the wizard closes
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
index e0f3f92..fbce82f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.components.wizard;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import com.smartgwt.client.widgets.Canvas;
@@ -59,6 +60,8 @@ public class WizardView extends VLayout {
ArrayList<IButton> customButtons = new ArrayList<IButton>();
Canvas currentCanvas;
+ HashSet<Canvas> createdCanvases = new HashSet<Canvas>();
+
public WizardView(Wizard wizard) {
super(10);
this.wizard = wizard;
@@ -195,6 +198,8 @@ public class WizardView extends VLayout {
contentLayout.removeMember(currentCanvas);
}
currentCanvas = wizardSteps.get(currentStep).getCanvas();
+ createdCanvases.add(currentCanvas);
+
contentLayout.addMember(currentCanvas);
markForRedraw();
@@ -222,6 +227,12 @@ public class WizardView extends VLayout {
}
public void closeDialog() {
+
+ // Attempt to clean up canvases created in the steps
+ for (Canvas canvas : createdCanvases) {
+ canvas.markForDestroy();
+ }
+
wizardWindow.destroy();
}
commit cb861499b222038f52a4879ae73334955716dc26
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Tue May 25 16:42:42 2010 -0400
Workaround for certain times when the upload form is not completely destroyed
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java
index 81f48fe..93b8428 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java
@@ -28,6 +28,8 @@ import com.smartgwt.client.widgets.form.DynamicForm;
public class DynamicCallbackForm extends DynamicForm implements DynamicCallbackFormImplHost {
+ private static int frameIndex = 0;
+
private String frameName;
private Element synthesizedFrame;
private DynamicCallbackFormHandlerCollection formHandlers;
@@ -35,8 +37,8 @@ public class DynamicCallbackForm extends DynamicForm implements DynamicCallbackF
public DynamicCallbackForm(String frameName) {
super();
- this.frameName = frameName;
- setTarget(frameName);
+ this.frameName = frameName + (frameIndex++);
+ setTarget(this.frameName);
init();
}
1
0
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 138 +++++-----
1 file changed, 80 insertions(+), 58 deletions(-)
New commits:
commit 2dccbf98d5dfb7931d1263f415e57927436397b4
Merge: 165c6dd... 28951fe...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue May 25 16:00:34 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 165c6dd10417bbc3a2988491a07d01570d50ef5c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue May 25 15:59:19 2010 -0400
[BZ 586500] Fixed Regression for Refresh Core menu item.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index 285807a..50efde2 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -491,50 +491,71 @@ v <rich:menuItem submitMode="none"
</f:facet>
</a4j:status>
-
-
-
-
- <rich:dropDownMenu rendered="#{request.method == 'GET'}">
- <f:facet name="label">
- <h:panelGroup>
- <h:graphicImage value="/images/refreshRunning.gif" rendered="#{UserPreferencesUIBean.pageRefresh != 0}"/>
- <h:graphicImage value="/images/refreshStopped.gif" rendered="#{UserPreferencesUIBean.pageRefresh == 0}"/>
- <span id="refreshTimeLeft" style="width: 0px;"><h:outputText value="#{UserPreferencesUIBean.pageRefresh}" rendered="#{UserPreferencesUIBean.pageRefresh != 0}"/></span>
-
- </h:panelGroup>
- </f:facet>
-
- <ui:remove>***** Logged in as > EDIT DETAILS *****</ui:remove>
-
-
-
- <rich:menuItem submitMode="none" onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}', 0)">
- <h:outputText value="Stop"/>
- <f:facet name="icon">
- <h:graphicImage value="/images/#{UserPreferencesUIBean.pageRefresh == 0 ? 'check.png' : 'spacer.gif'}" width="16" height="16"/>
- </f:facet>
- </rich:menuItem>
- <rich:menuItem submitMode="none" onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',60)">
- <h:outputText value="Refresh every 1 minute"/>
- <f:facet name="icon">
- <h:graphicImage value="/images/#{UserPreferencesUIBean.pageRefresh == 60 ? 'check.png' : 'spacer.gif'}" width="16" height="16"/>
- </f:facet>
- </rich:menuItem>
- <rich:menuItem submitMode="none" onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',300)">
- <h:outputText value="Refresh every 5 minutes"/>
- <f:facet name="icon">
- <h:graphicImage value="/images/#{UserPreferencesUIBean.pageRefresh == 300 ? 'check.png' : 'spacer.gif'}" width="16" height="16"/>
- </f:facet>
- </rich:menuItem>
- <rich:menuItem submitMode="none" onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',600)">
- <h:outputText value="Refresh every 10 minutes"/>
- <f:facet name="icon">
- <h:graphicImage value="/images/#{UserPreferencesUIBean.pageRefresh == 600 ? 'check.png' : 'spacer.gif'}" width="16" height="16"/>
- </f:facet>
- </rich:menuItem>
-
- </rich:dropDownMenu>
+ <ui:remove>***** Refresh Graphic *****</ui:remove>
+ <rich:dropDownMenu rendered="#{request.method == 'GET'}">
+ <f:facet name="label">
+ <h:panelGroup>
+ <h:graphicImage
+ value="/images/refreshRunning.gif"
+ rendered="#{UserPreferencesUIBean.pageRefresh != 0}" />
+ <h:graphicImage
+ value="/images/refreshStopped.gif"
+ rendered="#{UserPreferencesUIBean.pageRefresh == 0}" />
+ <span
+ id="refreshTimeLeft"
+ style="width: 0px;"><h:outputText
+ value="#{UserPreferencesUIBean.pageRefresh}"
+ rendered="#{UserPreferencesUIBean.pageRefresh != 0}" /></span>
+
+ </h:panelGroup>
+ </f:facet>
+
+ <ui:remove>***** Refresh Intervals *****</ui:remove>
+ <rich:menuItem
+ submitMode="none"
+ onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}', 0)">
+ <h:outputText value="Stop" />
+ <f:facet name="icon">
+ <h:graphicImage
+ value="/images/#{UserPreferencesUIBean.pageRefresh == 0 ? 'check.png' : 'spacer.gif'}"
+ width="16"
+ height="16" />
+ </f:facet>
+ </rich:menuItem>
+ <rich:menuItem
+ submitMode="none"
+ onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',60)">
+ <h:outputText value="Refresh every 1 minute" />
+ <f:facet name="icon">
+ <h:graphicImage
+ value="/images/#{UserPreferencesUIBean.pageRefresh == 60 ? 'check.png' : 'spacer.gif'}"
+ width="16"
+ height="16" />
+ </f:facet>
+ </rich:menuItem>
+ <rich:menuItem
+ submitMode="none"
+ onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',300)">
+ <h:outputText value="Refresh every 5 minutes" />
+ <f:facet name="icon">
+ <h:graphicImage
+ value="/images/#{UserPreferencesUIBean.pageRefresh == 300 ? 'check.png' : 'spacer.gif'}"
+ width="16"
+ height="16" />
+ </f:facet>
+ </rich:menuItem>
+ <rich:menuItem
+ submitMode="none"
+ onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',600)">
+ <h:outputText value="Refresh every 10 minutes" />
+ <f:facet name="icon">
+ <h:graphicImage
+ value="/images/#{UserPreferencesUIBean.pageRefresh == 600 ? 'check.png' : 'spacer.gif'}"
+ width="16"
+ height="16" />
+ </f:facet>
+ </rich:menuItem>
+ </rich:dropDownMenu>
<ui:remove>===== LOGGED IN AS =====</ui:remove>
@@ -628,23 +649,24 @@ v <rich:menuItem submitMode="none"
function refresh() {
- timeLeft = timeLeft - 1;
- document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
-
- if (timeLeft < 1) {
- window.location.href = window.location.href;
- }
- setTimeout("refresh()", 1000);
- }
-
- var refreshTime = <h:outputText value="#{UserPreferencesUIBean.pageRefresh}"/>;
- var timeLeft = refreshTime;
+ if (timeLeft > 0) {
+ timeLeft = timeLeft - 1;
+ document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
+ setTimeout("refresh()", 1000); // call again in 1 second (1000ms)
+ }
- if (refreshTime > 0) {
- setTimeout("refresh()", 1000);
- }
+ if (timeLeft == 0) {
+ document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
+ window.location.reload(true);
+ }
+ }
+ var refreshTime = <h:outputText value="#{UserPreferencesUIBean.pageRefresh}"/>;
+ var timeLeft = refreshTime;
+ if (refreshTime > 0) {
+ setTimeout("refresh()", 1000);
+ }
</script>
1
0
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 28951fe704b7eb584d24161dcc6d4f2952222254
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 25 15:28:08 2010 -0400
[BZ 591490] Reverting alert links back to struts links since that UI code was reverted back to struts
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml
index a1caee7..863357b 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml
@@ -143,17 +143,20 @@
</onc:sortableColumnHeader>
</f:facet>
- <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml" rendered="#{empty item.original.alertDefinition.resourceType and empty item.original.alertDefinition.resourceGroup}">
+ <h:outputLink value="/alerts/Config.do" rendered="#{empty item.original.alertDefinition.resourceType and empty item.original.alertDefinition.resourceGroup}">
+ <f:param name="mode" value="viewRoles" />
<f:param name="id" value="#{item.original.alertDefinition.resource.id}" />
<f:param name="ad" value="#{item.original.alertDefinition.id}" />
<h:outputText value="#{item.original.alertDefinition.name}" />
</h:outputLink>
- <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml" rendered="#{not empty item.original.alertDefinition.resourceType}">
+ <h:outputLink value="/alerts/Config.do" rendered="#{not empty item.original.alertDefinition.resourceType}">
+ <f:param name="mode" value="viewRoles" />
<f:param name="type" value="#{item.original.alertDefinition.resourceType.id}" />
<f:param name="ad" value="#{item.original.alertDefinition.id}" />
<h:outputText value="#{item.original.alertDefinition.name}" />
</h:outputLink>
- <h:outputLink value="/rhq/resource/alert/viewAlert.xhtml" rendered="#{not empty item.original.alertDefinition.resourceGroup}">
+ <h:outputLink value="/alerts/Config.do" rendered="#{not empty item.original.alertDefinition.resourceGroup}">
+ <f:param name="mode" value="viewRoles" />
<f:param name="groupId" value="#{item.original.alertDefinition.resourceGroup.id}" />
<f:param name="ad" value="#{item.original.alertDefinition.id}" />
<h:outputText value="#{item.original.alertDefinition.name}" />
1
0
modules/core/util/src/test/resources/ini-editor-test.ini | 72 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java | 31 ++--
2 files changed, 55 insertions(+), 48 deletions(-)
New commits:
commit 63ad14acc094e44dad2a79885a8ef72368c08782
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue May 25 12:12:35 2010 -0400
[BZ 594706] Remove cleanup of some obsolete prop def in favor of avoiding
deadlock.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
index e4c608c..8427c8b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
@@ -302,7 +302,6 @@ public class ConfigurationMetadataManagerBean implements ConfigurationMetadataMa
* @param newProperty
*/
private void updatePropertyDefinition(PropertyDefinition existingProperty, PropertyDefinition newProperty) {
-
existingProperty.setDescription(newProperty.getDescription());
existingProperty.setDisplayName(newProperty.getDisplayName());
existingProperty.setActivationPolicy(newProperty.getActivationPolicy());
@@ -350,7 +349,7 @@ public class ConfigurationMetadataManagerBean implements ConfigurationMetadataMa
PropertyDefinitionList exList = (PropertyDefinitionList) existingProperty;
if (newProperty instanceof PropertyDefinitionList) {
PropertyDefinitionList newList = (PropertyDefinitionList) newProperty;
- replaceListPropertyMemberDefinition(exList, newList);
+ replaceListProperty(exList, newList);
} else { // simple property or map-property
replaceProperty(existingProperty, newProperty);
}
@@ -437,28 +436,36 @@ public class ConfigurationMetadataManagerBean implements ConfigurationMetadataMa
}
/**
- * This replaces the member property for the list. If it is a nested structure the whole thing
- * is replaced from the top. The previous member property is removed. cascading should remove a nested
- * structure.
+ * This replaces an existing list property def with a new list property definition. Primarily it replaces
+ * the member prop def for the list. If the member prop def is a nested structure the whole thing
+ * is replaced from the top.
*
- * @param existingProperty the existing prop
- * @param newProperty the new prop that should replace the existing prop
+ * @param exList the existing prop def list
+ * @param newList the new prop def list
*/
- private void replaceListPropertyMemberDefinition(PropertyDefinitionList exList, PropertyDefinitionList newList) {
- PropertyDefinition doomedMember = null;
+ private void replaceListProperty(PropertyDefinitionList exList, PropertyDefinitionList newList) {
+ PropertyDefinition doomedMemberDef = null;
// only remove the existing member if it is a different entity
if (exList.getMemberDefinition().getId() != newList.getMemberDefinition().getId()) {
- doomedMember = exList.getMemberDefinition();
+ doomedMemberDef = exList.getMemberDefinition();
}
exList.setMemberDefinition(newList.getMemberDefinition());
exList.setMax(newList.getMax());
exList.setMin(newList.getMin());
- if (null != doomedMember) {
- entityManager.remove(doomedMember);
+ // BZ 594706
+ // Don't clean this up here because it's causing deadlocks in Oracle. Instead we'll just leave
+ // garbage in the db. Although annoying, and confusing for db queries, it's not a lot of data,
+ // just some extra prop defs and prop_def_enums.
+ if (null != doomedMemberDef) {
+ // entityManager.remove(doomedMemberDef);
+ if (log.isDebugEnabled()) {
+ log.debug("Ignoring cleanup of [" + doomedMemberDef + "] due to BZ 594706");
+ }
}
+
entityManager.merge(exList);
entityManager.flush();
}
commit 3eda3f679f128eda9f5f412089082797d801f54c
Merge: a85f1e5... fa15c72...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue May 25 14:30:52 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Conflicts:
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java
commit a85f1e543e805b32d3cf13652d33c87a9931d7be
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue May 25 14:29:30 2010 -0400
LT commit
diff --git a/modules/core/util/src/test/resources/ini-editor-test.ini b/modules/core/util/src/test/resources/ini-editor-test.ini
index c5eeef2..7a6d5f0 100644
--- a/modules/core/util/src/test/resources/ini-editor-test.ini
+++ b/modules/core/util/src/test/resources/ini-editor-test.ini
@@ -1,36 +1,36 @@
-[main]
- # Where Puppet stores dynamic and growing data.
- # The default value is '/var/puppet'.
- vardir = /var/lib/puppet
-
- # The Puppet log directory.
- # The default value is '$vardir/log'.
- logdir = /var/log/puppet
-
- # Where Puppet PID files are kept.
- # The default value is '$vardir/run'.
- rundir = /var/run/puppet
-
- # Where SSL certificates are kept.
- # The default value is '$confdir/ssl'.
- ssldir = $vardir/ssl
-
-[puppetd]
- # The file in which puppetd stores a list of the classes
- # associated with the retrieved configuratiion. Can be loaded in
- # the separate ``puppet`` executable using the ``--loadclasses``
- # option.
- # The default value is '$confdir/classes.txt'.
- classfile = $vardir/classes.txt
-
- # Where puppetd caches the local configuration. An
- # extension indicating the cache format is added automatically.
- # The default value is '$confdir/localconfig'.
- localconfig = $vardir/localconfig
-
-[puppetca]
-autosign = false
-
-[puppetmasterd]
-ca = true
-certname = mycertname
+[main]
+ # Where Puppet stores dynamic and growing data.
+ # The default value is '/var/puppet'.
+ vardir = /var/lib/puppet
+
+ # The Puppet log directory.
+ # The default value is '$vardir/log'.
+ logdir = /var/log/puppet
+
+ # Where Puppet PID files are kept.
+ # The default value is '$vardir/run'.
+ rundir = /var/run/puppet
+
+ # Where SSL certificates are kept.
+ # The default value is '$confdir/ssl'.
+ ssldir = $vardir/ssl
+
+[puppetd]
+ # The file in which puppetd stores a list of the classes
+ # associated with the retrieved configuratiion. Can be loaded in
+ # the separate ``puppet`` executable using the ``--loadclasses``
+ # option.
+ # The default value is '$confdir/classes.txt'.
+ classfile = $vardir/classes.txt
+
+ # Where puppetd caches the local configuration. An
+ # extension indicating the cache format is added automatically.
+ # The default value is '$confdir/localconfig'.
+ localconfig = $vardir/localconfig
+
+[puppetca]
+autosign = false
+
+[puppetmasterd]
+ca = true
+certname = mycertname
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java
index 4ee766f..f6af275 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java
@@ -1,150 +1,150 @@
-/*
-* Jopr Management Platform
-* Copyright (C) 2005-2009 Red Hat, Inc.
-* All rights reserved.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License, version 2, as
-* published by the Free Software Foundation, and/or the GNU Lesser
-* General Public License, version 2.1, also 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 and the GNU Lesser General Public License
-* for more details.
-*
-* You should have received a copy of the GNU General Public License
-* and the GNU Lesser General Public License along with this program;
-* if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-package org.rhq.plugins.jbossas5;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.deployers.spi.management.ManagementView;
-import org.jboss.managed.api.ComponentType;
-import org.jboss.managed.api.ManagedComponent;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-import org.rhq.plugins.jbossas5.util.ConversionUtils;
-
-/**
- * Discovery component for ManagedComponents exposed by the JBoss AS 5.x Profile Service that will be represented as
- * child Resources of the JBoss AS Resource.
- *
- * @author Jason Dobies
- * @author Mark Spritzer
- * @author Ian Springer
- */
-public class ManagedComponentDiscoveryComponent<P extends ProfileServiceComponent> implements
- ResourceDiscoveryComponent<P> {
- private final Log log = LogFactory.getLog(this.getClass());
-
- public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<P> discoveryContext)
- throws Exception {
- ResourceType resourceType = discoveryContext.getResourceType();
- log.trace("Discovering " + resourceType.getName() + " Resources...");
-
- ManagementView managementView = discoveryContext.getParentResourceComponent().getConnection()
- .getManagementView();
- // TODO (ips): Only refresh the ManagementView *once* per runtime discovery scan, rather than every time this
- // method is called. Do this by providing a runtime scan id in the ResourceDiscoveryContext.
- managementView.load();
-
- ComponentType componentType = getComponentType(discoveryContext);
- Set<ManagedComponent> components;
- try {
- components = managementView.getComponentsForType(componentType);
- } catch (Exception e) {
- throw new IllegalStateException("Failed to get component types for " + resourceType + ".", e);
- }
-
- Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>(components.size());
- /* Create a resource for each managed component found. We know all managed components will be of a
- type we're interested in, so we can just add them all. There may be need for multiple iterations
- over lists retrieved from different component types, but that is possible through the current API.
- */
- for (ManagedComponent component : components) {
- if (accept(discoveryContext, component)) {
- String resourceName = getResourceName(component);
- if (resourceName == null) {
- resourceName = component.getName();
- }
- String resourceKey = getResourceKey(component);
- if (resourceKey == null) {
- resourceKey = component.getName();
- }
- String version = null; // (ips) I don't think there's anything generic we can do here.
-
- DiscoveredResourceDetails resource = new DiscoveredResourceDetails(resourceType, resourceKey,
- resourceName, version, resourceType.getDescription(), discoveryContext
- .getDefaultPluginConfiguration(), null);
-
- resource.getPluginConfiguration().put(
- new PropertySimple(ManagedComponentComponent.Config.COMPONENT_NAME, resourceKey));
-
- discoveredResources.add(resource);
- }
- }
-
- log.trace("Discovered " + discoveredResources.size() + " " + resourceType.getName() + " Resources.");
- return discoveredResources;
- }
-
- protected ComponentType getComponentType(ResourceDiscoveryContext<P> discoveryContext) {
- ResourceType resourceType = discoveryContext.getResourceType();
- return ConversionUtils.getComponentType(resourceType);
- }
-
- /**
- * Subclasses can override this method if they don't want to use the ManagedComponent name as the initial
- * Resource name.
- *
- * @param component the ManagedComponent being discovered
- * @return the name to be assigned to the corresponding Resource
- */
- protected String getResourceName(ManagedComponent component) {
- return component.getName();
- }
-
- /**
- * Return the unique resource key for the component.
- * If you override this method, make sure to override
- * {@link ManagedComponentComponent#getManagedComponent()} method as well
- * because the return value of this method is used as the component name
- * ({@link ManagedComponentComponent#getComponentName()}).
- *
- * @param component the component to uniquely identify
- * @return the unique identifier for the component
- */
- protected String getResourceKey(ManagedComponent component) {
- return component.getName();
- }
-
- /**
- * This method is called during {@link #discoverResources(ResourceDiscoveryContext)} to determine
- * whether given component that has been found in the management view by this component's configured
- * component type is applicable in the discovery context.
- * <p>
- * Because the Profile Service doesn't always provide the components in a hierarchy we present the resources
- * we need this method to filter the components into their appropriate places.
- * <p>
- * This default implementation always returns true.
- *
- * @param discoveryContext the current discovery context
- * @param component the discovered component
- * @return true if the component logically belongs in the context, false otherwise.
- */
- protected boolean accept(ResourceDiscoveryContext<P> discoveryContext, ManagedComponent component) {
- return true;
- }
-}
+/*
+* Jopr Management Platform
+* Copyright (C) 2005-2009 Red Hat, Inc.
+* All rights reserved.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2, as
+* published by the Free Software Foundation, and/or the GNU Lesser
+* General Public License, version 2.1, also 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 and the GNU Lesser General Public License
+* for more details.
+*
+* You should have received a copy of the GNU General Public License
+* and the GNU Lesser General Public License along with this program;
+* if not, write to the Free Software Foundation, Inc.,
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+package org.rhq.plugins.jbossas5;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.managed.api.ComponentType;
+import org.jboss.managed.api.ManagedComponent;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jbossas5.util.ConversionUtils;
+
+/**
+ * Discovery component for ManagedComponents exposed by the JBoss AS 5.x Profile Service that will be represented as
+ * child Resources of the JBoss AS Resource.
+ *
+ * @author Jason Dobies
+ * @author Mark Spritzer
+ * @author Ian Springer
+ */
+public class ManagedComponentDiscoveryComponent<P extends ProfileServiceComponent> implements
+ ResourceDiscoveryComponent<P> {
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<P> discoveryContext)
+ throws Exception {
+ ResourceType resourceType = discoveryContext.getResourceType();
+ log.trace("Discovering " + resourceType.getName() + " Resources...");
+
+ ManagementView managementView = discoveryContext.getParentResourceComponent().getConnection()
+ .getManagementView();
+ // TODO (ips): Only refresh the ManagementView *once* per runtime discovery scan, rather than every time this
+ // method is called. Do this by providing a runtime scan id in the ResourceDiscoveryContext.
+ managementView.load();
+
+ ComponentType componentType = getComponentType(discoveryContext);
+ Set<ManagedComponent> components;
+ try {
+ components = managementView.getComponentsForType(componentType);
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to get component types for " + resourceType + ".", e);
+ }
+
+ Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>(components.size());
+ /* Create a resource for each managed component found. We know all managed components will be of a
+ type we're interested in, so we can just add them all. There may be need for multiple iterations
+ over lists retrieved from different component types, but that is possible through the current API.
+ */
+ for (ManagedComponent component : components) {
+ if (accept(discoveryContext, component)) {
+ String resourceName = getResourceName(component);
+ if (resourceName == null) {
+ resourceName = component.getName();
+ }
+ String resourceKey = getResourceKey(component);
+ if (resourceKey == null) {
+ resourceKey = component.getName();
+ }
+ String version = null; // (ips) I don't think there's anything generic we can do here.
+
+ DiscoveredResourceDetails resource = new DiscoveredResourceDetails(resourceType, resourceKey,
+ resourceName, version, resourceType.getDescription(), discoveryContext
+ .getDefaultPluginConfiguration(), null);
+
+ resource.getPluginConfiguration().put(
+ new PropertySimple(ManagedComponentComponent.Config.COMPONENT_NAME, resourceKey));
+
+ discoveredResources.add(resource);
+ }
+ }
+
+ log.trace("Discovered " + discoveredResources.size() + " " + resourceType.getName() + " Resources.");
+ return discoveredResources;
+ }
+
+ protected ComponentType getComponentType(ResourceDiscoveryContext<P> discoveryContext) {
+ ResourceType resourceType = discoveryContext.getResourceType();
+ return ConversionUtils.getComponentType(resourceType);
+ }
+
+ /**
+ * Subclasses can override this method if they don't want to use the ManagedComponent name as the initial
+ * Resource name.
+ *
+ * @param component the ManagedComponent being discovered
+ * @return the name to be assigned to the corresponding Resource
+ */
+ protected String getResourceName(ManagedComponent component) {
+ return component.getName();
+ }
+
+ /**
+ * Return the unique resource key for the component.
+ * If you override this method, make sure to override
+ * {@link ManagedComponentComponent#getManagedComponent()} method as well
+ * because the return value of this method is used as the component name
+ * ({@link ManagedComponentComponent#getComponentName()}).
+ *
+ * @param component the component to uniquely identify
+ * @return the unique identifier for the component
+ */
+ protected String getResourceKey(ManagedComponent component) {
+ return component.getName();
+ }
+
+ /**
+ * This method is called during {@link #discoverResources(ResourceDiscoveryContext)} to determine
+ * whether given component that has been found in the management view by this component's configured
+ * component type is applicable in the discovery context.
+ * <p>
+ * Because the Profile Service doesn't always provide the components in a hierarchy we present the resources
+ * we need this method to filter the components into their appropriate places.
+ * <p>
+ * This default implementation always returns true.
+ *
+ * @param discoveryContext the current discovery context
+ * @param component the discovered component
+ * @return true if the component logically belongs in the context, false otherwise.
+ */
+ protected boolean accept(ResourceDiscoveryContext<P> discoveryContext, ManagedComponent component) {
+ return true;
+ }
+}
1
0