Author: heiko.braun(a)jboss.com Date: 2009-10-20 11:33:22 -0400 (Tue, 20 Oct 2009) New Revision: 196 Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java trunk/pom.xml Log: Fix RIFTSAW-51: Instance filter doesn't work correctly Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java 2009-10-20 15:12:05 UTC (rev 195) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java 2009-10-20 15:33:22 UTC (rev 196) @@ -21,10 +21,7 @@ */ package org.jboss.soa.bpel.console; -import org.apache.ode.bpel.pmapi.ProcessInfoListDocument; -import org.apache.ode.bpel.pmapi.TProcessInfo; -import org.apache.ode.bpel.pmapi.InstanceInfoListDocument; -import org.apache.ode.bpel.pmapi.TInstanceInfo; +import org.apache.ode.bpel.pmapi.*; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; @@ -73,7 +70,7 @@ encodeId(i0.getPid()), i0.getDtStarted().getTime(), null, - false + false // see filter criteria when selecting instances ); results.add(ref); Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2009-10-20 15:12:05 UTC (rev 195) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2009-10-20 15:33:22 UTC (rev 196) @@ -25,14 +25,14 @@ import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.server.integration.ProcessManagement; import org.jboss.soa.bpel.runtime.engine.BPELEngine; -import org.apache.ode.bpel.pmapi.BpelManagementFacade; -import org.apache.ode.bpel.pmapi.InstanceInfoListDocument; +import org.apache.ode.bpel.pmapi.*; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.xml.namespace.QName; import java.util.List; import java.util.Map; +import java.util.HashMap; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; @@ -67,12 +67,12 @@ public ProcessDefinitionRef getProcessDefinition(String definitionId) { - return null; + throw new RuntimeException("Not implemented"); } public List<ProcessDefinitionRef> removeProcessDefinition(String definitionId) { - return null; + throw new RuntimeException("Not implemented"); } public List<ProcessInstanceRef> getProcessInstances(String definitionId) @@ -83,7 +83,7 @@ //TODO: qname.getLocalPart() includes the version number. InstanceInfoListDocument result = getMgmtFacade().listInstances( // filter, order, limit - "namespace=" + qname.getNamespaceURI(), "name", 1000); + "namespace=" + qname.getNamespaceURI()+" status=active", "name", 1000); return ModelAdaptor.adoptInstances(result); } @@ -105,7 +105,28 @@ public Map<String, Object> getInstanceData(String instanceId) { - throw new RuntimeException("Not implemented"); + Map<String,Object> variables = new HashMap<String,Object>(); + + String iid = ModelAdaptor.decodeId(instanceId); // what a crappy API... + + // get root scope id + BpelManagementFacade mgmtFacade = getMgmtFacade(); + TInstanceInfo instanceInfo = mgmtFacade.getInstanceInfo(Long.valueOf(iid)).getInstanceInfo(); + String scopeId = instanceInfo.getRootScope().getSiid(); + + // get scope info + TScopeInfo scopeInfo = mgmtFacade.getScopeInfo(scopeId).getScopeInfo(); + List<TVariableRef> varRefs = scopeInfo.getVariables().getVariableRefList(); + + for(TVariableRef varRef : varRefs) + { + String varName = varRef.getName(); + TVariableInfo varInfo = mgmtFacade.getVariableInfo(scopeId, varName).getVariableInfo(); + Object obj = varInfo.getValue(); + variables.put(varName, obj); + } + + return variables; } public void setInstanceData(String instanceId, Map<String, Object> data) @@ -114,8 +135,9 @@ } public void endInstance(String instanceId, ProcessInstanceRef.RESULT result) - { - throw new RuntimeException("Not implemented"); + { + String iid = ModelAdaptor.decodeId(instanceId); + getMgmtFacade().terminate(Long.valueOf(iid)); } public void deleteInstance(String instanceId) @@ -131,5 +153,5 @@ public void signalExecution(String executionId, String signal) { throw new RuntimeException("Not implemented"); - } + } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-20 15:12:05 UTC (rev 195) +++ trunk/pom.xml 2009-10-20 15:33:22 UTC (rev 196) @@ -67,7 +67,7 @@ <properties> <riftsaw.engine.version>2.0-SNAPSHOT</riftsaw.engine.version> - <bpm.console.version>1.1.2-SNAPSHOT</bpm.console.version> + <bpm.console.version>1.2.0-SNAPSHOT</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> <jboss.version>5.0.0.GA</jboss.version>