modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
| 1
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
| 6 +++--
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
| 12 ++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 2817b52f6ecf08670242d62f381113969d78c8e9
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Thu Aug 26 09:21:24 2010 +0200
BZ-535208 Removed quartz-ra.rar. Nowhere in our code do we use
ResourceAdapter("quartz-ra.rar")
We rely on going directly to the quartz API to setup jobs.
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index 477f62f..d45932d 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -647,6 +647,7 @@ rhq.autoinstall.public-endpoint-address=
<!-- Delete 'minimal' and 'all' config dirs... -->
<delete dir="${jboss.home}/server/minimal" />
<delete dir="${jboss.home}/server/all" />
+ <delete file="${jboss.home}/server/default/deploy/quartz-ra.rar"
/>
</target>
<target name="unzip-jbossws-native"
unless="jbossws-native.uptodate">
commit 6475081857301ef290e610a1545c5ab9a7b9aa2d
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Thu Aug 26 09:15:38 2010 +0200
BZ-616071 Additional debug logging to identify state returned from ProfileService for
management deployments and components.
diff --git
a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
index e7a1194..bd78958 100644
---
a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
+++
b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
@@ -112,14 +112,16 @@ public abstract class AbstractManagedDeploymentComponent extends
AbstractManaged
+ e.getLocalizedMessage());
return AvailabilityType.DOWN;
} catch (Throwable t) {
- log.debug("Could not get deployment state, cause: ", t);
+ log.debug("Could not get deployment state for " +
this.deploymentType + " deployment '"
+ + this.deploymentName + "', cause: ", t);
return AvailabilityType.DOWN;
}
if (deploymentState == DeploymentState.STARTED) {
return AvailabilityType.UP;
} else {
- log.debug("Deployment was not STARTED, state was: " +
deploymentState);
+ log.debug(this.deploymentType + " deployment '" +
this.deploymentName +
+ "' was not running, state was: " + deploymentState);
return AvailabilityType.DOWN;
}
}
diff --git
a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
index e4511fd..7c70bc7 100644
---
a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
+++
b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java
@@ -108,10 +108,18 @@ public class ManagedComponentComponent extends
AbstractManagedComponent implemen
RunState runState;
try {
runState = getManagedComponent().getRunState();
- } catch (CannotConnectException e) {
+ } catch (Throwable t) {
+ log.debug("Could not get component state for " + this.componentType
+ " component '"
+ + this.componentName + "', cause: ", t);
+ return AvailabilityType.DOWN;
+ }
+ if (runState == RunState.RUNNING) {
+ return AvailabilityType.UP;
+ } else {
+ log.debug(this.componentType + " component '" +
this.componentName + "' was not running, state" +
+ " was: " + runState);
return AvailabilityType.DOWN;
}
- return (runState == RunState.RUNNING) ? AvailabilityType.UP :
AvailabilityType.DOWN;
}
public void start(ResourceContext<ProfileServiceComponent> resourceContext)
throws Exception {
Show replies by date