[jboss-svn-commits] JBL Code SVN: r23200 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2008-09-29 21:42:38 -0400 (Mon, 29 Sep 2008)
New Revision: 23200

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java
Log:
JBNADM-3532
Make sure deleting resources works.


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java	2008-09-29 22:15:16 UTC (rev 23199)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/DeploymentComponent.java	2008-09-30 01:42:38 UTC (rev 23200)
@@ -1,4 +1,4 @@
-package org.jbosson.plugins.jbossesb;
+ package org.jbosson.plugins.jbossesb;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -36,6 +36,7 @@
 import org.rhq.core.pluginapi.inventory.ResourceContext;
 import org.rhq.core.pluginapi.operation.OperationContext;
 import org.rhq.core.pluginapi.operation.OperationFacet;
+import org.rhq.plugins.jbossas.JBossASServerComponent;
 import org.rhq.plugins.jbossas.util.FileContentDelegate;
 import org.rhq.plugins.jmx.JMXComponent;
 import org.rhq.plugins.jmx.MBeanResourceComponent;
@@ -241,9 +242,12 @@
 
 	public void deleteResource() throws Exception {
         Configuration pluginConfiguration = super.resourceContext.getPluginConfiguration();
-        String fullFileName = pluginConfiguration.getSimple("filename").getStringValue();
+        String fullFileName = pluginConfiguration.getSimple("deployment").getStringValue();
+        
+        ESBComponent jbossASComponent = (ESBComponent) super.resourceContext.getParentResourceComponent();
+        //File deploymentFile = jbossASComponent.getDeploymentFilePath(super.resourceContext.getResourceKey());
 
-        File file = new File(fullFileName);
+        File file = new File(jbossASComponent.getConfigurationPath() + "/deploy/" + fullFileName);
 
         if (!file.exists()) {
             throw new Exception("Cannot find application file to delete: " + fullFileName);

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java	2008-09-29 22:15:16 UTC (rev 23199)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBComponent.java	2008-09-30 01:42:38 UTC (rev 23200)
@@ -35,6 +35,7 @@
 import org.rhq.plugins.jbossas.JBossASServerComponent;
 import org.rhq.plugins.jbossas.util.FileContentDelegate;
 import org.rhq.plugins.jmx.MBeanResourceComponent;
+import org.rhq.plugins.utils.FileUtils;
 
 public class ESBComponent extends MBeanResourceComponent implements CreateChildResourceFacet, ContentFacet {
    private static final String RESOURCE_TYPE_ESB = "JBoss ESB Deployment";