[jbpm-commits] JBoss JBPM SVN: r5497 - in projects/jopr-integration/trunk/src/main: java/org/rhq/plugins/jbpm4/connector and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Aug 20 05:18:50 EDT 2009
Author: jim.ma
Date: 2009-08-20 05:18:49 -0400 (Thu, 20 Aug 2009)
New Revision: 5497
Modified:
projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java
projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java
projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java
projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java
projects/jopr-integration/trunk/src/main/resources/META-INF/rhq-plugin.xml
Log:
Added delete deploymentfunction
Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java
===================================================================
--- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java 2009-08-20 09:18:49 UTC (rev 5497)
@@ -42,6 +42,7 @@
import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
import org.rhq.core.pluginapi.content.ContentFacet;
import org.rhq.core.pluginapi.content.ContentServices;
+import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
@@ -50,7 +51,7 @@
* @author ema at redhat.com
*
*/
-public class ProcessDeploymentComponent implements ResourceComponent<ProcessEngineComponent> , MeasurementFacet, ContentFacet{
+public class ProcessDeploymentComponent implements ResourceComponent<ProcessEngineComponent> , MeasurementFacet, ContentFacet, DeleteResourceFacet {
private ResourceContext<ProcessEngineComponent> resourceContext;
private Log log = LogFactory.getLog(this.getClass());
private Deployment deployment = null;
@@ -140,8 +141,10 @@
return response;
}
+ public void deleteResource() throws Exception {
+ this.jbpmConnection.deleteDeployment(resourceContext.getResourceKey());
+ }
-
}
Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java
===================================================================
--- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java 2009-08-20 09:18:49 UTC (rev 5497)
@@ -19,6 +19,7 @@
import org.rhq.core.pluginapi.content.ContentServices;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.plugins.jbossas5.ApplicationServerComponent;
import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection;
@@ -27,11 +28,11 @@
import org.rhq.plugins.jbpm4.connector.RemoteJBPMEngineConnector;
import org.rhq.plugins.jmx.MBeanResourceComponent;
-public class ProcessEngineComponent extends MBeanResourceComponent implements CreateChildResourceFacet{
+public class ProcessEngineComponent extends MBeanResourceComponent implements CreateChildResourceFacet {
private static final String NAMING_URL = "namingURL";
private static final String PRINCIPAL = "principal";
private static final String CREDENTIALS = "credentials";
- private static final String RESOURCE_TYPE_JBPM_DEVELOPMENT ="Process Developments";
+ private static final String RESOURCE_TYPE_JBPM_DEVELOPMENT ="Process Deployments";
private ContentContext contentContext = null;
private ResourceContext resourceContext = null;
@@ -59,10 +60,6 @@
return av;
}
- /* implement the DeleteResourceFacet */
- public void deleteResource() throws Exception {
- //TODO: implement it
- }
public void getValues(MeasurementReport report, Set requests) {
super.getValues(report, requests);
Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java
===================================================================
--- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java 2009-08-20 09:18:49 UTC (rev 5497)
@@ -36,6 +36,7 @@
List<ProcessDefinition> getProcessDefs();
ProcessDefinition getProcessDefById(String id);
String deployProcess(File processFile) throws Exception;
+ void deleteDeployment(String deploymentId);
List<ProcessInstance> getAllProcessInstance();
List<ProcessInstance> getProcessInstances(String defId);
ProcessInstance getProcessInstance(String instanceId);
Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java
===================================================================
--- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java 2009-08-20 09:18:49 UTC (rev 5497)
@@ -81,6 +81,11 @@
return processEngine.getRepositoryService().createDeploymentQuery().list();
}
+ public void deleteDeployment(String deploymentId) {
+ processEngine.getRepositoryService().deleteDeploymentCascade(deploymentId);
+ }
+
+
public Deployment getDeployment(String deploymentId) {
return processEngine.getRepositoryService().createDeploymentQuery().deploymentDbid(Long.valueOf(deploymentId)).uniqueResult();
Modified: projects/jopr-integration/trunk/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jopr-integration/trunk/src/main/resources/META-INF/rhq-plugin.xml 2009-08-20 07:04:51 UTC (rev 5496)
+++ projects/jopr-integration/trunk/src/main/resources/META-INF/rhq-plugin.xml 2009-08-20 09:18:49 UTC (rev 5497)
@@ -103,7 +103,7 @@
<service name="Process Deployments"
discovery="ProcessDeploymentDiscoveryComponent"
class="ProcessDeploymentComponent"
- createDeletePolicy="create-only"
+ createDeletePolicy="both"
creationDataType="content"
description="JBPM Process Deployment">
<metric property="id" displayName="id" dataType="trait" displayType="summary" defaultOn="true"
More information about the jbpm-commits
mailing list