modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java
| 11 +++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 88560f71766cfa3e3c55150e7e485826df37946b
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Jun 5 16:36:41 2012 -0500
[BZ 828464] Adding the two argument constructor back for backwards compatibility with
the ESB plugin.
(cherry picked from commit 0dc1ed3861c8ca702cb5f454d9cdad65c598d5c7)
(cherry picked from commit e2e7ceef85ad1e6edd558ac6d14794c475c22549)
diff --git
a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java
b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java
index f5eaec3..4f0e1a1 100644
---
a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java
+++
b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java
@@ -61,6 +61,15 @@ public class ManagedComponentDeployer implements Deployer {
private ProfileServiceConnection profileServiceConnection;
private ResourceContext<?> parentResourceContext;
+ /**
+ * @deprecated To be used only by the ESB plugin (backwards compatibility).
+ * Replaced by {@link #ManagedComponentDeployer(ProfileServiceConnection,
PackageDownloader, ResourceContext)}
+ */
+ @Deprecated
+ public ManagedComponentDeployer(ProfileServiceConnection profileServiceConnection,
PackageDownloader downloader) {
+ this(profileServiceConnection, downloader, null);
+ }
+
public ManagedComponentDeployer(ProfileServiceConnection profileServiceConnection,
PackageDownloader downloader,
ResourceContext<?> parentResourceContext) {
this.downloader = downloader;
@@ -133,7 +142,7 @@ public class ManagedComponentDeployer implements Deployer {
// If deployed exploded, we need to store the SHA of source package in
META-INF/MANIFEST.MF for correct
// versioning.
- if (deployExploded) {
+ if (deployExploded && this.parentResourceContext != null) {
URI deploymentURI = URI.create(deploymentName);
// e.g.: /C:/opt/jboss-6.0.0.Final/server/default/deploy/foo.war
String deploymentPath = deploymentURI.getPath();
Show replies by date