Author: jeff.yuchang Date: 2011-02-25 08:55:07 -0500 (Fri, 25 Feb 2011) New Revision: 1314 Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/CorrelationKey.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/CorrelationSetWriteAdapter.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ExpressionEvaluationFailedAdapter.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ExpressionEvaluationSuccessAdapter.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/PartnerLinkModificationAdapter.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ProcessMessageExchangeAdapter.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeCompletionAdapter.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeFaultAdapter.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeStartAdapter.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/Variable.java trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/VariableModificationAdapter.java Modified: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/EventAdapter.java trunk/distribution/pom.xml trunk/distribution/src/main/release/conf/jdbc/mysql.properties trunk/pom.xml Log: *RIFTSAW-343, added correlation information into process instance tab. (in the execution history). Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/CorrelationKey.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/CorrelationKey.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/CorrelationKey.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,23 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.jboss.bpm.monitor.model.bpaf.Tuple; + +/** + * The correlation key information + * + * @author Jeff Yu + * + */ +public class CorrelationKey extends Tuple { + + public static final String name = "correlation-key"; + + public CorrelationKey(String value) { + setName(name); + setValue(value); + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/CorrelationSetWriteAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/CorrelationSetWriteAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/CorrelationSetWriteAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,35 @@ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.CorrelationSetWriteEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * + * @author Jeff Yu + * + */ +public final class CorrelationSetWriteAdapter implements EventDetailMapping<CorrelationSetWriteEvent> { + + public static final String ACTIVITY_NAME = "CORRELATION_SET_WRITE"; + + public Event adoptDetails(Event target, CorrelationSetWriteEvent source) { + StringBuffer sbuffer = new StringBuffer(); + sbuffer.append(source.getKey().getCorrelationSetName()); + + sbuffer.append("=["); + String[] value = source.getKey().getValues(); + for (int i = 0; i< value.length; i++) { + sbuffer.append(value[i]); + if (i < value.length - 1) { + sbuffer.append(","); + } + } + sbuffer.append("]"); + + target.addData(new CorrelationKey(sbuffer.toString())); + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Modified: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/EventAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/EventAdapter.java 2011-02-24 12:06:08 UTC (rev 1313) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/EventAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -45,6 +45,18 @@ detailMapping.put(ActivityFailureEvent.class, new ActivityFailedAdapter()); detailMapping.put(ProcessInstanceStateChangeEvent.class, new StateChangeAdapter()); + + detailMapping.put(CorrelationSetWriteEvent.class, new CorrelationSetWriteAdapter()); + detailMapping.put(PartnerLinkModificationEvent.class, new PartnerLinkModificationAdapter()); + detailMapping.put(VariableModificationEvent.class, new VariableModificationAdapter()); + detailMapping.put(ProcessMessageExchangeEvent.class, new ProcessMessageExchangeAdapter()); + + detailMapping.put(ExpressionEvaluationSuccessEvent.class, new ExpressionEvaluationSuccessAdapter()); + detailMapping.put(ExpressionEvaluationFailedEvent.class, new ExpressionEvaluationFailedAdapter()); + + detailMapping.put(ScopeStartEvent.class, new ScopeStartAdapter()); + detailMapping.put(ScopeCompletionEvent.class, new ScopeCompletionAdapter()); + detailMapping.put(ScopeFaultEvent.class, new ScopeFaultAdapter()); } public static Event createBPAFModel(BpelEvent bpelEvent) @@ -64,7 +76,12 @@ // required for bpel2svg. See https://jira.jboss.org/browse/RIFTSAW-264 target.addData(new LineNumber(bpelEvent.getLineNo())); - + + if (source instanceof ProcessInstanceEvent) { + ProcessInstanceEvent instanceEvent = (ProcessInstanceEvent) source; + target.setProcessInstanceID(instanceEvent.getProcessInstanceId().toString()); + } + // can return null and thus invalidate the event target = mapping.adoptDetails(target, source); } Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ExpressionEvaluationFailedAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ExpressionEvaluationFailedAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ExpressionEvaluationFailedAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,23 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.ExpressionEvaluationFailedEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class ExpressionEvaluationFailedAdapter implements EventDetailMapping<ExpressionEvaluationFailedEvent> { + + public static final String ACTIVITY_NAME = "EXPRESSION_EVALUATION_FAIL"; + + public Event adoptDetails(Event target, ExpressionEvaluationFailedEvent source) { + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ExpressionEvaluationSuccessAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ExpressionEvaluationSuccessAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ExpressionEvaluationSuccessAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,24 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.ExpressionEvaluationSuccessEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class ExpressionEvaluationSuccessAdapter implements EventDetailMapping<ExpressionEvaluationSuccessEvent> { + + public static final String ACTIVITY_NAME = "Expression_EVALUATION_SUCCESS"; + + public Event adoptDetails(Event target, ExpressionEvaluationSuccessEvent source) { + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/PartnerLinkModificationAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/PartnerLinkModificationAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/PartnerLinkModificationAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,22 @@ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.PartnerLinkModificationEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class PartnerLinkModificationAdapter implements + EventDetailMapping<PartnerLinkModificationEvent> { + + public static final String ACTIVITY_NAME = "PARTNERLINK_MODIFICATION"; + + public Event adoptDetails(Event target, PartnerLinkModificationEvent source) { + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ProcessMessageExchangeAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ProcessMessageExchangeAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ProcessMessageExchangeAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,24 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.ProcessMessageExchangeEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class ProcessMessageExchangeAdapter implements + EventDetailMapping<ProcessMessageExchangeEvent> { + + public static final String ACTIVITY_NAME = "PROCESS_MESSAGE_EXCHANGE"; + + public Event adoptDetails(Event target, ProcessMessageExchangeEvent source) { + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeCompletionAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeCompletionAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeCompletionAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,24 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.ScopeCompletionEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class ScopeCompletionAdapter implements + EventDetailMapping<ScopeCompletionEvent> { + + public static final String ACTIVITY_NAME = "SCOPE_COMPLETION"; + + public Event adoptDetails(Event target, ScopeCompletionEvent source) { + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeFaultAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeFaultAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeFaultAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,23 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.ScopeFaultEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class ScopeFaultAdapter implements EventDetailMapping<ScopeFaultEvent> { + + public static final String ACTIVITY_NAME = "SCOPE_FAULT"; + + public Event adoptDetails(Event target, ScopeFaultEvent source) { + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeStartAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeStartAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/ScopeStartAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,23 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.ScopeStartEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class ScopeStartAdapter implements EventDetailMapping<ScopeStartEvent> { + + public static final String ACTIVITY_NAME = "SCOPE_START"; + + public Event adoptDetails(Event target, ScopeStartEvent source) { + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/Variable.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/Variable.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/Variable.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,25 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.utils.DOMUtils; +import org.jboss.bpm.monitor.model.bpaf.Tuple; +import org.w3c.dom.Node; + +/** + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class Variable extends Tuple { + + public static final String name = "variable"; + + public Variable(String varName, Node value) { + setName(name); + String theValue = varName + "=" + DOMUtils.domToString(value); + + setValue(theValue); + } + +} Added: trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/VariableModificationAdapter.java =================================================================== --- trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/VariableModificationAdapter.java (rev 0) +++ trunk/console/bpaf/src/main/java/org/jboss/soa/bpel/console/bpaf/VariableModificationAdapter.java 2011-02-25 13:55:07 UTC (rev 1314) @@ -0,0 +1,25 @@ +/** + * + */ +package org.jboss.soa.bpel.console.bpaf; + +import org.apache.ode.bpel.evt.VariableModificationEvent; +import org.jboss.bpm.monitor.model.bpaf.Event; +import org.jboss.soa.bpel.console.bpaf.EventAdapter.EventDetailMapping; + +/** + * @author Jeff Yu + * @date: Feb 22, 2011 + */ +public class VariableModificationAdapter implements + EventDetailMapping<VariableModificationEvent> { + + public static final String ACTIVITY_NAME = "VARIABLE_MODIFICATION"; + + public Event adoptDetails(Event target, VariableModificationEvent source) { + target.addData(new Variable(source.getVarName(), source.getNewValue())); + target.setActivityName(ACTIVITY_NAME); + return target; + } + +} Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2011-02-24 12:06:08 UTC (rev 1313) +++ trunk/distribution/pom.xml 2011-02-25 13:55:07 UTC (rev 1314) @@ -195,7 +195,7 @@ <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>activity-monitor-model</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${activity.monitor.model.version}</version> </dependency> <dependency> Modified: trunk/distribution/src/main/release/conf/jdbc/mysql.properties =================================================================== --- trunk/distribution/src/main/release/conf/jdbc/mysql.properties 2011-02-24 12:06:08 UTC (rev 1313) +++ trunk/distribution/src/main/release/conf/jdbc/mysql.properties 2011-02-25 13:55:07 UTC (rev 1314) @@ -1,5 +1,5 @@ connection.url=jdbc:mysql://localhost:3306/riftsaw driver=com.mysql.jdbc.Driver username=root -password= +password=jeff dialect=org.hibernate.dialect.MySQLInnoDBDialect Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-24 12:06:08 UTC (rev 1313) +++ trunk/pom.xml 2011-02-25 13:55:07 UTC (rev 1314) @@ -87,8 +87,8 @@ <properties> <riftsaw.ode.version>2.3.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.3.0-SNAPSHOT</riftsaw.engine.version> - <bpel.console.version>2.2.3-Final</bpel.console.version> - <activity.monitor.model.version>1.0.0-Beta2</activity.monitor.model.version> + <bpel.console.version>2.2.4-SNAPSHOT</bpel.console.version> + <activity.monitor.model.version>1.0.0-SNAPSHOT</activity.monitor.model.version> <dsp.version>1.0.0.CR2</dsp.version> <commons.logging.version>1.1.1</commons.logging.version> <commons.lang.version>2.4</commons.lang.version>